Merge branch 'master' into 'feature-20230321-serviceLeaveCloud'

Master

See merge request !19

.gitlab-ci.yml

@@ -64,21 +64,20 @@ test_upload_bee:
   dependencies:
     - test_package
 
-test_image_upload:
+test_artifact_upload:
   stage: upload
   script:
     - version_tools time && CURRENT_TIMESTAMP=$(version_tools result)
     - version_tools version && PROJECT_VERSION=$(version_tools result)
     - IMAGE_TAG="${PROJECT_VERSION}-${CI_COMMIT_REF_NAME##*/}-${CURRENT_TIMESTAMP}-${CI_PIPELINE_ID}"
     - IMAGE_NAME="${HARBOR_URL}/${HARBOR_APP_DIRECTOR}/${SERVICE_CODE}:${IMAGE_TAG}"
-    - unzip -o -q $CI_PROJECT_NAME.zip -d .
-    - docker build --pull -t ${IMAGE_NAME} .
-    - eval opera docker $OPERA_ARGS --env=test --imageName=${IMAGE_NAME} --imageTag=${IMAGE_TAG} --autoDeploy=true --clusterId=44 --ldcCode=cluster1
+    - eval opera truck $OPERA_ARGS --env=test --artifactPath=$CI_PROJECT_NAME.zip  --artifactVersion=$ARTIFACT_VERSION
   tags:
     - ci-backend
   only:
     - dev
     - /^feature-.*$/
+    - /^release.*$/
     - /^hotfix.*$/
   dependencies:
     - test_package

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

@@ -32,15 +32,15 @@ mybatis.configuration.map-underscore-to-camel-case=true
 
 
 # redis
-spring.redis.password=xc0CdqWMzMj6hBvpIY5HrciHX85txmftyXukMnyKdK8X
+spring.redis.password=KX4CRYuA68T2
 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=yx_common1_repl_test
+spring.redis.sentinel.nodes=10.131.99.201:11030
 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=10.131.99.201
+spring.redis.port=11030
 
 # supplier
 supplier.url=http://127.0.0.1:8550/proxy/test-v1.yanxuan-supplier-ms.service.mailsaas