解决冲突

3 years ago · fee3475b60
parent 10bcf42ebd bbb7d11090
commit fee3475b60
2 changed files with 2 additions and 2 deletions
--- a/hai-bweb/src/main/resources/pre/application.yml
+++ b/hai-bweb/src/main/resources/pre/application.yml
@ -9,7 +9,7 @@ debug: false
 #datasource数据源设置
 spring:
  datasource:
-    url: jdbc:mysql://122.9.135.148:3306/hsg?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    url: jdbc:mysql://139.159.177.244:3306/hsg_pre?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: root
    password: HF123456.
    type: com.alibaba.druid.pool.DruidDataSource
--- a/hai-cweb/src/main/resources/pre/application.yml
+++ b/hai-cweb/src/main/resources/pre/application.yml
@ -9,7 +9,7 @@ debug: false
 #datasource数据源设置
 spring:
  datasource:
-    url: jdbc:mysql://122.9.135.148:3306/hsg?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    url: jdbc:mysql://139.159.177.244:3306/hsg_pre?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: root
    password: HF123456.
    type: com.alibaba.druid.pool.DruidDataSource