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

Merge branch 'main' of e.coding.net:tsteam/urban-governance/population into main

Browse Source
This commit is contained in:
wans 2021-09-09 15:33:36 +08:00
commit 4478047ce7
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/resources/application.yml → src/main/resources/application-test.yml
View File

@ -1,6 +1,6 @@
server: server:
port: 8080 port: 8093
url: http://192.168.0.109:8080/population url: http://49.233.36.36:58093/population
title: population title: population
servlet: servlet:
context-path: /population context-path: /population
@ -20,11 +20,11 @@ spring:
max-request-size: 1GB max-request-size: 1GB
datasource: datasource:
druid: druid:
url: jdbc:mysql://localhost:3306/db_user_management?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false url: jdbc:mysql://localhost:3306/db_cloud_population?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: root username: root
password: 123456 password: root
initial-size: 2 initial-size: 2
min-idle: 2 min-idle: 2
max-active: 5 max-active: 5
@ -61,7 +61,7 @@ swagger:
# 文件 # 文件
file: file:
uploadPath: /Users/wenc/Desktop/filetest uploadPath: /Users/wanggeng/Desktop/UploadFiles
imageTypes: png,jpg,jpeg,gif,blob imageTypes: png,jpg,jpeg,gif,blob
videoTypes: mp4 videoTypes: mp4
audioTypes: mp3,wav,amr audioTypes: mp3,wav,amr
@ -71,11 +71,11 @@ file:
# 安全 # 安全
security: security:
oauth2: oauth2:
oauth-server: http://49.233.36.36:8868/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:
client-id: 3d24af9a292d40fbb58f133c63bb2abf client-id: ba950215f6bb4d45bddd6cbcb87395e7
client-secret: elFGMTBpSGI0QlROWlpMeDh4WVArc25yMVRmeWVtOUl5RTl2ZG9uTzBiNG1ac2wwZTJHWk5NbXh3L3h3U2c4Rg== client-secret: WmlVZ2M4M2ZTeTdaS25OVlFwUExac3QrOU9kdHEybVgxSmhETTdFV2F5TW1ac2wwZTJHWk5NbXh3L3h3U2c4Rg==
user-authorization-uri: ${security.oauth2.oauth-server}/oauth_client/authorize user-authorization-uri: ${security.oauth2.oauth-server}/oauth_client/authorize
access-token-uri: ${security.oauth2.oauth-server}/oauth_client/token access-token-uri: ${security.oauth2.oauth-server}/oauth_client/token
grant-type: authorization_code grant-type: authorization_code