Merge branch 'develop_zyq' into 'develop'

线上配置

See merge request 8timerv2/8timerapiv200!425

src/main/resources/application-pro.yml

@@ -31,7 +31,7 @@ spring:
     # username: tang
     # username: tang
     # password: Tang123456!
     # password: Tang123456!
     # url: jdbc:mysql://120.24.172.51:3306/youlingrc_tang?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
     # url: jdbc:mysql://120.24.172.51:3306/youlingrc_tang?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
-    url: jdbc:mysql://test-8timer-api.youlingrc.com/8timer_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
+    url: jdbc:mysql://rm-wz950gd8jf8209376ro.mysql.rds.aliyuncs.com/timer?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
     # url: jdbc:mysql://192.168.172.200:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
     # url: jdbc:mysql://192.168.172.200:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
     # url: jdbc:mysql://db.hhlsz.com:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
     # url: jdbc:mysql://db.hhlsz.com:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
     driver-class-name: com.mysql.cj.jdbc.Driver
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -107,8 +107,8 @@ spring:
                  class: javax.net.ssl.SSLSocketFactory
                  class: javax.net.ssl.SSLSocketFactory
   redis:
   redis:
     database: 5 # Redis数据库索引（默认为0）,如果设置为1，那么存入的key-value都存放在select 1中
     database: 5 # Redis数据库索引（默认为0）,如果设置为1，那么存入的key-value都存放在select 1中
-    host: 47.115.147.241
-    port: 7788
+    host: r-wz9p8pve7uem63b10upd.redis.rds.aliyuncs.com
+    port: 6379
     password: (!0YouLingRcRedis0!)
     password: (!0YouLingRcRedis0!)
     max-wait: 30000    # 连接池最大阻塞等待时间（使用负值表示没有限制）
     max-wait: 30000    # 连接池最大阻塞等待时间（使用负值表示没有限制）
     max-active: 100   # 连接池最大连接数（使用负值表示没有限制）
     max-active: 100   # 连接池最大连接数（使用负值表示没有限制）
@@ -165,7 +165,7 @@ logging:
 
 
 config-8timer:
 config-8timer:
   expiration_time: 2 #扫码登录过期时长
   expiration_time: 2 #扫码登录过期时长
-  machine8timerUrl: 'http://test-8timer-fk.youlingrc.com'
+  machine8timerUrl: 'http://record.8timer.cn'
   #machine8timerUrl: 'http://192.168.3.38:8088'
   #machine8timerUrl: 'http://192.168.3.38:8088'
   authentication-code: ''
   authentication-code: ''
   register-free-time: 90   #系统赠送时间
   register-free-time: 90   #系统赠送时间
@@ -183,8 +183,8 @@ config-8timer:
     expirationTime: 3153600000000L
     expirationTime: 3153600000000L
     expirationTime_pri: 600000L
     expirationTime_pri: 600000L
   esign: # e签宝
   esign: # e签宝
-     callbackUrl: 'https://test-8timer-pc.youlingrc.com/callback/esign/dev'
-     redirectUrl: 'http://test-8timer-pc.youlingrc.com/#/ElecCon/index'
+     callbackUrl: 'https://client.8timer.cn/callback/esign/dev'
+     redirectUrl: 'http://client.8timer.cn/#/ElecCon/index'
    # host: https://openapi.esign.cn
    # host: https://openapi.esign.cn
    # PROJECT_ID: 4438775940
    # PROJECT_ID: 4438775940
    # PROJECT_SECRET: 7b100813cca2746081c57837855ac5af
    # PROJECT_SECRET: 7b100813cca2746081c57837855ac5af