Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/cms into develop

.github/workflows/develop.yml

@@ -31,6 +31,16 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: WeChat Work notification by text
+        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同步状态..."
+          #mentioned_list: '["@all"]'
+          mentioned_mobile_list: '["@all"]'
+
       - name: Set up JDK 8
         uses: actions/setup-java@v1
         with:

kustomization/base/deployment.yaml

@@ -4,7 +4,7 @@ metadata:
   name: cms-deployment
   namespace: default
 spec:
-  minReadySeconds: 240
+#  minReadySeconds: 240
   revisionHistoryLimit: 2
   replicas: 1
   selector:
@@ -19,18 +19,28 @@ spec:
       containers:
         - name: cms
           image: REGISTRY/NAMESPACE/IMAGE:TAG
+          readinessProbe:
+            initialDelaySeconds: 480
+            periodSeconds: 10
+            #timeoutSeconds: 1
+            #successThreshold: 1
+            failureThreshold: 20
+            httpGet:
+              path: /userapp/actuator/health/readiness
+              port: cms-port
           volumeMounts:
             - name: log-of-app
               mountPath: /var/log/app
             - name: localtime
               mountPath: /etc/localtime
               readOnly: true
-          resources:
-            limits:
-              memory: 1024Mi
-              cpu: 100m
+#          resources:
+#            limits:
+#              memory: 1024Mi
+#              cpu: 100m
           ports:
             - containerPort: 35150
+              name: cms-port
           env:
             - name: SPRING_PROFILES_ACTIVE
               valueFrom:

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/cms
-  newTag: f82bfbd7ba3f82e57e43574044b424e2f3e379df
+  newTag: e6bd302421c5d6221917afe3b6fb795186395db5