From 0109e0a8481e30a8d4d7f9a720b164c2810c5ed4 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Thu, 18 Mar 2021 15:22:17 +0800
Subject: [PATCH 01/11] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DSQL=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E8=AF=A6=E6=83=85=E6=B2=A1=E6=9C=89=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E5=88=B0=E6=8E=A7=E5=88=B6=E5=8F=B0=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/handler/RestControllerExceptionHandler.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/controller/handler/RestControllerExceptionHandler.java b/backend/src/main/java/io/metersphere/controller/handler/RestControllerExceptionHandler.java
index b81d91fafe..3228880f97 100644
--- a/backend/src/main/java/io/metersphere/controller/handler/RestControllerExceptionHandler.java
+++ b/backend/src/main/java/io/metersphere/controller/handler/RestControllerExceptionHandler.java
@@ -35,7 +35,7 @@ public class RestControllerExceptionHandler {
     @ExceptionHandler(SQLException.class)
     public ResultHolder sqlExceptionHandler(HttpServletRequest request, HttpServletResponse response, SQLException e) {
         response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
-        LogUtil.error(e);
+        LogUtil.error(e.getMessage(), e);
         return ResultHolder.error("SQL error happened, please check logs.");
     }
 

From 13adca8f578140af4cec69d15b7f14a00158a4cf Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 18 Mar 2021 16:05:08 +0800
Subject: [PATCH 02/11] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E6=8E=A5=E5=8F=A3=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E6=97=B6=E5=88=9D=E5=A7=8B=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/definition/components/case/ApiCaseList.vue          | 6 ++++--
 .../components/api/definition/components/list/ApiList.vue   | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
index 5318d26e01..be73f0e974 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
@@ -222,7 +222,9 @@
           }
 
           this.result = this.$post("/api/testcase/list", this.condition, response => {
-            this.apiCaseList = response.data;
+            if(response.data){
+              this.apiCaseList = response.data;
+            }
             this.apiCaseList.forEach(apiCase => {
               if (apiCase.tags && apiCase.tags.length > 0) {
                 apiCase.tags = JSON.parse(apiCase.tags);
@@ -236,7 +238,7 @@
               }
 
             })
-            if (!this.useEnvironment && this.apiCaseList[0].request && this.apiCaseList[0].request.useEnvironment) {
+            if (!this.useEnvironment && this.apiCaseList[0] && this.apiCaseList[0].request && this.apiCaseList[0].request.useEnvironment) {
               this.useEnvironment = this.apiCaseList[0].request.useEnvironment;
               this.environment = this.useEnvironment;
             }
diff --git a/frontend/src/business/components/api/definition/components/list/ApiList.vue b/frontend/src/business/components/api/definition/components/list/ApiList.vue
index 3ae913db9d..cdc386be99 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -524,7 +524,8 @@ export default {
       this.$emit('editApi', row);
     },
     runApi(row) {
-      let request = JSON.parse(row.request);
+
+      let request = row ? JSON.parse(row.request) : {};
       if (row.tags instanceof Array) {
         row.tags = JSON.stringify(row.tags);
       }

From e8fd3f1847080af9c33435f40f9d53665ff15b76 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Thu, 18 Mar 2021 16:10:38 +0800
Subject: [PATCH 03/11] =?UTF-8?q?fix:=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/service/TestCaseReviewService.java     |  4 ++--
 .../definition/components/import/ApiImport.vue   | 16 ++++++++++++----
 .../components/common/head/HeaderCustom.vue      |  4 ++--
 frontend/src/i18n/en-US.js                       | 11 +++++++++--
 frontend/src/i18n/zh-CN.js                       | 11 +++++++++--
 frontend/src/i18n/zh-TW.js                       | 12 ++++++++++--
 6 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
index 3cff08ec4e..3a6d74178e 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
@@ -377,7 +377,7 @@ public class TestCaseReviewService {
 
         sqlSession.flushStatements();
         //同步添加关联的接口和测试用例
-        if(request.getChecked()){
+     /*   if(request.getChecked()){
             if (!testCaseIds.isEmpty()) {
                 testCaseIds.forEach(caseId -> {
                     TestCaseWithBLOBs testDtail=testCaseMapper.selectByPrimaryKey(caseId);
@@ -434,7 +434,7 @@ public class TestCaseReviewService {
 
                 });
             }
-        }
+        }*/
         TestCaseReview testCaseReview = testCaseReviewMapper.selectByPrimaryKey(request.getReviewId());
         if (StringUtils.equals(testCaseReview.getStatus(), TestCaseReviewStatus.Prepare.name())
                 || StringUtils.equals(testCaseReview.getStatus(), TestCaseReviewStatus.Completed.name())) {
diff --git a/frontend/src/business/components/api/definition/components/import/ApiImport.vue b/frontend/src/business/components/api/definition/components/import/ApiImport.vue
index 9d55688bb7..4a21594921 100644
--- a/frontend/src/business/components/api/definition/components/import/ApiImport.vue
+++ b/frontend/src/business/components/api/definition/components/import/ApiImport.vue
@@ -1,6 +1,7 @@
 <template>
   <el-dialog :close-on-click-modal="false" :title="$t('api_test.api_import.title')" width="30%"
-             :visible.sync="visible" class="api-import" v-loading="result.loading" @close="close">
+             :visible.sync="visible" class="api-import" v-loading="result.loading" @close="close"
+             :destroy-on-close="true">
 
     <div class="header-bar">
       <div>{{ $t('api_test.api_import.data_format') }}</div>
@@ -23,12 +24,12 @@
     <el-form :model="formData" :rules="rules" label-width="100px" v-loading="result.loading" ref="form">
       <el-row>
         <el-col :span="11">
-          <el-form-item :label="$t('commons.import_module')">
+          <el-form-item :label="$t('commons.import_module')" prop="moduleId">
             <el-select size="small" v-model="formData.moduleId" class="project-select" clearable>
               <el-option v-for="item in moduleOptions" :key="item.id" :label="item.path" :value="item.id"/>
             </el-select>
           </el-form-item>
-          <el-form-item v-if="!isScenarioModel&&!isHar" :label="$t('commons.import_mode')">
+          <el-form-item v-if="!isScenarioModel&&!isHar" :label="$t('commons.import_mode')" prop="modeId">
             <el-select size="small" v-model="formData.modeId" class="project-select" clearable>
               <el-option v-for="item in modeOptions" :key="item.id" :label="item.name" :value="item.id"/>
             </el-select>
@@ -167,7 +168,14 @@ export default {
         modeId: this.$t('commons.not_cover'),
         moduleId: '',
       },
-      rules: {},
+      rules: {
+        modeId: [
+          {required: true, message: this.$t('commons.please_select_import_mode'), trigger: 'change'},
+        ],
+        moduleId: [
+          {required: true, message: this.$t('commons.please_select_import_module'), trigger: 'change'},
+        ],
+      },
       currentModule: {},
       fileList: []
     }
diff --git a/frontend/src/business/components/common/head/HeaderCustom.vue b/frontend/src/business/components/common/head/HeaderCustom.vue
index c99050641c..228bfff28a 100644
--- a/frontend/src/business/components/common/head/HeaderCustom.vue
+++ b/frontend/src/business/components/common/head/HeaderCustom.vue
@@ -1,6 +1,6 @@
 <template>
-  <el-dialog title="表头显示字段" :visible.sync="dialogTableVisible"  :append-to-body="true">
-    <tree-transfer :title="['待选字段', '已选字段']"
+  <el-dialog :title="$t('table.header_display_field')" :visible.sync="dialogTableVisible" :append-to-body="true">
+    <tree-transfer :title="[$t('table.fields_to_be_selected'), $t('table.selected_fields')]"
                    :from_data='optionalFields'
                    :draggable="true"
                    :to_data='fieldSelected'
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index fb3594604d..86cff09907 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -1,7 +1,9 @@
 export default {
   commons: {
-    pass_rate:'Pass rate',
-    execution_times:'Execution times',
+    please_select_import_mode: 'Please select import mode',
+    please_select_import_module: 'Please select import module',
+    pass_rate: 'Pass rate',
+    execution_times: 'Execution times',
     cover: 'Cover',
     not_cover: 'Not Cover',
     import: 'Import',
@@ -1608,5 +1610,10 @@ export default {
     delete_prompt: 'This operation will delete the authentication source, do you want to continue? ',
     title: 'Auth Source',
     auth_name_valid: 'Name does not support special characters',
+  },
+  table: {
+    header_display_field: 'Header display field',
+    fields_to_be_selected: 'Fields to be selected',
+    selected_fields: 'Selected fields'
   }
 };
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index baac535903..e4d609b0af 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1,7 +1,9 @@
 export default {
   commons: {
-    pass_rate:'通过率',
-    execution_times:'执行次数',
+    please_select_import_mode: '请选择导入模式',
+    please_select_import_module: '请选择导入模块',
+    pass_rate: '通过率',
+    execution_times: '执行次数',
     cover: '覆盖',
     not_cover: '不覆盖',
     import: '导入',
@@ -1611,5 +1613,10 @@ export default {
     delete_prompt: '此操作会删除认证源，是否继续？',
     title: '认证设置',
     auth_name_valid: '名称不支持特殊字符',
+  },
+  table: {
+    header_display_field: '表头显示字段',
+    fields_to_be_selected: '待选字段',
+    selected_fields: '已选字段'
   }
 };
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index c939f1bd90..c28d257f3d 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -1,7 +1,9 @@
 export default {
   commons: {
-    pass_rate:'通過率',
-    execution_times:'執行次數',
+    please_select_import_mode: '請選擇導入模式',
+    please_select_import_module: '請選擇導入模塊',
+    pass_rate: '通過率',
+    execution_times: '執行次數',
     cover: '覆蓋',
     not_cover: '不覆蓋',
     import: '導入',
@@ -1609,5 +1611,11 @@ export default {
     delete_prompt: '此操作會刪除認證源，是否繼續？ ',
     title: '認證設置',
     auth_name_valid: '名稱不支持特殊字符',
+  },
+  table: {
+    header_display_field: '表頭顯示欄位',
+    fields_to_be_selected: '待選欄位',
+    selected_fields: '已選欄位'
   }
+
 };

From 095424a8099b0f7dd8033990988081742761668f Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 18 Mar 2021 16:11:00 +0800
Subject: [PATCH 04/11] =?UTF-8?q?fix(=E5=9C=BA=E6=99=AF=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/api/service/ApiAutomationService.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index 9da3974953..6ac27b6001 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -332,8 +332,10 @@ public class ApiAutomationService {
     public ApiScenarioDTO getApiScenario(String id) {
         ApiScenarioDTO apiScenarioDTO = new ApiScenarioDTO();
         ApiScenarioWithBLOBs scenarioWithBLOBs = apiScenarioMapper.selectByPrimaryKey(id);
-        BeanUtils.copyBean(apiScenarioDTO, scenarioWithBLOBs);
-        setApiScenarioProjectIds(apiScenarioDTO);
+        if (scenarioWithBLOBs != null) {
+            BeanUtils.copyBean(apiScenarioDTO, scenarioWithBLOBs);
+            setApiScenarioProjectIds(apiScenarioDTO);
+        }
         return apiScenarioDTO;
     }
 

From 0ba062f00855a50daef9fda7e822e5670ca74cf8 Mon Sep 17 00:00:00 2001
From: Ambitiousliga <73278880+Ambitiousliga@users.noreply.github.com>
Date: Thu, 18 Mar 2021 16:11:20 +0800
Subject: [PATCH 05/11] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95)?=
 =?UTF-8?q?:=E4=BD=BFXPath=E6=96=AD=E8=A8=80=E8=A7=84=E5=88=99=E7=9A=84?=
 =?UTF-8?q?=E8=A1=A8=E8=BE=BE=E5=BC=8F=E8=83=BD=E6=8E=A5=E6=94=B6=E6=9B=B4?=
 =?UTF-8?q?=E9=95=BF=E7=9A=84=E5=AD=97=E7=AC=A6=20(#1661)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
---
 .../api/definition/components/assertion/ApiAssertionXPath2.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/api/definition/components/assertion/ApiAssertionXPath2.vue b/frontend/src/business/components/api/definition/components/assertion/ApiAssertionXPath2.vue
index c134f9faea..1c686b3afe 100644
--- a/frontend/src/business/components/api/definition/components/assertion/ApiAssertionXPath2.vue
+++ b/frontend/src/business/components/api/definition/components/assertion/ApiAssertionXPath2.vue
@@ -2,7 +2,7 @@
   <div>
     <el-row :gutter="10" type="flex" justify="space-between" align="middle">
       <el-col>
-        <el-input :disabled="isReadOnly" v-model="xPath2.expression" maxlength="200" size="small" show-word-limit
+        <el-input :disabled="isReadOnly" v-model="xPath2.expression" maxlength="500" size="small" show-word-limit
                   :placeholder="$t('api_test.request.extract.xpath_expression')"/>
       </el-col>
       <el-col class="assertion-btn">

From af5a0edfe278f4bb7a224ba96dea0dd50638d653 Mon Sep 17 00:00:00 2001
From: Ambitiousliga <73278880+Ambitiousliga@users.noreply.github.com>
Date: Thu, 18 Mar 2021 16:12:08 +0800
Subject: [PATCH 06/11] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE)?=
 =?UTF-8?q?:=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E6=97=B6=E5=A2=9E=E5=8A=A0=E7=A1=AE=E8=AE=A4=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E6=A1=86=20(#1662)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
---
 .../components/settings/system/User.vue       | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue
index 3f9da0158a..be2f32c869 100644
--- a/frontend/src/business/components/settings/system/User.vue
+++ b/frontend/src/business/components/settings/system/User.vue
@@ -330,6 +330,9 @@
         <el-form-item :label="$t('member.new_password')" prop="newpassword">
           <el-input type="password" v-model="ruleForm.newpassword" autocomplete="off" show-password></el-input>
         </el-form-item>
+        <el-form-item :label="$t('member.repeat_password')" prop="confirmpassword">
+          <el-input type="password" v-model="ruleForm.confirmpassword" autocomplete="off" show-password></el-input>
+        </el-form-item>
         <el-form-item>
           <el-input v-model="ruleForm.id" autocomplete="off" :disabled="true" style="display:none"/>
         </el-form-item>
@@ -385,6 +388,15 @@ export default {
     ShowMoreBtn
   },
   data() {
+    const validateConfirmPwd = (rule, value, callback) => {
+      if(value === ''){
+        callback(new Error(this.$t('user.input_password')));
+      }else if((value !== this.ruleForm.newpassword)){
+        callback(new Error(this.$t('member.inconsistent_passwords')));
+      }else{
+        callback();
+      }
+    };
     return {
       referenced: false,
       queryPath: '/user/special/list',
@@ -479,7 +491,17 @@ export default {
             message: this.$t('member.password_format_is_incorrect'),
             trigger: 'blur'
           }
+        ],
+        confirmpassword: [
+          {
+            required: true,
+            pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[^]{8,30}$/,
+            message: this.$t('member.password_format_is_incorrect'),
+            trigger: 'blur'
+          },
+          {trigger: ['blur', 'change'], validator: validateConfirmPwd}
         ]
+
       }
     }
   },

From 613555101ea8aac84f4607ea4b665f3c3c4189eb Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 18 Mar 2021 16:55:54 +0800
Subject: [PATCH 07/11] =?UTF-8?q?fix(LDAP):=20=E4=BF=AE=E5=A4=8DLDAP?=
 =?UTF-8?q?=E7=99=BB=E9=99=86=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/ldap/controller/LdapController.java   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/ldap/controller/LdapController.java b/backend/src/main/java/io/metersphere/ldap/controller/LdapController.java
index 6771d3a87e..4d14f667d9 100644
--- a/backend/src/main/java/io/metersphere/ldap/controller/LdapController.java
+++ b/backend/src/main/java/io/metersphere/ldap/controller/LdapController.java
@@ -4,6 +4,9 @@ import io.metersphere.base.domain.User;
 import io.metersphere.commons.constants.ParamConstants;
 import io.metersphere.commons.constants.UserSource;
 import io.metersphere.commons.exception.MSException;
+import io.metersphere.commons.utils.CommonBeanFactory;
+import io.metersphere.commons.utils.RsaKey;
+import io.metersphere.commons.utils.RsaUtil;
 import io.metersphere.controller.ResultHolder;
 import io.metersphere.controller.request.LoginRequest;
 import io.metersphere.i18n.Translator;
@@ -16,6 +19,7 @@ import org.springframework.ldap.core.DirContextOperations;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.security.NoSuchAlgorithmException;
 
 @RestController
 @RequestMapping("/ldap")
@@ -29,7 +33,7 @@ public class LdapController {
     private SystemParameterService systemParameterService;
 
     @PostMapping(value = "/signin")
-    public ResultHolder login(@RequestBody LoginRequest request) {
+    public ResultHolder login(@RequestBody LoginRequest request) throws NoSuchAlgorithmException {
 
         String isOpen = systemParameterService.getValue(ParamConstants.LDAP.OPEN.getValue());
         if (StringUtils.isBlank(isOpen) || StringUtils.equals(Boolean.FALSE.toString(), isOpen)) {
@@ -71,7 +75,8 @@ public class LdapController {
 
         // 执行 ShiroDBRealm 中 LDAP 登录逻辑
         LoginRequest loginRequest = new LoginRequest();
-        loginRequest.setUsername(userId);
+        RsaKey rsaKey = CommonBeanFactory.getBean(RsaKey.class);
+        loginRequest.setUsername(RsaUtil.publicEncrypt(userId,rsaKey.getPublicKey()));
         return userService.login(loginRequest);
     }
 

From ecc33663ecae855ff7c2623fb1ccb84f21481a1b Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 18 Mar 2021 17:04:13 +0800
Subject: [PATCH 08/11] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=99=BB?=
 =?UTF-8?q?=E9=99=86=E4=BF=A1=E6=81=AF=E5=8A=A0=E5=AF=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/controller/request/LoginRequest.java   |  4 ++--
 .../io/metersphere/ldap/controller/LdapController.java | 10 ++--------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/controller/request/LoginRequest.java b/backend/src/main/java/io/metersphere/controller/request/LoginRequest.java
index 20c2ab2dd9..78bd20ff87 100644
--- a/backend/src/main/java/io/metersphere/controller/request/LoginRequest.java
+++ b/backend/src/main/java/io/metersphere/controller/request/LoginRequest.java
@@ -20,7 +20,7 @@ public class LoginRequest {
         try {
             RsaKey rsaKey = CommonBeanFactory.getBean(RsaKey.class);
             return RsaUtil.privateDecrypt(username, rsaKey.getPrivateKey());
-        } catch (NoSuchAlgorithmException e) {
+        } catch (Exception e) {
             return username;
         }
     }
@@ -29,7 +29,7 @@ public class LoginRequest {
         try {
             RsaKey rsaKey = CommonBeanFactory.getBean(RsaKey.class);
             return RsaUtil.privateDecrypt(password, rsaKey.getPrivateKey());
-        } catch (NoSuchAlgorithmException e) {
+        } catch (Exception e) {
             return password;
         }
     }
diff --git a/backend/src/main/java/io/metersphere/ldap/controller/LdapController.java b/backend/src/main/java/io/metersphere/ldap/controller/LdapController.java
index 4d14f667d9..abf6b7299b 100644
--- a/backend/src/main/java/io/metersphere/ldap/controller/LdapController.java
+++ b/backend/src/main/java/io/metersphere/ldap/controller/LdapController.java
@@ -4,9 +4,6 @@ import io.metersphere.base.domain.User;
 import io.metersphere.commons.constants.ParamConstants;
 import io.metersphere.commons.constants.UserSource;
 import io.metersphere.commons.exception.MSException;
-import io.metersphere.commons.utils.CommonBeanFactory;
-import io.metersphere.commons.utils.RsaKey;
-import io.metersphere.commons.utils.RsaUtil;
 import io.metersphere.controller.ResultHolder;
 import io.metersphere.controller.request.LoginRequest;
 import io.metersphere.i18n.Translator;
@@ -17,9 +14,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.ldap.core.DirContextOperations;
 import org.springframework.web.bind.annotation.*;
-
 import javax.annotation.Resource;
-import java.security.NoSuchAlgorithmException;
 
 @RestController
 @RequestMapping("/ldap")
@@ -33,7 +28,7 @@ public class LdapController {
     private SystemParameterService systemParameterService;
 
     @PostMapping(value = "/signin")
-    public ResultHolder login(@RequestBody LoginRequest request) throws NoSuchAlgorithmException {
+    public ResultHolder login(@RequestBody LoginRequest request) {
 
         String isOpen = systemParameterService.getValue(ParamConstants.LDAP.OPEN.getValue());
         if (StringUtils.isBlank(isOpen) || StringUtils.equals(Boolean.FALSE.toString(), isOpen)) {
@@ -75,8 +70,7 @@ public class LdapController {
 
         // 执行 ShiroDBRealm 中 LDAP 登录逻辑
         LoginRequest loginRequest = new LoginRequest();
-        RsaKey rsaKey = CommonBeanFactory.getBean(RsaKey.class);
-        loginRequest.setUsername(RsaUtil.publicEncrypt(userId,rsaKey.getPublicKey()));
+        loginRequest.setUsername(userId);
         return userService.login(loginRequest);
     }
 

From 4a93952020a09189072842835039cad42475f6b9 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Thu, 18 Mar 2021 17:19:14 +0800
Subject: [PATCH 09/11] chore: sync

---
 backend/src/main/java/io/metersphere/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index efd6af73b7..adefde265f 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit efd6af73b7c5cc53cd4515772000bc1436c49837
+Subproject commit adefde265ff12d4ea909353c3f46008f8a8e17e7

From 5e5be76df599ff125745708097340b2f8d9b3f27 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 18 Mar 2021 17:24:10 +0800
Subject: [PATCH 10/11] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA)?=
 =?UTF-8?q?:=20=E5=88=9B=E5=BB=BA=E7=94=A8=E4=BE=8B=E6=97=B6=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/case/components/TestCaseEdit.vue    | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index 4ddd1d4e2a..2d9ec236b8 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -136,12 +136,12 @@
           <el-row>
             <el-col :span="10">
               <el-form-item label="关联需求" :label-width="formLabelWidth" prop="demandId">
-                <el-select filterable :disabled="readOnly" v-model="form.demandId"
-                           :placeholder="$t('test_track.case.input_type')" class="ms-case-input">
+                <el-select filterable :disabled="readOnly" v-model="form.demandId" @visible-change="visibleChange"
+                           placeholder="请选择要关联的需求" class="ms-case-input">
                   <el-option
                     v-for="item in demandOptions"
                     :key="item.id"
-                    :label="item.name"
+                    :label="item.platform + ': '+item.name"
                     :value="item.id">
                   </el-option>
                 </el-select>
@@ -761,18 +761,31 @@ export default {
         });
       }
     },
+    visibleChange(flag) {
+      if (flag) {
+        this.getDemandOptions();
+      }
+    },
     getDemandOptions() {
-      this.projectId = getCurrentProjectID()
-      this.result = this.$get("demand/list/" + this.projectId, response => {
-        this.demandOptions = response.data;
-        this.demandOptions.unshift({id: 'other', name: this.$t('test_track.case.other')})
-      });
+      if (this.demandOptions.length === 0) {
+        this.projectId = getCurrentProjectID();
+        this.result = {loading : true};
+        this.$get("demand/list/" + this.projectId).then(response => {
+          this.demandOptions = response.data.data;
+          this.demandOptions.unshift({id: 'other', name: this.$t('test_track.case.other'), platform: 'Other'})
+          this.result = {loading : false};
+        }).catch(() => {
+          this.result = {loading : false};
+        })
+      }
     },
     getSelectOptions() {
       this.getModuleOptions();
       this.getMaintainerOptions();
       this.getTestOptions();
-      // this.getDemandOptions()
+      if (this.type === 'edit') {
+        this.getDemandOptions();
+      }
     },
 
     resetForm() {

From 3f1da2414360e23ce058c7747e7ce694a39ba64c Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 18 Mar 2021 17:27:23 +0800
Subject: [PATCH 11/11] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E5=8A=A0=E8=BD=BD=E5=A4=96=E9=83=A8js?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=A2=9E=E5=8A=A0=20Nashorn=20JavaS?=
 =?UTF-8?q?cript=E5=BC=95=E6=93=8E=E5=88=87=E6=8D=A2=E5=88=B0GraalVM=20?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/processors/MsJSR223Processor.java          |  6 ++++++
 .../request/processors/post/MsJSR223PostProcessor.java |  6 ++++++
 .../request/processors/pre/MsJSR223PreProcessor.java   | 10 ++++++++++
 .../scenario/common/Jsr233ProcessorContent.vue         |  5 +++--
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/MsJSR223Processor.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/MsJSR223Processor.java
index ba03b6a7a0..10136f6356 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/MsJSR223Processor.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/MsJSR223Processor.java
@@ -46,6 +46,12 @@ public class MsJSR223Processor extends MsTestElement {
         processor.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("TestBeanGUI"));
         processor.setProperty("cacheKey", "true");
         processor.setProperty("scriptLanguage", this.getScriptLanguage());
+        if (StringUtils.isNotEmpty(this.getScriptLanguage()) && this.getScriptLanguage().equals("nashornScript")) {
+            processor.setProperty("scriptLanguage", "nashorn");
+        }
+        if (StringUtils.isNotEmpty(this.getScriptLanguage()) && this.getScriptLanguage().equals("graalVMScript")) {
+            processor.setProperty("scriptLanguage", "javascript");
+        }
         processor.setProperty("script", this.getScript());
 
         final HashTree jsr223PreTree = tree.add(processor);
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/post/MsJSR223PostProcessor.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/post/MsJSR223PostProcessor.java
index cdf5ec9dd9..3172f2855e 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/post/MsJSR223PostProcessor.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/post/MsJSR223PostProcessor.java
@@ -40,6 +40,12 @@ public class MsJSR223PostProcessor extends MsTestElement {
         processor.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("TestBeanGUI"));
         processor.setProperty("cacheKey", "true");
         processor.setProperty("scriptLanguage", this.getScriptLanguage());
+        if (StringUtils.isNotEmpty(this.getScriptLanguage()) && this.getScriptLanguage().equals("nashornScript")) {
+            processor.setProperty("scriptLanguage", "nashorn");
+        }
+        if (StringUtils.isNotEmpty(this.getScriptLanguage()) && this.getScriptLanguage().equals("graalVMScript")) {
+            processor.setProperty("scriptLanguage", "javascript");
+        }
         processor.setProperty("script", this.getScript());
 
         final HashTree jsr223PostTree = tree.add(processor);
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/pre/MsJSR223PreProcessor.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/pre/MsJSR223PreProcessor.java
index 48bb6108d2..9cc8b35e56 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/pre/MsJSR223PreProcessor.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/pre/MsJSR223PreProcessor.java
@@ -12,6 +12,7 @@ import org.apache.jmeter.modifiers.JSR223PreProcessor;
 import org.apache.jmeter.save.SaveService;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jorphan.collections.HashTree;
+import org.graalvm.polyglot.Context;
 
 import java.util.List;
 
@@ -38,6 +39,8 @@ public class MsJSR223PreProcessor extends MsTestElement {
     }
 
     public JSR223PreProcessor getJSR223PreProcessor() {
+        Context.newBuilder().allowNativeAccess(true).build();
+
         JSR223PreProcessor processor = new JSR223PreProcessor();
         processor.setEnabled(this.isEnable());
         if (StringUtils.isNotEmpty(this.getName())) {
@@ -49,6 +52,13 @@ public class MsJSR223PreProcessor extends MsTestElement {
         processor.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("TestBeanGUI"));
         processor.setProperty("cacheKey", "true");
         processor.setProperty("scriptLanguage", this.getScriptLanguage());
+        if (StringUtils.isNotEmpty(this.getScriptLanguage()) && this.getScriptLanguage().equals("nashornScript")) {
+            processor.setProperty("scriptLanguage", "nashorn");
+        }
+        if (StringUtils.isNotEmpty(this.getScriptLanguage()) && this.getScriptLanguage().equals("graalVMScript")) {
+            processor.setProperty("scriptLanguage", "javascript");
+        }
+
         processor.setProperty("script", this.getScript());
         return processor;
     }
diff --git a/frontend/src/business/components/api/automation/scenario/common/Jsr233ProcessorContent.vue b/frontend/src/business/components/api/automation/scenario/common/Jsr233ProcessorContent.vue
index e00edd4aaa..0fdeff80af 100644
--- a/frontend/src/business/components/api/automation/scenario/common/Jsr233ProcessorContent.vue
+++ b/frontend/src/business/components/api/automation/scenario/common/Jsr233ProcessorContent.vue
@@ -72,13 +72,14 @@
           ],
           isCodeEditAlive: true,
           languages: [
-            'beanshell', "python", "groovy", "javascript"
+            'beanshell', "python", "groovy", "nashornScript","graalVMScript"
           ],
           codeEditModeMap: {
             beanshell: 'java',
             python: 'python',
             groovy: 'java',
-            javascript: 'javascript',
+            nashornScript: 'javascript',
+            graalVMScript: 'javascript',
           }
         }
       },