Merge branch 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project
Conflicts: buildpackage/src/main/resources/application-yc.yml
This commit is contained in:
commit
4d26dfa435
|
@ -5,7 +5,7 @@ logging:
|
||||||
encodings: UTF-8
|
encodings: UTF-8
|
||||||
file:
|
file:
|
||||||
# 日志保存路径
|
# 日志保存路径
|
||||||
path: /zt/log
|
path: /Users/apple/Desktop/log/local
|
||||||
spring:
|
spring:
|
||||||
flyway:
|
flyway:
|
||||||
# 启动flyway migration, 默认为true
|
# 启动flyway migration, 默认为true
|
||||||
|
@ -16,32 +16,22 @@ spring:
|
||||||
filters: stat,log4j2
|
filters: stat,log4j2
|
||||||
datasource:
|
datasource:
|
||||||
master:
|
master:
|
||||||
url: jdbc:dm://10.75.51.82:5238?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle
|
url: jdbc:dm://hzya.ufyct.com:9040?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle
|
||||||
username: businesscenter
|
username: hzyazt
|
||||||
password: 6842568689469adad597d144ee104063
|
password: 62e4295b615a30dbf3b8ee96f41c820b
|
||||||
driver-class-name: dm.jdbc.driver.DmDriver
|
driver-class-name: dm.jdbc.driver.DmDriver
|
||||||
savefile:
|
savefile:
|
||||||
# 文件保存路径
|
# 文件保存路径
|
||||||
path: /zt/file
|
path: /Users/apple/Desktop/log/local
|
||||||
ax:
|
ax:
|
||||||
url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface
|
url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface
|
||||||
#logging:
|
cbs8:
|
||||||
# #日志级别 指定目录级别
|
appId: 1P4AGrpz
|
||||||
# level:
|
appSecret: 2c2369ae5dc04382844bbe3a5abf39e1bea9cd3a
|
||||||
# root: warn
|
url: https://cbs8-openapi-reprd.csuat.cmburl.cn
|
||||||
# encodings: UTF-8
|
# 测试用这个 这个是银行给的,和下面的公钥不是一对密钥
|
||||||
# file:
|
ya_private_key: 83BA7EC821D35F4CB31FF9A51C1EFA520FC52AF828C2337F88E91CF119B07F44
|
||||||
# # 日志保存路径
|
# 这个私钥到时候上传到cbs,和下面到是同一对
|
||||||
# path: /home/webservice/zt/log
|
#ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46
|
||||||
#spring:
|
ya_public_key: 044fa399d2223760f17b81b863cb482b009294c4516f8a605dea1475ec09e720eaa98468715e5ad509a592a0b426061551c5a3df236966c23253a7d894eac0dcde
|
||||||
# datasource:
|
cbs_public_key: 0469146F06BF3B01236E84632441E826F3067A6B93BC3839C836A06007869CD351FBBE388B51F742859388BBC1DE089923AAFBC69E448F15141DDF30EE6CE90185
|
||||||
# dynamic:
|
|
||||||
# datasource:
|
|
||||||
# master:
|
|
||||||
# url: jdbc:mysql://hzya.ufyct.com:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
|
|
||||||
# username: root
|
|
||||||
# password: 62e4295b615a30dbf3b8ee96f41c820b
|
|
||||||
# driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
|
|
||||||
#savefile:
|
|
||||||
# # 文件保存路径
|
|
||||||
# path: /home/webservice/zt/file
|
|
Loading…
Reference in New Issue