xiaohanzi 5 лет назад
Родитель
Сommit
d5553b3ca5
10 измененных файлов: 38 добавлений и 40 удалений
  1. +4
    -4
      mallinkAdmin/src/main/resources/application-prod.yml
  2. +4
    -4
      mallinkBApi/src/main/resources/application-prod.yml
  3. +6
    -6
      mallinkCApi/src/main/resources/application-prod.yml
  4. +4
    -4
      mallinkCallback/src/main/resources/application-prod.yml
  5. +4
    -4
      mallinkMQConsumer/src/main/resources/application-prod.yml
  6. +4
    -4
      mallinkPosApi/src/main/resources/application-prod.yml
  7. +4
    -4
      mallinkSchedule/src/main/resources/application-prod.yml
  8. +0
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  9. +4
    -4
      mallinkSysAdmin/src/main/resources/application-prod.yml
  10. +4
    -4
      mallinkWebSocketServer/src/main/resources/application-prod.yml

+ 4
- 4
mallinkAdmin/src/main/resources/application-prod.yml Просмотреть файл

@@ -24,9 +24,9 @@ spring:
connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=60000"
# REDIS
redis:
host: 101.201.103.81
host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com
port: 6379
password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL)
password: mallone:iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 1
@@ -104,9 +104,9 @@ wechat:
componentToken: ENC(rkxj0733WxFFDLgA9x01m2s5Fi2L+0PC)
componentAesKey: ENC(EIbJUBpbYOrLb4YQ/HXLQmxlxgAqIp2ZmpnGICC8pu5xiTz3Cqfkbwd2S8raCcK/IvYcX2GmedI=)
redis:
host: 101.201.103.81
host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com
port: 6379
password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL)
password: mallone:iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 2


+ 4
- 4
mallinkBApi/src/main/resources/application-prod.yml Просмотреть файл

@@ -23,9 +23,9 @@ spring:
maxOpenPreparedStatements: 20
# REDIS
redis:
host: 101.201.103.81
host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com
port: 6379
password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL)
password: mallone:iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 1
@@ -96,9 +96,9 @@ wechat:
componentToken: ENC(rkxj0733WxFFDLgA9x01m2s5Fi2L+0PC)
componentAesKey: ENC(EIbJUBpbYOrLb4YQ/HXLQmxlxgAqIp2ZmpnGICC8pu5xiTz3Cqfkbwd2S8raCcK/IvYcX2GmedI=)
redis:
host: 101.201.103.81
host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com
port: 6379
password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL)
password: mallone:iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 2


+ 6
- 6
mallinkCApi/src/main/resources/application-prod.yml Просмотреть файл

@@ -23,9 +23,9 @@ spring:
maxOpenPreparedStatements: 20
# REDIS
redis:
host: 101.201.103.81
host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com
port: 6379
password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL)
password: mallone:iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 1
@@ -33,9 +33,9 @@ spring:
jedis:
pool:
max-active: 100
max-idle: 20
max-idle: 100
max-wait: -1
min-idle: 0
min-idle: 10
# SMS
aliyun:
sms:
@@ -95,9 +95,9 @@ wechat:
componentToken: ENC(rkxj0733WxFFDLgA9x01m2s5Fi2L+0PC)
componentAesKey: ENC(EIbJUBpbYOrLb4YQ/HXLQmxlxgAqIp2ZmpnGICC8pu5xiTz3Cqfkbwd2S8raCcK/IvYcX2GmedI=)
redis:
host: 101.201.103.81
host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com
port: 6379
password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL)
password: mallone:iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 2


+ 4
- 4
mallinkCallback/src/main/resources/application-prod.yml Просмотреть файл

@@ -24,9 +24,9 @@ spring:
connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=6000"
# REDIS
redis:
host: 101.201.103.81
host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com
port: 6379
password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL)
password: mallone:iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 1
@@ -100,9 +100,9 @@ wechat:
componentToken: ENC(rkxj0733WxFFDLgA9x01m2s5Fi2L+0PC)
componentAesKey: ENC(EIbJUBpbYOrLb4YQ/HXLQmxlxgAqIp2ZmpnGICC8pu5xiTz3Cqfkbwd2S8raCcK/IvYcX2GmedI=)
redis:
host: 101.201.103.81
host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com
port: 6379
password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL)
password: mallone:iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 2


