Merge branch 'feature_20220222_huayi' into develop

src/main/resources/application-pro.yml

 #生产环境
 server:
-  port: 8089
+  port: 8083
   servlet:
     # context-path: /YoulinghrApiV100
     session: 
@@ -36,12 +36,12 @@ spring:
   datasource:
     # username: root
     # password: youlingHR73!
-    username: youling8timer
-    password: (!0YouLingRoot0!)
+    username: root
+    password: huiYi12345678huaiQiao@*
     # username: tang
     # 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://rm-wz950gd8jf8209376.mysql.rds.aliyuncs.com/timer?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
+    url: jdbc:mysql://8.134.55.197:3306/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://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
@@ -117,9 +117,9 @@ spring:
                  class: javax.net.ssl.SSLSocketFactory
   redis:
     database: 5 # Redis数据库索引（默认为0）,如果设置为1，那么存入的key-value都存放在select 1中
-    host: r-wz9p8pve7uem63b10upd.redis.rds.aliyuncs.com
+    host: 8.134.55.197
     port: 6379
-    password: (!0YouLingRcRedis0!)
+    password: huayi20220222
     max-wait: 30000    # 连接池最大阻塞等待时间（使用负值表示没有限制）
     max-active: 100   # 连接池最大连接数（使用负值表示没有限制）
     max-idle: 20     # 连接池中的最大空闲连接
@@ -176,8 +176,8 @@ logging:
 config-8timer:
   environmental-science: pro
   expiration_time: 2 #扫码登录过期时长
-  machine8timerUrl: 'http://record.8timer.cn'
-  #machine8timerUrl: 'http://192.168.3.38:8088'
+  #machine8timerUrl: 'http://record.8timer.cn'
+  machine8timerUrl: 'http://8.134.55.197:8088'
   authentication-code: ''
   prescription: 8 #一天工作8小时
   register-free-time: 90   #系统赠送时间
@@ -225,14 +225,15 @@ zip:
 sftp:
   client:
     protocol: 'sftp'
-    host: '112.74.91.126'
+    host: '8.134.55.197'
     port: '22'
     username: 'root'
-    password: 'fksdlfjs(*&&%HGgjfkdjsfhksh9781283KFHFFGHghhndbv##2@'
-    root: '/home'
+    password: 'Huayi98765432Huaqiao@*'
+    root: '/data'
     sessionStrictHostKeyChecking: 'no'
-    sessionConnectTimeout: '15000'
-    channelConnectedTimeout: '15000'
-    serverUrl: 'https://img.8timer.cn'
+    sessionConnectTimeout: '1500'
+    channelConnectedTimeout: '1500'
+    #serverUrl: 'https://img.8timer.cn'
+    serverUrl: 'http://8.134.55.197:8080'
     targetPath: '/disk'
     reservedName: false
\ No newline at end of file

src/main/resources/application.yml

 spring:
   profiles:
-     active: test
+     active: pro
     #active: '@environment@'
\ No newline at end of file