From b0153eb550c2f87eed778675c5317911d23a4577 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 25 Jun 2021 17:24:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0Jira=E4=BF=A1=E6=81=AF=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/base/domain/User.java |   5 +-
 .../metersphere/base/mapper/UserMapper.java   |   6 ++
 .../io/metersphere/base/mapper/UserMapper.xml |  83 +++++++++++++++++-
 .../controller/UserController.java            |   9 +-
 .../controller/request/BaseQueryRequest.java  |   2 +
 .../main/java/io/metersphere/dto/UserDTO.java |   8 ++
 .../io/metersphere/service/UserService.java   |  26 ++++++
 .../track/issue/AbstractIssuePlatform.java    |  10 ++-
 .../metersphere/track/issue/JiraPlatform.java |  57 +++++++-----
 .../request/testcase/IssuesUpdateRequest.java |   2 +
 .../db/migration/V89__v1.10.4_release.sql     |   3 +
 frontend/src/assets/tapd-user.png             | Bin 0 -> 25838 bytes
 .../settings/personal/JiraUserInfo.vue        |  29 ++++++
 .../settings/personal/PersonSetting.vue       |  56 ++++++++++--
 .../settings/personal/TapdUserInfo.vue        |  29 ++++++
 .../track/issue/IssueEditDetail.vue           |   3 +-
 frontend/src/network/organization.js          |  11 +++
 17 files changed, 296 insertions(+), 43 deletions(-)
 create mode 100644 frontend/src/assets/tapd-user.png
 create mode 100644 frontend/src/business/components/settings/personal/JiraUserInfo.vue
 create mode 100644 frontend/src/business/components/settings/personal/TapdUserInfo.vue
 create mode 100644 frontend/src/network/organization.js

diff --git a/backend/src/main/java/io/metersphere/base/domain/User.java b/backend/src/main/java/io/metersphere/base/domain/User.java
index 445efcd027..5f737458c9 100644
--- a/backend/src/main/java/io/metersphere/base/domain/User.java
+++ b/backend/src/main/java/io/metersphere/base/domain/User.java
@@ -1,8 +1,7 @@
 package io.metersphere.base.domain;
 
-import lombok.Data;
-
 import java.io.Serializable;
