Tenlion/btxtgxq-system-city
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
wans 2021-09-07 17:25:09 +08:00
commit 96b650e1c4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/resources/application-test.yml
View File

@ -1,6 +1,6 @@
server: server:
port: 8083 port: 8091
url: http://192.168.0.109:8083/servicecity url: http://49.233.36.36:58091/servicecity
title: 稀土高新区社会治理综合管理平台 title: 稀土高新区社会治理综合管理平台
servlet: servlet:
context-path: /servicecity context-path: /servicecity
@ -26,7 +26,7 @@ spring:
druid: 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://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://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 db-type: mysql
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
# username: wanggeng # username: wanggeng
@ -74,7 +74,7 @@ swagger:
# 文件 # 文件
file: file:
uploadPath: D:\ideaWorkspace\uploadfiles\pianzhang uploadPath: /Users/wanggeng/Desktop/UploadFiles
imageTypes: png,jpg,jpeg,gif,blob imageTypes: png,jpg,jpeg,gif,blob
videoTypes: mp4,rmvb videoTypes: mp4,rmvb
audioTypes: mp3,wmv,wav audioTypes: mp3,wmv,wav
@ -83,7 +83,7 @@ file:
# 安全 # 安全
security: security:
oauth2: 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} oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url}
client: client:
# http://219.147.99.164:8082/ # http://219.147.99.164:8082/
@ -140,7 +140,7 @@ access-control:
# 日志 # 日志
logging: logging:
file: D:\ideaWorkspace\logs\pianzhang\pianzhang-logs.log file: /Users/wanggeng/Desktop/UploadFiles/logs/systemcity/logs.log
level: level:
root: error root: error
com.cm: debug com.cm: debug