Merge branch 'develop' of http://git.mmcuav.cn/iuav/ims into develop

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

.github/workflows/develop.yml

+name: Build and Push to ACR
+
+on:
+  push:
+    branches: [ "develop" ]
+
+env:
+  REGION_ID: cn-shenzhen
+  REGISTRY: mmc-registry.cn-shenzhen.cr.aliyuncs.com
+  NAMESPACE: sharefly
+  IMAGE: ims
+  TAG: ${{ github.sha }}
+
+  ACR_EE_REGISTRY: mmc-registry.cn-shenzhen.cr.aliyuncs.com
+  ACR_EE_INSTANCE_ID: cri-yhk5zgfc2v1sia6l
+  ACR_EE_NAMESPACE: sharefly
+  ACR_EE_IMAGE: ims
+  ACR_EE_TAG: ${{ github.sha }}
+  JAVA_VERSION: '8'
+  GITLAB_URL: https://oauth2:MjVJKxB7m4tCy7symBzn@git.mmcuav.cn/iuav/ims.git
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    environment: dev
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 8
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{env.JAVA_VERSION}}
+
+      - name: Login to ACR EE with the AccessKey pair
+        uses: aliyun/acr-login@v1
+        with:
+          login-server: "https://${{ env.ACR_EE_REGISTRY }}"
+          region-id: "${{ env.REGION_ID }}"
+          username: "QD--KeBiTeHangKong@1354706964800968"
+          password: "MMC@2023&ACR"
+          instance-id: "${{ env.ACR_EE_INSTANCE_ID }}"
+
+      - name: Build and push image to ACR EE
+        run: |
+          mvn clean package
+          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"
+
+      - name: Kustomize Set Image
+        run: |-
+          cd kustomization/overlays/dev
+          curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"  | bash /dev/stdin 3.8.6
+          ./kustomize edit set image REGISTRY/NAMESPACE/IMAGE:TAG=$REGISTRY/$NAMESPACE/$IMAGE:$TAG
+
+      - name: Commit and Push
+        run: |
+          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 New Tag"
+          git push origin develop
\ No newline at end of file

.github/workflows/alibabacloud.yml → .github/workflows/master.yml

@@ -18,8 +18,7 @@ env:
   ACR_EE_IMAGE: ims
   ACR_EE_TAG: ${{ github.sha }}
   JAVA_VERSION: '8'
-  ### Kustomize
-  GITLAB_URL: https://oauth2:MjVJKxB7m4tCy7symBzn@git.mmcuav.cn/kustomize/iuav-ims.git
+  GITLAB_URL: https://oauth2:MjVJKxB7m4tCy7symBzn@git.mmcuav.cn/iuav/ims.git
 
 permissions:
   contents: read
@@ -53,13 +52,13 @@ jobs:
           mvn clean package
           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"
-
+      ### Production
       - name: Kustomize Set Image
         run: |-
           cd kustomization/overlays/prod
           curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"  | bash /dev/stdin 3.8.6
           ./kustomize edit set image REGISTRY/NAMESPACE/IMAGE:TAG=$REGISTRY/$NAMESPACE/$IMAGE:$TAG
-
+      ### Production
       - name: Commit and Push
         run: |
           git config user.name "Chuck"

.gitignore

@@ -6,5 +6,4 @@ target
 .settings
 .idea
 *.iml
-*/application.yml
-.github/
+*/application.yml
\ 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:
@@ -9,5 +9,12 @@ commonLabels:
 commonAnnotations:
   note: This is prod!
 patches:
-  - path: configMap.yaml
-  - path: service.yaml
\ No newline at end of file
+- path: configMap.yaml
+- path: service-patch.yaml
+  target:
+    kind: Service
+    name: ims-svc
+images:
+- name: REGISTRY/NAMESPACE/IMAGE:TAG
+  newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/ims
+  newTag: 1f36751b7a432aa3c1a6f21bef45f5427af38788

kustomization/overlays/prod/service-patch.yaml

+- op: replace
+  path: /spec/ports/0/nodePort
+  value: 30001
\ No newline at end of file

kustomization/overlays/prod/service.yaml

-apiVersion: v1
-kind: Service
-metadata:
-  name: ims-svc
-  namespace: prod
-spec:
-  selector:
-    app: ims
-  type: NodePort
-  ports:
-    - protocol: TCP
-      port: 10001
-      nodePort: 30001
\ No newline at end of file

release-service/src/main/java/com/mmc/csf/release/service/TaskService.java

@@ -5,56 +5,55 @@ import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.release.task.qo.TaskServiceQo;
 import com.mmc.csf.release.task.vo.OrderTaskVO;
 import com.mmc.csf.release.task.vo.TaskServiceDetailVO;
-import com.sun.org.apache.regexp.internal.RE;
 
 /**
  * @Author LW
- * @date 2023/5/17 13:56
- * 概要：
+ *
+ * @date 2023/5/17 13:56 概要：
  */
 public interface TaskService {
-    /**
-     * 查询任务服务列表
-     *
-     * @param taskServiceQo 任务服务
-     * @return {@link ResultBody}
-     */
-    PageResult queryTaskServiceList(TaskServiceQo taskServiceQo);
+  /**
+   * 查询任务服务列表
+   *
+   * @param taskServiceQo 任务服务
+   * @return {@link ResultBody}
+   */
+  PageResult queryTaskServiceList(TaskServiceQo taskServiceQo);
 
-    /**
-     * 通过id获取服务详情
-     *
-     * @param id id
-     * @return {@link ResultBody}<{@link TaskServiceDetailVO}>
-     */
-    ResultBody<TaskServiceDetailVO> getInspectionById(Integer id);
+  /**
+   * 通过id获取服务详情
+   *
+   * @param id id
+   * @return {@link ResultBody}<{@link TaskServiceDetailVO}>
+   */
+  ResultBody<TaskServiceDetailVO> getInspectionById(Integer id);
 
-    /**
-     * 预订服务
-     *
-     * @param orderTaskVO 订单任务
-     * @return {@link ResultBody}
-     */
-    ResultBody reservationService(OrderTaskVO orderTaskVO);
+  /**
+   * 预订服务
+   *
+   * @param orderTaskVO 订单任务
+   * @return {@link ResultBody}
+   */
+  ResultBody reservationService(OrderTaskVO orderTaskVO);
 
-    /**
-     * 列出所有行业
-     *
-     * @return {@link ResultBody}
-     */
-    ResultBody listAllIndustry();
+  /**
+   * 列出所有行业
+   *
+   * @return {@link ResultBody}
+   */
+  ResultBody listAllIndustry();
 
-    /**
-     * 列出所有应用程序类型
-     *
-     * @return {@link ResultBody}
-     */
-    ResultBody listAllAppType();
+  /**
+   * 列出所有应用程序类型
+   *
+   * @return {@link ResultBody}
+   */
+  ResultBody listAllAppType();
 
-    /**
-     * 列出所有任务服务
-     *
-     * @return {@link ResultBody}
-     */
-    ResultBody listAllTaskService();
+  /**
+   * 列出所有任务服务
+   *
+   * @return {@link ResultBody}
+   */
+  ResultBody listAllTaskService();
 }