+import lombok.Data;
 
 @Data
 public class User implements Serializable {
@@ -34,5 +33,7 @@ public class User implements Serializable {
 
     private String createUser;
 
+    private String platformInfo;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/UserMapper.java b/backend/src/main/java/io/metersphere/base/mapper/UserMapper.java
index 286dd2ab87..61e121cd60 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/UserMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/UserMapper.java
@@ -16,15 +16,21 @@ public interface UserMapper {
 
     int insertSelective(User record);
 
+    List<User> selectByExampleWithBLOBs(UserExample example);
+
     List<User> selectByExample(UserExample example);
 
     User selectByPrimaryKey(String id);
 
     int updateByExampleSelective(@Param("record") User record, @Param("example") UserExample example);
 
+    int updateByExampleWithBLOBs(@Param("record") User record, @Param("example") UserExample example);
+
     int updateByExample(@Param("record") User record, @Param("example") UserExample example);
 
     int updateByPrimaryKeySelective(User record);
 
+    int updateByPrimaryKeyWithBLOBs(User record);
+
     int updateByPrimaryKey(User record);
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/UserMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/UserMapper.xml
index 846e717acb..448ca4dd36 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/UserMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/UserMapper.xml
@@ -17,6 +17,9 @@
     <result column="last_project_id" jdbcType="VARCHAR" property="lastProjectId" />
     <result column="create_user" jdbcType="VARCHAR" property="createUser" />
   </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.base.domain.User">
+    <result column="platform_info" jdbcType="LONGVARCHAR" property="platformInfo" />
+  </resultMap>
   <sql id="Example_Where_Clause">
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -79,6 +82,25 @@
     id, `name`, email, `password`, `status`, create_time, update_time, `language`, last_workspace_id, 
     last_organization_id, phone, `source`, last_project_id, create_user
   </sql>
+  <sql id="Blob_Column_List">
+    platform_info
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="io.metersphere.base.domain.UserExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from user
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
   <select id="selectByExample" parameterType="io.metersphere.base.domain.UserExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
@@ -93,9 +115,11 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
     select 
     <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
     from user
     where id = #{id,jdbcType=VARCHAR}
   </select>
@@ -114,12 +138,14 @@
       `password`, `status`, create_time, 
       update_time, `language`, last_workspace_id, 
       last_organization_id, phone, `source`, 
-      last_project_id, create_user)
+      last_project_id, create_user, platform_info
+      )
     values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, 
       #{password,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, 
       #{updateTime,jdbcType=BIGINT}, #{language,jdbcType=VARCHAR}, #{lastWorkspaceId,jdbcType=VARCHAR}, 
       #{lastOrganizationId,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, #{source,jdbcType=VARCHAR}, 
-      #{lastProjectId,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR})
+      #{lastProjectId,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{platformInfo,jdbcType=LONGVARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.User">
     insert into user
@@ -166,6 +192,9 @@
       <if test="createUser != null">
         create_user,
       </if>
+      <if test="platformInfo != null">
+        platform_info,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -210,6 +239,9 @@
       <if test="createUser != null">
         #{createUser,jdbcType=VARCHAR},
       </if>
+      <if test="platformInfo != null">
+        #{platformInfo,jdbcType=LONGVARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="io.metersphere.base.domain.UserExample" resultType="java.lang.Long">
@@ -263,11 +295,35 @@
       <if test="record.createUser != null">
         create_user = #{record.createUser,jdbcType=VARCHAR},
       </if>
+      <if test="record.platformInfo != null">
+        platform_info = #{record.platformInfo,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update user
+    set id = #{record.id,jdbcType=VARCHAR},
+      `name` = #{record.name,jdbcType=VARCHAR},
+      email = #{record.email,jdbcType=VARCHAR},
+      `password` = #{record.password,jdbcType=VARCHAR},
+      `status` = #{record.status,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=BIGINT},
+      update_time = #{record.updateTime,jdbcType=BIGINT},
+      `language` = #{record.language,jdbcType=VARCHAR},
+      last_workspace_id = #{record.lastWorkspaceId,jdbcType=VARCHAR},
+      last_organization_id = #{record.lastOrganizationId,jdbcType=VARCHAR},
+      phone = #{record.phone,jdbcType=VARCHAR},
+      `source` = #{record.source,jdbcType=VARCHAR},
+      last_project_id = #{record.lastProjectId,jdbcType=VARCHAR},
+      create_user = #{record.createUser,jdbcType=VARCHAR},
+      platform_info = #{record.platformInfo,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
   <update id="updateByExample" parameterType="map">
     update user
     set id = #{record.id,jdbcType=VARCHAR},
@@ -330,9 +386,30 @@
       <if test="createUser != null">
         create_user = #{createUser,jdbcType=VARCHAR},
       </if>
+      <if test="platformInfo != null">
+        platform_info = #{platformInfo,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.metersphere.base.domain.User">
+    update user
+    set `name` = #{name,jdbcType=VARCHAR},
+      email = #{email,jdbcType=VARCHAR},
+      `password` = #{password,jdbcType=VARCHAR},
+      `status` = #{status,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=BIGINT},
+      update_time = #{updateTime,jdbcType=BIGINT},
+      `language` = #{language,jdbcType=VARCHAR},
+      last_workspace_id = #{lastWorkspaceId,jdbcType=VARCHAR},
+      last_organization_id = #{lastOrganizationId,jdbcType=VARCHAR},
+      phone = #{phone,jdbcType=VARCHAR},
+      `source` = #{source,jdbcType=VARCHAR},
+      last_project_id = #{lastProjectId,jdbcType=VARCHAR},
+      create_user = #{createUser,jdbcType=VARCHAR},
+      platform_info = #{platformInfo,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
   <update id="updateByPrimaryKey" parameterType="io.metersphere.base.domain.User">
     update user
     set `name` = #{name,jdbcType=VARCHAR},
diff --git a/backend/src/main/java/io/metersphere/controller/UserController.java b/backend/src/main/java/io/metersphere/controller/UserController.java
index 0727925cc5..19279c4af9 100644
--- a/backend/src/main/java/io/metersphere/controller/UserController.java
+++ b/backend/src/main/java/io/metersphere/controller/UserController.java
@@ -145,14 +145,7 @@ public class UserController {
     @PostMapping("/update/current")
     @MsAuditLog(module = "personal_information_personal_settings", type = OperLogConstants.UPDATE, beforeEvent = "#msClass.getLogDetails(#user.id)", content = "#msClass.getLogDetails(#user.id)", msClass = UserService.class)
     public UserDTO updateCurrentUser(@RequestBody User user) {
-        String currentUserId = SessionUtils.getUserId();
-        if (!StringUtils.equals(currentUserId, user.getId())) {
-            MSException.throwException(Translator.get("not_authorized"));
-        }
-        userService.updateUser(user);
-        UserDTO userDTO = userService.getUserDTO(user.getId());
-        SessionUtils.putUser(SessionUser.fromUser(userDTO));
-        return SessionUtils.getUser();
+        return userService.updateCurrentUser(user);
     }
 
     @PostMapping("/switch/source/org/{sourceId}")
diff --git a/backend/src/main/java/io/metersphere/controller/request/BaseQueryRequest.java b/backend/src/main/java/io/metersphere/controller/request/BaseQueryRequest.java
index 439a407b6d..848698c806 100644
--- a/backend/src/main/java/io/metersphere/controller/request/BaseQueryRequest.java
+++ b/backend/src/main/java/io/metersphere/controller/request/BaseQueryRequest.java
@@ -16,6 +16,8 @@ public class BaseQueryRequest {
 
     private String workspaceId;
 
+    private String organizationId;
+
     private List<String> ids;
 
     private List<String> moduleIds;
diff --git a/backend/src/main/java/io/metersphere/dto/UserDTO.java b/backend/src/main/java/io/metersphere/dto/UserDTO.java
index 065e96def1..84132de6bf 100644
--- a/backend/src/main/java/io/metersphere/dto/UserDTO.java
+++ b/backend/src/main/java/io/metersphere/dto/UserDTO.java
@@ -21,4 +21,12 @@ public class UserDTO extends User {
 
     private static final long serialVersionUID = 1L;
 
+    @Getter
+    @Setter
+    public static class PlatformInfo {
+        private String  jiraAccount;
+        private String  jiraPassword;
+        private String  tapdUserName;
+    }
+
 }
diff --git a/backend/src/main/java/io/metersphere/service/UserService.java b/backend/src/main/java/io/metersphere/service/UserService.java
index c8a4197536..199a70a1f6 100644
--- a/backend/src/main/java/io/metersphere/service/UserService.java
+++ b/backend/src/main/java/io/metersphere/service/UserService.java
@@ -2,6 +2,7 @@ package io.metersphere.service;
 
 import com.alibaba.excel.EasyExcelFactory;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.*;
 import io.metersphere.base.mapper.ext.ExtOrganizationMapper;
@@ -1358,4 +1359,29 @@ public class UserService {
             }
         }
     }
+
+    public UserDTO updateCurrentUser(User user) {
+        String currentUserId = SessionUtils.getUserId();
+        if (!StringUtils.equals(currentUserId, user.getId())) {
+            MSException.throwException(Translator.get("not_authorized"));
+        }
+        updateUser(user);
+        UserDTO userDTO = getUserDTO(user.getId());
+        SessionUtils.putUser(SessionUser.fromUser(userDTO));
+        return SessionUtils.getUser();
+    }
+
+    public UserDTO.PlatformInfo getCurrentPlatformInfo(String orgId, String userId) {
+        User user = userMapper.selectByPrimaryKey(userId);
+        String platformInfoStr = user.getPlatformInfo();
+        if (StringUtils.isBlank(orgId) || StringUtils.isBlank(platformInfoStr)) {
+           return null;
+        }
+        JSONObject platformInfos = JSONObject.parseObject(platformInfoStr);
+        JSONObject platformInfo = platformInfos.getJSONObject(orgId);
+        if (platformInfo == null) {
+            return null;
+        }
+        return JSONObject.parseObject(JSONObject.toJSONString(platformInfo), UserDTO.PlatformInfo.class);
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java b/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
index 75d197cf07..c01dfd726d 100644
--- a/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/AbstractIssuePlatform.java
@@ -13,9 +13,11 @@ import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.controller.request.IntegrationRequest;
 import io.metersphere.dto.CustomFieldItemDTO;
+import io.metersphere.dto.UserDTO;
 import io.metersphere.service.IntegrationService;
 import io.metersphere.service.ProjectService;
 import io.metersphere.service.ResourceService;
+import io.metersphere.service.UserService;
 import io.metersphere.track.request.testcase.IssuesRequest;
 import io.metersphere.track.request.testcase.IssuesUpdateRequest;
 import io.metersphere.track.service.TestCaseService;
@@ -48,6 +50,7 @@ public abstract class AbstractIssuePlatform implements IssuesPlatform {
     protected ExtIssuesMapper extIssuesMapper;
     protected ResourceService resourceService;
     protected RestTemplate restTemplateIgnoreSSL;
+    protected UserService userService;
 
     protected String testCaseId;
     protected String projectId;
@@ -81,12 +84,13 @@ public abstract class AbstractIssuePlatform implements IssuesPlatform {
         this.testCaseIssuesMapper = CommonBeanFactory.getBean(TestCaseIssuesMapper.class);
         this.projectService = CommonBeanFactory.getBean(ProjectService.class);
         this.testCaseService = CommonBeanFactory.getBean(TestCaseService.class);
+        this.userService = CommonBeanFactory.getBean(UserService.class);
         this.issuesMapper = CommonBeanFactory.getBean(IssuesMapper.class);
         this.extIssuesMapper = CommonBeanFactory.getBean(ExtIssuesMapper.class);
         this.resourceService = CommonBeanFactory.getBean(ResourceService.class);
         this.testCaseId = issuesRequest.getTestCaseId();
         this.projectId = issuesRequest.getProjectId();
-        //
+
         this.restTemplateIgnoreSSL = restTemplate;
     }
 
@@ -191,4 +195,8 @@ public abstract class AbstractIssuePlatform implements IssuesPlatform {
         }
         return new ArrayList<>();
     }
+
+    protected UserDTO.PlatformInfo getUserPlatInfo(String orgId, String userId) {
+        return userService.getCurrentPlatformInfo(orgId, userId);
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java b/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
index ca6966626a..91ee591e56 100644
--- a/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/JiraPlatform.java
@@ -9,7 +9,9 @@ import io.metersphere.commons.constants.IssuesStatus;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.EncryptUtils;
 import io.metersphere.commons.utils.LogUtil;
+import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.dto.CustomFieldItemDTO;
+import io.metersphere.dto.UserDTO;
 import io.metersphere.track.dto.DemandDTO;
 import io.metersphere.track.issue.client.JiraClientV2;
 import io.metersphere.track.issue.domain.JiraAddIssueResponse;
@@ -44,13 +46,20 @@ public class JiraPlatform extends AbstractIssuePlatform {
         super(issuesRequest);
     }
 
-    public JiraConfig getConfig() {
+    public JiraConfig getConfig(String orgId) {
+        JiraConfig jiraConfig = null;
         String config = getPlatformConfig(IssuesManagePlatform.Jira.toString());
         if (StringUtils.isNotBlank(config)) {
-            return JSONObject.parseObject(config, JiraConfig.class);
-        } else {
-            return null;
+            jiraConfig = JSONObject.parseObject(config, JiraConfig.class);
+            UserDTO.PlatformInfo userPlatInfo = getUserPlatInfo(orgId, SessionUtils.getUserId());
+            if (userPlatInfo != null && StringUtils.isNotBlank(userPlatInfo.getJiraAccount())
+                    && StringUtils.isNotBlank(userPlatInfo.getJiraPassword())) {
+                jiraConfig.setAccount(userPlatInfo.getJiraAccount());
+                jiraConfig.setPassword(userPlatInfo.getJiraPassword());
+            }
         }
+        validateConfig(jiraConfig);
+        return jiraConfig;
     }
 
     @Override
@@ -64,7 +73,7 @@ public class JiraPlatform extends AbstractIssuePlatform {
         } else {
             issues = extIssuesMapper.getIssuesByCaseId(issuesRequest);
         }
-        setConfig();
+        setConfig(issuesRequest.getOrganizationId());
         issues.forEach(item -> {
             String issuesId = item.getId();
             parseIssue(item, jiraClientV2.getIssues(issuesId));
@@ -118,7 +127,7 @@ public class JiraPlatform extends AbstractIssuePlatform {
 
     @Override
     public void filter(List<IssuesDao> issues) {
-        setConfig();
+        setConfig(null);
         issues.forEach((issuesDao) -> {
             parseIssue(issuesDao, jiraClientV2.getIssues(issuesDao.getId()));
             if (StringUtils.isBlank(issuesDao.getId())) {
@@ -138,10 +147,7 @@ public class JiraPlatform extends AbstractIssuePlatform {
         List<DemandDTO> list = new ArrayList<>();
 
         try {
-            String key = this.getProjectId(projectId);
-            if (StringUtils.isBlank(key)) {
-                MSException.throwException("未关联Jira 项目Key");
-            }
+            String key = validateJiraKey(projectId);
             String config = getPlatformConfig(IssuesManagePlatform.Jira.toString());
             JSONObject object = JSON.parseObject(config);
 
@@ -186,25 +192,31 @@ public class JiraPlatform extends AbstractIssuePlatform {
         return list;
     }
 
-    @Override
-    public void addIssue(IssuesUpdateRequest issuesRequest) {
-        issuesRequest.setPlatform(IssuesManagePlatform.Jira.toString());
-
-        JiraConfig config = getConfig();
+    private void validateConfig(JiraConfig config) {
         jiraClientV2.setConfig(config);
-
         if (config == null) {
             MSException.throwException("jira config is null");
         }
         if (StringUtils.isBlank(config.getIssuetype())) {
             MSException.throwException("Jira 问题类型为空");
         }
+    }
 
-        String jiraKey = getProjectId(issuesRequest.getProjectId());
-
+    private String validateJiraKey(String projectId) {
+        String jiraKey = getProjectId(projectId);
         if (StringUtils.isBlank(jiraKey)) {
             MSException.throwException("未关联Jira 项目Key");
         }
+        return jiraKey;
+    }
+
+    @Override
+    public void addIssue(IssuesUpdateRequest issuesRequest) {
+        issuesRequest.setPlatform(IssuesManagePlatform.Jira.toString());
+
+        JiraConfig config = setConfig(issuesRequest.getOrganizationId());// todo
+
+        String jiraKey = validateJiraKey(issuesRequest.getProjectId());
 
         String content = issuesRequest.getDescription();
 
@@ -275,7 +287,7 @@ public class JiraPlatform extends AbstractIssuePlatform {
 
     @Override
     public void testAuth() {
-        setConfig();
+        setConfig(null);
         jiraClientV2.getIssueCreateMetadata();
     }
 
@@ -294,13 +306,14 @@ public class JiraPlatform extends AbstractIssuePlatform {
         return project.getJiraKey();
     }
 
-    public void setConfig() {
-        JiraConfig config = getConfig();
+    public JiraConfig setConfig(String orgId) {
+        JiraConfig config = getConfig(orgId);
         jiraClientV2.setConfig(config);
+        return config;
     }
 
     public IssuesWithBLOBs getJiraIssues(IssuesWithBLOBs issuesDao, String issueId) {
-        setConfig();
+        setConfig(null);
         if (issuesDao == null) {
             issuesDao = new IssuesDao();
         }
diff --git a/backend/src/main/java/io/metersphere/track/request/testcase/IssuesUpdateRequest.java b/backend/src/main/java/io/metersphere/track/request/testcase/IssuesUpdateRequest.java
index f84ccd2227..fff9f01bf0 100644
--- a/backend/src/main/java/io/metersphere/track/request/testcase/IssuesUpdateRequest.java
+++ b/backend/src/main/java/io/metersphere/track/request/testcase/IssuesUpdateRequest.java
@@ -11,6 +11,8 @@ import java.util.List;
 public class IssuesUpdateRequest extends IssuesWithBLOBs {
     private String content;
     private String testCaseId;
+    private String organizationId;
+
     private List<String> tapdUsers;
     /**
      * zentao bug 处理人
diff --git a/backend/src/main/resources/db/migration/V89__v1.10.4_release.sql b/backend/src/main/resources/db/migration/V89__v1.10.4_release.sql
index 5a5ef72dce..32812b5d53 100644
--- a/backend/src/main/resources/db/migration/V89__v1.10.4_release.sql
+++ b/backend/src/main/resources/db/migration/V89__v1.10.4_release.sql
@@ -4,3 +4,6 @@ ALTER TABLE api_scenario ADD version INT(10) DEFAULT 0 NULL COMMENT '版本号';
 ALTER TABLE load_test ADD scenario_version INT(10) DEFAULT 0 NULL COMMENT '关联的接口自动化版本号';
 
 ALTER TABLE load_test ADD scenario_id varchar(255) NULL COMMENT '关联的场景自动化ID';
+
+-- 对接Jira等平台认证信息
+ALTER TABLE `user` ADD platform_info LONGTEXT NULL COMMENT ' 其他平台对接信息';
diff --git a/frontend/src/assets/tapd-user.png b/frontend/src/assets/tapd-user.png
new file mode 100644
index 0000000000000000000000000000000000000000..97adec028020de61dae150e0884f50513a040faf
GIT binary patch
literal 25838
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

literal 0
HcmV?d00001

diff --git a/frontend/src/business/components/settings/personal/JiraUserInfo.vue b/frontend/src/business/components/settings/personal/JiraUserInfo.vue
new file mode 100644
index 0000000000..944ca4a100
--- /dev/null
+++ b/frontend/src/business/components/settings/personal/JiraUserInfo.vue
@@ -0,0 +1,29 @@
+<template>
+  <el-form label-position="right" label-width="100px" size="small">
+    <el-form-item :label="'Jira 信息'">
+      <ms-instructions-icon size="10" :content="'该信息为对接 Jira 的用户认证信息，若未填写，则使用组织中配置的默认信息'"/>
+    </el-form-item>
+    <el-form-item :label="'Jira ' + $t('organization.integration.account')" prop="account">
+      <el-input v-model="data.jiraAccount" :placeholder="$t('organization.integration.input_api_account')"/>
+    </el-form-item>
+    <el-form-item :label="'Jira ' + $t('organization.integration.password')" prop="password">
+      <el-input v-model="data.jiraPassword" auto-complete="new-password"
+                :placeholder="$t('organization.integration.input_api_password')" show-password/>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import MsInstructionsIcon from "@/business/components/common/components/MsInstructionsIcon";
+export default {
+  name: "JiraUserInfo",
+  components: {MsInstructionsIcon},
+  props: ['data'],
+}
+</script>
+
+<style scoped>
+.instructions-icon {
+  margin-left: -5px;
+}
+</style>
diff --git a/frontend/src/business/components/settings/personal/PersonSetting.vue b/frontend/src/business/components/settings/personal/PersonSetting.vue
index b64937b10d..4146d4586c 100644
--- a/frontend/src/business/components/settings/personal/PersonSetting.vue
+++ b/frontend/src/business/components/settings/personal/PersonSetting.vue
@@ -51,6 +51,8 @@
           <el-input v-model="form.phone" autocomplete="off"/>
         </el-form-item>
       </el-form>
+      <jira-user-info v-if="hasJira" :data="currentPlatformInfo"/>
+      <tapd-user-info v-if="hasTapd" :data="currentPlatformInfo"/>
       <template v-slot:footer>
         <ms-dialog-footer
           @cancel="updateVisible = false"
@@ -79,20 +81,27 @@
         </span>
     </el-dialog>
 
-
   </div>
 </template>
 
 <script>
 import {TokenKey} from "../../../../common/js/constants";
 import MsDialogFooter from "../../common/components/MsDialogFooter";
-import {getCurrentUser, listenGoBack, removeGoBackListener} from "../../../../common/js/utils";
+import {
+  getCurrentOrganizationId,
+  getCurrentUser,
+  listenGoBack,
+  removeGoBackListener
+} from "../../../../common/js/utils";
 import MsTableOperatorButton from "../../common/components/MsTableOperatorButton";
 import {EMAIL_REGEX, PHONE_REGEX} from "@/common/js/regex";
+import JiraUserInfo from "@/business/components/settings/personal/JiraUserInfo";
+import TapdUserInfo from "@/business/components/settings/personal/TapdUserInfo";
+import {getIntegrationService} from "@/network/organization";
 
 export default {
   name: "MsPersonSetting",
-  components: {MsDialogFooter, MsTableOperatorButton},
+  components: {TapdUserInfo, JiraUserInfo, MsDialogFooter, MsTableOperatorButton},
   inject: [
     'reload'
   ],
@@ -105,8 +114,15 @@ export default {
       tableData: [],
       updatePath: '/user/update/current',
       updatePasswordPath: '/user/update/password',
-      form: {},
+      form: {platformInfo: {}},
+      currentPlatformInfo: {
+        jiraAccount: '',
+        jiraPassword: '',
+        tapdUserName: ''
+      },
       ruleForm: {},
+      hasJira: false,
+      hasTapd: false,
       rule: {
         name: [
           {required: true, message: this.$t('member.input_name'), trigger: 'blur'},
@@ -168,11 +184,36 @@ export default {
     currentUser: () => {
       return getCurrentUser();
     },
-    edit(row) {
+    edit: function (row) {
       this.updateVisible = true;
       this.form = Object.assign({}, row);
+      this.getPlatformInfo(row);
       listenGoBack(this.handleClose);
     },
+    getPlatformInfo(row) {
+      if (row.platformInfo) {
+        this.form.platformInfo = JSON.parse(row.platformInfo);
+      } else {
+        this.form.platformInfo = {};
+      }
+      let orgId = getCurrentOrganizationId();
+      if (!this.form.platformInfo[orgId]) {
+        this.form.platformInfo[orgId] = {};
+      }
+      this.currentPlatformInfo = this.form.platformInfo[orgId];
+      this.result = getIntegrationService((data) => {
+        let platforms = data.map(d => d.platform);
+        if (platforms.indexOf("Tapd") !== -1) {
+          this.hasTapd = true;
+        }
+        if (platforms.indexOf("Jira") !== -1) {
+          this.hasJira = true;
+        }
+        // if (platforms.indexOf("Zentao") !== -1) {
+        //   this.zentao = true;
+        // }
+      });
+    },
     editPassword(row) {
       this.editPasswordVisible = true;
       listenGoBack(this.handleClose);
@@ -190,7 +231,10 @@ export default {
     updateUser(updateUserForm) {
       this.$refs[updateUserForm].validate(valid => {
         if (valid) {
-          this.result = this.$post(this.updatePath, this.form, response => {
+          let param = {};
+          Object.assign(param, this.form);
+          param.platformInfo = JSON.stringify(this.form.platformInfo);
+          this.result = this.$post(this.updatePath, param, response => {
             this.$success(this.$t('commons.modify_success'));
             localStorage.setItem(TokenKey, JSON.stringify(response.data));
             this.updateVisible = false;
diff --git a/frontend/src/business/components/settings/personal/TapdUserInfo.vue b/frontend/src/business/components/settings/personal/TapdUserInfo.vue
new file mode 100644
index 0000000000..727b22f9ca
--- /dev/null
+++ b/frontend/src/business/components/settings/personal/TapdUserInfo.vue
@@ -0,0 +1,29 @@
+<template>
+  <el-form label-position="right" label-width="100px" size="small">
+    <el-form-item :label="'Tapd 昵称'">
+      <ms-instructions-icon size="10" effect="light">
+        <template>
+          <img class="jira-image" src="../../../../assets/tapd-user.png"/>
+        </template>
+      </ms-instructions-icon>
+    </el-form-item>
+    <el-form-item :label="'Tapd 昵称'" prop="account">
+      <el-input v-model="data.tapdUserName" :placeholder="$t('organization.integration.input_api_account')"/>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import MsInstructionsIcon from "@/business/components/common/components/MsInstructionsIcon";
+export default {
+  name: "TapdUserInfo",
+  components: {MsInstructionsIcon},
+  props: ['data'],
+}
+</script>
+
+<style scoped>
+.instructions-icon {
+  margin-left: -5px;
+}
+</style>
diff --git a/frontend/src/business/components/track/issue/IssueEditDetail.vue b/frontend/src/business/components/track/issue/IssueEditDetail.vue
index 62cf19237a..927f4ed6a4 100644
--- a/frontend/src/business/components/track/issue/IssueEditDetail.vue
+++ b/frontend/src/business/components/track/issue/IssueEditDetail.vue
@@ -76,7 +76,7 @@ import {buildCustomFields, getTemplate, parseCustomField} from "@/common/js/cust
 import CustomFiledComponent from "@/business/components/settings/workspace/template/CustomFiledComponent";
 import TestCaseIssueList from "@/business/components/track/issue/TestCaseIssueList";
 import IssueEditDetail from "@/business/components/track/issue/IssueEditDetail";
-import {getCurrentProjectID, getCurrentUserId} from "@/common/js/utils";
+import {getCurrentOrganizationId, getCurrentProjectID, getCurrentUserId} from "@/common/js/utils";
 import {getIssueTemplate} from "@/network/custom-field-template";
 
 export default {
@@ -234,6 +234,7 @@ export default {
       let param = {};
       Object.assign(param, this.form);
       param.projectId = this.projectId;
+      param.organizationId = getCurrentOrganizationId();
       buildCustomFields(this.form, param, this.issueTemplate);
       if (this.isPlan) {
         param.testCaseIds = [this.caseId];
diff --git a/frontend/src/network/organization.js b/frontend/src/network/organization.js
new file mode 100644
index 0000000000..bc79527ae9
--- /dev/null
+++ b/frontend/src/network/organization.js
@@ -0,0 +1,11 @@
+import {getCurrentOrganizationId} from "@/common/js/utils";
+import {get} from "@/common/js/ajax";
+
+export function getIntegrationService(success) {
+  return get("/service/integration/all/" + getCurrentOrganizationId(), response => {
+    let data = response.data;
+    if (success) {
+      success(response.data);
+    }
+  });
+}