From d4d730781929de8306e9e763ee64a66c42db030b Mon Sep 17 00:00:00 2001
From: AgAngle <1323481023@qq.com>
Date: Sun, 22 Oct 2023 21:13:35 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E9=A1=B9=E7=9B=AE=E8=AE=BE=E7=BD=AE):?=
 =?UTF-8?q?=20=E8=A1=A5=E5=85=85=E6=A8=A1=E6=9D=BF=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/system/domain/StatusItem.java |   4 +-
 .../metersphere/system/domain/Template.java   |   5 -
 .../system/domain/TemplateExample.java        |  60 ----
 .../system/mapper/TemplateMapper.xml          |  34 +--
 .../3.0.0/ddl/V3.0.0_11__system_setting.sql   |   8 +-
 .../migration/3.0.0/dml/V3.0.0_11_1__data.sql |  40 +--
 .../plugin/platform/spi/Platform.java         |  16 +
 .../sdk/constants/InternalUser.java           |  20 ++
 .../sdk/constants/ProjectApplicationType.java |  20 ++
 .../io/metersphere/sdk/dto/TemplateDTO.java   |   2 +
 .../main/resources/i18n/commons.properties    |   2 +-
 .../resources/i18n/commons_en_US.properties   |   2 +-
 .../resources/i18n/commons_zh_CN.properties   |   2 +-
 .../resources/i18n/commons_zh_TW.properties   |   2 +-
 .../main/resources/i18n/project.properties    |   2 +
 .../resources/i18n/project_en_US.properties   |   3 +-
 .../resources/i18n/project_zh_CN.properties   |   3 +-
 .../resources/i18n/project_zh_TW.properties   |   1 +
 .../controller/ProjectTemplateController.java |  13 +-
 .../project/dto/ProjectTemplateDTO.java       |  22 ++
 .../project/dto/ProjectTemplateOptionDTO.java |  22 ++
 .../service/ProjectApplicationService.java    |   8 +-
 .../service/ProjectTemplateService.java       | 281 +++++++++++++++++-
 .../ProjectTemplateControllerTests.java       | 156 +++++++---
 .../file/metersphere-jira-plugin-3.x.jar      | Bin 46945 -> 46636 bytes
 .../OrganizationTemplateController.java       |   8 -
 .../system/service/BaseTemplateService.java   |  50 +---
 .../service/OrganizationTemplateService.java  |  30 +-
 .../service/ServiceIntegrationService.java    |   2 +-
 .../system/base/BasePluginTestService.java    | 151 ++++++++++
 .../OrganizationTemplateControllerTests.java  |  48 +--
 .../ServiceIntegrationControllerTests.java    |  74 +----
 32 files changed, 722 insertions(+), 369 deletions(-)
 create mode 100644 backend/framework/sdk/src/main/java/io/metersphere/sdk/constants/InternalUser.java
 create mode 100644 backend/services/project-management/src/main/java/io/metersphere/project/dto/ProjectTemplateDTO.java
 create mode 100644 backend/services/project-management/src/main/java/io/metersphere/project/dto/ProjectTemplateOptionDTO.java
 create mode 100644 backend/services/system-setting/src/test/java/io/metersphere/system/base/BasePluginTestService.java

diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/StatusItem.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/StatusItem.java
index 49b762bed9..b7289f3fbb 100644
--- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/StatusItem.java
+++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/StatusItem.java
@@ -37,9 +37,7 @@ public class StatusItem implements Serializable {
     @Size(min = 1, max = 50, message = "{status_item.scope_type.length_range}", groups = {Created.class, Updated.class})
     private String scopeType;
 
-    @Schema(description = "项目状态所关联的组织状态ID", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "{status_item.ref_id.not_blank}", groups = {Created.class})
-    @Size(min = 1, max = 50, message = "{status_item.ref_id.length_range}", groups = {Created.class, Updated.class})
+    @Schema(description = "项目状态所关联的组织状态ID")
     private String refId;
 
     @Schema(description = "组织或项目ID", requiredMode = Schema.RequiredMode.REQUIRED)
diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/Template.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/Template.java
index 749cbc0c35..0da552124a 100644
--- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/Template.java
+++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/Template.java
@@ -50,10 +50,6 @@ public class Template implements Serializable {
     @NotNull(message = "{template.enable_third_part.not_blank}", groups = {Created.class})
     private Boolean enableThirdPart;
 
-    @Schema(description = "是否是默认模板", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "{template.enable_default.not_blank}", groups = {Created.class})
-    private Boolean enableDefault;
-
     @Schema(description = "项目模板所关联的组织模板ID")
     private String refId;
 
@@ -75,7 +71,6 @@ public class Template implements Serializable {
         scopeType("scope_type", "scopeType", "VARCHAR", false),
         scopeId("scope_id", "scopeId", "VARCHAR", false),
         enableThirdPart("enable_third_part", "enableThirdPart", "BIT", false),
-        enableDefault("enable_default", "enableDefault", "BIT", false),
         refId("ref_id", "refId", "VARCHAR", false),
         scene("scene", "scene", "VARCHAR", false);
 
diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/TemplateExample.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/TemplateExample.java
index 86d1d22ecd..feffbfd0e6 100644
--- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/TemplateExample.java
+++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/TemplateExample.java
@@ -764,66 +764,6 @@ public class TemplateExample {
             return (Criteria) this;
         }
 
-        public Criteria andEnableDefaultIsNull() {
-            addCriterion("enable_default is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnableDefaultIsNotNull() {
-            addCriterion("enable_default is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnableDefaultEqualTo(Boolean value) {
-            addCriterion("enable_default =", value, "enableDefault");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnableDefaultNotEqualTo(Boolean value) {
-            addCriterion("enable_default <>", value, "enableDefault");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnableDefaultGreaterThan(Boolean value) {
-            addCriterion("enable_default >", value, "enableDefault");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnableDefaultGreaterThanOrEqualTo(Boolean value) {
-            addCriterion("enable_default >=", value, "enableDefault");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnableDefaultLessThan(Boolean value) {
-            addCriterion("enable_default <", value, "enableDefault");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnableDefaultLessThanOrEqualTo(Boolean value) {
-            addCriterion("enable_default <=", value, "enableDefault");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnableDefaultIn(List<Boolean> values) {
-            addCriterion("enable_default in", values, "enableDefault");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnableDefaultNotIn(List<Boolean> values) {
-            addCriterion("enable_default not in", values, "enableDefault");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnableDefaultBetween(Boolean value1, Boolean value2) {
-            addCriterion("enable_default between", value1, value2, "enableDefault");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnableDefaultNotBetween(Boolean value1, Boolean value2) {
-            addCriterion("enable_default not between", value1, value2, "enableDefault");
-            return (Criteria) this;
-        }
-
         public Criteria andRefIdIsNull() {
             addCriterion("ref_id is null");
             return (Criteria) this;
diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/TemplateMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/system/mapper/TemplateMapper.xml
index 311b8da9c1..39e9e7b686 100644
--- a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/TemplateMapper.xml
+++ b/backend/framework/domain/src/main/java/io/metersphere/system/mapper/TemplateMapper.xml
@@ -12,7 +12,6 @@
     <result column="scope_type" jdbcType="VARCHAR" property="scopeType" />
     <result column="scope_id" jdbcType="VARCHAR" property="scopeId" />
     <result column="enable_third_part" jdbcType="BIT" property="enableThirdPart" />
-    <result column="enable_default" jdbcType="BIT" property="enableDefault" />
     <result column="ref_id" jdbcType="VARCHAR" property="refId" />
     <result column="scene" jdbcType="VARCHAR" property="scene" />
   </resultMap>
@@ -76,7 +75,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, `name`, remark, internal, update_time, create_time, create_user, scope_type, 
-    scope_id, enable_third_part, enable_default, ref_id, scene
+    scope_id, enable_third_part, ref_id, scene
   </sql>
   <select id="selectByExample" parameterType="io.metersphere.system.domain.TemplateExample" resultMap="BaseResultMap">
     select
@@ -112,13 +111,13 @@
     insert into template (id, `name`, remark, 
       internal, update_time, create_time, 
       create_user, scope_type, scope_id, 
-      enable_third_part, enable_default, ref_id, 
-      scene)
+      enable_third_part, ref_id, scene
+      )
     values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, 
       #{internal,jdbcType=BIT}, #{updateTime,jdbcType=BIGINT}, #{createTime,jdbcType=BIGINT}, 
       #{createUser,jdbcType=VARCHAR}, #{scopeType,jdbcType=VARCHAR}, #{scopeId,jdbcType=VARCHAR}, 
-      #{enableThirdPart,jdbcType=BIT}, #{enableDefault,jdbcType=BIT}, #{refId,jdbcType=VARCHAR}, 
-      #{scene,jdbcType=VARCHAR})
+      #{enableThirdPart,jdbcType=BIT}, #{refId,jdbcType=VARCHAR}, #{scene,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.system.domain.Template">
     insert into template
@@ -153,9 +152,6 @@
       <if test="enableThirdPart != null">
         enable_third_part,
       </if>
-      <if test="enableDefault != null">
-        enable_default,
-      </if>
       <if test="refId != null">
         ref_id,
       </if>
@@ -194,9 +190,6 @@
       <if test="enableThirdPart != null">
         #{enableThirdPart,jdbcType=BIT},
       </if>
-      <if test="enableDefault != null">
-        #{enableDefault,jdbcType=BIT},
-      </if>
       <if test="refId != null">
         #{refId,jdbcType=VARCHAR},
       </if>
@@ -244,9 +237,6 @@
       <if test="record.enableThirdPart != null">
         enable_third_part = #{record.enableThirdPart,jdbcType=BIT},
       </if>
-      <if test="record.enableDefault != null">
-        enable_default = #{record.enableDefault,jdbcType=BIT},
-      </if>
       <if test="record.refId != null">
         ref_id = #{record.refId,jdbcType=VARCHAR},
       </if>
@@ -270,7 +260,6 @@
       scope_type = #{record.scopeType,jdbcType=VARCHAR},
       scope_id = #{record.scopeId,jdbcType=VARCHAR},
       enable_third_part = #{record.enableThirdPart,jdbcType=BIT},
-      enable_default = #{record.enableDefault,jdbcType=BIT},
       ref_id = #{record.refId,jdbcType=VARCHAR},
       scene = #{record.scene,jdbcType=VARCHAR}
     <if test="_parameter != null">
@@ -307,9 +296,6 @@
       <if test="enableThirdPart != null">
         enable_third_part = #{enableThirdPart,jdbcType=BIT},
       </if>
-      <if test="enableDefault != null">
-        enable_default = #{enableDefault,jdbcType=BIT},
-      </if>
       <if test="refId != null">
         ref_id = #{refId,jdbcType=VARCHAR},
       </if>
@@ -330,7 +316,6 @@
       scope_type = #{scopeType,jdbcType=VARCHAR},
       scope_id = #{scopeId,jdbcType=VARCHAR},
       enable_third_part = #{enableThirdPart,jdbcType=BIT},
-      enable_default = #{enableDefault,jdbcType=BIT},
       ref_id = #{refId,jdbcType=VARCHAR},
       scene = #{scene,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
@@ -338,14 +323,14 @@
   <insert id="batchInsert" parameterType="map">
     insert into template
     (id, `name`, remark, internal, update_time, create_time, create_user, scope_type, 
-      scope_id, enable_third_part, enable_default, ref_id, scene)
+      scope_id, enable_third_part, ref_id, scene)
     values
     <foreach collection="list" item="item" separator=",">
       (#{item.id,jdbcType=VARCHAR}, #{item.name,jdbcType=VARCHAR}, #{item.remark,jdbcType=VARCHAR}, 
         #{item.internal,jdbcType=BIT}, #{item.updateTime,jdbcType=BIGINT}, #{item.createTime,jdbcType=BIGINT}, 
         #{item.createUser,jdbcType=VARCHAR}, #{item.scopeType,jdbcType=VARCHAR}, #{item.scopeId,jdbcType=VARCHAR}, 
-        #{item.enableThirdPart,jdbcType=BIT}, #{item.enableDefault,jdbcType=BIT}, #{item.refId,jdbcType=VARCHAR}, 
-        #{item.scene,jdbcType=VARCHAR})
+        #{item.enableThirdPart,jdbcType=BIT}, #{item.refId,jdbcType=VARCHAR}, #{item.scene,jdbcType=VARCHAR}
+        )
     </foreach>
   </insert>
   <insert id="batchInsertSelective" parameterType="map">
@@ -388,9 +373,6 @@
         <if test="'enable_third_part'.toString() == column.value">
           #{item.enableThirdPart,jdbcType=BIT}
         </if>
-        <if test="'enable_default'.toString() == column.value">
-          #{item.enableDefault,jdbcType=BIT}
-        </if>
         <if test="'ref_id'.toString() == column.value">
           #{item.refId,jdbcType=VARCHAR}
         </if>
diff --git a/backend/framework/domain/src/main/resources/migration/3.0.0/ddl/V3.0.0_11__system_setting.sql b/backend/framework/domain/src/main/resources/migration/3.0.0/ddl/V3.0.0_11__system_setting.sql
index 6b1f3a34bd..3d3e819acb 100644
--- a/backend/framework/domain/src/main/resources/migration/3.0.0/ddl/V3.0.0_11__system_setting.sql
+++ b/backend/framework/domain/src/main/resources/migration/3.0.0/ddl/V3.0.0_11__system_setting.sql
@@ -380,19 +380,17 @@ CREATE TABLE IF NOT EXISTS template(
     `update_time` BIGINT NOT NULL   COMMENT '创建时间' ,
     `create_time` BIGINT NOT NULL   COMMENT '创建时间' ,
     `create_user` VARCHAR(50) NOT NULL   COMMENT '创建人' ,
-    `scope_type` VARCHAR(50) NOT NULL  COMMENT '组织或项目级别字段（PROJECT, ORGANIZATION）' ,
+    `scope_type` VARCHAR(50) NOT NULL   COMMENT '组织或项目级别字段（PROJECT, ORGANIZATION）' ,
     `scope_id` VARCHAR(50) NOT NULL   COMMENT '组织或项目ID' ,
     `enable_third_part` BIT NOT NULL  DEFAULT 0 COMMENT '是否开启api字段名配置' ,
-    `enable_default` BIT NOT NULL  DEFAULT 0 COMMENT '是否是默认模板' ,
     `ref_id` VARCHAR(50)    COMMENT '项目模板所关联的组织模板ID' ,
     `scene` VARCHAR(30) NOT NULL   COMMENT '使用场景' ,
     PRIMARY KEY (id)
 ) ENGINE = InnoDB
     DEFAULT CHARSET = utf8mb4
-    COLLATE = utf8mb4_general_ci
-    COMMENT = '模版';
+    COLLATE = utf8mb4_general_ci COMMENT = '模版';
 
-CREATE INDEX idx_scope_id ON template(scope_id);
+CREATE INDEX idx_scope_id_scene ON template(`scope_id`,`scene`);
 
 CREATE TABLE IF NOT EXISTS template_custom_field(
     `id` VARCHAR(50) NOT NULL   COMMENT 'ID' ,
diff --git a/backend/framework/domain/src/main/resources/migration/3.0.0/dml/V3.0.0_11_1__data.sql b/backend/framework/domain/src/main/resources/migration/3.0.0/dml/V3.0.0_11_1__data.sql
index f6120e35ba..8629df6271 100644
--- a/backend/framework/domain/src/main/resources/migration/3.0.0/dml/V3.0.0_11_1__data.sql
+++ b/backend/framework/domain/src/main/resources/migration/3.0.0/dml/V3.0.0_11_1__data.sql
@@ -145,8 +145,8 @@ INSERT INTO custom_field_option (field_id,value,`text`,internal)
 VALUES ((select id from custom_field where name = 'functional_priority'), 'P3', 'P3', 1);
 
 -- 初始化组织功能用例模板
-INSERT INTO template (id,name,remark,internal,update_time,create_time,create_user,scope_type,scope_id,enable_third_part,enable_default, scene)
-VALUES (UUID_SHORT(), 'functional_default', '', 1, UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000, 'admin', 'ORGANIZATION', '100001', 0, 1, 'FUNCTIONAL');
+INSERT INTO template (id,name,remark,internal,update_time,create_time,create_user,scope_type,scope_id,enable_third_part, scene)
+VALUES (UUID_SHORT(), 'functional_default', '', 1, UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000, 'admin', 'ORGANIZATION', '100001', 0, 'FUNCTIONAL');
 INSERT INTO template_custom_field(id, field_id, template_id, required, pos, api_field_id, default_value)
 VALUES(UUID_SHORT(), (select id from custom_field where name = 'functional_priority'), (select id from template where name = 'functional_default'), 1, 0, NULL, NULL);
 
@@ -167,8 +167,8 @@ INSERT INTO custom_field_option (field_id,value,`text`,internal)
 VALUES ((select id from custom_field where name = 'functional_priority' and scope_id = '100001100001'), 'P3', 'P3', 1);
 
 -- 初始化项目功能用例模板
-INSERT INTO template (id,name,remark,internal,update_time,create_time,create_user,scope_type,scope_id,enable_third_part, enable_default, scene, ref_id)
-VALUES (UUID_SHORT(), 'functional_default', '', 1, UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000, 'admin', 'PROJECT', '100001100001', 0, 1, 'FUNCTIONAL',
+INSERT INTO template (id,name,remark,internal,update_time,create_time,create_user,scope_type,scope_id,enable_third_part, scene, ref_id)
+VALUES (UUID_SHORT(), 'functional_default', '', 1, UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000, 'admin', 'PROJECT', '100001100001', 0, 'FUNCTIONAL',
         (SELECT id FROM (SELECT * FROM template) t where name = 'functional_default'));
 INSERT INTO template_custom_field(id, field_id, template_id, required, pos, api_field_id, default_value)
 VALUES(
@@ -179,39 +179,39 @@ VALUES(
 );
 
 -- 初始化组织缺陷模板
-INSERT INTO template (id,name,remark,internal,update_time,create_time,create_user,scope_type,scope_id,enable_third_part,enable_default,scene)
-VALUES (UUID_SHORT(), 'bug_default', '', 1, UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000, 'admin', 'ORGANIZATION', '100001', 0, 1, 'BUG');
+INSERT INTO template (id,name,remark,internal,update_time,create_time,create_user,scope_type,scope_id,enable_third_part,scene)
+VALUES (UUID_SHORT(), 'bug_default', '', 1, UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000, 'admin', 'ORGANIZATION', '100001', 0, 'BUG');
 
 -- 初始化项目缺陷模板
-INSERT INTO template (id,name,remark,internal,update_time,create_time,create_user,scope_type,scope_id,enable_third_part, enable_default, scene, ref_id)
-VALUES (UUID_SHORT(), 'bug_default', '', 1, UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000, 'admin', 'PROJECT', '100001100001', 0, 1, 'BUG',
+INSERT INTO template (id,name,remark,internal,update_time,create_time,create_user,scope_type,scope_id,enable_third_part, scene, ref_id)
+VALUES (UUID_SHORT(), 'bug_default', '', 1, UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000, 'admin', 'PROJECT', '100001100001', 0, 'BUG',
         (SELECT id FROM (SELECT * FROM template) t where name = 'bug_default'));
 
 -- 初始化组织接口模板
-INSERT INTO template (id,name,remark,internal,update_time,create_time,create_user,scope_type,scope_id,enable_third_part,enable_default,scene)
-VALUES (UUID_SHORT(), 'api_default', '', 1, UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000, 'admin', 'ORGANIZATION', '100001', 0, 1, 'API');
+INSERT INTO template (id,name,remark,internal,update_time,create_time,create_user,scope_type,scope_id,enable_third_part,scene)
+VALUES (UUID_SHORT(), 'api_default', '', 1, UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000, 'admin', 'ORGANIZATION', '100001', 0, 'API');
 
 -- 初始化项目接口模板
-INSERT INTO template (id,name,remark,internal,update_time,create_time,create_user,scope_type,scope_id,enable_third_part, enable_default, scene, ref_id)
-VALUES (UUID_SHORT(), 'api_default', '', 1, UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000, 'admin', 'PROJECT', '100001100001', 0, 1, 'API',
+INSERT INTO template (id,name,remark,internal,update_time,create_time,create_user,scope_type,scope_id,enable_third_part, scene, ref_id)
+VALUES (UUID_SHORT(), 'api_default', '', 1, UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000, 'admin', 'PROJECT', '100001100001', 0, 'API',
         (SELECT id FROM (SELECT * FROM template) t where name = 'api_default'));
 
 -- 初始化组织UI模板
-INSERT INTO template (id,name,remark,internal,update_time,create_time,create_user,scope_type,scope_id,enable_third_part,enable_default,scene)
-VALUES (UUID_SHORT(), 'ui_default', '', 1, UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000, 'admin', 'ORGANIZATION', '100001', 0, 1, 'UI');
+INSERT INTO template (id,name,remark,internal,update_time,create_time,create_user,scope_type,scope_id,enable_third_part,scene)
+VALUES (UUID_SHORT(), 'ui_default', '', 1, UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000, 'admin', 'ORGANIZATION', '100001', 0, 'UI');
 
 -- 初始化项目UI模板
-INSERT INTO template (id,name,remark,internal,update_time,create_time,create_user,scope_type,scope_id,enable_third_part, enable_default, scene, ref_id)
-VALUES (UUID_SHORT(), 'ui_default', '', 1, UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000, 'admin', 'PROJECT', '100001100001', 0, 1, 'UI',
+INSERT INTO template (id,name,remark,internal,update_time,create_time,create_user,scope_type,scope_id,enable_third_part, scene, ref_id)
+VALUES (UUID_SHORT(), 'ui_default', '', 1, UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000, 'admin', 'PROJECT', '100001100001', 0, 'UI',
         (SELECT id FROM (SELECT * FROM template) t where name = 'ui_default'));
 
 -- 初始化组织测试计划模板
-INSERT INTO template (id,name,remark,internal,update_time,create_time,create_user,scope_type,scope_id,enable_third_part,enable_default,scene)
-VALUES (UUID_SHORT(), 'test_plan_default', '', 1, UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000, 'admin', 'ORGANIZATION', '100001', 0, 1, 'TEST_PLAN');
+INSERT INTO template (id,name,remark,internal,update_time,create_time,create_user,scope_type,scope_id,enable_third_part,scene)
+VALUES (UUID_SHORT(), 'test_plan_default', '', 1, UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000, 'admin', 'ORGANIZATION', '100001', 0, 'TEST_PLAN');
 
 -- 初始化项目测试计划模板
-INSERT INTO template (id,name,remark,internal,update_time,create_time,create_user,scope_type,scope_id,enable_third_part, enable_default, scene, ref_id)
-VALUES (UUID_SHORT(), 'test_plan_default', '', 1, UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000, 'admin', 'PROJECT', '100001100001', 0, 1, 'TEST_PLAN',
+INSERT INTO template (id,name,remark,internal,update_time,create_time,create_user,scope_type,scope_id,enable_third_part, scene, ref_id)
+VALUES (UUID_SHORT(), 'test_plan_default', '', 1, UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000, 'admin', 'PROJECT', '100001100001', 0, 'TEST_PLAN',
         (SELECT id FROM (SELECT * FROM template) t where name = 'test_plan_default'));
 
 -- 初始化组织缺陷状态项
diff --git a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/spi/Platform.java b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/spi/Platform.java
index ed63a22567..865af9048b 100644
--- a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/spi/Platform.java
+++ b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/spi/Platform.java
@@ -1,7 +1,10 @@
 package io.metersphere.plugin.platform.spi;
 
+import io.metersphere.plugin.platform.dto.PlatformCustomFieldItemDTO;
 import org.pf4j.ExtensionPoint;
 
+import java.util.List;
+
 /**
  * 平台对接相关业务接口
  * @author jianxing.chen
@@ -19,4 +22,17 @@ public interface Platform extends ExtensionPoint {
      * 项目设置成点击校验项目 key 时调用
      */
     void validateProjectConfig(String projectConfig);
+
+    /**
+     * 插件是否支持第三方模板
+     * @return
+     */
+    boolean isThirdPartTemplateSupport();
+
+    /**
+     * 获取第三方平台缺陷的自定义字段
+     * 需要 PluginMetaInfo 的 isThirdPartTemplateSupport 返回 true
+     * @return
+     */
+    List<PlatformCustomFieldItemDTO> getThirdPartCustomField(String projectConfig);
 }
diff --git a/backend/framework/sdk/src/main/java/io/metersphere/sdk/constants/InternalUser.java b/backend/framework/sdk/src/main/java/io/metersphere/sdk/constants/InternalUser.java
new file mode 100644
index 0000000000..52feba8361
--- /dev/null
+++ b/backend/framework/sdk/src/main/java/io/metersphere/sdk/constants/InternalUser.java
@@ -0,0 +1,20 @@
+package io.metersphere.sdk.constants;
+
+/**
+ * 系统内置用户ID
+ * @author jianxing
+ */
+public enum InternalUser {
+
+    ADMIN("admin");
+
+    private String value;
+
+    InternalUser(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/backend/framework/sdk/src/main/java/io/metersphere/sdk/constants/ProjectApplicationType.java b/backend/framework/sdk/src/main/java/io/metersphere/sdk/constants/ProjectApplicationType.java
index 7dd43683b0..56081eff6c 100644
--- a/backend/framework/sdk/src/main/java/io/metersphere/sdk/constants/ProjectApplicationType.java
+++ b/backend/framework/sdk/src/main/java/io/metersphere/sdk/constants/ProjectApplicationType.java
@@ -1,5 +1,7 @@
 package io.metersphere.sdk.constants;
 
+import java.util.Arrays;
+
 /**
  * 应用设置 -相关配置
  */
@@ -81,4 +83,22 @@ public class ProjectApplicationType {
         VERSION_ENABLE
     }
 
+    /**
+     * 记录项目中配置的默认模板
+     */
+    public enum DEFAULT_TEMPLATE{
+        FUNCTIONAL_DEFAULT_TEMPLATE,
+        BUG_DEFAULT_TEMPLATE,
+        API_DEFAULT_TEMPLATE,
+        UI_DEFAULT_TEMPLATE,
+        TEST_PLAN_DEFAULT_TEMPLATE;
+
+        public static DEFAULT_TEMPLATE getByTemplateScene(String scene) {
+            return Arrays.stream(DEFAULT_TEMPLATE.values())
+                    .filter(e -> e.name().startsWith(scene))
+                    .findFirst()
+                    .orElse(null);
+        }
+    }
+
 }
diff --git a/backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/TemplateDTO.java b/backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/TemplateDTO.java
index 4175e616c8..bd5271d270 100644
--- a/backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/TemplateDTO.java
+++ b/backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/TemplateDTO.java
@@ -1,11 +1,13 @@
 package io.metersphere.sdk.dto;
 
 import io.metersphere.system.domain.Template;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
 public class TemplateDTO extends Template {
+    @Schema(description = "相关的自定义字段")
     List<TemplateCustomFieldDTO> customFields;
 }
diff --git a/backend/framework/sdk/src/main/resources/i18n/commons.properties b/backend/framework/sdk/src/main/resources/i18n/commons.properties
index 74d0e3a2f4..0c2075ef04 100644
--- a/backend/framework/sdk/src/main/resources/i18n/commons.properties
+++ b/backend/framework/sdk/src/main/resources/i18n/commons.properties
@@ -445,7 +445,7 @@ template_scene_illegal_error=使用场景不合法
 
 # 内置的模板或字段
 custom_field.functional_priority=优先级
-template.functional_default=默认模板
+template.default=默认模板
 
 parent.node.not_blank=父节点不能为空
 node.not_blank=节点不能为空
diff --git a/backend/framework/sdk/src/main/resources/i18n/commons_en_US.properties b/backend/framework/sdk/src/main/resources/i18n/commons_en_US.properties
index 8a3e206288..c6828a2e52 100644
--- a/backend/framework/sdk/src/main/resources/i18n/commons_en_US.properties
+++ b/backend/framework/sdk/src/main/resources/i18n/commons_en_US.properties
@@ -448,7 +448,7 @@ scheduled_tasks=Scheduled Tasks
 template_scene_illegal_error=Scene is illegal
 # 内置的模板或字段
 custom_field.functional_priority=Priority
-template.functional_default=Default
+template.default=Default
 
 set_default_template=Set the default template
 project_template_enable=Enable the project template
diff --git a/backend/framework/sdk/src/main/resources/i18n/commons_zh_CN.properties b/backend/framework/sdk/src/main/resources/i18n/commons_zh_CN.properties
index b51cd8e668..2c631f562c 100644
--- a/backend/framework/sdk/src/main/resources/i18n/commons_zh_CN.properties
+++ b/backend/framework/sdk/src/main/resources/i18n/commons_zh_CN.properties
@@ -446,7 +446,7 @@ scheduled_tasks=定时任务
 template_scene_illegal_error=使用场景不合法
 # 内置的模板或字段
 custom_field.functional_priority=优先级
-template.functional_default=默认模板
+template.default=默认模板
 
 set_default_template=设置默认模板
 project_template_enable=开启项目模板
diff --git a/backend/framework/sdk/src/main/resources/i18n/commons_zh_TW.properties b/backend/framework/sdk/src/main/resources/i18n/commons_zh_TW.properties
index 2b82fa1e62..4df26d9859 100644
--- a/backend/framework/sdk/src/main/resources/i18n/commons_zh_TW.properties
+++ b/backend/framework/sdk/src/main/resources/i18n/commons_zh_TW.properties
@@ -445,7 +445,7 @@ template_scene_illegal_error=使用場景不合法
 
 # 内置的模板或字段
 custom_field.functional_priority=優先級
-template.functional_default=默認模板
+template.default=默認模板
 
 set_default_template=設置默認模板
 project_template_enable=開啟項目模板
diff --git a/backend/framework/sdk/src/main/resources/i18n/project.properties b/backend/framework/sdk/src/main/resources/i18n/project.properties
index b80d852d22..5f572a947e 100644
--- a/backend/framework/sdk/src/main/resources/i18n/project.properties
+++ b/backend/framework/sdk/src/main/resources/i18n/project.properties
@@ -310,4 +310,6 @@ file.name.cannot.be.empty=文件名称不能为空
 
 # template
 project_template_permission_error=未开启项目模板
+plugin_bug_template_remark=模板为系统自动获取，不支持编辑和查看
+
 
diff --git a/backend/framework/sdk/src/main/resources/i18n/project_en_US.properties b/backend/framework/sdk/src/main/resources/i18n/project_en_US.properties
index 4da043a074..6fc71905e7 100644
--- a/backend/framework/sdk/src/main/resources/i18n/project_en_US.properties
+++ b/backend/framework/sdk/src/main/resources/i18n/project_en_US.properties
@@ -343,4 +343,5 @@ file.name.cannot.be.empty=File name cannot be empty
 
 # template
 project_template_permission_error=The project template is not turned on
-third_part_config_is_null=Third party configuration cannot be empty
\ No newline at end of file
+third_part_config_is_null=Third party configuration cannot be empty
+plugin_bug_template_remark=Templates are automatically obtained by the system and do not support editing and viewing
diff --git a/backend/framework/sdk/src/main/resources/i18n/project_zh_CN.properties b/backend/framework/sdk/src/main/resources/i18n/project_zh_CN.properties
index 4672485653..83277de9e6 100644
--- a/backend/framework/sdk/src/main/resources/i18n/project_zh_CN.properties
+++ b/backend/framework/sdk/src/main/resources/i18n/project_zh_CN.properties
@@ -343,4 +343,5 @@ file.name.cannot.be.empty=文件名称不能为空
 # template
 project_template_permission_error=未开启项目模板
 
-third_part_config_is_null=第三方平台配置信息不能为空
\ No newline at end of file
+third_part_config_is_null=第三方平台配置信息不能为空
+plugin_bug_template_remark=模板为系统自动获取，不支持编辑和查看
diff --git a/backend/framework/sdk/src/main/resources/i18n/project_zh_TW.properties b/backend/framework/sdk/src/main/resources/i18n/project_zh_TW.properties
index 717d8caff0..4dde785012 100644
--- a/backend/framework/sdk/src/main/resources/i18n/project_zh_TW.properties
+++ b/backend/framework/sdk/src/main/resources/i18n/project_zh_TW.properties
@@ -343,3 +343,4 @@ file.name.cannot.be.empty=文件名稱不能為空
 # template
 project_template_permission_error=未開啟項目模板
 third_part_config_is_null=第三方平臺配置信息不能爲空
+plugin_bug_template_remark=模板為系統自動獲取，不支持編輯和查看
\ No newline at end of file
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/controller/ProjectTemplateController.java b/backend/services/project-management/src/main/java/io/metersphere/project/controller/ProjectTemplateController.java
index ba08458a39..daa2412773 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/controller/ProjectTemplateController.java
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/controller/ProjectTemplateController.java
@@ -1,5 +1,6 @@
 package io.metersphere.project.controller;
 
+import io.metersphere.project.dto.ProjectTemplateDTO;
 import io.metersphere.project.service.ProjectTemplateLogService;
 import io.metersphere.project.service.ProjectTemplateService;
 import io.metersphere.sdk.constants.PermissionConstants;
@@ -37,9 +38,9 @@ public class ProjectTemplateController {
     @GetMapping("/list/{projectId}/{scene}")
     @Operation(summary = "获取模版列表")
     @RequiresPermissions(PermissionConstants.PROJECT_TEMPLATE_READ)
-    public List<Template> list(@Schema(description = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    public List<ProjectTemplateDTO> list(@Schema(description = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED)
                                @PathVariable String projectId,
-                               @Schema(description = "模板的使用场景（FUNCTIONAL,BUG,API,UI,TEST_PLAN）", requiredMode = Schema.RequiredMode.REQUIRED)
+                                         @Schema(description = "模板的使用场景（FUNCTIONAL,BUG,API,UI,TEST_PLAN）", requiredMode = Schema.RequiredMode.REQUIRED)
                                @PathVariable String scene) {
         return projectTemplateservice.list(projectId, scene);
     }
@@ -48,7 +49,7 @@ public class ProjectTemplateController {
     @Operation(summary = "获取模版详情")
     @RequiresPermissions(PermissionConstants.PROJECT_TEMPLATE_READ)
     public TemplateDTO get(@PathVariable String id) {
-        return projectTemplateservice.geDTOWithCheck(id);
+        return projectTemplateservice.geTemplateDTOWithCheck(id);
     }
 
     @PostMapping("/add")
@@ -80,11 +81,11 @@ public class ProjectTemplateController {
         projectTemplateservice.delete(id);
     }
 
-    @GetMapping("/set-default/{id}")
+    @GetMapping("/set-default/{projectId}/{id}")
     @Operation(summary = "设置模板模板")
     @RequiresPermissions(PermissionConstants.ORGANIZATION_TEMPLATE_UPDATE)
     @Log(type = OperationLogType.UPDATE, expression = "#msClass.setDefaultTemplateLog(#id)", msClass = ProjectTemplateLogService.class)
-    public void setDefaultTemplate(@PathVariable String id) {
-        projectTemplateservice.setDefaultTemplate(id);
+    public void setDefaultTemplate(@PathVariable String projectId, @PathVariable String id) {
+        projectTemplateservice.setDefaultTemplate(projectId, id);
     }
 }
\ No newline at end of file
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/dto/ProjectTemplateDTO.java b/backend/services/project-management/src/main/java/io/metersphere/project/dto/ProjectTemplateDTO.java
new file mode 100644
index 0000000000..3ba9b0a285
--- /dev/null
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/dto/ProjectTemplateDTO.java
@@ -0,0 +1,22 @@
+package io.metersphere.project.dto;
+
+import io.metersphere.system.domain.Template;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @Author: jianxing
+ * @CreateTime: 2023-10-19  16:46
+ */
+@Getter
+@Setter
+public class ProjectTemplateDTO extends Template implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "是否是默认模板")
+    private Boolean enableDefault = false;
+}
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/dto/ProjectTemplateOptionDTO.java b/backend/services/project-management/src/main/java/io/metersphere/project/dto/ProjectTemplateOptionDTO.java
new file mode 100644
index 0000000000..db43442e44
--- /dev/null
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/dto/ProjectTemplateOptionDTO.java
@@ -0,0 +1,22 @@
+package io.metersphere.project.dto;
+
+import io.metersphere.sdk.dto.OptionDTO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @Author: jianxing
+ * @CreateTime: 2023-10-19  16:46
+ */
+@Getter
+@Setter
+public class ProjectTemplateOptionDTO extends OptionDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "是否是默认模板")
+    private Boolean enableDefault;
+}
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectApplicationService.java b/backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectApplicationService.java
index 4e4ab1ca5f..8839631b18 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectApplicationService.java
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectApplicationService.java
@@ -87,7 +87,7 @@ public class ProjectApplicationService {
         this.createOrUpdateConfig(application);
     }
 
-    private void createOrUpdateConfig(ProjectApplication application) {
+    public void createOrUpdateConfig(ProjectApplication application) {
         String type = application.getType();
         String projectId = application.getProjectId();
         ProjectApplicationExample example = new ProjectApplicationExample();
@@ -546,4 +546,10 @@ public class ProjectApplicationService {
         return null;
     }
 
+    public ProjectApplication getByType(String projectId, String type) {
+        ProjectApplicationExample example = new ProjectApplicationExample();
+        example.createCriteria().andProjectIdEqualTo(projectId).andTypeEqualTo(type);
+        List<ProjectApplication> projectApplications = projectApplicationMapper.selectByExample(example);
+        return CollectionUtils.isEmpty(projectApplications) ? null : projectApplications.get(0);
+    }
 }
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectTemplateService.java b/backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectTemplateService.java
index 2dfada926d..2bd222522a 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectTemplateService.java
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectTemplateService.java
@@ -1,19 +1,41 @@
 package io.metersphere.project.service;
 
+import io.metersphere.plugin.platform.spi.Platform;
+import io.metersphere.plugin.sdk.spi.MsPlugin;
+import io.metersphere.project.domain.ProjectApplication;
+import io.metersphere.project.dto.ProjectTemplateDTO;
+import io.metersphere.project.dto.ProjectTemplateOptionDTO;
+import io.metersphere.sdk.constants.InternalUser;
+import io.metersphere.sdk.constants.ProjectApplicationType;
+import io.metersphere.sdk.constants.TemplateScene;
 import io.metersphere.sdk.constants.TemplateScopeType;
 import io.metersphere.sdk.dto.TemplateDTO;
 import io.metersphere.sdk.dto.request.TemplateCustomFieldRequest;
 import io.metersphere.sdk.exception.MSException;
+import io.metersphere.sdk.util.BeanUtils;
+import io.metersphere.sdk.util.Translator;
+import io.metersphere.system.domain.Plugin;
+import io.metersphere.system.domain.ServiceIntegration;
 import io.metersphere.system.domain.Template;
+import io.metersphere.system.domain.TemplateExample;
 import io.metersphere.system.dto.ProjectDTO;
 import io.metersphere.system.service.BaseTemplateService;
+import io.metersphere.system.service.PlatformPluginService;
+import io.metersphere.system.service.PluginLoadService;
+import io.metersphere.system.service.ServiceIntegrationService;
 import jakarta.annotation.Resource;
+import org.apache.commons.lang3.StringUtils;
+import org.pf4j.PluginWrapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Comparator;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import static io.metersphere.project.enums.result.ProjectResultCode.PROJECT_TEMPLATE_PERMISSION;
+import static io.metersphere.system.controller.handler.result.CommonResultCode.DEFAULT_TEMPLATE_PERMISSION;
 
 /**
  * @author jianxing
@@ -25,17 +47,231 @@ public class ProjectTemplateService extends BaseTemplateService {
 
     @Resource
     private ProjectService projectService;
+    @Resource
+    private ServiceIntegrationService serviceIntegrationService;
+    @Resource
+    private PluginLoadService pluginLoadService;
+    @Resource
+    private PlatformPluginService platformPluginService;
+    @Resource
+    private ProjectApplicationService projectApplicationService;
 
     @Override
-    public List<Template> list(String projectId, String scene) {
+    public List list(String projectId, String scene) {
         projectService.checkResourceExist(projectId);
-        return super.list(projectId, scene);
+        List<Template> templates = super.list(projectId, scene);
+        // 缺陷模板需要获取第三方平台模板
+        templates = addPluginBugTemplate(projectId, scene, templates);
+        // 标记默认模板
+        return tagDefaultTemplate(projectId, scene, templates);
     }
 
-    public TemplateDTO geDTOWithCheck(String id) {
+    /**
+     * 如果是缺陷模板，并且配置了服务集成和项目信息，则添加第三方平台模板
+     * @param projectId
+     * @param scene
+     * @param templates
+     * @return
+     */
+    private List<Template> addPluginBugTemplate(String projectId, String scene, List<Template> templates) {
+        if (StringUtils.equals(scene, TemplateScene.BUG.name())) {
+            Template pluginBugTemplate = getPluginBugTemplate(projectId);
+            if (pluginBugTemplate != null) {
+                templates.add(pluginBugTemplate);
+            }
+        }
+        return templates;
+    }
+
+    /**
+     * 获取当前项目中可用的模板选项
+     * 默认模板排前面
+     * !提供给其他模块调用
+     * @param projectId
+     * @param scene
+     * @return
+     */
+    public List<ProjectTemplateOptionDTO> getOption(String projectId, String scene) {
+        projectService.checkResourceExist(projectId);
+        List<Template> templates = getTemplates(projectId, scene);
+        translateInternalTemplate(templates);
+
+        // 缺陷模板需要获取第三方平台模板
+        templates = addPluginBugTemplate(projectId, scene, templates);
+
+        List<ProjectTemplateDTO> projectTemplateDTOS = tagDefaultTemplate(projectId, scene, templates);
+        return sortByDefaultTemplate(projectTemplateDTOS).stream()
+                .map(item -> BeanUtils.copyBean(new ProjectTemplateOptionDTO(), item))
+                .collect(Collectors.toList());
+    }
+
+
+    /**
+     * 将默认模板排最前面
+     * @param projectTemplateDTOS
+     * @return
+     */
+    private static List<ProjectTemplateDTO> sortByDefaultTemplate(List<ProjectTemplateDTO> projectTemplateDTOS) {
+        return projectTemplateDTOS.stream()
+                .sorted(Comparator.comparing(ProjectTemplateDTO::getEnableDefault)) // 默认模板排在前面
+                .toList();
+    }
+
+    /**
+     * 获取默认的模板以及字段
+     * !提供给其他模块调用
+     * @param projectId
+     * @param scene
+     * @return
+     */
+    public TemplateDTO getDefaultTemplateDTO(String projectId, String scene) {
+        String defaultTemplateId = getDefaultTemplateId(projectId, scene);
+        Template template;
+        if (StringUtils.isBlank(defaultTemplateId)) {
+            // 如果没有默认模板，则获取内置模板
+            template = getInternalTemplate(projectId, scene);
+        } else {
+            template = templateMapper.selectByPrimaryKey(defaultTemplateId);
+            if (template == null) {
+                // 如果默认模板查不到，则获取内置模板
+                template = getInternalTemplate(projectId, scene);
+            }
+        }
+        return geTemplateDTO(template);
+    }
+
+    /**
+     * 获取内置模板
+     * @param projectId
+     * @param scene
+     * @return
+     */
+    public Template getInternalTemplate(String projectId, String scene) {
+        // 获取内置模板
+        TemplateExample example = new TemplateExample();
+        example.createCriteria()
+                .andScopeIdEqualTo(projectId)
+                .andSceneEqualTo(scene)
+                .andInternalEqualTo(true);
+        return templateMapper.selectByExample(example).get(0);
+    }
+
+    /**
+     * 获取设置的默认模板ID
+     *
+     * @param projectId
+     * @param scene
+     * @return
+     */
+    public String getDefaultTemplateId(String projectId, String scene) {
+        ProjectApplicationType.DEFAULT_TEMPLATE defaultTemplateParam = ProjectApplicationType.DEFAULT_TEMPLATE.getByTemplateScene(scene);
+        ProjectApplication projectApplication = projectApplicationService.getByType(projectId, defaultTemplateParam.name());
+        return projectApplication == null ? null : projectApplication.getTypeValue();
+    }
+
+    /**
+     * 标记默认模板
+     *
+     * @param projectId
+     * @param scene
+     * @param templates
+     * @return
+     */
+    private List<ProjectTemplateDTO> tagDefaultTemplate(String projectId, String scene, List<Template> templates) {
+        // 查询项目下设置中配置的默认模板
+        String defaultProjectId = getDefaultTemplateId(projectId, scene);
+        List<ProjectTemplateDTO> templateDTOS = templates.stream().map(item -> BeanUtils.copyBean(new ProjectTemplateDTO(), item)).toList();
+
+        ProjectTemplateDTO defaultTemplate = templateDTOS.stream()
+                .filter(t -> StringUtils.equals(defaultProjectId, t.getId()))
+                .findFirst()
+                .orElse(null);
+
+        // 如果查询不到默认模板，设置内置模板为默认模板
+        if (defaultTemplate == null) {
+            defaultTemplate = templateDTOS.stream()
+                    .filter(ProjectTemplateDTO::getInternal)
+                    .findFirst()
+                    .get();
+        }
+        defaultTemplate.setEnableDefault(true);
+        return templateDTOS;
+    }
+
+    /**
+     * 获取第三方平台模板
+     *
+     * @param projectId
+     * @return
+     */
+    private Template getPluginBugTemplate(String projectId) {
+        ServiceIntegration serviceIntegration = getServiceIntegration(projectId);
+        if (serviceIntegration == null) {
+            return null;
+        }
+        Platform platform = platformPluginService.getPlatform(serviceIntegration.getPluginId(),
+                serviceIntegration.getOrganizationId(), new String(serviceIntegration.getConfiguration()));
+        if (platform != null && platform.isThirdPartTemplateSupport()) {
+            return getPluginBugTemplate(projectId, serviceIntegration.getPluginId()); // 该插件支持第三方平台模板
+        }
+        return null;
+    }
+
+    private Template getPluginBugTemplate(String projectId, String pluginId) {
+        PluginWrapper pluginWrapper = pluginLoadService.getPluginWrapper(pluginId);
+        Template template = new Template();
+        template.setId(pluginWrapper.getPluginId());
+        template.setCreateUser(InternalUser.ADMIN.getValue());
+        template.setScene(TemplateScene.BUG.name());
+        template.setEnableThirdPart(true);
+        template.setScopeId(projectId);
+        template.setScopeType(TemplateScopeType.PROJECT.name());
+        template.setInternal(false);
+        template.setRemark(((MsPlugin) pluginWrapper.getPlugin()).getName() + Translator.get("plugin_bug_template_remark"));
+        return template;
+    }
+
+    /**
+     * 如果项目下配置了第三方平台信息
+     * 获取对应的服务集成信息
+     *
+     * @param projectId
+     * @return
+     */
+    private ServiceIntegration getServiceIntegration(String projectId) {
+        // 判断项目是否开启集成缺陷
+        ProjectApplication syncEnableConfig = projectApplicationService.getByType(projectId, ProjectApplicationType.BUG_SYNC_CONFIG.SYNC_ENABLE.name());
+        boolean isSyncEnable = syncEnableConfig != null && Boolean.parseBoolean(syncEnableConfig.getTypeValue());
+        if (!isSyncEnable) {
+            return null;
+        }
+        ProjectDTO project = projectService.getProjectById(projectId);
+        // 查询组织下有权限的插件
+        Set<String> orgPluginIds = platformPluginService.getOrgEnabledPlatformPlugins(project.getOrganizationId())
+                .stream()
+                .map(Plugin::getId)
+                .collect(Collectors.toSet());
+        // 查询服务集成中启用并且支持第三方模板的插件
+        return serviceIntegrationService.getServiceIntegrationByOrgId(project.getOrganizationId())
+                .stream()
+                .filter(serviceIntegration -> {
+                    return serviceIntegration.getEnable()    // 服务集成开启
+                            && orgPluginIds.contains(serviceIntegration.getPluginId());  // 该服务集成对应的插件有权限
+                })
+                .findFirst()
+                .orElse(null);
+    }
+
+    /**
+     * 获取模板以及字段
+     * !提供给其他模块调用
+     * @param id
+     * @return
+     */
+    public TemplateDTO geTemplateDTOWithCheck(String id) {
         Template template = super.getWithCheck(id);
         checkProjectResourceExist(template);
-        return super.geDTOWithCheck(template);
+        return super.geTemplateDTO(template);
     }
 
     @Override
@@ -64,20 +300,45 @@ public class ProjectTemplateService extends BaseTemplateService {
     public void delete(String id) {
         Template template = getWithCheck(id);
         checkProjectTemplateEnable(template.getScopeId(), template.getScene());
+        checkDefault(template);
         super.delete(id);
     }
 
+    /**
+     * 设置成默认模板后不能删除
+     *
+     * @param template
+     */
+    protected void checkDefault(Template template) {
+        String defaultTemplateId = getDefaultTemplateId(template.getScopeId(), template.getScene());
+        if (StringUtils.equals(template.getId(), defaultTemplateId)) {
+            throw new MSException(DEFAULT_TEMPLATE_PERMISSION);
+        }
+    }
+
     /**
      * 将模板设置成默认模板
-     * 同时将其他没模板设置成非默认模板
      *
      * @param id
      */
-    @Override
-    public void setDefaultTemplate(String id) {
-        Template template = getWithCheck(id);
-        checkProjectTemplateEnable(template.getScopeId(), template.getScene());
-        super.setDefaultTemplate(id);
+    public void setDefaultTemplate(String projectId, String id) {
+        Template template = get(id);
+        if (template == null) {
+            Template pluginBugTemplate = getPluginBugTemplate(projectId);
+            if (pluginBugTemplate != null && StringUtils.equals(pluginBugTemplate.getId(), id)) {
+                template = pluginBugTemplate;
+            }
+        }
+        if (template == null) {
+            // 为空check抛出异常
+            template = getWithCheck(id);
+        }
+        String paramType = ProjectApplicationType.DEFAULT_TEMPLATE.getByTemplateScene(template.getScene()).name();
+        ProjectApplication projectApplication = new ProjectApplication();
+        projectApplication.setProjectId(projectId);
+        projectApplication.setTypeValue(id);
+        projectApplication.setType(paramType);
+        projectApplicationService.createOrUpdateConfig(projectApplication);
     }
 
 
diff --git a/backend/services/project-management/src/test/java/io/metersphere/project/controller/ProjectTemplateControllerTests.java b/backend/services/project-management/src/test/java/io/metersphere/project/controller/ProjectTemplateControllerTests.java
index 1680a59512..b6149b47a9 100644
--- a/backend/services/project-management/src/test/java/io/metersphere/project/controller/ProjectTemplateControllerTests.java
+++ b/backend/services/project-management/src/test/java/io/metersphere/project/controller/ProjectTemplateControllerTests.java
@@ -1,5 +1,8 @@
 package io.metersphere.project.controller;
 
+import io.metersphere.project.dto.ProjectTemplateDTO;
+import io.metersphere.project.dto.ProjectTemplateOptionDTO;
+import io.metersphere.project.service.ProjectTemplateService;
 import io.metersphere.sdk.constants.OrganizationParameterConstants;
 import io.metersphere.sdk.constants.PermissionConstants;
 import io.metersphere.sdk.constants.TemplateScene;
@@ -9,6 +12,7 @@ import io.metersphere.sdk.dto.TemplateDTO;
 import io.metersphere.sdk.dto.request.TemplateCustomFieldRequest;
 import io.metersphere.sdk.dto.request.TemplateUpdateRequest;
 import io.metersphere.sdk.util.BeanUtils;
+import io.metersphere.system.base.BasePluginTestService;
 import io.metersphere.system.base.BaseTest;
 import io.metersphere.system.controller.param.TemplateUpdateRequestDefinition;
 import io.metersphere.system.domain.*;
@@ -22,6 +26,7 @@ import io.metersphere.system.service.UserLoginService;
 import jakarta.annotation.Resource;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.*;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -30,6 +35,8 @@ import org.springframework.test.web.servlet.MvcResult;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import static io.metersphere.project.enums.result.ProjectResultCode.PROJECT_TEMPLATE_PERMISSION;
 import static io.metersphere.sdk.constants.InternalUserRole.ADMIN;
@@ -40,13 +47,13 @@ import static io.metersphere.system.controller.handler.result.MsHttpResultCode.N
  * @author jianxing
  * @date : 2023-8-30
  */
-@SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @AutoConfigureMockMvc
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class ProjectTemplateControllerTests extends BaseTest {
     private static final String BASE_PATH = "/project/template/";
     private static final String LIST = "list/{0}/{1}";
-    private static final String SET_DEFAULT = "set-default/{0}";
+    private static final String SET_DEFAULT = "set-default/{0}/{1}";
 
     @Resource
     private TemplateMapper templateMapper;
@@ -60,6 +67,10 @@ public class ProjectTemplateControllerTests extends BaseTest {
     private BaseTemplateCustomFieldService baseTemplateCustomFieldService;
     @Resource
     private OrganizationParameterMapper organizationParameterMapper;
+    @Resource
+    private ProjectTemplateService projectTemplateService;
+    @Resource
+    private BasePluginTestService basePluginTestService;
 
     private static Template addTemplate;
     private static Template anotherTemplateField;
@@ -77,6 +88,7 @@ public class ProjectTemplateControllerTests extends BaseTest {
         MvcResult mvcResult = this.requestGetWithOkAndReturn(LIST, DEFAULT_PROJECT_ID, TemplateScene.FUNCTIONAL.name());
         List<Template> templates = getResultDataArray(mvcResult, Template.class);
         this.defaultTemplate = templates.get(0);
+        this.requestGetWithOkAndReturn(LIST, DEFAULT_PROJECT_ID, TemplateScene.BUG.name());
     }
 
     @Test
@@ -228,26 +240,58 @@ public class ProjectTemplateControllerTests extends BaseTest {
     @Test
     @Order(3)
     public void list() throws Exception {
+
         String scene = TemplateScene.FUNCTIONAL.name();
         // @@请求成功
         MvcResult mvcResult = this.requestGetWithOk(LIST, DEFAULT_PROJECT_ID, scene)
                 .andReturn();
         // 校验数据是否正确
-        List<Template> resultList = getResultDataArray(mvcResult, Template.class);
-        List<Template> templates = baseTemplateService.getTemplates(DEFAULT_PROJECT_ID, scene);
-        List<String> userIds = templates.stream().map(Template::getCreateUser).toList();
-        Map<String, String> userNameMap = userLoginService.getUserNameMap(userIds);
-        for (int i = 0; i < resultList.size(); i++) {
-            Template resultItem = resultList.get(i);
-            Template template = templates.get(i);
-            template.setCreateUser(userNameMap.get(template.getCreateUser()));
-            if (template.getInternal()) {
-                // 校验内置用户名称是否翻译
-                template.setName(baseTemplateService.translateInternalTemplate(template.getName()));
-            }
-            Assertions.assertEquals(template, resultItem);
-            Assertions.assertEquals(resultItem.getScene(), scene);
-        }
+        List<ProjectTemplateDTO> resultList = getResultDataArray(mvcResult, ProjectTemplateDTO.class);
+        List<Template> dbTemplates = baseTemplateService.getTemplates(DEFAULT_PROJECT_ID, scene);
+        assertListTemplate(scene, resultList, dbTemplates);
+
+        // 校验获取模板选项方法
+        List<ProjectTemplateOptionDTO> projectTemplateOptions = projectTemplateService.getOption(DEFAULT_PROJECT_ID, scene);
+        assertTemplateOption(resultList, projectTemplateOptions);
+
+        scene = TemplateScene.BUG.name();
+        // @@缺陷模板请求成功
+        mvcResult = this.requestGetWithOk(LIST, DEFAULT_PROJECT_ID, scene)
+                .andReturn();
+        // 校验数据是否正确
+        resultList = getResultDataArray(mvcResult, ProjectTemplateDTO.class);
+        dbTemplates = baseTemplateService.getTemplates(DEFAULT_PROJECT_ID, scene);
+        assertListTemplate(scene, resultList, dbTemplates);
+
+        // 校验获取模板选项方法
+        projectTemplateOptions = projectTemplateService.getOption(DEFAULT_PROJECT_ID, scene);
+        assertTemplateOption(resultList, projectTemplateOptions);
+
+        // 上传jira插件，添加jira集成
+        basePluginTestService.addJiraPlugin();
+        basePluginTestService.addServiceIntegration(DEFAULT_ORGANIZATION_ID);
+        // @@校验配置服务集成后，是否有jira模板
+        mvcResult = this.requestGetWithOk(LIST, DEFAULT_PROJECT_ID, scene)
+                .andReturn();
+        resultList = getResultDataArray(mvcResult, ProjectTemplateDTO.class);
+        // 没有配置项目信息，校验是否有jira模板
+        Assertions.assertTrue(resultList.size() == dbTemplates.size());
+        Assertions.assertTrue(resultList.stream().filter(item -> StringUtils.equals(item.getId(), "jira")).count() == 0);
+
+        // 校验获取模板选项方法
+        projectTemplateOptions = projectTemplateService.getOption(DEFAULT_PROJECT_ID, scene);
+        assertTemplateOption(resultList, projectTemplateOptions);
+
+        // 配置项目信息
+        basePluginTestService.enableProjectBugConfig(DEFAULT_PROJECT_ID);
+        // @@校验配置项目信息后，是否有jira模板
+        mvcResult = this.requestGetWithOk(LIST, DEFAULT_PROJECT_ID, scene)
+                .andReturn();
+        Template jiraTemplate = getResultDataArray(mvcResult, Template.class).stream()
+                .filter(item -> StringUtils.equals(item.getId(), "jira"))
+                .findFirst()
+                .get();
+        Assertions.assertNotNull(jiraTemplate);
 
         // @@校验组织是否存在
         assertErrorCode(this.requestGet(LIST, "1111", scene), NOT_FOUND);
@@ -259,6 +303,34 @@ public class ProjectTemplateControllerTests extends BaseTest {
         requestGetPermissionTest(PermissionConstants.PROJECT_TEMPLATE_READ, LIST, DEFAULT_PROJECT_ID, scene);
     }
 
+    private static void assertTemplateOption(List<ProjectTemplateDTO> resultList, List<ProjectTemplateOptionDTO> projectTemplateOptions) {
+        Map<String, ProjectTemplateDTO> templateMap = resultList.stream().collect(Collectors.toMap(Template::getId, Function.identity()));
+        Assertions.assertEquals(projectTemplateOptions.size(), resultList.size());
+        projectTemplateOptions.forEach(option -> {
+            ProjectTemplateDTO template = templateMap.get(option.getId());
+            Assertions.assertEquals(option.getId(), template.getId());
+            Assertions.assertEquals(option.getName(), template.getName());
+            Assertions.assertEquals(option.getEnableDefault(), template.getEnableDefault());
+        });
+    }
+
+    private void assertListTemplate(String scene, List<ProjectTemplateDTO> resultList, List<Template> dbTemplates) {
+        List<String> userIds = dbTemplates.stream().map(Template::getCreateUser).toList();
+        Map<String, String> userNameMap = userLoginService.getUserNameMap(userIds);
+        Assertions.assertTrue(resultList.size() == dbTemplates.size());
+        for (int i = 0; i < resultList.size(); i++) {
+            Template resultItem = resultList.get(i);
+            Template template = dbTemplates.get(i);
+            template.setCreateUser(userNameMap.get(template.getCreateUser()));
+            if (template.getInternal()) {
+                // 校验内置用户名称是否翻译
+                template.setName(baseTemplateService.translateInternalTemplate());
+            }
+            Assertions.assertEquals(template, resultItem);
+            Assertions.assertEquals(resultItem.getScene(), scene);
+        }
+    }
+
     @Test
     @Order(4)
     public void get() throws Exception {
@@ -289,20 +361,26 @@ public class ProjectTemplateControllerTests extends BaseTest {
     @Order(5)
     public void setDefaultTemplate() throws Exception {
         changeOrgTemplateEnable(false);
+
+        String projectId = DEFAULT_PROJECT_ID;
+        String scene = TemplateScene.FUNCTIONAL.name();
+        String defaultTemplateId = projectTemplateService.getDefaultTemplateId(projectId, scene);
+        // 校验默认没有设置默认模板，使用内置模板
+        Assertions.assertNull(defaultTemplateId);
+        TemplateDTO defaultTemplateDTO = projectTemplateService.getDefaultTemplateDTO(projectId, scene);
+        Assertions.assertEquals(defaultTemplateDTO.getInternal(), true);
+
         // @@请求成功
-        this.requestGetWithOk(SET_DEFAULT, addTemplate.getId());
+        this.requestGetWithOk(SET_DEFAULT, DEFAULT_PROJECT_ID, addTemplate.getId());
         Template template = templateMapper.selectByPrimaryKey(addTemplate.getId());
         assertSetDefaultTemplate(template);
-
-        // @校验是否开启项目模板
-        changeOrgTemplateEnable(true);
-        assertErrorCode(this.requestGet(SET_DEFAULT, addTemplate.getId()), PROJECT_TEMPLATE_PERMISSION);
-        changeOrgTemplateEnable(false);
+        defaultTemplateDTO = projectTemplateService.getDefaultTemplateDTO(projectId, scene);
+        Assertions.assertEquals(defaultTemplateDTO.getId(), template.getId());
 
         // @@校验日志
         checkLog(addTemplate.getId(), OperationLogType.UPDATE);
         // @@校验权限
-        requestGetPermissionTest(PermissionConstants.ORGANIZATION_TEMPLATE_UPDATE, SET_DEFAULT, addTemplate.getScopeId(), addTemplate.getScene());
+        requestGetPermissionTest(PermissionConstants.ORGANIZATION_TEMPLATE_UPDATE, SET_DEFAULT, DEFAULT_PROJECT_ID, addTemplate.getId());
     }
 
     @Test
@@ -313,23 +391,21 @@ public class ProjectTemplateControllerTests extends BaseTest {
         assertErrorCode(this.requestGet(DEFAULT_DELETE, addTemplate.getId()), PROJECT_TEMPLATE_PERMISSION);
         changeOrgTemplateEnable(false);
 
+        // @@校验内置模板删除异常
+        Template internalTemplate = projectTemplateService.getInternalTemplate(DEFAULT_PROJECT_ID, TemplateScene.FUNCTIONAL.name());
+        assertErrorCode(this.requestGet(DEFAULT_DELETE, internalTemplate.getId()), INTERNAL_TEMPLATE_PERMISSION);
+
         // @@校验删除默认模板
         assertErrorCode(this.requestGet(DEFAULT_DELETE, addTemplate.getId()), DEFAULT_TEMPLATE_PERMISSION);
         // 设置回来，保证正常删除
-        this.requestGetWithOk(SET_DEFAULT, defaultTemplate.getId());
-        
+        this.requestGetWithOk(SET_DEFAULT, DEFAULT_PROJECT_ID, defaultTemplate.getId());
+
         // @@请求成功
         this.requestGetWithOk(DEFAULT_DELETE, addTemplate.getId());
         Assertions.assertNull(templateMapper.selectByPrimaryKey(addTemplate.getId()));
         Assertions.assertTrue(CollectionUtils.isEmpty(baseTemplateCustomFieldService.getByTemplateId(addTemplate.getId())));
 
-        // @@校验内置模板删除异常
-        TemplateExample example = new TemplateExample();
-        example.createCriteria()
-                .andScopeTypeEqualTo(TemplateScopeType.PROJECT.name())
-                .andInternalEqualTo(true);
-        Template internalTemplate = templateMapper.selectByExample(example).get(0);
-        assertErrorCode(this.requestGet(DEFAULT_DELETE, internalTemplate.getId()), INTERNAL_TEMPLATE_PERMISSION);
+        basePluginTestService.deleteJiraPlugin();
 
         // @@校验 NOT_FOUND 异常
         assertErrorCode(this.requestGet(DEFAULT_DELETE, "1111"), NOT_FOUND);
@@ -341,18 +417,8 @@ public class ProjectTemplateControllerTests extends BaseTest {
     }
 
     private void assertSetDefaultTemplate(Template template) {
-        Assertions.assertTrue(template.getEnableDefault());
-        int defaultCount = getTemplateByScopeId(addTemplate.getScopeId())
-                .stream()
-                .filter(Template::getEnableDefault)
-                .toList().size();
-        Assertions.assertEquals(defaultCount, 1);
-    }
-
-    private List<Template> getTemplateByScopeId(String scopeId) {
-        TemplateExample example = new TemplateExample();
-        example.createCriteria().andScopeIdEqualTo(scopeId);
-        return templateMapper.selectByExample(example);
+        String defaultTemplateId = projectTemplateService.getDefaultTemplateId(template.getScopeId(), template.getScene());
+        Assertions.assertEquals(defaultTemplateId, template.getId());
     }
 
     private void changeOrgTemplateEnable(boolean enable) {
diff --git a/backend/services/project-management/src/test/resources/file/metersphere-jira-plugin-3.x.jar b/backend/services/project-management/src/test/resources/file/metersphere-jira-plugin-3.x.jar
index 9a3ecda04b59fec8dc9e58cbec1060458019d2ed..75d4157323e70050c8f52c0a4d0cd3c6f0bee541 100644
GIT binary patch
delta 5752
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%0DxW&sn8D8%TALKeW&
z4Gr)&;q27bqYw>zkm;RzPRPg4^mH0oV5S<t?^f=2Krk3Kyhs=X@&T3=91yTJJ$%v^
z1a*N+Vsr}lKm-DY*3$#?*3|!#MVv3vpwU2yUl3s^UYj};0weWXs;!P0V%t`t5MwgG
z+3l4~kmcQQd;t|O)-|xl);?vKS^hT|C})6lB-f%4y^0W9L6;fmtbroG4;nO7fw<~*
zbdc7bcH91w4eJXSlgcTr2sH>OTgC@z9IinjI5d8-$N-jFDoB3n1+&W>C~tuegNdG!
zkJ5s`MlPg+e<}*fh531p!S@_sC?o{nE_q6*QU?^`2dc_AAfxC~6oOA5WC;PTrBo1W
zy#j@JVhFNifTI#3K&KMthwzfhUM1*5G`KE0r&KOp{sqPrItG;gYzeZIfQ1TNJqTB$
z5a+H!R+8nY{+lddq6~%j;sCKx<&2PVIGBV0XNaYzLh`RQt|><$uDXKLe83F*ze`{q
zOn;p_5MCn;aMk17{)XLEc@Cz}19V;Hl-t#wAW#dkdcFiKV{h=4A9!0$4v<u{<D3Dj
z+sF4eTicQHUk+u0kwpdkg0MmhX4SWeIVq#JU>O;lvKSZy)HlciJJPfOYc=jWUunv(
zjyVAn{<Au`Zb4v?Dq6^w+u%Zx-iBEDG*tgu@J=BEBY98{3%KBlr;H|rfkOI_XRGam
z_oYFQI0zCs1>%o{avD^NtJ&CLf6E0hY2{$jPJgU*(GW193iq-8`AZ506Fa4GB?jCT
zIDoohTv1FEqY#n_5DQtt%zE-)=<m)9l%qc-`w%c~;$b`8n4R3L{yf-lnq(j!U^<nD
zQyl@gbu<6LgWC+=ec)Y_0HpQTh3(gU?GFkYj!gw`Z#dJX`L}&yz*UI=f0TbPpe95*
zaP1Kbv?|GuQ1E7;>Jcu;kw+-R`y9YChXcSAkw5^(W)y-o7x<AQ1$Z};vHj}?b4s!Q
j2~ZK32Z5&!K@g;N3YeG=0_6a7Aqk+{f+V<Fa5DRU@Jdd8

delta 6310
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

diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationTemplateController.java b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationTemplateController.java
index b3e252b636..52e468ed9c 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationTemplateController.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationTemplateController.java
@@ -88,14 +88,6 @@ public class OrganizationTemplateController {
         organizationTemplateService.disableOrganizationTemplate(organizationId, scene);
     }
 
-    @GetMapping("/set-default/{id}")
-    @Operation(summary = "设置模板模板")
-    @RequiresPermissions(PermissionConstants.ORGANIZATION_TEMPLATE_UPDATE)
-    @Log(type = OperationLogType.UPDATE, expression = "#msClass.setDefaultTemplateLog(#id)", msClass = OrganizationTemplateLogService.class)
-    public void setDefaultTemplate(@PathVariable String id) {
-        organizationTemplateService.setDefaultTemplate(id);
-    }
-
     @GetMapping("/is-enable/{organizationId}/{scene}")
     @Operation(summary = "是否启用组织模版")
     @RequiresPermissions(PermissionConstants.ORGANIZATION_TEMPLATE_READ)
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTemplateService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTemplateService.java
index 00d20c1b05..d5756eebb7 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTemplateService.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTemplateService.java
@@ -50,10 +50,15 @@ public class BaseTemplateService {
         List<Template> templates = getTemplates(scopeId, scene);
         List<String> userIds = templates.stream().map(Template::getCreateUser).toList();
         Map<String, String> userNameMap = userLoginService.getUserNameMap(userIds);
+        templates.forEach(item -> item.setCreateUser(userNameMap.get(item.getCreateUser())));
+        translateInternalTemplate(templates);
+        return templates;
+    }
+
+    public List<Template> translateInternalTemplate(List<Template> templates) {
         templates.forEach(item -> {
-            item.setCreateUser(userNameMap.get(item.getCreateUser()));
             if (item.getInternal()) {
-                item.setName(translateInternalTemplate(item.getName()));
+                item.setName(translateInternalTemplate());
             }
         });
         return templates;
@@ -74,16 +79,19 @@ public class BaseTemplateService {
         return templateMapper.selectByExample(example);
     }
 
-    public String translateInternalTemplate(String filedName) {
-        return Translator.get("template." + filedName);
+    public String translateInternalTemplate() {
+        return Translator.get("template.default");
     }
 
     public Template getWithCheck(String id) {
         return checkResourceExist(id);
     }
 
+    public Template get(String id) {
+        return templateMapper.selectByPrimaryKey(id);
+    }
 
-    public TemplateDTO geDTOWithCheck(Template template) {
+    protected TemplateDTO geTemplateDTO(Template template) {
         List<TemplateCustomField> templateCustomFields = baseTemplateCustomFieldService.getByTemplateId(template.getId());
 
         // 查找字段名称
@@ -112,7 +120,6 @@ public class BaseTemplateService {
 
     public Template add(Template template, List<TemplateCustomFieldRequest> customFields) {
         template.setInternal(false);
-        template.setEnableDefault(false);
         return this.baseAdd(template, customFields);
     }
 
@@ -144,7 +151,6 @@ public class BaseTemplateService {
         template.setScopeId(null);
         template.setCreateUser(null);
         template.setCreateTime(null);
-        template.setEnableDefault(null);
         // customFields 为 null 则不修改
         if (customFields != null) {
             baseTemplateCustomFieldService.deleteByTemplateId(template.getId());
@@ -157,29 +163,10 @@ public class BaseTemplateService {
     public void delete(String id) {
         Template template = checkResourceExist(id);
         checkInternal(template);
-        checkDefault(template);
         templateMapper.deleteByPrimaryKey(id);
         baseTemplateCustomFieldService.deleteByTemplateId(id);
     }
 
-    public void setDefaultTemplate(String id) {
-        Template originTemplate = templateMapper.selectByPrimaryKey(id);
-        // 将当前模板设置成默认模板
-        Template template = new Template();
-        template.setId(id);
-        template.setEnableDefault(true);
-        templateMapper.updateByPrimaryKeySelective(template);
-
-        // 将其他模板设置成非默认模板
-        template = new Template();
-        template.setEnableDefault(false);
-        TemplateExample example = new TemplateExample();
-        example.createCriteria()
-                .andIdNotEqualTo(id)
-                .andScopeIdEqualTo(originTemplate.getScopeId());
-        templateMapper.updateByExampleSelective(template, example);
-    }
-
     /**
      * 校验时候是内置模板
      * @param template
@@ -190,16 +177,6 @@ public class BaseTemplateService {
         }
     }
 
-    /**
-     * 设置成默认模板后不能删除
-     * @param template
-     */
-    protected void checkDefault(Template template) {
-        if (template.getEnableDefault()) {
-            throw new MSException(DEFAULT_TEMPLATE_PERMISSION);
-        }
-    }
-
     protected void checkAddExist(Template template) {
         TemplateExample example = new TemplateExample();
         example.createCriteria()
@@ -329,7 +306,6 @@ public class BaseTemplateService {
         template.setScopeType(scopeType.name());
         template.setScopeId(scopeId);
         template.setEnableThirdPart(false);
-        template.setEnableDefault(true);
         template.setScene(scene.name());
         templateMapper.insert(template);
         return template;
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationTemplateService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationTemplateService.java
index a62d5575d2..a6dc0e80f1 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationTemplateService.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationTemplateService.java
@@ -45,7 +45,7 @@ public class OrganizationTemplateService extends BaseTemplateService {
     public TemplateDTO geDTOWithCheck(String id) {
         Template template = super.getWithCheck(id);
         checkOrgResourceExist(template);
-        return super.geDTOWithCheck(template);
+        return super.geTemplateDTO(template);
     }
 
     @Override
@@ -132,34 +132,6 @@ public class OrganizationTemplateService extends BaseTemplateService {
         super.delete(id);
     }
 
-    /**
-     * 将模板设置成默认模板
-     * 同时将其他没模板设置成非默认模板
-     *
-     * @param id
-     */
-    @Override
-    public void setDefaultTemplate(String id) {
-        Template template = getWithCheck(id);
-        checkOrganizationTemplateEnable(template.getScopeId(), template.getScene());
-        setRefDefaultTemplate(id);
-        super.setDefaultTemplate(id);
-    }
-
-    /**
-     * 同步设置项目级别模板
-     * 当开启组织模板时，操作组织模板，同时维护与之关联的项目模板
-     * 避免当开启项目模板时，需要将各个资源关联的模板和字段从组织切换为项目
-     * 无论是否开启组织模板，各资源都只关联各自项目下的模板和字段
-     *
-     * @param id
-     */
-    private void setRefDefaultTemplate(String id) {
-        getByRefId(id).stream()
-                .map(Template::getId)
-                .forEach(super::setDefaultTemplate);
-    }
-
     /**
      * 同步删除项目级别模板
      * 当开启组织模板时，操作组织模板，同时维护与之关联的项目模板
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/ServiceIntegrationService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/ServiceIntegrationService.java
index f0868e88c0..08ecad46af 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/ServiceIntegrationService.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/ServiceIntegrationService.java
@@ -73,7 +73,7 @@ public class ServiceIntegrationService {
         }).toList();
     }
 
-    private List<ServiceIntegration> getServiceIntegrationByOrgId(String organizationId) {
+    public List<ServiceIntegration> getServiceIntegrationByOrgId(String organizationId) {
         ServiceIntegrationExample example = new ServiceIntegrationExample();
         example.createCriteria()
                 .andOrganizationIdEqualTo(organizationId);
diff --git a/backend/services/system-setting/src/test/java/io/metersphere/system/base/BasePluginTestService.java b/backend/services/system-setting/src/test/java/io/metersphere/system/base/BasePluginTestService.java
new file mode 100644
index 0000000000..aad0daa8ec
--- /dev/null
+++ b/backend/services/system-setting/src/test/java/io/metersphere/system/base/BasePluginTestService.java
@@ -0,0 +1,151 @@
+package io.metersphere.system.base;
+
+import io.metersphere.project.domain.ProjectApplication;
+import io.metersphere.project.domain.ProjectApplicationExample;
+import io.metersphere.project.mapper.ProjectApplicationMapper;
+import io.metersphere.sdk.constants.ProjectApplicationType;
+import io.metersphere.sdk.util.JSON;
+import io.metersphere.system.domain.Plugin;
+import io.metersphere.system.domain.ServiceIntegration;
+import io.metersphere.system.mapper.PluginMapper;
+import io.metersphere.system.request.PluginUpdateRequest;
+import io.metersphere.system.request.ServiceIntegrationUpdateRequest;
+import io.metersphere.system.service.PluginService;
+import io.metersphere.system.service.ServiceIntegrationService;
+import jakarta.annotation.Resource;
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.commons.lang3.BooleanUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.Map;
+
+import static io.metersphere.sdk.constants.InternalUserRole.ADMIN;
+
+/**
+ * @Author: jianxing
+ * @CreateTime: 2023-10-20  11:32
+ */
+@Service
+public class BasePluginTestService {
+
+    @Resource
+    private PluginService pluginService;
+    @Value("${embedded.mockserver.host}")
+    private String mockServerHost;
+    @Value("${embedded.mockserver.port}")
+    private int mockServerHostPort;
+    @Resource
+    private ServiceIntegrationService serviceIntegrationService;
+    @Resource
+    private ProjectApplicationMapper projectApplicationMapper;
+    @Resource
+    private PluginMapper pluginMapper;
+    private static Plugin jiraPlugin;
+    private static ServiceIntegration serviceIntegration;
+
+
+    /**
+     * 添加插件，供测试使用
+     *
+     * @return
+     * @throws Exception
+     */
+    public Plugin addJiraPlugin() throws Exception {
+        if (hasJiraPlugin()) {
+            return jiraPlugin;
+        }
+        PluginUpdateRequest request = new PluginUpdateRequest();
+        File jarFile = new File(
+                this.getClass().getClassLoader().getResource("file/metersphere-jira-plugin-3.x.jar")
+                        .getPath()
+        );
+        FileInputStream inputStream = new FileInputStream(jarFile);
+        MockMultipartFile mockMultipartFile = new MockMultipartFile(jarFile.getName(), jarFile.getName(), "jar", inputStream);
+        request.setName("测试插件");
+        request.setGlobal(true);
+        request.setEnable(true);
+        request.setCreateUser(ADMIN.name());
+        jiraPlugin = pluginService.add(request, mockMultipartFile);
+        return jiraPlugin;
+    }
+
+    /**
+     * 添加服务集成信息
+     * @return
+     * @throws Exception
+     */
+    public ServiceIntegration addServiceIntegration(String orgId) {
+        JiraIntegrationConfig integrationConfig = new JiraIntegrationConfig();
+        integrationConfig.setAddress(String.format("http://%s:%s", mockServerHost, mockServerHostPort));
+        Map<String, Object> integrationConfigMap = JSON.parseMap(JSON.toJSONString(integrationConfig));
+
+        ServiceIntegrationUpdateRequest request = new ServiceIntegrationUpdateRequest();
+        request.setEnable(true);
+        request.setPluginId(jiraPlugin.getId());
+        request.setConfiguration(integrationConfigMap);
+        request.setOrganizationId(orgId);
+        serviceIntegration = serviceIntegrationService.add(request);
+        return serviceIntegration;
+    }
+
+    public Plugin getJiraPlugin() throws Exception {
+        if (!hasJiraPlugin()) {
+            return this.addJiraPlugin();
+        }
+        return jiraPlugin;
+    }
+
+    public boolean hasJiraPlugin() {
+        if (jiraPlugin != null) {
+            return true;
+        }
+        jiraPlugin = pluginMapper.selectByPrimaryKey("jira");
+        return jiraPlugin != null;
+    }
+
+    public void deleteJiraPlugin() {
+        if (jiraPlugin != null) {
+            pluginService.delete(jiraPlugin.getId());
+            jiraPlugin = null;
+        }
+    }
+
+    public void enableProjectBugConfig(String defaultProjectId) {
+        ProjectApplication projectApplication = new ProjectApplication();
+        projectApplication.setProjectId(defaultProjectId);
+        projectApplication.setType(ProjectApplicationType.BUG_SYNC_CONFIG.SYNC_ENABLE.name());
+        projectApplication.setTypeValue(BooleanUtils.toStringTrueFalse(true));
+        createOrUpdateConfig(projectApplication);
+    }
+
+    public void createOrUpdateConfig(ProjectApplication application) {
+        String type = application.getType();
+        String projectId = application.getProjectId();
+        ProjectApplicationExample example = new ProjectApplicationExample();
+        example.createCriteria().andProjectIdEqualTo(projectId).andTypeEqualTo(type);
+        if (projectApplicationMapper.countByExample(example) > 0) {
+            example.clear();
+            example.createCriteria().andProjectIdEqualTo(projectId).andTypeEqualTo(type);
+            projectApplicationMapper.updateByExample(application, example);
+        } else {
+            projectApplicationMapper.insertSelective(application);
+        }
+    }
+
+
+    @Getter
+    @Setter
+    public static class JiraIntegrationConfig {
+        private String account;
+        private String password;
+        private String token;
+        private String authType;
+        private String address;
+        private String version;
+    }
+}
diff --git a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationTemplateControllerTests.java b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationTemplateControllerTests.java
index 716023bc97..e1ceb60497 100644
--- a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationTemplateControllerTests.java
+++ b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationTemplateControllerTests.java
@@ -44,7 +44,6 @@ public class OrganizationTemplateControllerTests extends BaseTest {
     private static final String BASE_PATH = "/organization/template/";
     private static final String LIST = "list/{0}/{1}";
     private static final String DISABLE_ORG_TEMPLATE = "disable/{0}/{1}";
-    private static final String SET_DEFAULT = "set-default/{0}";
     protected static final String IS_ORGANIZATION_TEMPLATE_ENABLE = "is-enable/{0}/{1}";
 
     @Resource
@@ -286,7 +285,7 @@ public class OrganizationTemplateControllerTests extends BaseTest {
             template.setCreateUser(userNameMap.get(template.getCreateUser()));
             if (template.getInternal()) {
                 // 校验内置用户名称是否翻译
-                template.setName(baseTemplateService.translateInternalTemplate(template.getName()));
+                template.setName(baseTemplateService.translateInternalTemplate());
             }
             Assertions.assertEquals(template, resultItem);
             Assertions.assertEquals(resultItem.getScene(), scene);
@@ -349,46 +348,6 @@ public class OrganizationTemplateControllerTests extends BaseTest {
         requestGetPermissionTest(PermissionConstants.ORGANIZATION_TEMPLATE_ENABLE, DISABLE_ORG_TEMPLATE, addTemplate.getScopeId(), addTemplate.getScene());
     }
 
-    @Test
-    @Order(6)
-    public void setDefaultTemplate() throws Exception {
-        changeOrgTemplateEnable(true);
-        // @@请求成功
-        this.requestGetWithOk(SET_DEFAULT, addTemplate.getId());
-        Template template = templateMapper.selectByPrimaryKey(addTemplate.getId());
-        assertSetDefaultTemplate(template);
-        assertRefSetDefaultTemplate(template);
-
-        // @校验是否开启组织模板
-        changeOrgTemplateEnable(false);
-        assertErrorCode(this.requestGet(SET_DEFAULT, addTemplate.getId()), ORGANIZATION_TEMPLATE_PERMISSION);
-        changeOrgTemplateEnable(true);
-
-        // @@校验日志
-        checkLog(addTemplate.getId(), OperationLogType.UPDATE);
-        // @@校验权限
-        requestGetPermissionTest(PermissionConstants.ORGANIZATION_TEMPLATE_UPDATE, SET_DEFAULT, addTemplate.getScopeId(), addTemplate.getScene());
-    }
-
-    private void assertSetDefaultTemplate(Template template) {
-        Assertions.assertTrue(template.getEnableDefault());
-        int defaultCount = getTemplateByScopeId(addTemplate.getScopeId())
-                .stream()
-                .filter(Template::getEnableDefault)
-                .toList().size();
-        Assertions.assertEquals(defaultCount, 1);
-    }
-
-    /**
-     * 校验变更组织模板时，有没有同步变更项目模板
-     *
-     * @param template
-     */
-    private void assertRefSetDefaultTemplate(Template template) {
-        List<Template> refTemplates = organizationTemplateService.getByRefId(template.getId());
-        refTemplates.forEach(this::assertSetDefaultTemplate);
-    }
-
     @Test
     @Order(7)
     public void delete() throws Exception {
@@ -398,11 +357,6 @@ public class OrganizationTemplateControllerTests extends BaseTest {
         assertErrorCode(this.requestGet(DEFAULT_DELETE, addTemplate.getId()), ORGANIZATION_TEMPLATE_PERMISSION);
         changeOrgTemplateEnable(true);
 
-        // @@校验删除默认模板
-        assertErrorCode(this.requestGet(DEFAULT_DELETE, addTemplate.getId()), DEFAULT_TEMPLATE_PERMISSION);
-        // 设置回来，保证正常删除
-        this.requestGetWithOk(SET_DEFAULT, defaultTemplate.getId());
-
         // @@请求成功
         this.requestGetWithOk(DEFAULT_DELETE, addTemplate.getId());
         Assertions.assertNull(templateMapper.selectByPrimaryKey(addTemplate.getId()));
diff --git a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/ServiceIntegrationControllerTests.java b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/ServiceIntegrationControllerTests.java
index 88801c398e..df5c2310b7 100644
--- a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/ServiceIntegrationControllerTests.java
+++ b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/ServiceIntegrationControllerTests.java
@@ -1,25 +1,22 @@
 package io.metersphere.system.controller;
 
 import io.metersphere.plugin.platform.spi.AbstractPlatformPlugin;
-import io.metersphere.system.base.BaseTest;
 import io.metersphere.sdk.constants.PermissionConstants;
-import io.metersphere.system.log.constants.OperationLogType;
-import io.metersphere.system.service.PluginLoadService;
 import io.metersphere.sdk.util.JSON;
+import io.metersphere.system.base.BasePluginTestService;
+import io.metersphere.system.base.BaseTest;
 import io.metersphere.system.controller.param.ServiceIntegrationUpdateRequestDefinition;
 import io.metersphere.system.domain.Organization;
 import io.metersphere.system.domain.Plugin;
 import io.metersphere.system.domain.ServiceIntegration;
 import io.metersphere.system.dto.ServiceIntegrationDTO;
+import io.metersphere.system.log.constants.OperationLogType;
 import io.metersphere.system.mapper.PluginMapper;
 import io.metersphere.system.mapper.ServiceIntegrationMapper;
-import io.metersphere.system.request.PluginUpdateRequest;
 import io.metersphere.system.request.ServiceIntegrationUpdateRequest;
 import io.metersphere.system.service.OrganizationService;
-import io.metersphere.system.service.PluginService;
+import io.metersphere.system.service.PluginLoadService;
 import jakarta.annotation.Resource;
-import lombok.Getter;
-import lombok.Setter;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.*;
 import org.mockserver.client.MockServerClient;
@@ -27,15 +24,11 @@ import org.mockserver.model.Header;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.test.web.servlet.MvcResult;
 
-import java.io.File;
-import java.io.FileInputStream;
 import java.util.List;
 import java.util.Map;
 
-import static io.metersphere.sdk.constants.InternalUserRole.ADMIN;
 import static io.metersphere.system.controller.handler.result.CommonResultCode.PLUGIN_ENABLE;
 import static io.metersphere.system.controller.handler.result.CommonResultCode.PLUGIN_PERMISSION;
 import static io.metersphere.system.controller.handler.result.MsHttpResultCode.NOT_FOUND;
@@ -58,7 +51,6 @@ public class ServiceIntegrationControllerTests extends BaseTest {
     private static final String VALIDATE_POST = "/validate/{0}";
     private static final String SCRIPT_GET = "/script/{0}";
     private static ServiceIntegration addServiceIntegration;
-    private static Plugin plugin;
     private static Organization defaultOrg;
 
     @Resource
@@ -68,7 +60,7 @@ public class ServiceIntegrationControllerTests extends BaseTest {
     @Resource
     private PluginLoadService pluginLoadService;
     @Resource
-    private PluginService pluginService;
+    private BasePluginTestService basePluginTestService;
     @Resource
     private PluginMapper pluginMapper;
     @Resource
@@ -95,9 +87,9 @@ public class ServiceIntegrationControllerTests extends BaseTest {
     @Test
     @Order(1)
     public void add() throws Exception {
-        plugin = addPlugin();
+        Plugin plugin = basePluginTestService.addJiraPlugin();
 
-        JiraIntegrationConfig integrationConfig = new JiraIntegrationConfig();
+        BasePluginTestService.JiraIntegrationConfig integrationConfig = new BasePluginTestService.JiraIntegrationConfig();
         Map<String, Object> integrationConfigMap = JSON.parseMap(JSON.toJSONString(integrationConfig));
 
         // @@请求成功
@@ -140,7 +132,7 @@ public class ServiceIntegrationControllerTests extends BaseTest {
     @Test
     @Order(2)
     public void update() throws Exception {
-        JiraIntegrationConfig integrationConfig = new JiraIntegrationConfig();
+        BasePluginTestService.JiraIntegrationConfig integrationConfig = new BasePluginTestService.JiraIntegrationConfig();
         integrationConfig.setAddress(String.format("http://%s:%s", mockServerHost, mockServerHostPort));
         Map<String, Object> integrationConfigMap = JSON.parseMap(JSON.toJSONString(integrationConfig));
 
@@ -148,7 +140,7 @@ public class ServiceIntegrationControllerTests extends BaseTest {
         ServiceIntegrationUpdateRequest request = new ServiceIntegrationUpdateRequest();
         request.setId(addServiceIntegration.getId());
         request.setEnable(false);
-        request.setPluginId(plugin.getId());
+        request.setPluginId(basePluginTestService.getJiraPlugin().getId());
         request.setConfiguration(integrationConfigMap);
         request.setOrganizationId(defaultOrg.getId());
         this.requestPostWithOk(DEFAULT_UPDATE, request);
@@ -190,6 +182,7 @@ public class ServiceIntegrationControllerTests extends BaseTest {
     @Test
     @Order(3)
     public void list() throws Exception {
+        Plugin plugin = basePluginTestService.getJiraPlugin();
         // @@请求成功
         MvcResult mvcResult = this.requestGetWithOkAndReturn(LIST, defaultOrg.getId());
         // 校验请求成功数据
@@ -252,7 +245,8 @@ public class ServiceIntegrationControllerTests extends BaseTest {
     @Test
     @Order(5)
     public void validatePost() throws Exception {
-        JiraIntegrationConfig integrationConfig = new JiraIntegrationConfig();
+        Plugin plugin = basePluginTestService.getJiraPlugin();
+        BasePluginTestService.JiraIntegrationConfig integrationConfig = new BasePluginTestService.JiraIntegrationConfig();
         integrationConfig.setAddress(String.format("http://%s:%s", mockServerHost, mockServerHostPort));
         Map<String, Object> integrationConfigMap = JSON.parseMap(JSON.toJSONString(integrationConfig));
         // @@请求成功
@@ -277,6 +271,7 @@ public class ServiceIntegrationControllerTests extends BaseTest {
     @Test
     @Order(6)
     public void getPluginScript() throws Exception {
+        Plugin plugin = basePluginTestService.getJiraPlugin();
         // @@请求成功
         MvcResult mvcResult = this.requestGetWithOkAndReturn(SCRIPT_GET, plugin.getId());
         // 校验请求成功数据
@@ -307,7 +302,7 @@ public class ServiceIntegrationControllerTests extends BaseTest {
         Assertions.assertNull(serviceIntegration);
 
         // 清理插件
-        deletePlugin();
+        basePluginTestService.deleteJiraPlugin();
 
         // @@校验日志
         checkLog(addServiceIntegration.getId(), OperationLogType.DELETE);
@@ -319,28 +314,6 @@ public class ServiceIntegrationControllerTests extends BaseTest {
         requestGetPermissionTest(PermissionConstants.SYSTEM_SERVICE_INTEGRATION_DELETE, DEFAULT_DELETE, addServiceIntegration.getId());
     }
 
-
-    /**
-     * 添加插件，供测试使用
-     *
-     * @return
-     * @throws Exception
-     */
-    public Plugin addPlugin() throws Exception {
-        PluginUpdateRequest request = new PluginUpdateRequest();
-        File jarFile = new File(
-                this.getClass().getClassLoader().getResource("file/metersphere-jira-plugin-3.x.jar")
-                        .getPath()
-        );
-        FileInputStream inputStream = new FileInputStream(jarFile);
-        MockMultipartFile mockMultipartFile = new MockMultipartFile(jarFile.getName(), jarFile.getName(), "jar", inputStream);
-        request.setName("测试插件");
-        request.setGlobal(true);
-        request.setEnable(true);
-        request.setCreateUser(ADMIN.name());
-        return pluginService.add(request, mockMultipartFile);
-    }
-
     public void setPluginEnable(String pluginId, boolean enabled) {
         Plugin plugin = new Plugin();
         plugin.setId(pluginId);
@@ -354,23 +327,4 @@ public class ServiceIntegrationControllerTests extends BaseTest {
         plugin.setGlobal(global);
         pluginMapper.updateByPrimaryKeySelective(plugin);
     }
-
-    /**
-     * 删除插件
-     * @throws Exception
-     */
-    public void deletePlugin() {
-        pluginService.delete(plugin.getId());
-    }
-
-    @Getter
-    @Setter
-    public class JiraIntegrationConfig {
-        private String account;
-        private String password;
-        private String token;
-        private String authType;
-        private String address;
-        private String version;
-    }
 }
\ No newline at end of file