Commit 90db7a50 by yxdubhe_bot

merge:feature-changeFlow-221110:operator:hzhuyuanyuan@corp.netease.com:auto_bran…

merge:feature-changeFlow-221110:operator:hzhuyuanyuan@corp.netease.com:auto_branch_merge_by_branchService_end
parents 412ac8fa 3ae8cb94
Pipeline #44491 passed with stages
in 1 minute 48 seconds
......@@ -7,7 +7,7 @@ dschedule.job-group=736
dschedule.enable-auto-register=true
dschedule.executor-fail-strategy=fail_alarm
dschedule.alarm-email=wb.tanglongwei@mesg.corp.netease.com
dschedule.adminAddresses=http://127.0.0.1:8550/proxy/online.dschedule-admin.service.mailsaas/
dschedule.adminAddresses=http://127.0.0.1:8550/proxy/test.dschedule-admin.service.mailsaas/
spring.http.multipart.max-file-size=100MB
spring.http.multipart.max-request-size=100MB
......@@ -32,19 +32,19 @@ mybatis.configuration.map-underscore-to-camel-case=true
# redis
spring.redis.password=10cXYKgHCPtrgZ1D
spring.redis.password=
spring.redis.timeout=20000
spring.redis.sentinel.master=paas-redis/yx-qc-change-system-onl
spring.redis.sentinel.nodes=yx-cust23-online.ncr.cn-east-p1.internal.:32427
spring.redis.sentinel.master=paas-redis/yx-common-repl-1-reg
spring.redis.sentinel.nodes=yx-cust23-reg.ncr.cn-east-p1.internal.:32025
spring.redis.pool.max-active=50
spring.redis.pool.max-idle=20
spring.redis.pool.max-wait=10000
spring.redis.host=yx-cust23-online.ncr.cn-east-p1.internal.
spring.redis.port=32427
spring.redis.host=yx-cust23-reg.ncr.cn-east-p1.internal.
spring.redis.port=32025
# supplier
supplier.url=http://127.0.0.1:8550/proxy/online.yanxuan-supplier-ms.service.mailsaas
supplier.url=http://127.0.0.1:8550/proxy/regression.yanxuan-supplier-ms.service.mailsaas
### des\u914D\u7F6E
# \u5BFC\u51FA\u6587\u4EF6\u4E0A\u4F20\u5230\u54EA\u4E2A\u670D\u52A1\u5668\uFF0C\u6709test\u548Conline\u53EF\u9009
des.prop.env=online
\ No newline at end of file
des.prop.env=regression
\ 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