Merge branch 'master' into feature/chuck

.github/workflows/feature-chuck.yml → .github/workflows/develop.yml

@@ -2,7 +2,7 @@ name: Build and Push to ACR
 
 on:
   push:
-    branches: ["feature/chuck"]
+    branches: ["develop"]
 
 env:
   REGION_ID: cn-shenzhen
@@ -57,4 +57,4 @@ jobs:
           git config user.email "Chuck@users.noreply.github.com"
           git remote set-url origin "$GITLAB_URL"
           git commit -am "Generated Image Update"
-          git push origin "feature/chuck"
+          git push origin "develop"

.github/workflows/release-chuck.yml → .github/workflows/master.yml

@@ -3,7 +3,7 @@ name: Build and Push to ACR
 on:
   push:
     ### Production
-    branches: ["release/chuck"]
+    branches: ["master"]
 
 env:
   REGION_ID: cn-shenzhen
@@ -58,4 +58,4 @@ jobs:
           git config user.email "Chuck@users.noreply.github.com"
           git remote set-url origin "$GITLAB_URL"
           git commit -am "generated Image update"
-          git push origin "release/chuck"
+          git push origin "master"

README.md

@@ -5,7 +5,7 @@ github: https://github.com/sharefly-iuav/web
 1. 先本地npm run build, 确认构建前ts检查无错误, 可构建成功.
 
 ## 构建测试服
-1. 切换到feature/chuck分支下, 先提交gitlab, 再提交github, 自动触发构建测试服
+1. 切换到develop分支下, 先提交gitlab, 再提交github, 自动触发构建测试服
 
 ## 构建正式服
 1. ssh连接到远程服务器登录(ip:120.77.247.178 账号: root 密码: YXF&mmc@m2023)

kustomization/base/deployment.yaml

@@ -4,7 +4,7 @@ metadata:
   name: web-deployment
   namespace: default
 spec:
-  minReadySeconds: 250
+  #  minReadySeconds: 250
   revisionHistoryLimit: 2
   replicas: 1
   selector:
@@ -23,4 +23,4 @@ spec:
               memory: 512Mi
               cpu: 100m
           ports:
-            - containerPort: 3000
\ No newline at end of file
+            - containerPort: 3000

kustomization/overlays/prod/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/web
-  newTag: 18a408695e671822e9b91f298e42cdb52a870360
+  newTag: bfd86338f2723db513e880683b5e4281a1b047b8

next.config.js

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

pages/home/waterfallFlowBody/components/rotationChart/index.tsx

@@ -8,8 +8,8 @@ export default function RotationChart() {
     'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/1(1).jpg',
     'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/2(1).jpg',
     'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/3(1).jpg',
-    'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/4(1).jpg',
-    'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/5(1).jpg',
+    'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/a0dc9062-cef8-44ce-bbba-ee82a0d5fe80.jpg',
+    'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/95843a99-e8bf-4156-b47a-cf3720f4a885.jpg',
   ];
   return (
     <Box>