合并分支 'dev_20230216' 到 'master'

Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!95
This commit is contained in:
高嵩
2023-06-01 17:28:44 +08:00
6 changed files with 111 additions and 22 deletions
@@ -3,7 +3,7 @@
# 数据库配置
#=============================================
spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://121.36.69.172:3307/foton_slrs_20230531?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false&serverTimezone=Asia/Shanghai
spring.datasource.url = jdbc:mysql://121.36.69.172:3307/foton_slrs_20230522?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false&serverTimezone=Asia/Shanghai
spring.datasource.username = root
spring.datasource.password = hzwlsoft.com
@@ -310,6 +310,9 @@ elas.flag=true
elasticsearch.img=http://localhost:9090
# 福田数据库备份脚本地址
script.backup.foton.mySql.path.sh=11
# \u6587\u6863\u8F6C\u6362TCP\u901A\u8BAF\u5730\u5740