From 9aa7a535fd1c0661b093b063a05d19df0fe72cfa Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Tue, 25 Jun 2024 15:59:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bweb/config/SysConfig.java | 19 +------- bweb/src/main/resources/dev/config.properties | 1 - bweb/src/main/resources/prod/application.yml | 46 ++++++++++++++++--- .../src/main/resources/prod/config.properties | 3 +- .../main/java/com/cweb/config/SysConfig.java | 19 +------- .../controller/order/OrderPayController.java | 2 + cweb/src/main/resources/dev/config.properties | 2 - cweb/src/main/resources/prod/application.yml | 46 ++++++++++++++++--- .../src/main/resources/prod/config.properties | 3 +- .../src/main/resources/prod/application.yml | 46 ++++++++++++++++--- .../java/com/hfkj/config/MessageConfig.java | 2 +- .../resources/prod/commonConfig.properties | 3 ++ 12 files changed, 131 insertions(+), 61 deletions(-) diff --git a/bweb/src/main/java/com/bweb/config/SysConfig.java b/bweb/src/main/java/com/bweb/config/SysConfig.java index 1535c40..b6c2a37 100644 --- a/bweb/src/main/java/com/bweb/config/SysConfig.java +++ b/bweb/src/main/java/com/bweb/config/SysConfig.java @@ -1,5 +1,6 @@ package com.bweb.config; +import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.PropertySource; import org.springframework.stereotype.Component; @@ -7,25 +8,9 @@ import org.springframework.stereotype.Component; @Component("sysConfig") @ConfigurationProperties @PropertySource("classpath:/config.properties") +@Data public class SysConfig { private String fileUrl; - private String cmsPath; - - public String getFileUrl() { - return fileUrl; - } - - public void setFileUrl(String fileUrl) { - this.fileUrl = fileUrl; - } - - public String getCmsPath() { - return cmsPath; - } - - public void setCmsPath(String cmsPath) { - this.cmsPath = cmsPath; - } } diff --git a/bweb/src/main/resources/dev/config.properties b/bweb/src/main/resources/dev/config.properties index 29bda5b..9ee346e 100644 --- a/bweb/src/main/resources/dev/config.properties +++ b/bweb/src/main/resources/dev/config.properties @@ -1,2 +1 @@ fileUrl=/home/project/oil/filesystem -cmsPath=/home/project/oil/filesystem/cmsPath diff --git a/bweb/src/main/resources/prod/application.yml b/bweb/src/main/resources/prod/application.yml index 18a5cc0..89e6a42 100644 --- a/bweb/src/main/resources/prod/application.yml +++ b/bweb/src/main/resources/prod/application.yml @@ -1,5 +1,5 @@ server: - port: 9302 + port: 9802 servlet: context-path: /brest @@ -9,9 +9,9 @@ debug: false #datasource数据源设置 spring: datasource: - url: jdbc:mysql://127.0.0.1:3306/hsg?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8 - username: root - password: HF123456. + url: jdbc:mysql://192.168.0.63:21100/hai_oil?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false + username: oil + password: HUfukeji123456!@# type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver filters: stat @@ -28,7 +28,7 @@ spring: poolPreparedStatements: true maxOpenPreparedStatements: 20 redis: - database: 0 + database: 2 host: 127.0.0.1 port: 36379 password: HF123456.Redis @@ -44,9 +44,43 @@ spring: serialization: write-dates-as-timestamps: true +rocketmq: + name-server: 1.95.43.71:9876 + producer: + access-key: huifukeji + secret-key: HF123456. + #必须指定group + group: default-group + consumer: + access-key: huifukeji + secret-key: HF123456. + +jetcache: + statIntervalMinutes: 15 + areaInCacheName: false + local: + default: + type: linkedhashmap + keyConvertor: fastjson + remote: + default: + type: redis + host: 127.0.0.1 + port: 36379 + password: HF123456.Redis + database: 2 + keyConvertor: fastjson + broadcastChannel: projectA + valueEncoder: java + valueDecoder: java + poolConfig: + minIdle: 5 + maxIdle: 20 + maxTotal: 50 + mybatis: mapperLocations: - - classpath*:sqlmap*/*.xml + - classpath*:sqlmap*/*.xml type-aliases-package: org.springboot.sample.entity diff --git a/bweb/src/main/resources/prod/config.properties b/bweb/src/main/resources/prod/config.properties index 44ea8fc..9ee346e 100644 --- a/bweb/src/main/resources/prod/config.properties +++ b/bweb/src/main/resources/prod/config.properties @@ -1,2 +1 @@ -fileUrl=/home/project/hsg/filesystem -cmsPath=/home/project/hsg/filesystem/cmsPath +fileUrl=/home/project/oil/filesystem diff --git a/cweb/src/main/java/com/cweb/config/SysConfig.java b/cweb/src/main/java/com/cweb/config/SysConfig.java index 3be648e..ae2325a 100644 --- a/cweb/src/main/java/com/cweb/config/SysConfig.java +++ b/cweb/src/main/java/com/cweb/config/SysConfig.java @@ -1,5 +1,6 @@ package com.cweb.config; +import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.PropertySource; import org.springframework.stereotype.Component; @@ -7,25 +8,9 @@ import org.springframework.stereotype.Component; @Component("sysConfig") @ConfigurationProperties @PropertySource("classpath:/config.properties") +@Data public class SysConfig { private String fileUrl; - private String cmsPath; - - public String getFileUrl() { - return fileUrl; - } - - public void setFileUrl(String fileUrl) { - this.fileUrl = fileUrl; - } - - public String getCmsPath() { - return cmsPath; - } - - public void setCmsPath(String cmsPath) { - this.cmsPath = cmsPath; - } } diff --git a/cweb/src/main/java/com/cweb/controller/order/OrderPayController.java b/cweb/src/main/java/com/cweb/controller/order/OrderPayController.java index 5c21eb0..1f13425 100644 --- a/cweb/src/main/java/com/cweb/controller/order/OrderPayController.java +++ b/cweb/src/main/java/com/cweb/controller/order/OrderPayController.java @@ -89,6 +89,7 @@ public class OrderPayController { if (orderSettle == null) { orderSettle = new BsOrderSettle(); } + orderSettle.setMerNo(merPay.getMerNo()); orderSettle.setOrderNo(order.getOrderNo()); orderSettle.setSettleMerNo(merPay.getChannelMerNo()); orderSettle.setSettleMerKey(merPay.getChannelMerKey()); @@ -143,6 +144,7 @@ public class OrderPayController { if (orderSettle == null) { orderSettle = new BsOrderSettle(); } + orderSettle.setMerNo(merPay.getMerNo()); orderSettle.setOrderNo(order.getOrderNo()); orderSettle.setSettleMerNo(merPay.getChannelMerNo()); orderSettle.setSettleMerKey(merPay.getChannelMerKey()); diff --git a/cweb/src/main/resources/dev/config.properties b/cweb/src/main/resources/dev/config.properties index 44ea8fc..e69de29 100644 --- a/cweb/src/main/resources/dev/config.properties +++ b/cweb/src/main/resources/dev/config.properties @@ -1,2 +0,0 @@ -fileUrl=/home/project/hsg/filesystem -cmsPath=/home/project/hsg/filesystem/cmsPath diff --git a/cweb/src/main/resources/prod/application.yml b/cweb/src/main/resources/prod/application.yml index f3e38c7..85bc5e5 100644 --- a/cweb/src/main/resources/prod/application.yml +++ b/cweb/src/main/resources/prod/application.yml @@ -1,5 +1,5 @@ server: - port: 9301 + port: 9801 servlet: context-path: /crest @@ -9,9 +9,9 @@ debug: false #datasource数据源设置 spring: datasource: - url: jdbc:mysql://127.0.0.1:3306/hsg?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8 - username: root - password: HF123456. + url: jdbc:mysql://192.168.0.63:21100/hai_oil?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false + username: oil + password: HUfukeji123456!@# type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver filters: stat @@ -27,9 +27,8 @@ spring: testOnReturn: false poolPreparedStatements: true maxOpenPreparedStatements: 20 - redis: - database: 0 + database: 2 host: 127.0.0.1 port: 36379 password: HF123456.Redis @@ -44,6 +43,41 @@ spring: jackson: serialization: write-dates-as-timestamps: true + +rocketmq: + name-server: 1.95.43.71:9876 + producer: + access-key: huifukeji + secret-key: HF123456. + #必须指定group + group: default-group + consumer: + access-key: huifukeji + secret-key: HF123456. + +jetcache: + statIntervalMinutes: 15 + areaInCacheName: false + local: + default: + type: linkedhashmap + keyConvertor: fastjson + remote: + default: + type: redis + host: 127.0.0.1 + port: 36379 + password: HF123456.Redis + database: 2 + keyConvertor: fastjson + broadcastChannel: projectA + valueEncoder: java + valueDecoder: java + poolConfig: + minIdle: 5 + maxIdle: 20 + maxTotal: 50 + mybatis: mapperLocations: - classpath*:sqlmap*/*.xml diff --git a/cweb/src/main/resources/prod/config.properties b/cweb/src/main/resources/prod/config.properties index 44ea8fc..9ee346e 100644 --- a/cweb/src/main/resources/prod/config.properties +++ b/cweb/src/main/resources/prod/config.properties @@ -1,2 +1 @@ -fileUrl=/home/project/hsg/filesystem -cmsPath=/home/project/hsg/filesystem/cmsPath +fileUrl=/home/project/oil/filesystem diff --git a/schedule/src/main/resources/prod/application.yml b/schedule/src/main/resources/prod/application.yml index 54fea1f..590f6de 100644 --- a/schedule/src/main/resources/prod/application.yml +++ b/schedule/src/main/resources/prod/application.yml @@ -1,5 +1,5 @@ server: - port: 9303 + port: 9803 servlet: context-path: /schedule @@ -9,9 +9,9 @@ debug: false #datasource数据源设置 spring: datasource: - url: jdbc:mysql://127.0.0.1:3306/hsg?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8 - username: root - password: HF123456. + url: jdbc:mysql://192.168.0.63:21100/hai_oil?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false + username: oil + password: HUfukeji123456!@# type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver filters: stat @@ -27,9 +27,8 @@ spring: testOnReturn: false poolPreparedStatements: true maxOpenPreparedStatements: 20 - redis: - database: 0 + database: 2 host: 127.0.0.1 port: 36379 password: HF123456.Redis @@ -40,12 +39,45 @@ spring: max-wait: -1 max-idle: 10 min-idle: 0 - #配置日期返回至前台为时间戳 jackson: serialization: write-dates-as-timestamps: true +rocketmq: + name-server: 1.95.43.71:9876 + producer: + access-key: huifukeji + secret-key: HF123456. + #必须指定group + group: default-group + consumer: + access-key: huifukeji + secret-key: HF123456. + +jetcache: + statIntervalMinutes: 15 + areaInCacheName: false + local: + default: + type: linkedhashmap + keyConvertor: fastjson + remote: + default: + type: redis + host: 127.0.0.1 + port: 36379 + password: HF123456.Redis + database: 2 + keyConvertor: fastjson + broadcastChannel: projectA + valueEncoder: java + valueDecoder: java + poolConfig: + minIdle: 5 + maxIdle: 20 + maxTotal: 50 + mybatis: mapperLocations: - classpath*:sqlmap*/*.xml diff --git a/service/src/main/java/com/hfkj/config/MessageConfig.java b/service/src/main/java/com/hfkj/config/MessageConfig.java index 1529953..2b03ebb 100644 --- a/service/src/main/java/com/hfkj/config/MessageConfig.java +++ b/service/src/main/java/com/hfkj/config/MessageConfig.java @@ -210,7 +210,7 @@ public class MessageConfig { mtSmsMessage.setMobiles(mobiles); mtSmsMessage.setTemplateId(smsTemplateId); mtSmsMessage.setTemplateParas(paramValues); - mtSmsMessage.setSignature("【普惠GO】"); + mtSmsMessage.setSignature("【嗨加油】"); requestLists.add(mtSmsMessage); map.put("account", accout); map.put("password", passward); diff --git a/service/src/main/resources/prod/commonConfig.properties b/service/src/main/resources/prod/commonConfig.properties index e69de29..1efe9bd 100644 --- a/service/src/main/resources/prod/commonConfig.properties +++ b/service/src/main/resources/prod/commonConfig.properties @@ -0,0 +1,3 @@ +filesystem=/home/project/oil/filesystem +huiPayPreorderNotifyUrl=https://oil.dctpay.com/crest/notify/huipay +domainName=https://oil.dctpay.com