Commit d5dc6543 by 张勇

Merge branch 'dev' into 'master'

Dev

See merge request !1
parents 2867fd66 73efb3b2
server:
port: 4001
#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_ems?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_ems?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.channels.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
\ No newline at end of file
...@@ -30,6 +30,17 @@ zuul: ...@@ -30,6 +30,17 @@ zuul:
serviceId: proudkids-upms-service serviceId: proudkids-upms-service
stripPrefix: true stripPrefix: true
sensitiveHeaders: sensitiveHeaders:
proudkids-salse:
path: /salse/**
serviceId: proudkids-salse
stripPrefix: true
sensitiveHeaders:
proudkids-channels:
path: /channels/**
serviceId: proudkids-channels
stripPrefix: true
sensitiveHeaders:
ratelimit: ratelimit:
key-prefix: proudkids-ratelimite key-prefix: proudkids-ratelimite
enabled: true enabled: true
......
server:
port: 4001
#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_ems?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_ems?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.salse.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
\ No newline at end of file
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