Skip to content

8
8timerapiv200
Commit d2da1ee3 by 284718418@qq.com
Options

Merge branch 'feature_20220222_huayi' into develop

parents 7acc3d19 cf8a390b
Showing with 18 additions and 15 deletions
src/main/resources/application-pro.yml
#生产环境 #生产环境
server: server:
port: 8089 port: 8083
servlet: servlet:
# context-path: /YoulinghrApiV100 # context-path: /YoulinghrApiV100
session: session:
...@@ -36,12 +36,12 @@ spring: ...@@ -36,12 +36,12 @@ spring:
datasource: datasource:
# username: root # username: root
# password: youlingHR73! # password: youlingHR73!
username: youling8timer username: root
password: (!0YouLingRoot0!) password: huiYi12345678huaiQiao@*
# 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://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://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
...@@ -117,9 +117,9 @@ spring: ...@@ -117,9 +117,9 @@ 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: r-wz9p8pve7uem63b10upd.redis.rds.aliyuncs.com host: 8.134.55.197
port: 6379 port: 6379
password: (!0YouLingRcRedis0!) password: huayi20220222
max-wait: 30000 # 连接池最大阻塞等待时间（使用负值表示没有限制） max-wait: 30000 # 连接池最大阻塞等待时间（使用负值表示没有限制）
max-active: 100 # 连接池最大连接数（使用负值表示没有限制） max-active: 100 # 连接池最大连接数（使用负值表示没有限制）
max-idle: 20 # 连接池中的最大空闲连接 max-idle: 20 # 连接池中的最大空闲连接
...@@ -176,8 +176,8 @@ logging: ...@@ -176,8 +176,8 @@ logging:
config-8timer: config-8timer:
environmental-science: pro environmental-science: pro
expiration_time: 2 #扫码登录过期时长 expiration_time: 2 #扫码登录过期时长
machine8timerUrl: 'http://record.8timer.cn' #machine8timerUrl: 'http://record.8timer.cn'
#machine8timerUrl: 'http://192.168.3.38:8088' machine8timerUrl: 'http://8.134.55.197:8088'
authentication-code: '' authentication-code: ''
prescription: 8 #一天工作8小时 prescription: 8 #一天工作8小时
register-free-time: 90 #系统赠送时间 register-free-time: 90 #系统赠送时间
...@@ -225,14 +225,15 @@ zip: ...@@ -225,14 +225,15 @@ zip:
sftp: sftp:
client: client:
protocol: 'sftp' protocol: 'sftp'
host: '112.74.91.126' host: '8.134.55.197'
port: '22' port: '22'
username: 'root' username: 'root'
password: 'fksdlfjs(*&&%HGgjfkdjsfhksh9781283KFHFFGHghhndbv##2@' password: 'Huayi98765432Huaqiao@*'
root: '/home' root: '/data'
sessionStrictHostKeyChecking: 'no' sessionStrictHostKeyChecking: 'no'
sessionConnectTimeout: '15000' sessionConnectTimeout: '1500'
channelConnectedTimeout: '15000' channelConnectedTimeout: '1500'
serverUrl: 'https://img.8timer.cn' #serverUrl: 'https://img.8timer.cn'
serverUrl: 'http://8.134.55.197:8080'
targetPath: '/disk' targetPath: '/disk'
reservedName: false reservedName: false
\ No newline at end of file
src/main/resources/application.yml
spring: spring:
profiles: profiles:
active: test active: pro
#active: '@environment@' #active: '@environment@'
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment