From 5b7dda982553071fa9ae42f32096a46e93994577 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 10 Nov 2020 16:57:40 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=A7=84=E8=8C=83=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack       |   2 +-
 frontend/src/assets/zentao.jpg                   | Bin 0 -> 5854 bytes
 .../{IssuesManagement.vue => BugManagement.vue}  |   3 +++
 .../settings/organization/ServiceIntegration.vue |   6 +++---
 frontend/src/business/components/xpack           |   2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 frontend/src/assets/zentao.jpg
 rename frontend/src/business/components/settings/organization/{IssuesManagement.vue => BugManagement.vue} (98%)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 57d6f78efa..24047fea95 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 57d6f78efa4b0300be188e8b024511ceef0873ed
+Subproject commit 24047fea950a74f7848a9fdaa857a22b884c4ce2
diff --git a/frontend/src/assets/zentao.jpg b/frontend/src/assets/zentao.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..703a90689856abd1ea2b5c2d543b039d65c5c9f5
GIT binary patch
literal 5854
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
Xu#^XYOME=%4nKx4hyTl0ETjJbbZA^*

literal 0
HcmV?d00001

diff --git a/frontend/src/business/components/settings/organization/IssuesManagement.vue b/frontend/src/business/components/settings/organization/BugManagement.vue
similarity index 98%
rename from frontend/src/business/components/settings/organization/IssuesManagement.vue
rename to frontend/src/business/components/settings/organization/BugManagement.vue
index 6506b90f06..8a2ee1511d 100644
--- a/frontend/src/business/components/settings/organization/IssuesManagement.vue
+++ b/frontend/src/business/components/settings/organization/BugManagement.vue
@@ -9,6 +9,9 @@
         <el-radio label="Jira">
           <img class="platform" src="../../../../assets/jira.png" alt="Jira"/>
         </el-radio>
+        <el-radio label="Zentao">
+          <img class="platform" src="../../../../assets/zentao.jpg" alt="Zentao"/>
+        </el-radio>
       </el-radio-group>
     </div>
 
diff --git a/frontend/src/business/components/settings/organization/ServiceIntegration.vue b/frontend/src/business/components/settings/organization/ServiceIntegration.vue
index 65e3cefb6f..acb4662d77 100644
--- a/frontend/src/business/components/settings/organization/ServiceIntegration.vue
+++ b/frontend/src/business/components/settings/organization/ServiceIntegration.vue
@@ -2,7 +2,7 @@
   <el-card>
     <el-tabs class="system-setting" v-model="activeName">
       <el-tab-pane :label="$t('organization.defect_manage')" name="defect">
-        <defect-management/>
+        <bug-management/>
       </el-tab-pane>
     </el-tabs>
   </el-card>
@@ -10,12 +10,12 @@
 
 <script>
 
-  import DefectManagement from "./IssuesManagement";
+  import BugManagement from "./BugManagement";
 
   export default {
     name: "ServiceIntegration",
     components: {
-      DefectManagement
+      BugManagement
     },
     data() {
       return {
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index eb237fb6bf..b9091a47b1 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit eb237fb6bfeba8d99e4db52450ae92f3cdd4ea33
+Subproject commit b9091a47b197faef77c72b134b7cf604fe3209f0