Commit 6f7336a9 by 张宗强

update master config

parent 76a802e4
...@@ -6,7 +6,7 @@ jasypt: ...@@ -6,7 +6,7 @@ jasypt:
spring: spring:
redis: redis:
remote: true #cachecloud 获取 remote: true #cachecloud 获取
host: 172.31.157.231 host: 172.17.229.79
port: 6379 port: 6379
password: password:
http: http:
......
...@@ -8,7 +8,7 @@ redis: ...@@ -8,7 +8,7 @@ redis:
# datasoure默认使用JDBC # datasoure默认使用JDBC
spring: spring:
rabbitmq: rabbitmq:
host: 172.31.157.231 host: 172.17.229.78
port: 5672 port: 5672
username: zzq223 username: zzq223
password: 222222 password: 222222
...@@ -37,7 +37,7 @@ sharding: ...@@ -37,7 +37,7 @@ sharding:
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
username: proudkids username: proudkids
password: pds123!@# password: pds123!@#
jdbc-url: jdbc:mysql://60.205.210.36:3306/proudkids_ems_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false jdbc-url: jdbc:mysql://172.17.229.78:3306/proudkids_ce?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
datasource: datasource:
names: ds names: ds
ds: ds:
...@@ -45,7 +45,7 @@ sharding: ...@@ -45,7 +45,7 @@ sharding:
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
username: proudkids username: proudkids
password: pds123!@# password: pds123!@#
jdbc-url: jdbc:mysql://60.205.210.36:3306/proudkids_ems_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false jdbc-url: jdbc:mysql://172.17.229.78:3306/proudkids_ce?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
config: config:
sharding: sharding:
tables: tables:
......
...@@ -7,7 +7,7 @@ spring: ...@@ -7,7 +7,7 @@ spring:
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
username: proudkids username: proudkids
password: pds123!@# password: pds123!@#
url: jdbc:mysql://60.205.210.36:3306/proudkids_ems_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false url: jdbc:mysql://172.17.229.78:3306/proudkids_ce?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
proudkids: proudkids:
auth: auth:
......
...@@ -3,7 +3,7 @@ server: ...@@ -3,7 +3,7 @@ server:
spring: spring:
rabbitmq: rabbitmq:
host: 172.31.157.231 host: 172.17.229.78
port: 5672 port: 5672
username: zzq223 username: zzq223
password: 222222 password: 222222
...@@ -52,8 +52,6 @@ zuul: ...@@ -52,8 +52,6 @@ zuul:
stripPrefix: true stripPrefix: true
sensitiveHeaders: sensitiveHeaders:
ratelimit: ratelimit:
key-prefix: proudkids-ratelimite key-prefix: proudkids-ratelimite
enabled: true enabled: true
...@@ -67,7 +65,7 @@ zuul: ...@@ -67,7 +65,7 @@ zuul:
security: security:
validate: validate:
code: false code: true
sessions: stateless sessions: stateless
oauth2: oauth2:
resource: resource:
...@@ -79,6 +77,8 @@ security: ...@@ -79,6 +77,8 @@ security:
urls: urls:
anon: anon:
- /mobile/** - /mobile/**
- /admin/user/upload
- /admin/user/editInfo
- /auth/** - /auth/**
- /admin/code/* - /admin/code/*
- /admin/smsCode/* - /admin/smsCode/*
...@@ -90,6 +90,9 @@ urls: ...@@ -90,6 +90,9 @@ urls:
- /swagger/api-docs - /swagger/api-docs
- /webjars/** - /webjars/**
- /aom/lesson/downloadZip/* - /aom/lesson/downloadZip/*
#- /zuul/aom/lesson/courseware/upload
- /ruser/**
- /ruser/v1/ruserChannel/installRuser/** - /ruser/v1/ruserChannel/installRuser/**
logging: logging:
config: classpath:logback.xml config: classpath:logback.xml
...@@ -8,7 +8,7 @@ redis: ...@@ -8,7 +8,7 @@ redis:
# datasoure默认使用JDBC # datasoure默认使用JDBC
spring: spring:
rabbitmq: rabbitmq:
host: 172.31.157.231 host: 172.17.229.78
port: 5672 port: 5672
username: zzq223 username: zzq223
password: 222222 password: 222222
...@@ -27,7 +27,7 @@ sharding: ...@@ -27,7 +27,7 @@ sharding:
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
username: proudkids username: proudkids
password: pds123!@# password: pds123!@#
jdbc-url: jdbc:mysql://60.205.210.36:3306/proudkids_ems_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false jdbc-url: jdbc:mysql://172.17.229.78:3306/proudkids_ce?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
datasource: datasource:
names: ds names: ds
ds: ds:
...@@ -35,7 +35,7 @@ sharding: ...@@ -35,7 +35,7 @@ sharding:
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
username: proudkids username: proudkids
password: pds123!@# password: pds123!@#
jdbc-url: jdbc:mysql://60.205.210.36:3306/proudkids_ems_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false jdbc-url: jdbc:mysql://172.17.229.78:3306/proudkids_ce?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
config: config:
sharding: sharding:
tables: tables:
......
...@@ -8,7 +8,7 @@ redis: ...@@ -8,7 +8,7 @@ redis:
# datasoure默认使用JDBC # datasoure默认使用JDBC
spring: spring:
rabbitmq: rabbitmq:
host: 172.31.157.231 host: 172.17.229.78
port: 5672 port: 5672
username: zzq223 username: zzq223
password: 222222 password: 222222
...@@ -27,7 +27,7 @@ sharding: ...@@ -27,7 +27,7 @@ sharding:
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
username: proudkids username: proudkids
password: pds123!@# password: pds123!@#
jdbc-url: jdbc:mysql://60.205.210.36:3306/proudkids_ems_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false jdbc-url: jdbc:mysql://172.17.229.78:3306/proudkids_ce?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
datasource: datasource:
names: ds names: ds
ds: ds:
...@@ -35,7 +35,7 @@ sharding: ...@@ -35,7 +35,7 @@ sharding:
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
username: proudkids username: proudkids
password: pds123!@# password: pds123!@#
jdbc-url: jdbc:mysql://60.205.210.36:3306/proudkids_ems_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false jdbc-url: jdbc:mysql://172.17.229.78:3306/proudkids_ce?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
config: config:
sharding: sharding:
tables: tables:
...@@ -83,5 +83,5 @@ logging: ...@@ -83,5 +83,5 @@ logging:
proudkids: proudkids:
thirdparty: thirdparty:
card: card:
viewcard: http://192.168.1.83:8888/app/card-record viewcard: https://www.mp.proudkids.cn/app/card-record
viewinvited: http://192.168.1.83:8888/app/invited-ref viewinvited: http://www.mp.proudkids.cn/app/invited-ref
\ No newline at end of file \ No newline at end of file
...@@ -8,7 +8,7 @@ redis: ...@@ -8,7 +8,7 @@ redis:
# datasoure默认使用JDBC # datasoure默认使用JDBC
spring: spring:
rabbitmq: rabbitmq:
host: 172.31.157.231 host: 172.17.229.78
port: 5672 port: 5672
username: zzq223 username: zzq223
password: 222222 password: 222222
...@@ -27,7 +27,7 @@ sharding: ...@@ -27,7 +27,7 @@ sharding:
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
username: proudkids username: proudkids
password: pds123!@# password: pds123!@#
jdbc-url: jdbc:mysql://60.205.210.36:3306/proudkids_ems_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false jdbc-url: jdbc:mysql://172.17.229.78:3306/proudkids_ce?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
datasource: datasource:
names: ds names: ds
ds: ds:
...@@ -35,7 +35,7 @@ sharding: ...@@ -35,7 +35,7 @@ sharding:
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
username: proudkids username: proudkids
password: pds123!@# password: pds123!@#
jdbc-url: jdbc:mysql://60.205.210.36:3306/proudkids_ems_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false jdbc-url: jdbc:mysql://172.17.229.78:3306/proudkids_ce?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
config: config:
sharding: sharding:
tables: tables:
......
...@@ -6,13 +6,13 @@ redis: ...@@ -6,13 +6,13 @@ redis:
spring: spring:
datasource: datasource:
url: jdbc:mysql://60.205.210.36:3306/proudkids_ems_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false url: jdbc:mysql://172.17.229.78:3306/proudkids_ems_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
username: proudkids username: proudkids
password: pds123!@# password: pds123!@#
rabbitmq: rabbitmq:
host: 172.31.157.231 host: 172.17.229.78
port: 5672 port: 5672
username: zzq223 username: zzq223
password: 222222 password: 222222
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment