Merge branch 'develop_master' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_2

Conflicts: adc-da-main/src/main/resources/application-dev.properties
2021-06-30 13:37:56 +08:00
parent c4a885922d b69bc81066
commit 52015144b5
1 changed files with 3 additions and 2 deletions
@@ -3,9 +3,10 @@
 # 数据库配置
 #=============================================
 spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://localhost:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
+spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
 spring.datasource.username = root
-spring.datasource.password = Zxy20010202
+spring.datasource.password = root
+
 #==============================================
 # 应用设置
 spring.application.name=FotonLAWSSystem