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: web
+  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: web
+  ACR_EE_TAG: $CI_COMMIT_SHA
+  JAVA_VERSION: '8'
+  GITLAB_URL: https://oauth2:MjVJKxB7m4tCy7symBzn@git.mmcuav.cn/iuav/csf-web.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  #重新提交修改镜像版本后的代码

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: 1aed0c116d311264da9ec1f7a9e27f501e58a7fe
+  newTag: 180afdaea7088b8b94fc4c34a1bdb882689686b9

next.config.js

@@ -27,8 +27,8 @@ const nextConfig = {
     return [
       {
         source: '/local/:path*',
-        // destination: 'https://www.iuav.shop/:path*',
-        destination: 'https://test.iuav.shop/:path*',
+        // destination: 'https://www.iuav.com/:path*',
+        destination: 'https://test.iuav.com/:path*',
       },
     ];
   },

pages/equipmentLeasing/detail/components/orderForGoods/index.tsx

@@ -368,9 +368,9 @@ export default function OrderForGoods(props: PropsBox) {
             className='addressImg'
             preview={{ visible: false }}
             src={
-              window.location.href.includes('https://test.iuav.shop/')
-                ? 'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/image/app-iuav-formal1.jpg'
-                : 'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/image/app-iuav-trial1.jpg' || ''
+              window.location.href.includes('https://test.iuav.com/')
+                ? 'https://share-fly.oss-cn-hangzhou.aliyuncs.com/image/app-iuav-formal1.jpg'
+                : 'https://share-fly.oss-cn-hangzhou.aliyuncs.com/image/app-iuav-trial1.jpg' || ''
             }
             onClick={() => setAddressVisible(true)}
           />
@@ -383,9 +383,9 @@ export default function OrderForGoods(props: PropsBox) {
             >
               <Image
                 src={
-                  window.location.href.includes('https://test.iuav.shop/')
-                    ? 'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/image/app-iuav-formal1.jpg'
-                    : 'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/image/app-iuav-trial1.jpg' ||
+                  window.location.href.includes('https://test.iuav.com/')
+                    ? 'https://share-fly.oss-cn-hangzhou.aliyuncs.com/image/app-iuav-formal1.jpg'
+                    : 'https://share-fly.oss-cn-hangzhou.aliyuncs.com/image/app-iuav-trial1.jpg' ||
                       ''
                 }
               />

pages/flyingHandService/index.page.tsx

@@ -38,8 +38,8 @@ export default function FlyingHandService() {
   const router = useRouter();
   const { userInfo, setNeedLogin } = useContext(UserContext);
   const [list, setList] = useState([
-    'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/540X844-1(1).jpg',
-    'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/540X844(1).jpg',
+    'https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/540X844-1(1).jpg',
+    'https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/540X844(1).jpg',
   ]);
   const [productList, setProductList] = useState(Array<{ element: JSX.Element }>);
   const [rightDomList, setRightDomList] = useState(Array<{ element: JSX.Element }>);

pages/mall/detail/components/orderForGoods/index.tsx

@@ -278,9 +278,9 @@ export default function OrderForGoods(props: PropsBox) {
             className='addressImg'
             preview={{ visible: false }}
             src={
-              window.location.href.includes('https://test.iuav.shop/')
-                ? 'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/image/app-iuav-formal1.jpg'
-                : 'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/image/app-iuav-trial1.jpg' || ''
+              window.location.href.includes('https://test.iuav.com/')
+                ? 'https://share-fly.oss-cn-hangzhou.aliyuncs.com/image/app-iuav-formal1.jpg'
+                : 'https://share-fly.oss-cn-hangzhou.aliyuncs.com/image/app-iuav-trial1.jpg' || ''
             }
             onClick={() => setAddressVisible(true)}
           />
@@ -293,9 +293,9 @@ export default function OrderForGoods(props: PropsBox) {
             >
               <Image
                 src={
-                  window.location.href.includes('https://test.iuav.shop/')
-                    ? 'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/image/app-iuav-formal1.jpg'
-                    : 'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/image/app-iuav-trial1.jpg' ||
+                  window.location.href.includes('https://test.iuav.com/')
+                    ? 'https://share-fly.oss-cn-hangzhou.aliyuncs.com/image/app-iuav-formal1.jpg'
+                    : 'https://share-fly.oss-cn-hangzhou.aliyuncs.com/image/app-iuav-trial1.jpg' ||
                       ''
                 }
               />