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

.gitlab-ci.yml

@@ -101,8 +101,8 @@ online_package:
       - swagger/
     expire_in: 1d
   only:
-    - master
-
+    - /^release.*$/
+    - /^hotfix.*$/
 online_upload_bee:
   stage: upload-bee
   script:
@@ -111,7 +111,8 @@ online_upload_bee:
   tags:
     - ci-backend
   only:
-    - master
+    - /^release.*$/
+    - /^hotfix.*$/
   dependencies:
     - online_package
 
@@ -128,7 +129,8 @@ online_image_upload:
   tags:
     - ci-backend
   only:
-    - master
+    - /^release.*$/
+    - /^hotfix.*$/
   dependencies:
     - online_package
 

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

 dschedule.enable=true
 dschedule.env=test
-dschedule.app-id=yanxuan-sc-ehc
+dschedule.app-id=yanxuan-qc-change-system
 dschedule.job-group=235
 dschedule.enable-auto-register=true
 dschedule.executor-fail-strategy=fail_alarm

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

@@ -2,20 +2,20 @@ env=online
 
 dschedule.enable=true
 dschedule.env=online
-dschedule.app-id=yanxuan-sc-ehc
-dschedule.job-group=375
+dschedule.app-id=yanxuan-qc-change-system
+dschedule.job-group=481
 dschedule.enable-auto-register=true
 dschedule.executor-fail-strategy=fail_alarm
 dschedule.alarm-email=wb.tanglongwei@mesg.corp.netease.com
-dschedule.adminAddresses=http://10.200.169.73:8080,http://10.200.169.74:8080,http://10.200.169.75:8080,http://10.200.169.76:8080,http://10.200.169.77:8080
+dschedule.adminAddresses=http://127.0.0.1:8550/proxy/online.dschedule-admin.service.mailsaas/
 spring.http.multipart.max-file-size=100MB
 spring.http.multipart.max-request-size=100MB
 
 #mysql
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.datasource.url=jdbc:mysql://10.130.72.182:4306/hd_qc_ecr?useUnicode=true&characterEncoding=UTF-8&autoReconnet=true
-spring.datasource.username=hd_qc_ecr
-spring.datasource.password=hd_qc_ecr
+spring.datasource.url=jdbc:mysql://10.131.73.20:6306/yx_qc_change_system?useUnicode=true&characterEncoding=UTF-8&autoReconnet=true
+spring.datasource.username=yx_qc_change_system
+spring.datasource.password=1f28144c4be7e7a0
 
 #tomcat
 server.tomcat.max-threads=600
@@ -24,9 +24,6 @@ server.tomcat.basedir=/home/logs/access
 server.tomcat.accesslog.enabled=true
 server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %{X-Forwarded-For}i %D %{P_INFO}c  %{Referer}i  %{User-Agent}i  %{Host}i
 
-mapper.style=normal
-mapper.enum-as-simple-type=true
-
 # mybatis
 mybatis.mapper-locations=classpath:mybatis/mapper/*.xml
 mybatis.configuration.cache-enabled=true
@@ -34,9 +31,9 @@ mybatis.configuration.map-underscore-to-camel-case=true
 
 
 # redis
-spring.redis.password=BC6AYgWOXuJetuJG
+spring.redis.password=10cXYKgHCPtrgZ1D
 spring.redis.timeout=20000
-spring.redis.sentinel.master=paas-redis/yx-sc-ehc-onl
+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.pool.max-active=50
 spring.redis.pool.max-idle=20

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

@@ -7,15 +7,15 @@ 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/test.dschedule-admin.service.mailsaas/
+dschedule.adminAddresses=http://127.0.0.1:8550/proxy/online.dschedule-admin.service.mailsaas/
 spring.http.multipart.max-file-size=100MB
 spring.http.multipart.max-request-size=100MB
 
 # mysql
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.datasource.url=jdbc:mysql://10.170.155.148:4306/qc_ecr_system?useUnicode=true&characterEncoding=UTF-8&autoReconnet=true
-spring.datasource.username=qc_ecr_system
-spring.datasource.password=qc_ecr_system
+spring.datasource.url=jdbc:mysql://regression-public-instance-uyogz-21338.rds.cn-east-p1.internal.:5566/yx_qc_change_system?useUnicode=true&characterEncoding=UTF-8&autoReconnet=true
+spring.datasource.username=yx_qc_change_system
+spring.datasource.password=fd929d26963a3187
 
 #tomcat
 server.tomcat.max-threads=600
@@ -32,19 +32,19 @@ mybatis.configuration.map-underscore-to-camel-case=true
 
 
 # redis
-spring.redis.password=xc0CdqWMzMj6hBvpIY5HrciHX85txmftyXukMnyKdK8X
+spring.redis.password=10cXYKgHCPtrgZ1D
 spring.redis.timeout=20000
-spring.redis.sentinel.master=paas-redis/yx-common-repl-1-test
-spring.redis.sentinel.nodes=yx-cust23-test.ncr.cn-east-p1.internal:31461
+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.pool.max-active=50
 spring.redis.pool.max-idle=20
 spring.redis.pool.max-wait=10000
-spring.redis.host=yx-cust23-test.ncr.cn-east-p1.internal
-spring.redis.port=31461
+spring.redis.host=yx-cust23-online.ncr.cn-east-p1.internal.
+spring.redis.port=32427
 
 # supplier
-supplier.url=http://127.0.0.1:8550/proxy/test-v1.yanxuan-supplier-ms.service.mailsaas
+supplier.url=http://127.0.0.1:8550/proxy/online.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=test
\ No newline at end of file
+des.prop.env=online
\ No newline at end of file