Przeglądaj źródła

Merge commit 'refs/tags/jenkins-back-end-308^{}' into release

release_toaliyun_real
hupeng 7 lat temu
rodzic
commit
cb898d2e8b
11 zmienionych plików z 192 dodań i 17 usunięć
  1. +2
    -2
      mallinkAdmin/src/main/resources/application-prod.yml
  2. +43
    -0
      mallinkAdmin/src/main/resources/application-test.yml
  3. +1
    -1
      mallinkBApi/src/main/resources/application-dev.yml
  4. +4
    -3
      mallinkBApi/src/main/resources/application-prod.yml
  5. +42
    -0
      mallinkBApi/src/main/resources/application-test.yml
  6. +5
    -4
      mallinkCApi/src/main/resources/application-prod.yml
  7. +42
    -0
      mallinkCApi/src/main/resources/application-test.yml
  8. +5
    -4
      mallinkSchedule/src/main/resources/application-prod.yml
  9. +43
    -0
      mallinkSchedule/src/main/resources/application-test.yml
  10. +1
    -1
      mallinkSchedule/src/main/resources/application.yml
  11. +4
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java

+ 2
- 2
mallinkAdmin/src/main/resources/application-prod.yml Wyświetl plik

@@ -22,9 +22,9 @@ spring:
connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=6000"
# REDIS
redis:
host: 202.165.179.86
host: 127.0.0.1
port: 6379
password: ENC(YOLO4buIPjiYfosG+Akk3XZ9HYrbCFco)
password: ENC(4Z6xTEJOw04DYyhur0mTwlveexVEX9YRfNTY78MyKgU=)
timeout: 3600
expire: 1800 #30分钟
database: 1


+ 43
- 0
mallinkAdmin/src/main/resources/application-test.yml Wyświetl plik

@@ -0,0 +1,43 @@
spring:
# JDBC
datasource:
url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallink?useUnicode=true&characterEncoding=UTF-8
username: ENC(BDv01/sQdBGEhFEXuw+8tw==)
password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=)
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
filters: stat
maxActive: 20
initialSize: 1
maxWait: 60000
minIdle: 1
timeBetweenEvictionRunsMillis: 60000
minEvictableIdleTimeMillis: 300000
validationQuery: select 'x'
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
poolPreparedStatements: true
maxOpenPreparedStatements: 20
connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=6000"
# REDIS
redis:
host: 127.0.0.1
port: 6379
password: ENC(4Z6xTEJOw04DYyhur0mTwlveexVEX9YRfNTY78MyKgU=)
timeout: 3600
expire: 1800 #30分钟
database: 1
defaultExpiration: 2592000 # 默认生命周期30天
jedis:
pool:
max-active: 8
max-idle: 8
max-wait: -1
min-idle: 0

logging:
level:
tk.mybatis: debug
com.iformall: debug
path: ./logs/admin

+ 1
- 1
mallinkBApi/src/main/resources/application-dev.yml Wyświetl plik

@@ -1,7 +1,7 @@
spring:
# JDBC
datasource:
url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false
url: jdbc:mysql://202.165.179.86:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8
username: ENC(dZ8fmrtuBMQYaRytKQgTqg==)
password: ENC(OZXsE6/Tj+V1Yu2wdjnIGbNOaBVQzi9W)
type: com.alibaba.druid.pool.DruidDataSource


+ 4
- 3
mallinkBApi/src/main/resources/application-prod.yml Wyświetl plik

@@ -1,7 +1,7 @@
spring:
# JDBC
datasource:
url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallink?useUnicode=true&characterEncoding=UTF-8
url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8
username: ENC(BDv01/sQdBGEhFEXuw+8tw==)
password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=)
type: com.alibaba.druid.pool.DruidDataSource
@@ -21,12 +21,13 @@ spring:
maxOpenPreparedStatements: 20
# REDIS
redis:
host: 202.165.179.86
host: 127.0.0.1
port: 6789
password: ENC(YOLO4buIPjiYfosG+Akk3XZ9HYrbCFco)
password: ENC(4Z6xTEJOw04DYyhur0mTwlveexVEX9YRfNTY78MyKgU=)
timeout: 3600
expire: 1800 #30分钟
database: 1
defaultExpiration: 2592000 # 默认生命周期30天
jedis:
pool:
max-active: 8


+ 42
- 0
mallinkBApi/src/main/resources/application-test.yml Wyświetl plik

@@ -0,0 +1,42 @@
spring:
# JDBC
datasource:
url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallinkTest?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8
username: ENC(BDv01/sQdBGEhFEXuw+8tw==)
password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=)
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
filters: stat
maxActive: 20
initialSize: 1
maxWait: 60000
minIdle: 1
timeBetweenEvictionRunsMillis: 60000
minEvictableIdleTimeMillis: 300000
validationQuery: select 'x'
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
poolPreparedStatements: true
maxOpenPreparedStatements: 20
# REDIS
redis:
host: 127.0.0.1
port: 6789
password: ENC(4Z6xTEJOw04DYyhur0mTwlveexVEX9YRfNTY78MyKgU=)
timeout: 3600
expire: 1800 #30分钟
database: 1
defaultExpiration: 2592000 # 默认生命周期30天
jedis:
pool:
max-active: 8
max-idle: 8
max-wait: -1
min-idle: 0

logging:
level:
tk.mybatis: debug
com.iformall: debug
path: ./logs/b

+ 5
- 4
mallinkCApi/src/main/resources/application-prod.yml Wyświetl plik

