From e6afadea4d2b542345c0d0bfd532d260c8f57aa5 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 28 Dec 2021 19:16:08 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E5=BC=80=E5=90=AF=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E5=90=8C=E6=AD=A5jar=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/api/dto/RunRequest.java |  2 ++
 .../main/java/io/metersphere/dto/NodeDTO.java   |  1 +
 .../settings/system/TestResourcePool.vue        | 17 +++++++++++++++--
 frontend/src/i18n/en-US.js                      |  1 +
 frontend/src/i18n/zh-CN.js                      |  1 +
 frontend/src/i18n/zh-TW.js                      |  1 +
 6 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/RunRequest.java b/backend/src/main/java/io/metersphere/api/dto/RunRequest.java
index 9b572d02cf..13be9e001b 100644
--- a/backend/src/main/java/io/metersphere/api/dto/RunRequest.java
+++ b/backend/src/main/java/io/metersphere/api/dto/RunRequest.java
@@ -11,6 +11,8 @@ import java.util.Map;
 public class RunRequest {
     private String testId;
     private String poolId;
+    // 开启定时同步
+    private boolean enable;
     // api / case 或有这个属性值
     private String reportId;
     private String url;
diff --git a/backend/src/main/java/io/metersphere/dto/NodeDTO.java b/backend/src/main/java/io/metersphere/dto/NodeDTO.java
index a040c469bd..768f325cd3 100644
--- a/backend/src/main/java/io/metersphere/dto/NodeDTO.java
+++ b/backend/src/main/java/io/metersphere/dto/NodeDTO.java
@@ -7,6 +7,7 @@ import lombok.Setter;
 @Setter
 public class NodeDTO {
     private String ip;
+    private boolean enable;
     private Integer port;
     private Integer monitorPort;
     private Integer maxConcurrency;
diff --git a/frontend/src/business/components/settings/system/TestResourcePool.vue b/frontend/src/business/components/settings/system/TestResourcePool.vue
index 81a166ed34..9f5548441a 100644
--- a/frontend/src/business/components/settings/system/TestResourcePool.vue
+++ b/frontend/src/business/components/settings/system/TestResourcePool.vue
@@ -128,18 +128,23 @@
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="12">
+                <el-col :span="8">
                   <el-form-item :label="$t('test_resource_pool.max_threads')"
                                 :rules="requiredRules">
                     <el-input-number v-model="item.maxConcurrency" :min="1" :max="1000000000"/>
                   </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="8">
                   <el-form-item :label="$t('test_resource_pool.pod_thread_limit')"
                                 :rules="requiredRules">
                     <el-input-number v-model="item.podThreadLimit" :min="1" :max="1000000"/>
                   </el-form-item>
                 </el-col>
+                <el-col :span="8">
+                  <el-form-item :label="$t('test_resource_pool.sync_jar')">
+                    <el-checkbox v-model="item.enable"/>
+                  </el-form-item>
+                </el-col>
               </el-row>
               <el-row>
                 <el-col>
@@ -201,6 +206,14 @@
                                        :max="1000000000"></el-input-number>
                     </template>
                   </el-table-column>
+                  <el-table-column
+                    align="center"
+                    prop="enable"
+                    :label="$t('test_resource_pool.sync_jar')">
+                    <template v-slot:default="{row}">
+                      <el-checkbox size="small" v-model="row.enable"/>
+                    </template>
+                  </el-table-column>
                   <el-table-column align="center" :label="$t('commons.operating')">
                     <template v-slot:default="{row, $index}">
                       <el-button @click="removeResourceInfo($index)" type="danger" icon="el-icon-delete" size="mini"
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 04664ee84b..d306626e54 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -2287,6 +2287,7 @@ export default {
     update_resource_pool: 'Create resource pool',
     select_pool_type: 'Select resource type',
     max_threads: 'Maximum concurrent number',
+    sync_jar: 'Timing synchronization jar',
     input_pool_name: 'Please enter the resource pool name',
     pool_name_valid: 'Resource pool name does not support special characters',
     cannot_remove_all_node: 'Cannot delete all independent nodes',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index aa7500747f..651fac5b0c 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -2291,6 +2291,7 @@ export default {
     update_resource_pool: '修改资源池',
     select_pool_type: '选择资源类型',
     max_threads: '最大并发数',
+    sync_jar: '定时同步JAR',
     input_pool_name: '请输入资源池名称',
     pool_name_valid: '资源池名称不支持特殊字符',
     cannot_remove_all_node: '不能删除所有独立节点',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 04d54f528d..7073d2b2b1 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -2291,6 +2291,7 @@ export default {
     update_resource_pool: '修改資源池',
     select_pool_type: '選擇資源類型',
     max_threads: '最大並發數',
+    sync_jar: '定時同步JAR',
     input_pool_name: '請輸入資源池名稱',
     pool_name_valid: '資源池名稱不支持特殊字符',
     cannot_remove_all_node: '不能刪除所有獨立節點',