Merge branch 'dev_20230216' of E:\futianxiangmu\foton-slrs-system-rest with conflicts.

2023-06-01 16:56:55 +08:00
parent 157b967451
commit 1f7cd1625c
6 changed files with 85 additions and 2 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