Merge branch 'develop'

# Conflicts:
#	kustomization/overlays/prod/kustomization.yaml

.github/workflows/develop.yml

@@ -82,7 +82,7 @@ jobs:
           {
             "msgtype": "markdown",
             "markdown": {
-              "content": "### GitHub构建并推送镜像失败 \n
+              "content": "### `GitHub构建并推送镜像失败` \n
                           > - 提交人: ${{github.actor}} \n
                           > - 提交信息: ${{github.event.head_commit.message}} \n
                           > - 提交到仓库: ${{github.repository}} \n

.github/workflows/master.yml

@@ -83,7 +83,7 @@ jobs:
           {
             "msgtype": "markdown",
             "markdown": {
-              "content": "### GitHub构建并推送镜像失败 \n
+              "content": "### `GitHub构建并推送镜像失败` \n
                           > - 提交人: ${{github.actor}} \n
                           > - 提交信息: ${{github.event.head_commit.message}} \n
                           > - 提交到仓库: ${{github.repository}} \n

components/filter/index.tsx

@@ -133,7 +133,6 @@ const Filter = (props: Props, ref: Ref<any>) => {
     if (obj?.children) {
       obj.children = obj.children.filter((item: FilterOptionResp) => item.id === v.id);
       obj.name += `/${v.name}`;
-      console.log('选中数据-->', obj);
       onChange(obj, 'categoryId');
     }
   };

components/footer/index.tsx

@@ -59,7 +59,9 @@ export default function Footer() {
           })}
         </div>
       </div>
-      <div className={styles.filingNumber}>浙ICP备2023014395号</div>
+      <a className={styles.filingNumber} href='https://beian.miit.gov.cn' target='_blank'>
+        浙ICP备2023014395号
+      </a>
     </div>
   );
 }

kustomization/base/service.yaml

@@ -6,7 +6,6 @@ metadata:
 spec:
   selector:
     app: web
-  type: NodePort
   ports:
     - protocol: TCP
       port: 3000

kustomization/overlays/dev/kustomization.yaml

@@ -11,11 +11,7 @@ commonAnnotations:
 patches:
 - path: ./increase_replicas.yaml
 - path: ./configMap.yaml
-- path: ./service-patch.yaml
-  target:
-    kind: Service
-    name: web-svc
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/web
-  newTag: 38db11ebbf8f8d68e8d920c13d827b26a39447f9
+  newTag: 1aed0c116d311264da9ec1f7a9e27f501e58a7fe

kustomization/overlays/prod/increase_replicas.yaml

@@ -3,9 +3,9 @@ kind: Deployment
 metadata:
   name: web-deployment
 spec:
-  replicas: 2
+  replicas: 1
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
-      maxUnavailable: 1
\ No newline at end of file
+      maxUnavailable: 0
\ No newline at end of file

kustomization/overlays/prod/kustomization.yaml

 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ../../base
+  - ../../base
 namespace: prod
 #namePrefix: prod-
 commonLabels:

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.shop/:path*',
+        destination: 'https://test.iuav.shop/:path*',
       },
     ];
   },

pages/equipmentLeasing/detail/[id].page.tsx

@@ -276,7 +276,7 @@ export default function EquipmentLeasingDetail() {
                 <div className='top'>
                   <div className='left'>
                     <span className='label'>选择</span>
-                    <span className='value'>商品分类</span>
+                    <span className='value'>产品规格</span>
                   </div>
                   <div className='right'>
                     <Select

pages/jobServices/detail/[id].page.tsx

@@ -29,7 +29,7 @@ export default function JobServicesDetail() {
   const items: TabsProps['items'] = [
     {
       key: '1',
-      label: `团队介绍`,
+      label: `服务介绍`,
       children: (
         <div className='teamIntroduction'>
           {detail?.serviceIntroduction ? (
@@ -40,7 +40,7 @@ export default function JobServicesDetail() {
     },
     {
       key: '2',
-      label: `团队评价`,
+      label: `服务评价`,
       children: <Evaluate evaluateInfo={detail?.inspComtList || []} />,
     },
   ];