Merge remote-tracking branch 'origin/dev' into dev

bweb/src/main/java/com/bweb/config/SysConfig.java

@@ -1,5 +1,6 @@
 package com.bweb.config;
 
+import lombok.Getter;
 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")
+@Getter
 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;
-    }
 }

bweb/src/main/resources/dev/config.properties

@@ -1,2 +1 @@
 fileUrl=/home/project/phg/filesystem
-cmsPath=/home/project/phg/filesystem/cmsPath

bweb/src/main/resources/prod/application.yml

@@ -1,7 +1,7 @@
 server:
-  port: 9301
+  port: 9702
   servlet:
-    context-path: /crest
+    context-path: /brest
 
 #配置是否为debug模式，debug模式下，不开启权限校验
 debug: false
@@ -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
+    url: jdbc:mysql://192.168.0.63:21100/hsg?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
-    username: root
+    username: phg
-    password: HF123456.
+    password: HUfukeji123456!@#
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.jdbc.Driver
     filters: stat
@@ -29,7 +29,7 @@ spring:
     maxOpenPreparedStatements: 20
 
   redis:
-    database: 0
+    database: 1
     host: 127.0.0.1
     port: 36379
     password: HF123456.Redis
@@ -44,12 +44,41 @@ spring:
   jackson:
     serialization:
       write-dates-as-timestamps: true
+
+rocketmq:
+  name-server: 1.95.43.71:9876
+  producer:
+    #必须指定group
+    group: default-group
+
 mybatis:
   mapperLocations:
     - classpath*:sqlmap*/*.xml
   type-aliases-package:
     org.springboot.sample.entity
 
+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
+      keyConvertor: fastjson
+      broadcastChannel: projectA
+      valueEncoder: java
+      valueDecoder: java
+      poolConfig:
+        minIdle: 5
+        maxIdle: 20
+        maxTotal: 50
+
 pagehelper:
   helperDialect: mysql
   reasonable: true

bweb/src/main/resources/prod/config.properties

@@ -1,2 +1 @@
-fileUrl=/home/project/hsg/filesystem
+fileUrl=/home/project/phg/filesystem
-cmsPath=/home/project/hsg/filesystem/cmsPath

cweb/src/main/java/com/cweb/config/SysConfig.java

@@ -1,5 +1,6 @@
 package com.cweb.config;
 
+import lombok.Getter;
 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")
+@Getter
 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;
-    }
 }

cweb/src/main/resources/dev/config.properties

@@ -1,2 +1 @@
 fileUrl=/home/project/phg/filesystem
-cmsPath=/home/project/phg/filesystem/cmsPath

cweb/src/main/resources/prod/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 9301
+  port: 9701
   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
+    url: jdbc:mysql://192.168.0.63:21100/hsg?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
-    username: root
+    username: phg
-    password: HF123456.
+    password: HUfukeji123456!@#
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.jdbc.Driver
     filters: stat
@@ -29,7 +29,7 @@ spring:
     maxOpenPreparedStatements: 20
 
   redis:
-    database: 0
+    database: 1
     host: 127.0.0.1
     port: 36379
     password: HF123456.Redis
@@ -44,12 +44,41 @@ spring:
   jackson:
     serialization:
       write-dates-as-timestamps: true
+
+rocketmq:
+  name-server: 1.95.43.71:9876
+  producer:
+    #必须指定group
+    group: default-group
+
 mybatis:
   mapperLocations:
     - classpath*:sqlmap*/*.xml
   type-aliases-package:
     org.springboot.sample.entity
 
+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
+      keyConvertor: fastjson
+      broadcastChannel: projectA
+      valueEncoder: java
+      valueDecoder: java
+      poolConfig:
+        minIdle: 5
+        maxIdle: 20
+        maxTotal: 50
+
 pagehelper:
   helperDialect: mysql
   reasonable: true

cweb/src/main/resources/prod/config.properties

@@ -1,2 +1 @@
-fileUrl=/home/project/hsg/filesystem
+fileUrl=/home/project/phg/filesystem
-cmsPath=/home/project/hsg/filesystem/cmsPath

order/src/main/resources/dev/config.properties

@@ -1,2 +0,0 @@
-fileUrl=/home/project/hsg/filesystem
-cmsPath=/home/project/hsg/filesystem/cmsPath

order/src/main/resources/prod/application.yml

@@ -1,7 +1,7 @@
 server:
-  port: 9301
+  port: 9703
   servlet:
