[pull] master from metersphere:master

.github/ISSUE_TEMPLATE/bug.md

@@ -2,25 +2,30 @@
 name: BUG 提交
 about: 提交产品缺陷帮助我们更好的改进
 title: "[BUG]"
-labels: bug
-assignees: xulinde
+labels: "类型: 缺陷"
+assignees: youliyuan-fit2cloud
 
 ---
 
 **MeterSphere 版本**
+
 您所使用的 MeterSphere 版本是？
 
 **Bug 描述**
+
 简要描述您碰到的问题
 
 **Bug 重现步骤**
+
 1.  
 2. 
 3. 
 4. 
 
 **期待的正确结果**
+
 正确情况下应该是什么样的？
 
 **截图**
+
 如果有截图，请附上截图.

.github/ISSUE_TEMPLATE/feature.md

@@ -3,12 +3,12 @@ name: 需求建议
 about: 提出针对本项目的想法和建议
 title: "[FEATURE]"
 labels: enhancement
-assignees: ''
+assignees: 'Hyyfit'
 
 ---
 
 **请描述您的需求或者改进建议.**
 
 
 
-**请描述你建议的实现方案**
+**请描述你建议的实现方案**

.github/ISSUE_TEMPLATE/question.md

@@ -3,7 +3,7 @@ name: 问题咨询
 about: 提出针对本项目安装部署、使用及其他方面的相关问题
 title: "[QUESTION]"
 labels: question