@@ -1,7 +1,7 @@
spring:
# JDBC
datasource:
url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallink?useUnicode=true&characterEncoding=UTF-8
url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8
username: ENC(BDv01/sQdBGEhFEXuw+8tw==)
password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=)
type: com.alibaba.druid.pool.DruidDataSource
@@ -21,12 +21,13 @@ spring:
maxOpenPreparedStatements: 20
# REDIS
redis:
host: 202.165.179.86
host: 127.0.0.1
port: 6789
password: ENC(YOLO4buIPjiYfosG+Akk3XZ9HYrbCFco)
password: ENC(4Z6xTEJOw04DYyhur0mTwlveexVEX9YRfNTY78MyKgU=)
timeout: 3600
expire: 1800 #30分钟
database: 1
defaultExpiration: 2592000 # 默认生命周期30天
jedis:
pool:
max-active: 8
@@ -37,5 +38,5 @@ spring:
logging:
level:
tk.mybatis: debug
com.iformall.mapper: debug
com.iformall: debug
path: ./logs/c

+ 42
- 0
mallinkCApi/src/main/resources/application-test.yml Wyświetl plik

@@ -0,0 +1,42 @@
spring:
# JDBC
datasource:
url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallinkTest?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8
username: ENC(BDv01/sQdBGEhFEXuw+8tw==)
password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=)
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
filters: stat
maxActive: 20
initialSize: 1
maxWait: 60000
minIdle: 1
timeBetweenEvictionRunsMillis: 60000
minEvictableIdleTimeMillis: 300000
validationQuery: select 'x'
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
poolPreparedStatements: true
maxOpenPreparedStatements: 20
# REDIS
redis:
host: 127.0.0.1
port: 6789
password: ENC(4Z6xTEJOw04DYyhur0mTwlveexVEX9YRfNTY78MyKgU=)
timeout: 3600
expire: 1800 #30分钟
database: 1
defaultExpiration: 2592000 # 默认生命周期30天
jedis:
pool:
max-active: 8
max-idle: 8
max-wait: -1
min-idle: 0

logging:
level:
tk.mybatis: debug
com.iformall: debug
path: ./logs/c

+ 5
- 4
mallinkSchedule/src/main/resources/application-prod.yml Wyświetl plik

@@ -1,7 +1,7 @@
spring:
# JDBC
datasource:
url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallink?characterEncoding=UTF-8
url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8
username: ENC(BDv01/sQdBGEhFEXuw+8tw==)
password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=)
type: com.alibaba.druid.pool.DruidDataSource
@@ -22,12 +22,13 @@ spring:
connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=6000"
# REDIS
redis:
host: 202.165.179.86
host: 127.0.0.1
port: 6379
password: ENC(YOLO4buIPjiYfosG+Akk3XZ9HYrbCFco)
password: ENC(4Z6xTEJOw04DYyhur0mTwlveexVEX9YRfNTY78MyKgU=)
timeout: 3600
expire: 1800 #30分钟
database: 1
defaultExpiration: 2592000 # 默认生命周期30天
jedis:
pool:
max-active: 8
@@ -38,5 +39,5 @@ spring:
logging:
level:
tk.mybatis: debug
com.iformall.mapper: debug
com.iformall: debug
path: ./logs/s

+ 43
- 0
mallinkSchedule/src/main/resources/application-test.yml Wyświetl plik

@@ -0,0 +1,43 @@
spring:
# JDBC
datasource:
url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallinkTest?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8
username: ENC(BDv01/sQdBGEhFEXuw+8tw==)
password: ENC(0wvpX49+RMUpGP2tb9PY4ta/yCwAmLLhbKG9ndvifPI=)
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
filters: stat
maxActive: 20
initialSize: 1
maxWait: 60000
minIdle: 1
timeBetweenEvictionRunsMillis: 60000
minEvictableIdleTimeMillis: 300000
validationQuery: select 'x'
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
poolPreparedStatements: true
maxOpenPreparedStatements: 20
connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=6000"
# REDIS
redis:
host: 127.0.0.1
port: 6379
password: ENC(4Z6xTEJOw04DYyhur0mTwlveexVEX9YRfNTY78MyKgU=)
timeout: 3600
expire: 1800 #30分钟
database: 1
defaultExpiration: 2592000 # 默认生命周期30天
jedis:
pool:
max-active: 8
max-idle: 8
max-wait: -1
min-idle: 0

logging:
level:
tk.mybatis: debug
com.iformall: debug
path: ./logs/s

+ 1
- 1
mallinkSchedule/src/main/resources/application.yml Wyświetl plik

@@ -1,7 +1,7 @@
server:
port: 5000
servlet:
context-path: /
context-path: /S

spring:
application:


+ 4
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java Wyświetl plik

@@ -106,7 +106,9 @@ public class WxPayBillServiceImpl implements WxPayBillService {
WxPayAccountBill payAccount = wxPayAccountBillMapper.selectByPrimaryKey(appInfo.getPayBillId());
Date currentDate = new Date();
String payBillNo;
List<WxPayBill> list = wxPayBillMapper.findList(record);
WxPayBill billParam= new WxPayBill();
billParam.setBillId(record.getBillId());
List<WxPayBill> list = wxPayBillMapper.findList(billParam);
//数据库不存在已有订单,新建订单
if (list.size() <= 0) {
// 创建支付订单
@@ -603,7 +605,7 @@ public class WxPayBillServiceImpl implements WxPayBillService {
public void updatePayBillStatus(WxPayBill payBill) {
try {
logger.info("更新支付订单");
wxPayBillMapper.selectByPrimaryKey(payBill);
wxPayBillMapper.updateByPrimaryKeySelective(payBill);
}catch (MallinkException e){
logger.info("更新支付订单失败");
throw new MallinkException(ErrorCode.ORDER_UPDATE_ERR);


Ładowanie…
Anuluj
Zapisz