merge:feature-0116-dbConfig:operator:hzlihui@corp.netease.com:auto_branch_merge_…

merge:feature-0116-dbConfig:operator:hzlihui@corp.netease.com:auto_branch_merge_by_branchService_end

yanxuan-qc-change-system-assembly/src/main/resources/META-INF/apolloY-server.properties

-dev.meta=http://dev.yx.localhost:8550/proxy/dev.apolloy-configservice.service.mailsaas
 test.meta=http://127.0.0.1:8550/proxy/test.apolloy-configservice.service.mailsaas/
-release.meta=http://10.200.169.113:8080
-pressure.meta=http://10.200.168.231:8080
+release.meta=http://127.0.0.1:8550/proxy/release.apolloy-configservice.service.mailsaas/
 regression.meta=http://127.0.0.1:8550/proxy/regression.apolloy-configservice.service.mailsaas/
 online.meta=http://127.0.0.1:8550/proxy/online.apolloy-configservice.service.mailsaas/
\ No newline at end of file

yanxuan-qc-change-system-assembly/src/main/resources/config/online/application.properties

@@ -31,15 +31,15 @@ mybatis.configuration.map-underscore-to-camel-case=true
 
 
 # redis
-spring.redis.password=10cXYKgHCPtrgZ1D
+spring.redis.password=wrXodjsHEa28
 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=yx_qc_change_ga_onl
+spring.redis.sentinel.nodes=10.104.3.40:11010,10.104.3.50:11010,10.104.3.60:11010
 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=10.104.3.40
+spring.redis.port=11010
 
 # supplier
 supplier.url=http://127.0.0.1:8550/proxy/online.yanxuan-supplier-ms.service.mailsaas