From dbaa3297f040eb8758ca0ba1a412eece1f1254ec Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 21 Oct 2022 14:43:02 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E9=83=A8=E5=88=86=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E5=8D=95=E8=AF=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../definition/request/sampler/MsTCPSampler.java |  4 ++--
 .../api/jmeter/ResourcePoolCalculation.java      |  2 +-
 .../base/mapper/ext/ExtApiScenarioMapper.java    |  2 +-
 .../base/mapper/ext/ExtApiScenarioMapper.xml     |  2 +-
 .../ext/ExtApiScenarioReportDetailMapper.java    |  2 +-
 .../ext/ExtApiScenarioReportDetailMapper.xml     |  2 +-
 .../plan/ext/ExtTestPlanScenarioCaseMapper.java  |  2 +-
 .../plan/ext/ExtTestPlanScenarioCaseMapper.xml   |  2 +-
 .../automation/scenario/EditApiScenario.vue      |  2 +-
 .../src/business/automation/scenario/Setting.js  |  4 ++--
 .../scenario/component/ApiComponent.vue          |  8 +-------
 .../scenario/component/PluginComponent.vue       |  2 +-
 .../scenario/maximize/MaximizeScenario.vue       |  2 +-
 .../environment/model/EnvironmentModel.js        |  4 ++--
 .../home/components/card/ApiCaseCountCard.vue    |  2 +-
 .../home/components/card/ScenarioCountCard.vue   |  2 +-
 api-test/frontend/src/i18n/lang/en-US.js         |  2 ++
 api-test/frontend/src/i18n/lang/zh-CN.js         |  2 ++
 api-test/frontend/src/i18n/lang/zh-TW.js         |  2 ++
 .../environment/EnvironmentSSLConfig.vue         | 16 ++++++++--------
 .../frontend/src/model/EnvironmentModel.js       |  4 ++--
 .../environment/service/CommandService.java      |  4 ++--
 .../environment/ssl/KeyStoreConfig.java          | 10 +++++-----
 23 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsTCPSampler.java b/api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsTCPSampler.java
