From 2dfbf36da76a0ee3fdb1370cad2e4610aadb177b Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Wed, 3 Apr 2024 14:33:16 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=85=E5=AD=98=E5=AE=9A=E6=97=B6=E6=B8=85?=
 =?UTF-8?q?=E7=90=86=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/service/SystemParameterService.java      | 13 ++++---------
 .../src/views/setting/system/config/locale/en-US.ts |  2 +-
 .../src/views/setting/system/config/locale/zh-CN.ts |  2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/SystemParameterService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/SystemParameterService.java
index 19fb421239..1a724c0638 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/SystemParameterService.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/SystemParameterService.java
@@ -4,13 +4,15 @@ import io.metersphere.sdk.constants.HttpMethodConstants;
 import io.metersphere.sdk.constants.OperationLogConstants;
 import io.metersphere.sdk.constants.ParamConstants;
 import io.metersphere.sdk.exception.MSException;
-import io.metersphere.sdk.util.*;
+import io.metersphere.sdk.util.EncryptUtils;
+import io.metersphere.sdk.util.JSON;
+import io.metersphere.sdk.util.LogUtils;
+import io.metersphere.sdk.util.Translator;
 import io.metersphere.system.domain.SystemParameter;
 import io.metersphere.system.domain.SystemParameterExample;
 import io.metersphere.system.dto.sdk.BaseCleanConfigDTO;
 import io.metersphere.system.dto.sdk.BaseSystemConfigDTO;
 import io.metersphere.system.dto.sdk.EMailInfoDto;
-import io.metersphere.system.job.CleanHistoryJob;
 import io.metersphere.system.log.constants.OperationLogModule;
 import io.metersphere.system.log.constants.OperationLogType;
 import io.metersphere.system.log.dto.LogDTO;
@@ -283,13 +285,6 @@ public class SystemParameterService {
             } else {
                 systemParameterMapper.insert(parameter);
             }
-            if (StringUtils.equals(parameter.getParamKey(), ParamConstants.CleanConfig.OPERATION_HISTORY.getValue())) {
-                // 清理历史记录
-                CleanHistoryJob bean = CommonBeanFactory.getBean(CleanHistoryJob.class);
-                if (bean != null) {
-                    bean.cleanupLog();
-                }
-            }
         });
     }
 
diff --git a/frontend/src/views/setting/system/config/locale/en-US.ts b/frontend/src/views/setting/system/config/locale/en-US.ts
index 057665e751..a1c15a8145 100644
--- a/frontend/src/views/setting/system/config/locale/en-US.ts
+++ b/frontend/src/views/setting/system/config/locale/en-US.ts
@@ -203,5 +203,5 @@ export default {
   'system.config.memoryCleanup.setSuccess': 'Setup successful',
   'system.config.memoryCleanup.saveCount': 'Reserved quantity',
   'system.config.memoryCleanup.saveCountTip':
-    'It is effective for all projects in the system. Use case change history that exceeds the settings will be cleared and will take effect immediately after the update.',
+    'Effective for all projects in the system, the system will clear unset change history in the early morning',
 };
diff --git a/frontend/src/views/setting/system/config/locale/zh-CN.ts b/frontend/src/views/setting/system/config/locale/zh-CN.ts
index ffb89d136d..f593beb441 100644
--- a/frontend/src/views/setting/system/config/locale/zh-CN.ts
+++ b/frontend/src/views/setting/system/config/locale/zh-CN.ts
@@ -197,5 +197,5 @@ export default {
   'system.config.memoryCleanup.year': '年',
   'system.config.memoryCleanup.setSuccess': '设置成功',
   'system.config.memoryCleanup.saveCount': '保留条数',
-  'system.config.memoryCleanup.saveCountTip': '对系统内所有的项目生效，超出设置的用例变更历史会被清除，更新后立即生效',
+  'system.config.memoryCleanup.saveCountTip': '对系统内所有的项目生效，系统会在凌晨清除超出设置的变更历史记录',
 };