Merge branch 'develop'

.gitlab-ci.yml

@@ -15,7 +15,7 @@ variables:
   ACR_EE_TAG: $CI_COMMIT_SHA
 
   JAVA_VERSION: '8'
-  GITLAB_URL: https://oauth2:ZhN6PrYzu9ELfyVq_KE5@git.mmcuav.cn/iuav/csf-web.git
+  GITLAB_URL: http://oauth2:glpat-msSvMfyvQacx1MfESJd6@gitlab.iuav.com:8081/iuav/web.git
 
 docker_build_dev:
   stage: dockerbuild

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/web
-  newTag: 3ac6d24efec646fb4066d67d24a7e6450ece0b45
+  newTag: 12af84f9b2e1e811e0a39c007f5c723c562e7430