-assignees: wangzhen-fit2cloud
+assignees: Hyyfit
 
 ---
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,9 @@
+#### What this PR does / why we need it?
+
+#### Summary of your change
+
+#### Please indicate you've done the following:
+
+- [ ] Made sure tests are passing and test coverage is added if needed.
+- [ ] Made sure commit message follow the rule of [Conventional Commits specification](https://www.conventionalcommits.org/).
+- [ ] Considered the docs impact and opened a new docs issue or PR with docs changes if needed.

.github/workflows/build-push.yml

@@ -4,56 +4,85 @@ on:
   push:
     branches:
       - master
-      - v1*  
+      - v1*
+      - test-build
   workflow_dispatch:
-  
+
 jobs:
   build_push:
     runs-on: ubuntu-latest
     name: Build Docker Image and Push
     steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: true
-        token: ${{ secrets.ACCESS_TOKEN }}
-
-    - name: Inject slug/short variables
-      uses: rlespinasse/github-slug-action@v3.x
-    - name: Cache node modules
-      uses: actions/cache@v2
-      env:
-        cache-name: cache-node-modules
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-build-${{ env.cache-name }}-
-          ${{ runner.os }}-build-
-          ${{ runner.os }}-
-
-    - name: Cache local Maven repository
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          ${{ runner.os }}-maven-
-
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-        server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
-        settings-path: ${{ github.workspace }} # location for the settings.xml file
-
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml    
-
-    - name: Push to Docker Hub
-      uses: docker/build-push-action@v1
-      with:
-        username: metersphere
-        password: ${{ secrets.DOCKER_HUB_TOKEN }}
-        repository: metersphere/metersphere
-        tags: ${{ env.GITHUB_REF_SLUG }}
-        build_args: MS_VERSION=${{ env.GITHUB_REF_SLUG }}-${{ env.GITHUB_SHA_SHORT }}
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+          token: ${{ secrets.ACCESS_TOKEN }}
+
+      - name: Inject slug/short variables
+        uses: rlespinasse/github-slug-action@v3.x
+      - name: Cache node modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-node-modules
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      - name: Cache local Maven repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+          server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
+          settings-path: ${{ github.workspace }} # location for the settings.xml file
+
+      - name: Build with Maven
+        run: mvn -B package --file pom.xml
+
+      - name: Unzip jar
+        run: mkdir -p backend/target/dependency && (cd backend/target/dependency; jar -xf ../*.jar)
+
+      - name: Prepare
+        id: prepare
+        run: |
+          DOCKER_IMAGE=metersphere/metersphere
+          DOCKER_PLATFORMS=linux/amd64,linux/arm64
+          TAG_NAME=${{ env.GITHUB_REF_SLUG }}
+          DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME} --tag ${DOCKER_IMAGE}:latest"
+          echo ::set-output name=docker_image::${DOCKER_IMAGE}
+          echo ::set-output name=version::${TAG_NAME}
+          echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \
+            --build-arg VERSION=${TAG_NAME} \
+            --build-arg MS_VERSION=${{ env.GITHUB_REF_SLUG }}-${{ env.GITHUB_SHA_SHORT }} \
+            --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
+            --build-arg VCS_REF=${GITHUB_SHA::8} \
+            ${DOCKER_IMAGE_TAGS} .
+
+      - name: Set up Docker Buildx
+        uses: crazy-max/ghaction-docker-buildx@v3
+
+      - name: Docker Buildx (build)
+        run: |
+          docker buildx build --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }}
+
+      - name: Login to Registry
+        uses: docker/login-action@v1
+        with:
+          username: metersphere
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+
+      - name: Docker Buildx (push)
+        run: |
+          docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }}
+

.github/workflows/issue-close-require.yml

@@ -0,0 +1,18 @@
+name: Issue Close Require
+
+on:
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  issue-close-require:
+    runs-on: ubuntu-latest
+    steps:
+      - name: needs more info
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'close-issues'
+          labels: '状态:待反馈'
+          inactive-day: 30
+          body: |
+            您超过30天未反馈信息，我们将关闭此Issue，如有需要您可以重新打开或提交新的Issue

.github/workflows/issue-close.yml

@@ -0,0 +1,16 @@
+name: Issue Close Check
+
+on:
+  issues:
+    types: [closed]
+
+jobs:
+  issue-close-remove-labels:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Remove labels
+        uses: actions-cool/issues-helper@v2
+        if: ${{ !github.event.issue.pull_request }}
+        with:
+          actions: 'remove-labels'
+          labels: '状态:待处理'

.github/workflows/issue-comment.yml

@@ -0,0 +1,38 @@
+on:
+  issue_comment:
+    types: [created]
+
+name: Add issues workflow labels
+
+jobs:
+  add-label-if-is-author:
+    runs-on: ubuntu-latest
+    if: ${{ (github.event.issue.user.id == github.event.comment.user.id) && (!github.event.issue.pull_request) }}
+    steps:
+      - name: Add require handle label
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'add-labels'
+          labels: '状态:待处理'
+
+      - name: Remove require reply label
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'remove-labels'
+          labels: '状态:待反馈'
+
+  add-label-if-not-author:
+    runs-on: ubuntu-latest
+    if: ${{ (github.event.issue.user.id != github.event.comment.user.id) && (!github.event.issue.pull_request) && (github.event.issue.state == 'open') }}
+    steps:
+      - name: Add require replay label
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'add-labels'
+          labels: '状态:待反馈'
+
+      - name: Remove require handle label
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'remove-labels'
+          labels: '状态:待处理'

.github/workflows/issue-open.yml

@@ -0,0 +1,16 @@
+name: Issue Open Check
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  issue-open-add-labels:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Add labels
+        uses: actions-cool/issues-helper@v2
+        if: ${{ !github.event.issue.pull_request }}
+        with:
+          actions: 'add-labels'
+          labels: '状态:待处理'

.github/workflows/issue-recent-alert.yml

@@ -0,0 +1,17 @@
+on:
+  schedule:
+    - cron: "0 1 * * *"
+
+name: Check recent handle issues
+
+jobs:
+  check-recent-issues-not-handle:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check recent issues and send msg
+        uses: jumpserver/action-issues-alert@master
+        with:
+          hook: ${{ secrets.WECHAT_GROUP_WEB_HOOK }}
+          type: recent
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/issue-untimely-alert.yml

@@ -0,0 +1,17 @@
+on:
+  schedule:
+    - cron: "0 9 * * 1-5"
+
+name: Check untimely handle issues
+
+jobs:
+  check-untimely-handle-issues:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check untimely issues and send msg
+        uses: jumpserver/action-issues-alert@master
+        with:
+          hook: ${{ secrets.WECHAT_GROUP_WEB_HOOK }}
+          type: untimely
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -23,7 +23,8 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.sw?
-
+.mvn
+!.mvn/maven-wrapper.properties
 
 src/main/resources/static
 src/main/resources/templates

.gitmodules

@@ -1,6 +1,8 @@
 [submodule "backend/src/main/java/io/metersphere/xpack"]
 	path = backend/src/main/java/io/metersphere/xpack
 	url = git@github.com:metersphere/xpack-backend.git
+	branch = v1.19
 [submodule "frontend/src/business/components/xpack"]
 	path = frontend/src/business/components/xpack
 	url = git@github.com:metersphere/xpack-frontend.git
+	branch = v1.19

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar