Commit 836715fb by 张宗强

Merge branch 'master' of git@60.205.210.36:proudkids-pub/config-center.git

parents 1988677d f8eedf15
...@@ -6,11 +6,13 @@ jasypt: ...@@ -6,11 +6,13 @@ jasypt:
spring: spring:
redis: redis:
remote: true #cachecloud 获取 remote: true #cachecloud 获取
host: 172.31.157.231 host: 192.168.1.82
port: 6379 port: 6379
password: password:
http: http:
multipart: multipart:
enabled: true
file-size-threshold: 10MB
max-file-size: 1000MB max-file-size: 1000MB
max-request-size: 1000MB max-request-size: 1000MB
jackson: jackson:
...@@ -26,9 +28,9 @@ ribbon: ...@@ -26,9 +28,9 @@ ribbon:
enabled: false enabled: false
OkHttp: OkHttp:
enabled: true enabled: true
ReadTimeout: 60000 ReadTimeout: 1800000
ConnectTimeout: 60000 ConnectTimeout: 1800000
SocketTimeout: 60000 SocketTimeout: 1800000
feign: feign:
hystrix: hystrix:
...@@ -40,16 +42,9 @@ feign: ...@@ -40,16 +42,9 @@ feign:
client: client:
config: config:
feignName: feignName:
connectTimeout: 30000 connectTimeout: 1800000
readTimeout: 30000 readTimeout: 1800000
#hystrix:
# command:
# default:
# execution:
# isolation:
# thread:
# timeoutInMilliseconds: 600000
hystrix: hystrix:
command: command:
default: default:
...@@ -58,8 +53,7 @@ hystrix: ...@@ -58,8 +53,7 @@ hystrix:
enabled: false enabled: false
isolation: #命令的执行超时时间 超时将执行回退 isolation: #命令的执行超时时间 超时将执行回退
thread: thread:
timeoutInMilliseconds: 60000 timeoutInMilliseconds: 1800000
#监控短点配置 #监控短点配置
management: management:
security: security:
...@@ -71,8 +65,8 @@ endpoints: ...@@ -71,8 +65,8 @@ endpoints:
enabled: false enabled: false
proudkids: proudkids:
oss-domain: http://files.proudkids.cn oss-domain: https://files.proudkids.cn
ems-domain: http://ce.proudkids.cn ems-domain: http://test.proudkids.cn
winter-domain: http://test.proudkids.cn winter-domain: http://test.proudkids.cn
ct-default-header: https://files.proudkids.cn/default/ct.png ct-default-header: https://files.proudkids.cn/default/ct.png
ft-default-header: https://files.proudkids.cn/default/ft.png ft-default-header: https://files.proudkids.cn/default/ft.png
......
...@@ -8,10 +8,10 @@ redis: ...@@ -8,10 +8,10 @@ redis:
# datasoure默认使用JDBC # datasoure默认使用JDBC
spring: spring:
rabbitmq: rabbitmq:
host: 192.168.1.83 host: 192.168.1.83
port: 5675 port: 5672
username: zzq223 username: zzq223
password: 222222 password: 222222
zipkin: zipkin:
rabbitmq: rabbitmq:
queue: zipkin queue: zipkin
...@@ -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?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false jdbc-url: jdbc:mysql://192.168.1.82:3306/proudkids_ce_test?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?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false jdbc-url: jdbc:mysql://192.168.1.82:3306/proudkids_ce_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
config: config:
sharding: sharding:
tables: tables:
......
server:
port: 1017
#Redis cache 过期时间设置
redis:
cache:
expiration: 3600
# datasoure默认使用JDBC
spring:
rabbitmq:
host: 192.168.1.83
port: 5672
username: zzq223
password: 222222
zipkin:
rabbitmq:
queue: zipkin
sleuth:
sampler:
percentage: 1.0
# 分库分表支持
sharding:
jdbc:
defaultDataSourceName:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.jdbc.Driver
username: proudkids
password: pds123!@#
jdbc-url: jdbc:mysql://192.168.1.82:3306/proudkids_ce_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
datasource:
names: ds
ds:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.jdbc.Driver
username: proudkids
password: pds123!@#
jdbc-url: jdbc:mysql://192.168.1.82:3306/proudkids_ce_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
#mybaits-plus配置,修改主键类型,mapper.xml、type 别名等
mybatis-plus:
mapper-locations: classpath:/mapper/*Mapper.xml
typeAliasesPackage: com.proudkids.admin.model.entity
global-config:
#主键类型 0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
id-type: 0
#字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
field-strategy: 1
#驼峰下划线转换
db-column-underline: true
#刷新mapper 调试神器
refresh-mapper: true
#数据库大写下划线转换
#capital-mode: true
configuration:
map-underscore-to-camel-case: true
cache-enabled: true
logging:
config: classpath:logback.xml
wechat:
#share_url: http://test.proudkids.cn/fissionClass/index.html?cid=122682&inviteRuserId=inviteRuserIdR&pid=2
access_token:
url: http://wechat.proudkids.cn/weixinAccessController.do?getAccessToken&accountid=gh_b94dbecca2cf
appid: wx2d17f5ef6a69a2ff
secret: 2a90355c5b4f03f883f9374f31dee995
ffmpeg:
location: ffmpeg
file:
tmp:
location: /opt/tmp
mp:
appId: 5c78c503
domain: iat
language: en_us
result_type: plain
audio_source: -1
server: server:
port: 3000 port: 3000
# datasoure默认使用JDBC
spring: spring:
rabbitmq:
host: 192.168.1.83
port: 5672
username: zzq223
password: 222222
zipkin:
rabbitmq:
queue: zipkin
sleuth:
sampler:
percentage: 1.0
batch:
job:
enabled : true
initializer:
enabled: false
datasource: datasource:
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://192.168.1.82:3306/proudkids_ce_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
proudkids: proudkids:
auth: auth:
clientId: ENC(rbxhyTerjSi2LATpOlQN0g==) clientId: ENC(rbxhyTerjSi2LATpOlQN0g==)
...@@ -20,8 +35,12 @@ urls: ...@@ -20,8 +35,12 @@ urls:
- /social - /social
- /signin - /signin
- /signup - /signup
- /wechat/token
- /mobile/token - /mobile/token
- /ruser/mobile/token
- /admin/user/upload
- /apps/ph/material/uploadMaterial
- /admin/user/editInfo
logging: logging:
config: classpath:logback.xml config: classpath:logback.xml
\ No newline at end of file
...@@ -159,6 +159,9 @@ urls: ...@@ -159,6 +159,9 @@ urls:
- /apps/mp/phRuserLessonAnswer/liked/** - /apps/mp/phRuserLessonAnswer/liked/**
- /apps/mp/phRuserLessonAnswer/share/page/query/** - /apps/mp/phRuserLessonAnswer/share/page/query/**
- /apps/mp/phRuserLesson/content/** - /apps/mp/phRuserLesson/content/**
- /apps/mp/phRuserLesson/new/content/**
- /apps/mp/phRuserLesson/query/evaluate/**
- /apps/mp/phRuserLesson/repordcard/**
- /apps/mp/phRuserLesson/getMiniProInfo/** - /apps/mp/phRuserLesson/getMiniProInfo/**
- /apps/mp/phRuserLessonAnswer/query/wechatUser/haveLiked/** - /apps/mp/phRuserLessonAnswer/query/wechatUser/haveLiked/**
- /apps/mp/lessonSectionContent/query/** - /apps/mp/lessonSectionContent/query/**
......
...@@ -160,6 +160,9 @@ urls: ...@@ -160,6 +160,9 @@ urls:
- /apps/mp/phRuserLessonAnswer/liked/** - /apps/mp/phRuserLessonAnswer/liked/**
- /apps/mp/phRuserLessonAnswer/share/page/query/** - /apps/mp/phRuserLessonAnswer/share/page/query/**
- /apps/mp/phRuserLesson/content/** - /apps/mp/phRuserLesson/content/**
- /apps/mp/phRuserLesson/new/content/**
- /apps/mp/phRuserLesson/query/evaluate/**
- /apps/mp/phRuserLesson/repordcard/**
- /apps/mp/phRuserLesson/getMiniProInfo/** - /apps/mp/phRuserLesson/getMiniProInfo/**
- /apps/mp/phRuserLessonAnswer/query/wechatUser/haveLiked/** - /apps/mp/phRuserLessonAnswer/query/wechatUser/haveLiked/**
- /apps/mp/lessonSectionContent/query/** - /apps/mp/lessonSectionContent/query/**
......
...@@ -3,8 +3,8 @@ server: ...@@ -3,8 +3,8 @@ server:
spring: spring:
rabbitmq: rabbitmq:
host: 172.31.157.231 host: 192.168.1.83
port: 5675 port: 5672
username: zzq223 username: zzq223
password: 222222 password: 222222
zipkin: zipkin:
...@@ -13,13 +13,24 @@ spring: ...@@ -13,13 +13,24 @@ spring:
sleuth: sleuth:
sampler: sampler:
percentage: 0.5 percentage: 0.5
http:
multipart:
enabled: true
file-size-threshold: 100MB
max-file-size: 1000MB
max-request-size: 1000MB
encoding:
charset: UTF-8
enabled: true
force: true
zuul: zuul:
servlet-path: / servlet-path: /zuul
ignoredServices: '*' ignoredServices: '*'
#ignoredPatterns: /, /**/swagger-ui.html/**
host: host:
connect-timeout-millis: 30000 connect-timeout-millis: 1800000
socket-timeout-millis: 30000 socket-timeout-millis: 1800000
routes: routes:
proudkids-auth: proudkids-auth:
path: /auth/** path: /auth/**
...@@ -56,12 +67,26 @@ zuul: ...@@ -56,12 +67,26 @@ zuul:
serviceId: proudkids-pay serviceId: proudkids-pay
stripPrefix: true stripPrefix: true
sensitiveHeaders: sensitiveHeaders:
proudkids-mms:
path: /mms/**
serviceId: proudkids-mms
stripPrefix: true
sensitiveHeaders:
proudkids-apps:
path: /apps/**
serviceId: proudkids-apps
stripPrefix: true
sensitiveHeaders:
proudkids-website01:
path: /website01/**
serviceId: proudkids-website01
stripPrefix: true
sensitiveHeaders:
ratelimit: ratelimit:
key-prefix: proudkids-ratelimite key-prefix: proudkids-ratelimite
enabled: true enabled: true
repository: REDIS repository: REDIS
behind-proxy: true behind-proxy: true
policies: policies:
proudkids-upms-service: proudkids-upms-service:
...@@ -71,7 +96,7 @@ zuul: ...@@ -71,7 +96,7 @@ zuul:
security: security:
validate: validate:
code: false code: true
sessions: stateless sessions: stateless
oauth2: oauth2:
resource: resource:
...@@ -83,6 +108,9 @@ security: ...@@ -83,6 +108,9 @@ security:
urls: urls:
anon: anon:
- /mobile/** - /mobile/**
- /wechat/token/*
- /admin/user/upload
- /admin/user/editInfo
- /auth/** - /auth/**
- /admin/code/* - /admin/code/*
- /admin/smsCode/* - /admin/smsCode/*
...@@ -99,7 +127,6 @@ urls: ...@@ -99,7 +127,6 @@ urls:
- /aom/classLessonDetail/subscription - /aom/classLessonDetail/subscription
- /aom/lessonReview/query/lessonReviews/** - /aom/lessonReview/query/lessonReviews/**
- /aom/lessonReview/download/review/files/** - /aom/lessonReview/download/review/files/**
- /ruser/v1/ruserChannel/installRuser/**
- /pay/v1/payOrders* - /pay/v1/payOrders*
- /pay/wechatPay/** - /pay/wechatPay/**
- /pay/payCenter/** - /pay/payCenter/**
...@@ -118,16 +145,23 @@ urls: ...@@ -118,16 +145,23 @@ urls:
- /ruser/ruser/v1/ruserChannel/installRuser/** - /ruser/ruser/v1/ruserChannel/installRuser/**
- /ruser/ruser/v1/set/password - /ruser/ruser/v1/set/password
- /ruser/ruser/v1/checkCode/** - /ruser/ruser/v1/checkCode/**
- /ruser/ruser/v1/miniPro/bind/openId/** - /ruser/ruser/v1/ruser/haveInsatll/**
- /ruser/ruser/v1/is/bind/** - /ruser/en/website/**
- /ruser/ruser/v1/cancle/push/message/**
- /ruser/v1/ruser/load/share/image* - /ruser/v1/ruser/load/share/image*
- /ruser/v1/ruser/isHaveInstallWinter* - /ruser/v1/ruser/isHaveInstallWinter*
- /ruser/ruser/v1/cancle/push/message/**
- /ruser/ruser/v1/miniPro/bind/openId/**
- /ruser/ruser/v1/is/bind/**
- /mms/email/v1/send/** - /mms/email/v1/send/**
- /mms/sms/v1/send - /mms/sms/v1/send
- /apps/wechat/**
- /apps/ph/material/uploadMaterial
- /apps/mp/phRuserLessonAnswer/liked/** - /apps/mp/phRuserLessonAnswer/liked/**
- /apps/mp/phRuserLessonAnswer/share/page/query/** - /apps/mp/phRuserLessonAnswer/share/page/query/**
- /apps/mp/phRuserLesson/content/** - /apps/mp/phRuserLesson/content/**
- /apps/mp/phRuserLesson/new/content/**
- /apps/mp/phRuserLesson/query/evaluate/**
- /apps/mp/phRuserLesson/repordcard/**
- /apps/mp/phRuserLesson/getMiniProInfo/** - /apps/mp/phRuserLesson/getMiniProInfo/**
- /apps/mp/phRuserLessonAnswer/query/wechatUser/haveLiked/** - /apps/mp/phRuserLessonAnswer/query/wechatUser/haveLiked/**
- /apps/mp/lessonSectionContent/query/** - /apps/mp/lessonSectionContent/query/**
...@@ -135,3 +169,8 @@ urls: ...@@ -135,3 +169,8 @@ urls:
logging: logging:
config: classpath:logback.xml config: classpath:logback.xml
server.port: 8443
server.ssl.key-store: classpath:ce.proudkids.cn.jks
server.ssl.key-store-password: proudkids
server.ssl.keyStoreType: JKS
\ No newline at end of file
server:
port: 8313
#Redis cache 过期时间设置
redis:
cache:
expiration: 3600
# datasoure默认使用JDBC
spring:
data:
mongodb:
database: pk-mg
host: 192.168.1.80
port: 27017
username: proudkids
password: pds123!@#
rabbitmq:
host: 192.168.1.83
port: 5672
username: zzq223
password: 222222
zipkin:
rabbitmq:
queue: zipkin
sleuth:
sampler:
percentage: 1.0
# 分库分表支持
sharding:
jdbc:
defaultDataSourceName:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.jdbc.Driver
username: proudkids
password: pds123!@#
jdbc-url: jdbc:mysql://192.168.1.82:3306/proudkids_ce_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
datasource:
names: ds
ds:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.jdbc.Driver
username: proudkids
password: pds123!@#
jdbc-url: jdbc:mysql://192.168.1.82:3306/proudkids_ce_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
config:
sharding:
tables:
sys_log:
actual-data-nodes: ds.sys_log_${0..1}
table-strategy:
inline:
sharding-column: id
algorithm-expression: sys_log_${id % 2}
key-generator-column-name: id
#mybaits-plus配置,修改主键类型,mapper.xml、type 别名等
mybatis-plus:
mapper-locations: classpath:/mapper/*Mapper.xml
typeAliasesPackage: com.proudkids.admin.model.entity
global-config:
#主键类型 0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
id-type: 0
#字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
field-strategy: 1
#驼峰下划线转换
db-column-underline: true
#刷新mapper 调试神器
refresh-mapper: true
#数据库大写下划线转换
#capital-mode: true
configuration:
map-underscore-to-camel-case: true
cache-enabled: true
logging:
config: classpath:logback.xml
wechat:
access_token:
url: http://wechat.proudkids.cn/weixinAccessController.do?getAccessToken&accountid=gh_b94dbecca2cf
ruser:
openId:
url: http://wechat.proudkids.cn/weixinAccessController.do?getAccessToken&accountid=gh_b94dbecca2cf
appid: wx2d17f5ef6a69a2ff
secret: 2a90355c5b4f03f883f9374f31dee995
mms:
smstools:
url: https://ce.proudkids.cn/mms/sms/v1/send?
mini:
email_acount: devops@proudkids.cn
emial_password: Zzq222222
message_type: text/html;charset=UTF-8
protocol: smtp
send_name: devops@proudkids.cn
send_port: 465
smtp_host: smtp.exmail.qq.com
subject: Cancel Below Class(es)
sms:
sign: 骄傲吧孩子
sms.accessKeyId: LTAIAMiJjEYtdsGH
sms.accessKeySecret: 4NB3Fm7CnSCOeq9QI4RCckwR2yZOVu
allow_ip: 172.17.229.80;140.143.35.92;172.17.229.78;172.17.229.79;140.143.35.92;106.38.28.148;39.106.15.229;59.110.225.13;219.143.153.14;119.80.41.62;39.106.15.229;59.110.225.13;47.95.115.100;60.205.204.60;192.168.1.163;
domain: dysmsapi.aliyuncs.com
product: Dysmsapi
\ No newline at end of file
server:
port: 8713
redis:
cache:
expiration: 3600
spring:
rabbitmq:
host: 192.168.1.83
port: 5672
username: zzq223
password: 222222
zipkin:
rabbitmq:
queue: zipkin
sleuth:
sampler:
percentage: 1.0
sharding:
jdbc:
defaultDataSourceName:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.jdbc.Driver
username: proudkids
password: pds123!@#
jdbc-url: jdbc:mysql://192.168.1.82:3306/proudkids_ce_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
datasource:
names: ds
ds:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.jdbc.Driver
username: proudkids
password: pds123!@#
jdbc-url: jdbc:mysql://192.168.1.82:3306/proudkids_ce_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
config:
sharding:
tables:
sys_log:
actual-data-nodes: ds.sys_log_${0..1}
table-strategy:
inline:
sharding-column: id
algorithm-expression: sys_log_${id % 2}
key-generator-column-name: id
mybatis-plus:
mapper-locations: classpath:/mapper/*Mapper.xml
typeAliasesPackage: com.proudkids.pay.model.entity
global-config:
#主键类型 0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
id-type: 0
#字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
field-strategy: 1
#驼峰下划线转换
db-column-underline: true
#刷新mapper 调试神器
refresh-mapper: true
#数据库大写下划线转换
#capital-mode: true
configuration:
map-underscore-to-camel-case: true
cache-enabled: true
logging:
config: classpath:logback.xml
\ No newline at end of file
server:
port: 6003
#Redis cache 过期时间设置
redis:
cache:
expiration: 3600
# datasoure默认使用JDBC
spring:
rabbitmq:
host: 192.168.1.83
port: 5672
username: zzq223
password: 222222
zipkin:
rabbitmq:
queue: zipkin
sleuth:
sampler:
percentage: 1.0
# 分库分表支持
sharding:
jdbc:
defaultDataSourceName:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.jdbc.Driver
username: proudkids
password: pds123!@#
jdbc-url: jdbc:mysql://192.168.1.82:3306/proudkids_ce_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
datasource:
names: ds
ds:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.jdbc.Driver
username: proudkids
password: pds123!@#
jdbc-url: jdbc:mysql://192.168.1.82:3306/proudkids_ce_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
config:
sharding:
tables:
sys_log:
actual-data-nodes: ds.sys_log_${0..1}
table-strategy:
inline:
sharding-column: id
algorithm-expression: sys_log_${id % 2}
key-generator-column-name: id
#mybaits-plus配置,修改主键类型,mapper.xml、type 别名等
mybatis-plus:
mapper-locations: classpath:/mapper/*Mapper.xml
typeAliasesPackage: com.proudkids.ruser.model.entity
global-config:
#主键类型 0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
id-type: 0
#字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
field-strategy: 1
#驼峰下划线转换
db-column-underline: true
#刷新mapper 调试神器
refresh-mapper: true
#数据库大写下划线转换
#capital-mode: true
configuration:
map-underscore-to-camel-case: true
cache-enabled: true
fdfs:
file-host: http://123.206.94.20:9999/
tracker-list:
- 123.206.94.20:22122
#qiniu:
# accessKey: hM2cBDEM0FTYzpXbigRW90kV12NhhzhFM3jCzurJ
#secretKey: ENC(xUadBts805WTXkGtxsgPEybtR3D14GFQHAPUBDEnIoYmStJftu63fldDFUhUA2W2OU3NdRR0+3A=)
#bucket: proudkidscloud
#qiniuHost: http://p0hpm86wj.bkt.clouddn.com/
logging:
config: classpath:logback.xml
wechat:
share_url: http://test.proudkids.cn/fissionClass/index.html?cid=122682&inviteRuserId=inviteRuserIdR&pid=2
access_token:
url: http://wechat.proudkids.cn/weixinAccessController.do?getAccessToken&accountid=gh_b94dbecca2cf
ffmpeg:
location: ffmpeg
file:
tmp:
location: /opt/tmp
server:
port: 4003
#Redis cache 过期时间设置
redis:
cache:
expiration: 3600
# datasoure默认使用JDBC
spring:
rabbitmq:
host: 192.168.1.83
port: 5672
username: zzq223
password: 222222
zipkin:
rabbitmq:
queue: zipkin
sleuth:
sampler:
percentage: 1.0
# 分库分表支持
sharding:
jdbc:
defaultDataSourceName:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.jdbc.Driver
username: proudkids
password: pds123!@#
jdbc-url: jdbc:mysql://192.168.1.82:3306/proudkids_ce_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
datasource:
names: ds
ds:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.jdbc.Driver
username: proudkids
password: pds123!@#
jdbc-url: jdbc:mysql://192.168.1.82:3306/proudkids_ce_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
config:
sharding:
tables:
sys_log:
actual-data-nodes: ds.sys_log_${0..1}
table-strategy:
inline:
sharding-column: id
algorithm-expression: sys_log_${id % 2}
key-generator-column-name: id
#mybaits-plus配置,修改主键类型,mapper.xml、type 别名等
mybatis-plus:
mapper-locations: classpath:/mapper/*Mapper.xml
typeAliasesPackage: com.proudkids.sales.model.entity
global-config:
#主键类型 0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
id-type: 0
#字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
field-strategy: 1
#驼峰下划线转换
db-column-underline: true
#刷新mapper 调试神器
refresh-mapper: true
#数据库大写下划线转换
#capital-mode: true
configuration:
map-underscore-to-camel-case: true
cache-enabled: true
fdfs:
file-host: http://123.206.94.20:9999/
tracker-list:
- 123.206.94.20:22122
#qiniu:
# accessKey: hM2cBDEM0FTYzpXbigRW90kV12NhhzhFM3jCzurJ
#secretKey: ENC(xUadBts805WTXkGtxsgPEybtR3D14GFQHAPUBDEnIoYmStJftu63fldDFUhUA2W2OU3NdRR0+3A=)
#bucket: proudkidscloud
#qiniuHost: http://p0hpm86wj.bkt.clouddn.com/
logging:
config: classpath:logback.xml
---
proudkids:
thirdparty:
card:
viewcard: http://192.168.1.83:8888/app/card-record
viewinvited: http://192.168.1.83:8888/app/invited-ref
\ No newline at end of file
...@@ -8,8 +8,8 @@ redis: ...@@ -8,8 +8,8 @@ redis:
# datasoure默认使用JDBC # datasoure默认使用JDBC
spring: spring:
rabbitmq: rabbitmq:
host: 172.31.157.231 host: 192.168.1.83
port: 5675 port: 5672
username: zzq223 username: zzq223
password: 222222 password: 222222
zipkin: zipkin:
...@@ -19,6 +19,7 @@ spring: ...@@ -19,6 +19,7 @@ spring:
sampler: sampler:
percentage: 1.0 percentage: 1.0
# 分库分表支持 # 分库分表支持
sharding: sharding:
jdbc: jdbc:
...@@ -27,7 +28,7 @@ sharding: ...@@ -27,7 +28,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://192.168.1.82:3306/proudkids_ce_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
datasource: datasource:
names: ds names: ds
ds: ds:
...@@ -35,18 +36,7 @@ sharding: ...@@ -35,18 +36,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://192.168.1.82:3306/proudkids_ce_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
config:
sharding:
tables:
sys_log:
actual-data-nodes: ds.sys_log_${0..1}
table-strategy:
inline:
sharding-column: id
algorithm-expression: sys_log_${id % 2}
key-generator-column-name: id
#mybaits-plus配置,修改主键类型,mapper.xml、type 别名等 #mybaits-plus配置,修改主键类型,mapper.xml、type 别名等
mybatis-plus: mybatis-plus:
mapper-locations: classpath:/mapper/*Mapper.xml mapper-locations: classpath:/mapper/*Mapper.xml
...@@ -69,15 +59,21 @@ fdfs: ...@@ -69,15 +59,21 @@ fdfs:
file-host: http://123.206.94.20:9999/ file-host: http://123.206.94.20:9999/
tracker-list: tracker-list:
- 123.206.94.20:22122 - 123.206.94.20:22122
qiniu: qiniu:
accessKey: hM2cBDEM0FTYzpXbigRW90kV12NhhzhFM3jCzurJ accessKey: hM2cBDEM0FTYzpXbigRW90kV12NhhzhFM3jCzurJ
secretKey: ENC(xUadBts805WTXkGtxsgPEybtR3D14GFQHAPUBDEnIoYmStJftu63fldDFUhUA2W2OU3NdRR0+3A=) secretKey: ENC(xUadBts805WTXkGtxsgPEybtR3D14GFQHAPUBDEnIoYmStJftu63fldDFUhUA2W2OU3NdRR0+3A=)
bucket: proudkidscloud bucket: proudkidscloud
qiniuHost: http://p0hpm86wj.bkt.clouddn.com/ qiniuHost: http://p0hpm86wj.bkt.clouddn.com/
logging: logging:
config: classpath:logback.xml config: classpath:logback.xml
static: cms:
location: /opt/devops/cms/ websites:
\ No newline at end of file - domain: http://192.168.1.81
location: /opt/devops/www/officail/dist/
templete: templates/
- domain: http://192.168.1.81/dist
location: /opt/devops/www/m/dist/
templete: templates002/
\ No newline at end of file
server:
port: 5001
#Redis cache 过期时间设置
redis:
cache:
expiration: 3600
# datasoure默认使用JDBC
spring:
rabbitmq:
host: 192.168.1.83
port: 5675
username: zzq223
password: 222222
zipkin:
rabbitmq:
queue: zipkin
sleuth:
sampler:
percentage: 1.0
# 分库分表支持
sharding:
jdbc:
defaultDataSourceName:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.jdbc.Driver
username: proudkids
password: pds123!@#
jdbc-url: jdbc:mysql://192.168.1.82:3306/proudkids-website01?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
datasource:
names: ds
ds:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.jdbc.Driver
username: proudkids
password: pds123!@#
jdbc-url: jdbc:mysql://192.168.1.82:3306/proudkids-website01?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
#mybaits-plus配置,修改主键类型,mapper.xml、type 别名等
mybatis-plus:
mapper-locations: classpath:/mapper/*Mapper.xml
typeAliasesPackage: com.proudkids.admin.model.entity
global-config:
#主键类型 0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
id-type: 0
#字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
field-strategy: 1
#驼峰下划线转换
db-column-underline: true
#刷新mapper 调试神器
refresh-mapper: true
#数据库大写下划线转换
#capital-mode: true
configuration:
map-underscore-to-camel-case: true
cache-enabled: true
logging:
config: classpath:logback.xml
cms:
websites:
- domain: http://192.168.1.80/website001
location: /opt/devops/www/website001/
templete: templates/
- domain: http://192.168.1.80/website001/m
location: /opt/devops/www/website001/m/
templete: templates002/
\ No newline at end of file
...@@ -6,14 +6,14 @@ redis: ...@@ -6,14 +6,14 @@ 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://192.168.1.82:3306/proudkids_ce_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: 192.168.1.83
port: 5675 port: 5672
username: zzq223 username: zzq223
password: 222222 password: 222222
zipkin: zipkin:
......
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