Merge branch 'develop'

.gitlab-ci.yml

+stages:
+  - dockerbuild
+  - kustomize_tag_push
+
+variables:
+  REGION_id: cn-shenzhen
+  REGISTRY: mmc-registry.cn-shenzhen.cr.aliyuncs.com
+  IMAGE: h5
+  TAG: $CI_COMMIT_SHA
+  ACR_EE_USERNAME: QD--KeBiTeHangKong@1354706964800968
+  ACR_EE_PASSWORD: MMC@2023&ACR
+  ACR_EE_REGISTRY: mmc-registry.cn-shenzhen.cr.aliyuncs.com
+  ACR_EE_INSTANCE_ID: cri-yhk5zgfc2v1sia6l
+  ACR_EE_IMAGE: h5
+  ACR_EE_TAG: $CI_COMMIT_SHA
+  JAVA_VERSION: '8'
+  GITLAB_URL: https://oauth2:MjVJKxB7m4tCy7symBzn@git.mmcuav.cn/iuav/h5.git
+
+docker_build_dev:
+  stage: dockerbuild
+  variables:
+    NAMESPACE: sharefly-dev
+    ACR_EE_NAMESPACE: sharefly-dev
+  only:
+    - develop
+  script:
+    - echo "dev docker build"
+    - echo $ACR_EE_USERNAME
+    - echo $ACR_EE_REGISTRY
+    - docker login -u $ACR_EE_USERNAME -p 'MMC@2023&ACR' $ACR_EE_REGISTRY
+    - docker build -t ${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG} .
+    - docker push "${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG}"
+    - docker logout
+
+docker_build_prod:
+  stage: dockerbuild
+  variables:
+    NAMESPACE: sharefly
+    ACR_EE_NAMESPACE: sharefly
+  only:
+    - master
+  script:
+    - echo "prod docker build"
+    - echo $ACR_EE_USERNAME
+    - echo $ACR_EE_REGISTRY
+    - docker login -u $ACR_EE_USERNAME -p 'MMC@2023&ACR' $ACR_EE_REGISTRY
+    - docker build -t ${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG} .
+    - docker push "${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG}"
+    - docker logout
+
+
+kustomize_set_image_dev:
+  stage: kustomize_tag_push
+  variables:
+    NAMESPACE: sharefly-dev
+    ACR_EE_NAMESPACE: sharefly-dev
+  only:
+    - develop
+  before_script:
+    - echo "dev set image"
+    - git config --global user.name "bax" #配置本地仓库用户名信息
+    - git config --global user.email "baoaxin1999@163.com" #配置本地仓库邮箱信息
+  script:
+    - git remote -v
+    - git checkout -B develop
+    - cd kustomization/overlays/dev
+    - kustomize edit set image REGISTRY/NAMESPACE/IMAGE:TAG=$REGISTRY/$NAMESPACE/$IMAGE:$TAG
+    - cat kustomization.yaml
+    - git remote set-url origin "$GITLAB_URL"
+    - git commit -am '[skip ci] DEV image update'  #git 本地提交，注意“skip ci”为gitlab流水线文件内置关键字，作用为跳过ci流水线操作，未设置可能导致流水线进入死循环
+    - git push --set-upstream origin develop  #重新提交修改镜像版本后的代码
+
+
+
+kustomize_set_image_prod:
+  stage: kustomize_tag_push
+  variables:
+    NAMESPACE: sharefly
+    ACR_EE_NAMESPACE: sharefly
+  only:
+    - master
+  before_script:
+    - echo "prod set image"
+    - echo "master"
+    - git config --global user.name "bax" #配置本地仓库用户名信息
+    - git config --global user.email "baoaxin1999@163.com" #配置本地仓库邮箱信息
+  script:
+    - git remote -v
+    - git checkout -B master
+    - cd kustomization/overlays/prod
+    - kustomize edit set image REGISTRY/NAMESPACE/IMAGE:TAG=$REGISTRY/$NAMESPACE/$IMAGE:$TAG
+    - cat kustomization.yaml
+    - git remote set-url origin "$GITLAB_URL"
+    - git commit -am '[skip ci] DEV image update'  #git 本地提交，注意“skip ci”为gitlab流水线文件内置关键字，作用为跳过ci流水线操作，未设置可能导致流水线进入死循环
+    - git push --set-upstream origin master  #重新提交修改镜像版本后的代码

env/.env.development

 # 请求接口地址
-#VITE_REQUEST_BASE_URL='https://www.iuav.shop'
-VITE_REQUEST_BASE_URL='https://test.iuav.shop'
+#VITE_REQUEST_BASE_URL='https://www.iuav.com'
+VITE_REQUEST_BASE_URL='https://test.iuav.com'

env/.env.production

 # 请求接口地址
-VITE_REQUEST_BASE_URL='https://www.iuav.shop'
-#VITE_REQUEST_BASE_URL='https://test.iuav.shop'
+VITE_REQUEST_BASE_URL='https://www.iuav.com'
+#VITE_REQUEST_BASE_URL='https://test.iuav.com'
 #VITE_REQUEST_BASE_URL='http://119.23.248.181'
 #VITE_REQUEST_BASE_URL='http://120.77.145.47'

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: 8f4a1c17a6579254de67237c51a47fc3af1d971f
+  newTag: 155a3b62a34068a2723e9ad95709022ec8fb04fd

src/pages/electronic-contracting/index.vue

@@ -3,7 +3,7 @@
 <template>
   <view class="electronic-contracting">
     <image
-      src="http://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/36396951-5948-430e-9a34-9cc8694d8408.png"
+      src="http://share-fly.oss-cn-hangzhou.aliyuncs.com/file/36396951-5948-430e-9a34-9cc8694d8408.png"
       mode="widthFix"
     />
   </view>

src/pages/index/index.vue

@@ -190,7 +190,7 @@ import weChatSDK from 'z-weixin-ts'
         currentItem: {},
 				icon: {
 					type: 'image',
-					image: 'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/b0364bd1-f193-4b93-ac9f-cfb6e2624d6b.png',
+					image: 'https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/b0364bd1-f193-4b93-ac9f-cfb6e2624d6b.png',
 					size: [32, 32],
 					anchor: 'bottom-center',
 				},