提交代码

5 months ago · 9aa7a535fd
parent f471728554
commit 9aa7a535fd
12 changed files with 131 additions and 61 deletions
--- 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;
-    }
 }
--- 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
--- 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,6 +44,40 @@ 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
--- 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
--- 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;
-    }
 }
--- 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());
--- 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
--- 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
--- 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
--- 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
--- 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);
--- 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