Merge branch 'develop'

.gitlab-ci.yml

@@ -14,7 +14,7 @@ variables:
   ACR_EE_IMAGE: h5
   ACR_EE_TAG: $CI_COMMIT_SHA
   JAVA_VERSION: '8'
-  GITLAB_URL: https://oauth2:MjVJKxB7m4tCy7symBzn@git.mmcuav.cn/iuav/h5.git
+  GITLAB_URL: https://oauth2:ZhN6PrYzu9ELfyVq_KE5@git.mmcuav.cn/iuav/h5.git
 
 docker_build_dev:
   stage: dockerbuild

kustomization/overlays/dev/kustomization.yaml

@@ -13,4 +13,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/h5
-  newTag: 6b86788a3a36f53ea8bee25a6f09e844fe49aad6
+  newTag: 7531366e5410188b027524c8b995072113f7fd82