From eceb099545b5b071807eccacba048275738f8c83 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 20 Aug 2020 18:16:28 +0800
Subject: [PATCH] =?UTF-8?q?feactor:=20=E7=94=A8=E6=88=B7ID=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ext/ExtTestPlanTestCaseMapper.xml  |  2 +-
 .../components/common/head/HeaderOrgWs.vue    |  4 +--
 .../organization/OrganizationMember.vue       |  4 +--
 .../organization/OrganizationWorkspace.vue    |  6 ++--
 .../settings/personal/PersonSetting.vue       |  2 +-
 .../settings/system/Organization.vue          |  6 ++--
 .../settings/system/SystemWorkspace.vue       |  6 ++--
 .../components/settings/system/User.vue       | 30 ++++++++++---------
 .../settings/workspace/WorkspaceMember.vue    |  4 +--
 9 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
index f746ae4f57..938936e64d 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
@@ -115,7 +115,7 @@
     </select>
 
     <select id="list" resultType="io.metersphere.track.dto.TestPlanCaseDTO">
-        select test_case.remark, test_plan_test_case.*,test_case.*,test_case_node.name as model
+        select test_case.remark, test_plan_test_case.id as id, test_plan_test_case.*,test_case.*,test_case_node.name as model
         from test_plan_test_case
         inner join test_case on test_plan_test_case.case_id = test_case.id left join test_case_node on
         test_case_node.id=test_case.node_id
