解决冲突

src/main/resources/application-test.yml

@@ -1,6 +1,6 @@
 server:
-  port: 8083
-  url: http://192.168.0.109:8083/servicecity
+  port: 8091
+  url: http://49.233.36.36:58091/servicecity
   title: 稀土高新区社会治理综合管理平台
   servlet:
     context-path: /servicecity
@@ -26,7 +26,7 @@ spring:
     druid:
 #      url: jdbc:mysql://49.233.36.36:6688/db_cloud_city?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
 #      url: jdbc:mysql://127.0.0.1:3306/db_cloud_servicecity?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
-      url: jdbc:mysql://192.168.0.151:3306/db_cloud_system_city?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
+      url: jdbc:mysql://127.0.0.1:3306/db_cloud_v2_city?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
       db-type: mysql
       driver-class-name: com.mysql.jdbc.Driver
 #      username: wanggeng
@@ -74,7 +74,7 @@ swagger:
 
 # 文件
 file:
-  uploadPath: D:\ideaWorkspace\uploadfiles\pianzhang
+  uploadPath: /Users/wanggeng/Desktop/UploadFiles
   imageTypes: png,jpg,jpeg,gif,blob
   videoTypes: mp4,rmvb
   audioTypes: mp3,wmv,wav
@@ -83,7 +83,7 @@ file:
 # 安全
 security:
   oauth2:
-    oauth-server: http://192.168.0.155:7001/usercenter
+    oauth-server: http://49.233.36.36:58090/usercenter
     oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url}
     client:
       # http://219.147.99.164:8082/
@@ -140,7 +140,7 @@ access-control:
 
 # 日志
 logging:
-  file: D:\ideaWorkspace\logs\pianzhang\pianzhang-logs.log
+  file: /Users/wanggeng/Desktop/UploadFiles/logs/systemcity/logs.log
   level:
     root: error
     com.cm: debug