index c9c555173e..76d2d5502c 100644
--- a/api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsTCPSampler.java
+++ b/api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsTCPSampler.java
@@ -322,8 +322,8 @@ public class MsTCPSampler extends MsTestElement {
     }
 
     private String formatMockValue(String value) {
-        String patten = ">@[^>@]+</?";
-        Pattern r = Pattern.compile(patten);
+        String pattern = ">@[^>@]+</?";
+        Pattern r = Pattern.compile(pattern);
         try {
             Matcher m = r.matcher(value);
             while (m.find()) {
diff --git a/api-test/backend/src/main/java/io/metersphere/api/jmeter/ResourcePoolCalculation.java b/api-test/backend/src/main/java/io/metersphere/api/jmeter/ResourcePoolCalculation.java
index f40b1dd385..129a1f04e9 100644
--- a/api-test/backend/src/main/java/io/metersphere/api/jmeter/ResourcePoolCalculation.java
+++ b/api-test/backend/src/main/java/io/metersphere/api/jmeter/ResourcePoolCalculation.java
@@ -59,7 +59,7 @@ public class ResourcePoolCalculation {
                 NodeDTO node = JSON.parseObject(configuration, NodeDTO.class);
                 String nodeIp = node.getIp();
                 Integer port = node.getPort();
-                String uri = String.format(BASE_URL + "/jmeter/getJvmInfo", nodeIp, port);
+                String uri = String.format(BASE_URL + "/jmeter/get-jvm-info", nodeIp, port);
                 JvmInfoDTO nodeJvm = this.getNodeJvmInfo(uri);
                 if (nodeJvm == null) {
                     continue;
diff --git a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.java b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.java
index 1e877d107f..9f9cc536ae 100644
--- a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.java
+++ b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.java
@@ -30,7 +30,7 @@ public interface ExtApiScenarioMapper {
 
     int selectTrash(@Param("projectId") String projectId);
 
-    List<ApiScenarioWithBLOBs> selectByIds(@Param("ids") String ids, @Param("oderId") String oderId);
+    List<ApiScenarioWithBLOBs> selectByIds(@Param("ids") String ids, @Param("order") String order);
 
     List<ApiScenario> selectReference(@Param("request") ApiScenarioRequest request);
 
diff --git a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
index 8ed1312104..3a869aa12c 100644
--- a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
+++ b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
@@ -442,7 +442,7 @@
         select *
         from api_scenario
         where id in (${ids})
-        ORDER BY FIND_IN_SET(id, ${oderId})
+        ORDER BY FIND_IN_SET(id, ${order})
     </select>
 
     <select id="selectReference" resultType="io.metersphere.base.domain.ApiScenario">
diff --git a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportDetailMapper.java b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportDetailMapper.java
index bcd6420437..15d1224dfc 100644
--- a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportDetailMapper.java
+++ b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportDetailMapper.java
@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 public interface ExtApiScenarioReportDetailMapper {
-    List<ApiScenarioReportDetail> selectByIds(@Param("ids") String ids, @Param("oderId") String oderId);
+    List<ApiScenarioReportDetail> selectByIds(@Param("ids") String ids, @Param("order") String order);
 
 
 }
diff --git a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportDetailMapper.xml b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportDetailMapper.xml
index 2b4cfe6ece..bf23908443 100644
--- a/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportDetailMapper.xml
+++ b/api-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportDetailMapper.xml
@@ -6,6 +6,6 @@
         where ad.report_id in  (select ar.id from api_scenario_report ar where ar.project_id = #{projectId,jdbcType=VARCHAR} )
     </delete>
     <select id="selectByIds" resultType="io.metersphere.base.domain.ApiScenarioReportDetail">
-        select t.* from api_scenario_report_detail t where t.report_id in (${ids}) ORDER BY FIND_IN_SET(t.report_id,${oderId})
+        select t.* from api_scenario_report_detail t where t.report_id in (${ids}) ORDER BY FIND_IN_SET(t.report_id,${order})
     </select>
 </mapper>
\ No newline at end of file
diff --git a/api-test/backend/src/main/java/io/metersphere/base/mapper/plan/ext/ExtTestPlanScenarioCaseMapper.java b/api-test/backend/src/main/java/io/metersphere/base/mapper/plan/ext/ExtTestPlanScenarioCaseMapper.java
index dafb7c57cf..205fa40b86 100644
--- a/api-test/backend/src/main/java/io/metersphere/base/mapper/plan/ext/ExtTestPlanScenarioCaseMapper.java
+++ b/api-test/backend/src/main/java/io/metersphere/base/mapper/plan/ext/ExtTestPlanScenarioCaseMapper.java
@@ -25,7 +25,7 @@ public interface ExtTestPlanScenarioCaseMapper {
 
     List<String> selectIds(@Param("request")TestPlanScenarioRequest request);
 
-    List<TestPlanApiScenario> selectByIds(@Param("ids")String ids ,@Param("oderId")String oderId );
+    List<TestPlanApiScenario> selectByIds(@Param("ids")String ids ,@Param("order")String order );
 
     List<TestPlanApiScenarioInfoDTO> selectLegalDataByTestPlanId(String planId);
 
diff --git a/api-test/backend/src/main/java/io/metersphere/base/mapper/plan/ext/ExtTestPlanScenarioCaseMapper.xml b/api-test/backend/src/main/java/io/metersphere/base/mapper/plan/ext/ExtTestPlanScenarioCaseMapper.xml
index 3970772451..a999434a37 100644
--- a/api-test/backend/src/main/java/io/metersphere/base/mapper/plan/ext/ExtTestPlanScenarioCaseMapper.xml
+++ b/api-test/backend/src/main/java/io/metersphere/base/mapper/plan/ext/ExtTestPlanScenarioCaseMapper.xml
@@ -136,7 +136,7 @@
         select t.*
         from test_plan_api_scenario t
         where t.id in (${ids})
-        ORDER BY FIND_IN_SET(t.id, ${oderId})
+        ORDER BY FIND_IN_SET(t.id, ${order})
     </select>
     <select id="selectIds" resultType="java.lang.String">
         select
diff --git a/api-test/frontend/src/business/automation/scenario/EditApiScenario.vue b/api-test/frontend/src/business/automation/scenario/EditApiScenario.vue
index 3546fff6da..4bfa748e66 100644
--- a/api-test/frontend/src/business/automation/scenario/EditApiScenario.vue
+++ b/api-test/frontend/src/business/automation/scenario/EditApiScenario.vue
@@ -1880,7 +1880,7 @@ export default {
     apiImport(importData) {
       if (importData && importData.data) {
         importData.data.forEach(item => {
-          this.setApiParameter(item, "API", "OT_IMPORT");
+          this.setApiParameter(item, "API", "TO_IMPORT");
         })
         this.sort();
         this.reload();
diff --git a/api-test/frontend/src/business/automation/scenario/Setting.js b/api-test/frontend/src/business/automation/scenario/Setting.js
index d63df797e9..94cd0d322a 100644
--- a/api-test/frontend/src/business/automation/scenario/Setting.js
+++ b/api-test/frontend/src/business/automation/scenario/Setting.js
@@ -20,7 +20,7 @@ export function STEP() {
     ['DubboSampler', getDefaultSamplerMenu()],
     ['JDBCSampler', getDefaultSamplerMenu()],
     ['TCPSampler', getDefaultSamplerMenu()],
-    ['OT_IMPORT', getDefaultSamplerMenu()],
+    ['TO_IMPORT', getDefaultSamplerMenu()],
     ['AbstractSampler', getDefaultSamplerMenu()],
     ['IfController', getAll()],
     ['TransactionController', getAll()],
@@ -48,7 +48,7 @@ export function STEP() {
 export const ELEMENT_TYPE = {
   scenario: 'scenario',
   HTTPSamplerProxy: 'HTTPSamplerProxy',
-  OT_IMPORT: 'OT_IMPORT',
+  TO_IMPORT: 'TO_IMPORT',
   IfController: 'IfController',
   TransactionController: 'TransactionController',
   ConstantTimer: 'ConstantTimer',
diff --git a/api-test/frontend/src/business/automation/scenario/component/ApiComponent.vue b/api-test/frontend/src/business/automation/scenario/component/ApiComponent.vue
index 16dbe4b8d4..d9cdd3ebd2 100644
--- a/api-test/frontend/src/business/automation/scenario/component/ApiComponent.vue
+++ b/api-test/frontend/src/business/automation/scenario/component/ApiComponent.vue
@@ -339,7 +339,7 @@ export default {
       return (this.request.referenced && verifies.indexOf(this.request.referenced) !== -1);
     },
     isExternalImport() {
-      return (this.request.referenced && this.request.referenced === 'OT_IMPORT');
+      return (this.request.referenced && this.request.referenced === 'TO_IMPORT');
     },
     isCustomizeReq() {
       return (!this.request.referenced || this.request.referenced === 'Created');
@@ -712,12 +712,6 @@ export default {
 </script>
 
 <style scoped>
-.ms-api-col-ot-import-button {
-  background-color: #EEF5FE;
-  margin-right: 20px;
-  color: #409EFF;
-}
-
 .icon.is-active {
   transform: rotate(90deg);
 }
diff --git a/api-test/frontend/src/business/automation/scenario/component/PluginComponent.vue b/api-test/frontend/src/business/automation/scenario/component/PluginComponent.vue
index 5d886e7b5d..10f5a45e69 100644
--- a/api-test/frontend/src/business/automation/scenario/component/PluginComponent.vue
+++ b/api-test/frontend/src/business/automation/scenario/component/PluginComponent.vue
@@ -226,7 +226,7 @@ export default {
       return false;
     },
     isExternalImport() {
-      if (this.request.referenced && this.request.referenced === 'OT_IMPORT') {
+      if (this.request.referenced && this.request.referenced === 'TO_IMPORT') {
         return true
       }
       return false;
diff --git a/api-test/frontend/src/business/automation/scenario/maximize/MaximizeScenario.vue b/api-test/frontend/src/business/automation/scenario/maximize/MaximizeScenario.vue
index af0215687d..c3d96f843b 100644
--- a/api-test/frontend/src/business/automation/scenario/maximize/MaximizeScenario.vue
+++ b/api-test/frontend/src/business/automation/scenario/maximize/MaximizeScenario.vue
@@ -899,7 +899,7 @@ export default {
     apiImport(importData) {
       if (importData && importData.data) {
         importData.data.forEach(item => {
-          this.setApiParameter(item, "API", "OT_IMPORT");
+          this.setApiParameter(item, "API", "TO_IMPORT");
         })
         this.sort();
         this.reload();
diff --git a/api-test/frontend/src/business/environment/model/EnvironmentModel.js b/api-test/frontend/src/business/environment/model/EnvironmentModel.js
index bce33e55eb..a223430f36 100644
--- a/api-test/frontend/src/business/environment/model/EnvironmentModel.js
+++ b/api-test/frontend/src/business/environment/model/EnvironmentModel.js
@@ -22,11 +22,11 @@ export class Environment extends BaseConfig {
 export class SSLConfig extends BaseConfig {
   constructor(options = {}) {
     super();
-    this.entrys = [];
+    this.entry = [];
     this.files = [];
     this.set(options);
     this.sets({files: KeyValue}, options);
-    this.sets({entrys: KeyValue}, options);
+    this.sets({entry: KeyValue}, options);
   }
 
   initOptions(options = {}) {
diff --git a/api-test/frontend/src/business/home/components/card/ApiCaseCountCard.vue b/api-test/frontend/src/business/home/components/card/ApiCaseCountCard.vue
index 4fa6260f8f..77eb590088 100644
--- a/api-test/frontend/src/business/home/components/card/ApiCaseCountCard.vue
+++ b/api-test/frontend/src/business/home/components/card/ApiCaseCountCard.vue
@@ -85,7 +85,7 @@
       <el-header style="height:20px;padding: 0px;margin-bottom: 5px;font-size: 14px">
         <el-row>
           <span style="float: left">
-            {{ $t('api_test.home_page.detail_card.rate.case_pase') + ":" }} &nbsp;&nbsp;
+            {{ $t('home.table.case_pass') + ":" }} &nbsp;&nbsp;
           </span>
           <span class="rows-count-number" style="font-size: 14px">
             <b>
diff --git a/api-test/frontend/src/business/home/components/card/ScenarioCountCard.vue b/api-test/frontend/src/business/home/components/card/ScenarioCountCard.vue
index a23db23ecd..ce570d5e60 100644
--- a/api-test/frontend/src/business/home/components/card/ScenarioCountCard.vue
+++ b/api-test/frontend/src/business/home/components/card/ScenarioCountCard.vue
@@ -58,7 +58,7 @@
       <el-header style="height:20px;padding: 0px;margin-bottom: 5px;font-size: 14px">
         <el-row>
           <span style="float: left">
-            {{ $t('api_test.home_page.detail_card.rate.scenario_pase') + ":" }}&nbsp;&nbsp;
+            {{ $t('home.table.scenario_pass') + ":" }}&nbsp;&nbsp;
           </span>
           <span class="rows-count-number" style="font-size: 14px">
             <b>
diff --git a/api-test/frontend/src/i18n/lang/en-US.js b/api-test/frontend/src/i18n/lang/en-US.js
index 886dc36ed6..ceb3d40b8b 100644
--- a/api-test/frontend/src/i18n/lang/en-US.js
+++ b/api-test/frontend/src/i18n/lang/en-US.js
@@ -29,6 +29,8 @@ const message = {
       next_execution_time: "Next Execution Time",
       create_user: "Creator",
       update_time: "Update time",
+      case_pass: "Case pass rate",
+      scenario_pass: "Scenario pass rate",
     },
     case: {
       index: "Ranking",
diff --git a/api-test/frontend/src/i18n/lang/zh-CN.js b/api-test/frontend/src/i18n/lang/zh-CN.js
index 12d10b1732..ab33b8c999 100644
--- a/api-test/frontend/src/i18n/lang/zh-CN.js
+++ b/api-test/frontend/src/i18n/lang/zh-CN.js
@@ -29,6 +29,8 @@ const message = {
       next_execution_time: "下次执行时间",
       create_user: "创建人",
       update_time: "更新时间",
+      case_pass: "用例通过率",
+      scenario_pass: "场景通过率",
     },
     case: {
       index: "排名",
diff --git a/api-test/frontend/src/i18n/lang/zh-TW.js b/api-test/frontend/src/i18n/lang/zh-TW.js
index 98dcf93fe7..847aae9618 100644
--- a/api-test/frontend/src/i18n/lang/zh-TW.js
+++ b/api-test/frontend/src/i18n/lang/zh-TW.js
@@ -29,6 +29,8 @@ const message = {
       next_execution_time: "下次執行時間",
       create_user: "創建人",
       update_time: "更新時間",
+      case_pass: "用例通過率",
+      scenario_pass: "場景通過率",
     },
     case: {
       index: "排名",
diff --git a/framework/sdk-parent/frontend/src/components/environment/EnvironmentSSLConfig.vue b/framework/sdk-parent/frontend/src/components/environment/EnvironmentSSLConfig.vue
index 13f9fa9d74..0c86cc20b9 100644
--- a/framework/sdk-parent/frontend/src/components/environment/EnvironmentSSLConfig.vue
+++ b/framework/sdk-parent/frontend/src/components/environment/EnvironmentSSLConfig.vue
@@ -38,7 +38,7 @@
     </div>
     <p class="tip">{{ this.$t('commons.ssl.entry') }} </p>
     <div class="ms-border">
-      <el-table :data="sslConfig.entrys" highlight-current-row v-if="!loading">
+      <el-table :data="sslConfig.entry" highlight-current-row v-if="!loading">
         <el-table-column prop="originalAsName" :label="$t('commons.ssl.original_as_name')" show-overflow-tooltip
                          width="180"/>
         <el-table-column prop="newAsName" :label="$t('commons.ssl.new_as_name')" show-overflow-tooltip
@@ -145,7 +145,7 @@ export default {
               item.password = "";
               item.default = false;
 
-              this.sslConfig.entrys.unshift(item);
+              this.sslConfig.entry.unshift(item);
             })
             this.sslConfig.files.unshift(sslFile);
           } else {
@@ -159,7 +159,7 @@ export default {
               }
               item.password = "";
               item.default = false;
-              this.sslConfig.entrys.unshift(item);
+              this.sslConfig.entry.unshift(item);
             })
             this.sslConfig.files.unshift(sslFile);
           }
@@ -170,24 +170,24 @@ export default {
       const index = this.sslConfig.files.findIndex((d) => d.id === row.id);
       this.sslConfig.files.splice(index, 1);
       // 同时删除条目
-      if (this.sslConfig.entrys) {
+      if (this.sslConfig.entry) {
         let removeKeys = [];
-        this.sslConfig.entrys.forEach(item => {
+        this.sslConfig.entry.forEach(item => {
           if (item && item.sourceId === row.id) {
-            const index = this.sslConfig.entrys.findIndex((d) => d.sourceId === row.id);
+            const index = this.sslConfig.entry.findIndex((d) => d.sourceId === row.id);
             removeKeys.push(index);
           }
         });
         removeKeys.forEach(index => {
           if (index !== -1) {
-            this.sslConfig.entrys.splice(index, 1);
+            this.sslConfig.entry.splice(index, 1);
           }
         })
       }
     },
     changeCheck(row) {
       if (row.default) {
-        this.sslConfig.entrys.forEach(item => {
+        this.sslConfig.entry.forEach(item => {
           if (item && item.sourceId !== row.id) {
             item.default = false;
           }
diff --git a/framework/sdk-parent/frontend/src/model/EnvironmentModel.js b/framework/sdk-parent/frontend/src/model/EnvironmentModel.js
index 7dcc885484..d1d27159b5 100644
--- a/framework/sdk-parent/frontend/src/model/EnvironmentModel.js
+++ b/framework/sdk-parent/frontend/src/model/EnvironmentModel.js
@@ -23,11 +23,11 @@ export class Environment extends BaseConfig {
 export class SSLConfig extends BaseConfig {
   constructor(options = {}) {
     super();
-    this.entrys = [];
+    this.entry = [];
     this.files = [];
     this.set(options);
     this.sets({files: KeyValue}, options);
-    this.sets({entrys: KeyValue}, options);
+    this.sets({entry: KeyValue}, options);
   }
 
   initOptions(options = {}) {
diff --git a/framework/sdk-parent/sdk/src/main/java/io/metersphere/environment/service/CommandService.java b/framework/sdk-parent/sdk/src/main/java/io/metersphere/environment/service/CommandService.java
index ae7f03c6d7..8dfba4a2ab 100644
--- a/framework/sdk-parent/sdk/src/main/java/io/metersphere/environment/service/CommandService.java
+++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/environment/service/CommandService.java
@@ -101,8 +101,8 @@ public class CommandService {
             this.createKeyStore("ms-run", newKeyStore);
             // 修改别名
             Map<String, List<KeyStoreEntry>> entryMap = new HashMap<>();
-            if (sslConfig != null && CollectionUtils.isNotEmpty(sslConfig.getEntrys())) {
-                sslConfig.getEntrys().forEach(item -> {
+            if (sslConfig != null && CollectionUtils.isNotEmpty(sslConfig.getEntry())) {
+                sslConfig.getEntry().forEach(item -> {
                     if (entryMap.containsKey(item.getSourceId())) {
                         entryMap.get(item.getSourceId()).add(item);
                     } else {
diff --git a/framework/sdk-parent/sdk/src/main/java/io/metersphere/environment/ssl/KeyStoreConfig.java b/framework/sdk-parent/sdk/src/main/java/io/metersphere/environment/ssl/KeyStoreConfig.java
index 6e2b89605b..ef42348886 100644
--- a/framework/sdk-parent/sdk/src/main/java/io/metersphere/environment/ssl/KeyStoreConfig.java
+++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/environment/ssl/KeyStoreConfig.java
@@ -9,12 +9,12 @@ import java.util.stream.Collectors;
 
 @Data
 public class KeyStoreConfig {
-    private List<KeyStoreEntry> entrys;
+    private List<KeyStoreEntry> entry;
     private List<KeyStoreFile> files;
 
     public String getDefaultAlias() {
-        if (CollectionUtils.isNotEmpty(entrys)) {
-            List<KeyStoreEntry> entryList = this.entrys.stream().filter(KeyStoreEntry::isDefault).collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(entry)) {
+            List<KeyStoreEntry> entryList = this.entry.stream().filter(KeyStoreEntry::isDefault).collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(entryList)) {
                 if (StringUtils.isNotEmpty(entryList.get(0).getNewAsName())) {
                     return entryList.get(0).getNewAsName();
@@ -27,8 +27,8 @@ public class KeyStoreConfig {
     }
 
     public String getAlias(String asName) {
-        if (CollectionUtils.isNotEmpty(entrys)) {
-            List<KeyStoreEntry> entryList = this.entrys.stream().filter(ks -> StringUtils.equals(asName, ks.getNewAsName())).collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(entry)) {
+            List<KeyStoreEntry> entryList = this.entry.stream().filter(ks -> StringUtils.equals(asName, ks.getNewAsName())).collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(entryList) && CollectionUtils.isNotEmpty(files) && files.size() == 1) {
                 return entryList.get(0).getOriginalAsName();
             }