Merge branch 'develop'

.github/workflows/develop.yml

@@ -31,13 +31,20 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: WeChat Work notification by text
+      - name: WeChat Work notification by markdown
         uses: chf007/action-wechat-work@master
         env:
           WECHAT_WORK_BOT_WEBHOOK: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=9be1b073-1760-442d-8e3d-faa0fd32ea16
         with:
-          msgtype: text
-          content: "GitHub提交信息\n - 提交人: ${{github.actor}}\n - 提交信息: ${{ github.event.head_commit.message }}\n - 提交到仓库: ${{github.repository}}\n - 提交到分支: ${{github.ref}}\n 即将开始更新，请关注Argocd同步状态..."
+          msgtype: markdown
+          content: "
+          ### GitHub提交信息 \n
+          > - 提交人: ${{github.actor}} \n
+          > - 提交信息: ${{ github.event.head_commit.message }} \n
+          > - 提交到仓库: ${{github.repository}} \n
+          > - 提交到分支: ${{github.ref}} \n
+          即将开始更新，请关注Argocd同步状态...
+          "
 
       - name: Login to ACR EE with the AccessKey pair
         uses: aliyun/acr-login@v1
@@ -64,5 +71,20 @@ jobs:
           git config user.name "Chuck"
           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 "develop"
+          git commit -am "Update Image Tag"
+          git tag -a $TAG -m "日常迭代"          
+          git push origin "develop" --tags
+
+      - name: Send Error Notification by WeChat
+        if: ${{ failure() }}
+        run: |
+          curl 'https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=9be1b073-1760-442d-8e3d-faa0fd32ea16' -H 'Content-Type: application/json' -d '
+          {
+            "msgtype": "markdown",
+            "markdown": {
+              "content": "### GitHub构建并推送镜像失败 \n
+                          > - 提交人: ${{github.actor}} \n
+                          > - 提交信息: ${{github.event.head_commit.message}} \n
+                          > - 提交到仓库: ${{github.repository}} \n
+                          > - 提交到分支: ${{github.ref}} \n 请修复错误后重新提交..."
+          }'          
\ No newline at end of file

.github/workflows/master.yml

@@ -32,6 +32,21 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: WeChat Work notification by markdown
+        uses: chf007/action-wechat-work@master
+        env:
+          WECHAT_WORK_BOT_WEBHOOK: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=9be1b073-1760-442d-8e3d-faa0fd32ea16
+        with:
+          msgtype: markdown
+          content: "
+          ### GitHub提交信息 \n
+          > - 提交人: ${{github.actor}} \n
+          > - 提交信息: ${{ github.event.head_commit.message }} \n
+          > - 提交到仓库: ${{github.repository}} \n
+          > - 提交到分支: ${{github.ref}} \n
+          即将开始更新，请关注Argocd同步状态...
+          "        
+
       - name: Login to ACR EE with the AccessKey pair
         uses: aliyun/acr-login@v1
         with:
@@ -57,5 +72,20 @@ jobs:
           git config user.name "Chuck"
           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 "master"
+          git commit -am "Update Image Tag"
+          git tag -a $TAG -m "日常迭代"          
+          git push origin "master" --tags
+
+      - name: Send Error Notification by WeChat
+        if: ${{ failure() }}
+        run: |
+          curl 'https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=9be1b073-1760-442d-8e3d-faa0fd32ea16' -H 'Content-Type: application/json' -d '
+          {
+            "msgtype": "markdown",
+            "markdown": {
+              "content": "### GitHub构建并推送镜像失败 \n
+                          > - 提交人: ${{github.actor}} \n
+                          > - 提交信息: ${{github.event.head_commit.message}} \n
+                          > - 提交到仓库: ${{github.repository}} \n
+                          > - 提交到分支: ${{github.ref}} \n 请修复错误后重新提交..."
+          }'          
\ No newline at end of file

kustomization/overlays/dev/kustomization.yaml

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

pages/projectInfo/caseArticle/index.module.scss

@@ -38,7 +38,7 @@
   @include ellipsis(1);
 }
 .richText{
-  img{
+  img,video{
     max-width: 100%;
     height: auto;
   }

pages/projectInfo/components/cases/index.module.scss

@@ -24,6 +24,7 @@
         color: #3c3e42;
         width:100%;
         text-overflow: ellipsis;
+        font-family: MicrosoftYaHeiUI-Bold, MicrosoftYaHeiUI;
         @include ellipsis(1);
         margin-right: 10px;
       }

pages/projectInfo/index.page.tsx

@@ -16,7 +16,7 @@ export interface Params {
 }
 
 const items = (params: any) =>
-  [/* "项目需求", */ '招投标项目', '项目案例', '行业新闻'].map((value) => {
+  [/* "项目需求", */ '招标快讯', '业务案例', '行业新闻'].map((value) => {
     let children: JSX.Element | string = <></>;
 
     switch (value) {
@@ -24,11 +24,11 @@ const items = (params: any) =>
         children = <Requirements params={params}></Requirements>;
         break;
 
-      case '招投标项目':
+      case '招标快讯':
         children = <Bids params={params}></Bids>;
         break;
 
-      case '项目案例':
+      case '业务案例':
         children = <Cases params={params}></Cases>;
         break;
 

pages/projectInfo/newsArticle/index.module.scss

@@ -38,7 +38,7 @@
   @include ellipsis(1);
 }
 .richText{
-  img{
+  img,video{
     max-width: 100%;
     height: auto;
   }

pages/projectInfo/tenderProjectsDetail/index.module.scss

@@ -38,7 +38,7 @@
   @include ellipsis(1);
 }
 .richText{
-  img{
+  img,video{
     max-width: 100%;
     height: auto;
   }