+ 4
- 4
mallinkMQConsumer/src/main/resources/application-prod.yml Просмотреть файл

@@ -24,9 +24,9 @@ spring:
connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=6000"
# REDIS
redis:
host: 101.201.103.81
host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com
port: 6379
password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL)
password: mallone:iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 1
@@ -95,9 +95,9 @@ wechat:
componentToken: ENC(rkxj0733WxFFDLgA9x01m2s5Fi2L+0PC)
componentAesKey: ENC(EIbJUBpbYOrLb4YQ/HXLQmxlxgAqIp2ZmpnGICC8pu5xiTz3Cqfkbwd2S8raCcK/IvYcX2GmedI=)
redis:
host: 101.201.103.81
host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com
port: 6379
password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL)
password: mallone:iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 2


+ 4
- 4
mallinkPosApi/src/main/resources/application-prod.yml Просмотреть файл

@@ -23,9 +23,9 @@ spring:
maxOpenPreparedStatements: 20
# REDIS
redis:
host: 101.201.103.81
host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com
port: 6379
password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL)
password: mallone:iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 1
@@ -94,9 +94,9 @@ wechat:
componentToken: ENC(rkxj0733WxFFDLgA9x01m2s5Fi2L+0PC)
componentAesKey: ENC(EIbJUBpbYOrLb4YQ/HXLQmxlxgAqIp2ZmpnGICC8pu5xiTz3Cqfkbwd2S8raCcK/IvYcX2GmedI=)
redis:
host: 101.201.103.81
host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com
port: 6379
password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL)
password: mallone:iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 2


+ 4
- 4
mallinkSchedule/src/main/resources/application-prod.yml Просмотреть файл

@@ -24,9 +24,9 @@ spring:
connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=6000"
# REDIS
redis:
host: 101.201.103.81
host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com
port: 6379
password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL)
password: mallone:iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 1
@@ -95,9 +95,9 @@ wechat:
componentToken: ENC(rkxj0733WxFFDLgA9x01m2s5Fi2L+0PC)
componentAesKey: ENC(EIbJUBpbYOrLb4YQ/HXLQmxlxgAqIp2ZmpnGICC8pu5xiTz3Cqfkbwd2S8raCcK/IvYcX2GmedI=)
redis:
host: 101.201.103.81
host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com
port: 6379
password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL)
password: mallone:iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 2


+ 0
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java Просмотреть файл

@@ -511,8 +511,6 @@ public class WxMerchantServiceImpl implements WxMerchantService {
}
}

return new ResultData(Result.SUCCESS, "商户更新成功");
} catch (Exception e) {
logger.error("db failed: 商户更新失败, e:" + e.getMessage());


+ 4
- 4
mallinkSysAdmin/src/main/resources/application-prod.yml Просмотреть файл

@@ -24,9 +24,9 @@ spring:
connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=6000"
# REDIS
redis:
host: 101.201.103.81
host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com
port: 6379
password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL)
password: mallone:iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 1
@@ -102,9 +102,9 @@ wechat:
componentToken: ENC(rkxj0733WxFFDLgA9x01m2s5Fi2L+0PC)
componentAesKey: ENC(EIbJUBpbYOrLb4YQ/HXLQmxlxgAqIp2ZmpnGICC8pu5xiTz3Cqfkbwd2S8raCcK/IvYcX2GmedI=)
redis:
host: 101.201.103.81
host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com
port: 6379
password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL)
password: mallone:iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 2


+ 4
- 4
mallinkWebSocketServer/src/main/resources/application-prod.yml Просмотреть файл

@@ -24,9 +24,9 @@ spring:
connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=6000"
# REDIS
redis:
host: 101.201.103.81
host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com
port: 6379
password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL)
password: mallone:iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 3
@@ -96,9 +96,9 @@ wechat:
componentToken: ENC(rkxj0733WxFFDLgA9x01m2s5Fi2L+0PC)
componentAesKey: ENC(EIbJUBpbYOrLb4YQ/HXLQmxlxgAqIp2ZmpnGICC8pu5xiTz3Cqfkbwd2S8raCcK/IvYcX2GmedI=)
redis:
host: 101.201.103.81
host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com
port: 6379
password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL)
password: mallone:iF0rm@2l2ol9
timeout: 3600
expire: 1800 #30分钟
database: 2


Загрузка…
Отмена
Сохранить