-    context-path: /crest
+    context-path: /order
 
 #配置是否为debug模式，debug模式下，不开启权限校验
 debug: false
@@ -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
+    url: jdbc:mysql://192.168.0.63:21100/hsg?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
-    username: root
+    username: phg
-    password: HF123456.
+    password: HUfukeji123456!@#
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.jdbc.Driver
     filters: stat
@@ -29,7 +29,7 @@ spring:
     maxOpenPreparedStatements: 20
 
   redis:
-    database: 0
+    database: 1
     host: 127.0.0.1
     port: 36379
     password: HF123456.Redis
@@ -44,12 +44,41 @@ spring:
   jackson:
     serialization:
       write-dates-as-timestamps: true
+
+rocketmq:
+  name-server: 1.95.43.71:9876
+  producer:
+    #必须指定group
+    group: default-group
+
 mybatis:
   mapperLocations:
     - classpath*:sqlmap*/*.xml
   type-aliases-package:
     org.springboot.sample.entity
 
+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
+      keyConvertor: fastjson
+      broadcastChannel: projectA
+      valueEncoder: java
+      valueDecoder: java
+      poolConfig:
+        minIdle: 5
+        maxIdle: 20
+        maxTotal: 50
+
 pagehelper:
   helperDialect: mysql
   reasonable: true

order/src/main/resources/prod/config.properties

@@ -1,2 +0,0 @@
-fileUrl=/home/project/hsg/filesystem
-cmsPath=/home/project/hsg/filesystem/cmsPath

service/src/main/java/com/hfkj/service/order/impl/BsOrderServiceImpl.java

@@ -128,9 +128,9 @@ public class BsOrderServiceImpl implements BsOrderService {
             // 提交订单前实物商品处理
             if (child.getProductType().equals(OrderChildProductTypeEnum.type1.getCode())) {
                 child = orderCreateService.goods(order, child);
-            }
+
-            // 提交订单前产品处理
+            } else if (child.getProductType().equals(OrderChildProductTypeEnum.type2.getCode())) {
-            if (child.getProductType().equals(OrderChildProductTypeEnum.type2.getCode())) {
+                // 提交订单虚拟商品处理
                 child = orderCreateService.product(order, child);
             }
             child.setProductTotalPrice(child.getProductPrice().multiply(new BigDecimal(child.getProductCount().toString())));

service/src/main/resources/dev/commonConfig.properties

@@ -1,5 +1,4 @@
 
-
 wechatMpAppid=wxa075e8509802f826
 wechatMpSecret=0e606fc1378d35e359fcf3f15570b2c5
 

service/src/main/resources/prod/commonConfig.properties

@@ -5,7 +5,11 @@ wechatMpSecret=0e606fc1378d35e359fcf3f15570b2c5
 wechatMaAppid=wx8d49e2f83025229d
 wechatMaSecret=d8d6dcaef77d3b659258a01b5ddba5df
 
-huiPayPreorderNotifyUrl=https://phgcs.dctpay.com/order/notify/huipay
+obsBucketName=phg
+obsEndPoint=https://obs.cn-southwest-2.myhuaweicloud.com
+obsUrl=https://phg.obs.cn-southwest-2.myhuaweicloud.com
+
+huiPayPreorderNotifyUrl=https://phg.dctpay.com/order/notify/huipay
 
 # ChongQingCNPC configuration parameters
 chongQingCnpcUrl=http://cqpingan.wisdomyt.cn/d/cross/api
@@ -28,3 +32,20 @@ huiliantongAppsecret=52662415DDCE55C7BA34223BCF53877A
 huiliantongSinopecDistributorId=aNId4A3X
 huiliantongDistributorId=1JnL8YMV
 huiliantongSinopecUrl=fuelCoupons
+
+
+scPetroUrl = http://43.136.176.177:8081/hd-api/out/
+scPetroAppid = 510000526745391907
+scPetroAppKey = 5100006xmbmM2NBpm5HXT
+scPetroAesKey = AueRgSEVwPg87ebYhbYvfxMM3XAkvimu
+
+gzPetroUrl = http://140.143.82.223:1588/gz
+gzPetroAppid = F0bdoJRwt
+gzPetroAppKey = pIyhCbA61wwyyU371QUSnBKqbWvO8Q98
+gzPetroAesKey = pIyhCbA61wwyyU371QUSnBKqbWvO8Q98
+
+#ETC
+etcPostUrl = https://test.djien-qr.com/
+etcChannelCode = GZETCFXQD
+etcPublicKey = MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCMyQb5gR1rweB5oHKqRPJtJjLQKsn5PXOVfaNdGt/2kPkHvRdN3L9zOaAvFEXcEl2V0sg3D8a+2Sfy1YANAZvjscTQYOaoFl+LVyQZvgyyX8RQw+26Jmbqh8DwenUbNf7DFYVSDxIMBLOiWPkGsYGFONjsUVmfykSeVTcEgQB3VwIDAQAB
+etcPrivateKey = MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAO8+KWh/OmBahFk7TWOEjPl13BT5NdlbGvQ/311Yua6CQqul9w1DIR2TwFUUh/Bko/eVoLROfF2XVjHbw2bImTdJ7y9C3511HI59YPNzqyql0DHjLxbH0VW92eUgk8mG09wtrUMu1ImN0b7aFE3uqAgz6pwh3TUiQWsDWz+l/MG7AgMBAAECgYEA7nYsOd8OpbmzT2m/omEdTwz9993KocKgZDJCBj4InftyTrrXO93cZSm/PE6BjMgTcxUuIGpWpcbRgFLHOmzZ4Qd+k/6Yb1ErMTfdGlgrxv2B+vztWYfjmFzEiXpecFH47ED6iYrrqm14X3InpnBv4rUkGdqqNbyPGgTO2ncs/3kCQQD+xqRAQSb/TROlqJdO91y6z9v0PO2GLmokqYg444rKYZKhDE0tdJeLU/sfK8SMg5+SlwdQm4nlo8EDJ/w2CEn3AkEA8GRqVkKgIuH413/a6+luYDjlf30WY7Mi1sm3QPSZ6+eH35UwsL6mdX6mjRpUN9Hez6FMfE7s3XOldoPVMzR1XQJBAOa2VTkGhtz8HEWQZOySXfuhjSogHmu7Dk2C5CO4Eg/wycpjDGSUR0NZWnfAt60S6GbjszEQmJBGeNt10xPO78MCQQCWXwnRaZ3IFDhXfQfRWFSN5ilQ5UszFGQvnUB/ZkI+ObdZmXY6qRdxGcdPLnAN9r78fDZe7/Pk1qljCDY98IuVAkEAnSeO/221gDhL1wnbUhGuX1yo8f5Eo/wDTW5cBxXFGZeexhB8I4jnEV4E/xmikkb3jDFvmrnFk+XUtDqkrvicRQ==

user/src/main/resources/dev/config.properties

@@ -1,2 +1 @@
-fileUrl=/home/project/hsg/filesystem
+fileUrl=/home/project/phg/filesystem
-cmsPath=/home/project/hsg/filesystem/cmsPath

user/src/main/resources/prod/application.yml

@@ -1,7 +1,7 @@
 server:
-  port: 9301
+  port: 9704
   servlet:
-    context-path: /crest
+    context-path: /user
 
 #配置是否为debug模式，debug模式下，不开启权限校验
 debug: false
@@ -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
+    url: jdbc:mysql://192.168.0.63:21100/hsg?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
-    username: root
+    username: phg
-    password: HF123456.
+    password: HUfukeji123456!@#
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.jdbc.Driver
     filters: stat
@@ -29,7 +29,7 @@ spring:
     maxOpenPreparedStatements: 20
 
   redis:
-    database: 0
+    database: 1
     host: 127.0.0.1
     port: 36379
     password: HF123456.Redis
@@ -44,12 +44,41 @@ spring:
   jackson:
     serialization:
       write-dates-as-timestamps: true
+
+rocketmq:
+  name-server: 1.95.43.71:9876
+  producer:
+    #必须指定group
+    group: default-group
+
 mybatis:
   mapperLocations:
     - classpath*:sqlmap*/*.xml
   type-aliases-package:
     org.springboot.sample.entity
 
+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
+      keyConvertor: fastjson
+      broadcastChannel: projectA
+      valueEncoder: java
+      valueDecoder: java
+      poolConfig:
+        minIdle: 5
+        maxIdle: 20
+        maxTotal: 50
+
 pagehelper:
   helperDialect: mysql
   reasonable: true

user/src/main/resources/prod/config.properties

@@ -1,2 +1 @@
-fileUrl=/home/project/hsg/filesystem
+fileUrl=/home/project/phg/filesystem
-cmsPath=/home/project/hsg/filesystem/cmsPath