diff --git a/frontend/src/business/components/common/head/HeaderOrgWs.vue b/frontend/src/business/components/common/head/HeaderOrgWs.vue
index 82ed993072..d91a800ecc 100644
--- a/frontend/src/business/components/common/head/HeaderOrgWs.vue
+++ b/frontend/src/business/components/common/head/HeaderOrgWs.vue
@@ -64,7 +64,7 @@
     methods: {
       initMenuData() {
         if (hasRoles(ROLE_ORG_ADMIN, ROLE_TEST_VIEWER, ROLE_TEST_USER, ROLE_TEST_MANAGER)) {
-          this.$get("/organization/list/userorg/" + this.currentUserId, response => {
+          this.$get("/organization/list/userorg/" + encodeURIComponent(this.currentUserId), response => {
             let data = response.data;
             this.organizationList = data;
             let org = data.filter(r => r.id === this.currentUser.lastOrganizationId);
@@ -93,7 +93,7 @@
         }
       },
       getCurrentUserInfo() {
-        this.$get("/user/info/" + this.currentUserId, response => {
+        this.$get("/user/info/" + encodeURIComponent(this.currentUserId), response => {
           this.currentUserInfo = response.data;
         })
       },
diff --git a/frontend/src/business/components/settings/organization/OrganizationMember.vue b/frontend/src/business/components/settings/organization/OrganizationMember.vue
index efb5ba166f..0f22f54054 100644
--- a/frontend/src/business/components/settings/organization/OrganizationMember.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationMember.vue
@@ -163,7 +163,7 @@
           this.tableData = data.listObject;
           let url = "/userrole/list/org/" + this.currentUser().lastOrganizationId;
           for (let i = 0; i < this.tableData.length; i++) {
-            this.$get(url + "/" + this.tableData[i].id, response => {
+            this.$get(url + "/" + encodeURIComponent(this.tableData[i].id), response => {
               let roles = response.data;
               this.$set(this.tableData[i], "roles", roles);
             })
@@ -217,7 +217,7 @@
           cancelButtonText: this.$t('commons.cancel'),
           type: 'warning'
         }).then(() => {
-          this.result = this.$get('/user/org/member/delete/' + this.currentUser().lastOrganizationId + '/' + row.id, () => {
+          this.result = this.$get('/user/org/member/delete/' + this.currentUser().lastOrganizationId + '/' + encodeURIComponent(row.id), () => {
             this.$success(this.$t('commons.remove_success'));
             this.initTableData();
           });
diff --git a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
index b418029a0f..964f4d41b9 100644
--- a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
@@ -316,7 +316,7 @@
           let url = "/userrole/list/ws/" + row.id;
           // 填充角色信息
           for (let i = 0; i < this.memberLineData.length; i++) {
-            this.$get(url + "/" + this.memberLineData[i].id, response => {
+            this.$get(url + "/" + encodeURIComponent(this.memberLineData[i].id), response => {
               let roles = response.data;
               this.$set(this.memberLineData[i], "roles", roles);
             })
@@ -336,7 +336,7 @@
           let url = "/userrole/list/ws/" + row.id;
           // 填充角色信息
           for (let i = 0; i < this.memberLineData.length; i++) {
-            this.$get(url + "/" + this.memberLineData[i].id, response => {
+            this.$get(url + "/" + encodeURIComponent(this.memberLineData[i].id), response => {
               let roles = response.data;
               this.$set(this.memberLineData[i], "roles", roles);
             })
@@ -393,7 +393,7 @@
           cancelButtonText: this.$t('commons.cancel'),
           type: 'warning'
         }).then(() => {
-          this.result = this.$get('/user/ws/member/delete/' + this.currentWorkspaceRow.id + '/' + row.id, () => {
+          this.result = this.$get('/user/ws/member/delete/' + this.currentWorkspaceRow.id + '/' + encodeURIComponent(row.id), () => {
             this.$success(this.$t('commons.remove_success'));
             this.cellClick(this.currentWorkspaceRow);
           });
diff --git a/frontend/src/business/components/settings/personal/PersonSetting.vue b/frontend/src/business/components/settings/personal/PersonSetting.vue
index 038e56af30..dfc56780d0 100644
--- a/frontend/src/business/components/settings/personal/PersonSetting.vue
+++ b/frontend/src/business/components/settings/personal/PersonSetting.vue
@@ -216,7 +216,7 @@
         })
       },
       initTableData() {
-        this.result = this.$get("/user/info/" + this.currentUser().id, response => {
+        this.result = this.$get("/user/info/" + encodeURIComponent(this.currentUser().id), response => {
           let data = response.data;
           this.isLdapUser = response.data.source === 'LDAP' ? true : false;
           let dataList = [];
diff --git a/frontend/src/business/components/settings/system/Organization.vue b/frontend/src/business/components/settings/system/Organization.vue
index 695c52153f..e6cf183b63 100644
--- a/frontend/src/business/components/settings/system/Organization.vue
+++ b/frontend/src/business/components/settings/system/Organization.vue
@@ -298,7 +298,7 @@
           this.memberLineData = data.listObject;
           let url = "/userrole/list/org/" + row.id;
           for (let i = 0; i < this.memberLineData.length; i++) {
-            this.$get(url + "/" + this.memberLineData[i].id, response => {
+            this.$get(url + "/" + encodeURIComponent(this.memberLineData[i].id), response => {
               let roles = response.data;
               this.$set(this.memberLineData[i], "roles", roles);
             })
@@ -318,7 +318,7 @@
           this.memberLineData = data.listObject;
           let url = "/userrole/list/org/" + row.id;
           for (let i = 0; i < this.memberLineData.length; i++) {
-            this.$get(url + "/" + this.memberLineData[i].id, response => {
+            this.$get(url + "/" + encodeURIComponent(this.memberLineData[i].id), response => {
               let roles = response.data;
               this.$set(this.memberLineData[i], "roles", roles);
             })
@@ -358,7 +358,7 @@
           cancelButtonText: this.$t('commons.cancel'),
           type: 'warning'
         }).then(() => {
-          this.result = this.$get('/user/special/org/member/delete/' + this.currentRow.id + '/' + row.id, () => {
+          this.result = this.$get('/user/special/org/member/delete/' + this.currentRow.id + '/' +  encodeURIComponent(row.id), () => {
             let sourceId = this.currentRow.id;
             let currentUser = getCurrentUser();
             let userId = row.id;
diff --git a/frontend/src/business/components/settings/system/SystemWorkspace.vue b/frontend/src/business/components/settings/system/SystemWorkspace.vue
index cdb8a365db..6d24acbea8 100644
--- a/frontend/src/business/components/settings/system/SystemWorkspace.vue
+++ b/frontend/src/business/components/settings/system/SystemWorkspace.vue
@@ -274,7 +274,7 @@
           let url = "/userrole/list/ws/" + row.id;
           // 填充角色信息
           for (let i = 0; i < this.memberLineData.length; i++) {
-            this.$get(url + "/" + this.memberLineData[i].id, response => {
+            this.$get(url + "/" + encodeURIComponent(this.memberLineData[i].id), response => {
               let roles = response.data;
               this.$set(this.memberLineData[i], "roles", roles);
             })
@@ -295,7 +295,7 @@
           let url = "/userrole/list/ws/" + row.id;
           // 填充角色信息
           for (let i = 0; i < this.memberLineData.length; i++) {
-            this.$get(url + "/" + this.memberLineData[i].id, response => {
+            this.$get(url + "/" + encodeURIComponent(this.memberLineData[i].id), response => {
               let roles = response.data;
               this.$set(this.memberLineData[i], "roles", roles);
             })
@@ -421,7 +421,7 @@
           cancelButtonText: this.$t('commons.cancel'),
           type: 'warning'
         }).then(() => {
-          this.result = this.$get('/user/special/ws/member/delete/' + this.currentWorkspaceRow.id + '/' + row.id, () => {
+          this.result = this.$get('/user/special/ws/member/delete/' + this.currentWorkspaceRow.id + '/' + encodeURIComponent(row.id), () => {
             let sourceId = this.currentWorkspaceRow.id;
             let userId = row.id;
             let user = getCurrentUser();
diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue
index 292511d927..14dd1aeb3d 100644
--- a/frontend/src/business/components/settings/system/User.vue
+++ b/frontend/src/business/components/settings/system/User.vue
@@ -342,7 +342,6 @@
             {min: 2, max: 50, message: this.$t('commons.input_limit', [2, 50]), trigger: 'blur'},
             {
               required: true,
-              pattern: /^[a-zA-Z0-9]+$/,
               message: this.$t('user.special_characters_are_not_supported'),
               trigger: 'blur'
             }
@@ -352,7 +351,6 @@
             {min: 2, max: 50, message: this.$t('commons.input_limit', [2, 50]), trigger: 'blur'},
             {
               required: true,
-              pattern: /^[\u4e00-\u9fa5_a-zA-Z0-9.·-]+$/,
               message: this.$t('user.special_characters_are_not_supported'),
               trigger: 'blur'
             }
@@ -415,10 +413,12 @@
         this.$get("/workspace/list", response => {
           this.$set(this.form, "wsList", response.data);
         });
-        this.$get('/userrole/all/' + row.id, response => {
-          let data = response.data;
-          this.$set(this.form, "roles", data);
-        });
+        if (row.id) {
+          this.$get('/userrole/all/' + encodeURIComponent(row.id), response => {
+            let data = response.data;
+            this.$set(this.form, "roles", data);
+          });
+        }
         listenGoBack(this.handleClose);
       },
       editPassword(row) {
@@ -432,7 +432,7 @@
           cancelButtonText: this.$t('commons.cancel'),
           type: 'warning'
         }).then(() => {
-          this.result = this.$get(this.deletePath + row.id, () => {
+          this.result = this.$get(this.deletePath + encodeURIComponent(row.id), () => {
             this.$success(this.$t('commons.delete_success'));
             this.search();
           });
@@ -487,13 +487,15 @@
           this.tableData = data.listObject;
           let url = "/user/special/user/role";
           for (let i = 0; i < this.tableData.length; i++) {
-            this.$get(url + '/' + this.tableData[i].id, result => {
-              let data = result.data;
-              let roles = data.roles;
-              // let userRoles = result.userRoles;
-              this.$set(this.tableData[i], "roles", roles);
-              this.$set(this.tableData[i], "isLdapUser", this.tableData[i].source === 'LDAP');
-            });
+            if (this.tableData[i].id) {
+              this.$get(url + '/' + encodeURIComponent(this.tableData[i].id), result => {
+                let data = result.data;
+                let roles = data.roles;
+                // let userRoles = result.userRoles;
+                this.$set(this.tableData[i], "roles", roles);
+                this.$set(this.tableData[i], "isLdapUser", this.tableData[i].source === 'LDAP');
+              });
+            }
           }
         })
       },
diff --git a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
index 293b12f4da..ce1a365fa0 100644
--- a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
+++ b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
@@ -159,7 +159,7 @@
           this.tableData = data.listObject;
           let url = "/userrole/list/ws/" + this.currentUser().lastWorkspaceId;
           for (let i = 0; i < this.tableData.length; i++) {
-            this.$get(url + "/" + this.tableData[i].id, response => {
+            this.$get(url + "/" + encodeURIComponent(this.tableData[i].id), response => {
               let roles = response.data;
               this.$set(this.tableData[i], "roles", roles);
             })
@@ -183,7 +183,7 @@
           cancelButtonText: this.$t('commons.cancel'),
           type: 'warning'
         }).then(() => {
-          this.result = this.$get('/user/ws/member/delete/' + this.currentUser().lastWorkspaceId + '/' + row.id,() => {
+          this.result = this.$get('/user/ws/member/delete/' + this.currentUser().lastWorkspaceId + '/' + encodeURIComponent(row.id),() => {
             this.$success(this.$t('commons.remove_success'));
             this.initTableData();
           });