From 92a1ca5aa754e735ccd89373133b8a5ed1314774 Mon Sep 17 00:00:00 2001 From: CaptainB Date: Wed, 8 May 2024 10:04:32 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E5=8E=BB=E6=8E=89=E6=9A=82=E6=97=B6?= =?UTF-8?q?=E4=B8=8D=E5=86=8D=E8=A7=84=E5=88=92=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/src/main/resources/commons.properties | 2 +- .../system/domain/TestResourcePool.java | 12 -- .../domain/TestResourcePoolExample.java | 180 ------------------ .../system/mapper/TestResourcePoolMapper.xml | 67 +------ .../3.0.0/ddl/V3.0.0_12__beta_ddl.sql | 4 + .../sdk/constants/ProjectApplicationType.java | 24 --- .../sdk/constants/TaskCenterResourceType.java | 2 +- .../src/main/resources/i18n/load.properties | 72 ------- .../main/resources/i18n/load_en_US.properties | 72 ------- .../main/resources/i18n/load_zh_CN.properties | 72 ------- .../main/resources/i18n/load_zh_TW.properties | 72 ------- .../sdk/src/main/resources/i18n/ui.properties | 151 --------------- .../main/resources/i18n/ui_en_US.properties | 151 --------------- .../main/resources/i18n/ui_zh_CN.properties | 151 --------------- .../main/resources/i18n/ui_zh_TW.properties | 151 --------------- .../resources/i18n/workstation.properties | 0 .../i18n/workstation_en_US.properties | 0 .../i18n/workstation_zh_CN.properties | 0 .../i18n/workstation_zh_TW.properties | 0 .../ApiTaskCenterControllerTests.java | 1 - .../api/controller/KubernetesEngineTests.java | 2 - .../service/BaseResourcePoolTestService.java | 1 - .../api/service/RoundRobinServiceTests.java | 20 +- .../src/test/resources/application.properties | 2 +- .../resources/dml/init_api_definition.sql | 2 +- .../src/test/resources/application.properties | 2 +- .../src/test/resources/application.properties | 2 +- .../ProjectApplicationController.java | 81 +------- .../project/controller/ProjectController.java | 2 +- .../project/mapper/ExtProjectMapper.java | 6 +- .../project/mapper/ExtProjectMapper.xml | 6 +- .../service/ProjectApplicationService.java | 24 +-- .../project/service/ProjectService.java | 11 +- .../ProjectApplicationControllerTests.java | 150 --------------- .../src/test/resources/application.properties | 2 +- .../src/test/resources/dml/init_project.sql | 10 +- .../system/dto/pool/TestResourceNodeDTO.java | 6 - .../system/job/CleanUpReportJob.java | 20 -- .../system/mapper/ExtResourcePoolMapper.xml | 9 - .../notice/constants/NoticeConstants.java | 54 ------ .../system/service/CommonProjectService.java | 6 +- .../KubernetesResourcePoolService.java | 2 +- .../service/NodeResourcePoolService.java | 8 +- .../service/TestResourcePoolService.java | 33 +--- .../system/service/UiResourceService.java | 10 - .../main/resources/systemGeneratorConfig.xml | 4 +- .../TestResourcePoolControllerTests.java | 94 +++------ .../src/test/resources/application.properties | 2 +- .../test/resources/dml/init_org_project.sql | 10 +- .../src/test/resources/dml/init_project.sql | 10 +- .../resources/dml/init_test_resource_pool.sql | 6 +- .../src/test/resources/application.properties | 2 +- 52 files changed, 99 insertions(+), 1684 deletions(-) delete mode 100644 backend/framework/sdk/src/main/resources/i18n/load.properties delete mode 100644 backend/framework/sdk/src/main/resources/i18n/load_en_US.properties delete mode 100644 backend/framework/sdk/src/main/resources/i18n/load_zh_CN.properties delete mode 100644 backend/framework/sdk/src/main/resources/i18n/load_zh_TW.properties delete mode 100644 backend/framework/sdk/src/main/resources/i18n/ui.properties delete mode 100644 backend/framework/sdk/src/main/resources/i18n/ui_en_US.properties delete mode 100644 backend/framework/sdk/src/main/resources/i18n/ui_zh_CN.properties delete mode 100644 backend/framework/sdk/src/main/resources/i18n/ui_zh_TW.properties delete mode 100644 backend/framework/sdk/src/main/resources/i18n/workstation.properties delete mode 100644 backend/framework/sdk/src/main/resources/i18n/workstation_en_US.properties delete mode 100644 backend/framework/sdk/src/main/resources/i18n/workstation_zh_CN.properties delete mode 100644 backend/framework/sdk/src/main/resources/i18n/workstation_zh_TW.properties delete mode 100644 backend/services/system-setting/src/main/java/io/metersphere/system/service/UiResourceService.java diff --git a/backend/app/src/main/resources/commons.properties b/backend/app/src/main/resources/commons.properties index 2583f1637b..cbe933f38e 100644 --- a/backend/app/src/main/resources/commons.properties +++ b/backend/app/src/main/resources/commons.properties @@ -71,7 +71,7 @@ jmeter.home=/opt/jmeter spring.servlet.multipart.max-file-size=500MB spring.servlet.multipart.max-request-size=500MB # i18n -spring.messages.basename=i18n/commons,i18n/api,i18n/bug,i18n/case,i18n/load,i18n/plan,i18n/project,i18n/system,i18n/ui,i18n/workstation +spring.messages.basename=i18n/commons,i18n/api,i18n/bug,i18n/case,i18n/plan,i18n/project,i18n/system # actuator management.endpoints.web.exposure.include=* management.endpoints.enabled-by-default=false diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/TestResourcePool.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/TestResourcePool.java index ecd6449f99..9165640b96 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/TestResourcePool.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/TestResourcePool.java @@ -40,15 +40,6 @@ public class TestResourcePool implements Serializable { @Schema(description = "创建人") private String createUser; - @Schema(description = "是否用于接口测试") - private Boolean apiTest; - - @Schema(description = "是否用于性能测试") - private Boolean loadTest; - - @Schema(description = "是否用于ui测试") - private Boolean uiTest; - @Schema(description = "ms部署地址") private String serverUrl; @@ -71,9 +62,6 @@ public class TestResourcePool implements Serializable { createTime("create_time", "createTime", "BIGINT", false), updateTime("update_time", "updateTime", "BIGINT", false), createUser("create_user", "createUser", "VARCHAR", false), - apiTest("api_test", "apiTest", "BIT", false), - loadTest("load_test", "loadTest", "BIT", false), - uiTest("ui_test", "uiTest", "BIT", false), serverUrl("server_url", "serverUrl", "VARCHAR", false), allOrg("all_org", "allOrg", "BIT", false), deleted("deleted", "deleted", "BIT", false); diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/domain/TestResourcePoolExample.java b/backend/framework/domain/src/main/java/io/metersphere/system/domain/TestResourcePoolExample.java index d0312b4dc4..ceb75095a3 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/domain/TestResourcePoolExample.java +++ b/backend/framework/domain/src/main/java/io/metersphere/system/domain/TestResourcePoolExample.java @@ -634,186 +634,6 @@ public class TestResourcePoolExample { return (Criteria) this; } - public Criteria andApiTestIsNull() { - addCriterion("api_test is null"); - return (Criteria) this; - } - - public Criteria andApiTestIsNotNull() { - addCriterion("api_test is not null"); - return (Criteria) this; - } - - public Criteria andApiTestEqualTo(Boolean value) { - addCriterion("api_test =", value, "apiTest"); - return (Criteria) this; - } - - public Criteria andApiTestNotEqualTo(Boolean value) { - addCriterion("api_test <>", value, "apiTest"); - return (Criteria) this; - } - - public Criteria andApiTestGreaterThan(Boolean value) { - addCriterion("api_test >", value, "apiTest"); - return (Criteria) this; - } - - public Criteria andApiTestGreaterThanOrEqualTo(Boolean value) { - addCriterion("api_test >=", value, "apiTest"); - return (Criteria) this; - } - - public Criteria andApiTestLessThan(Boolean value) { - addCriterion("api_test <", value, "apiTest"); - return (Criteria) this; - } - - public Criteria andApiTestLessThanOrEqualTo(Boolean value) { - addCriterion("api_test <=", value, "apiTest"); - return (Criteria) this; - } - - public Criteria andApiTestIn(List values) { - addCriterion("api_test in", values, "apiTest"); - return (Criteria) this; - } - - public Criteria andApiTestNotIn(List values) { - addCriterion("api_test not in", values, "apiTest"); - return (Criteria) this; - } - - public Criteria andApiTestBetween(Boolean value1, Boolean value2) { - addCriterion("api_test between", value1, value2, "apiTest"); - return (Criteria) this; - } - - public Criteria andApiTestNotBetween(Boolean value1, Boolean value2) { - addCriterion("api_test not between", value1, value2, "apiTest"); - return (Criteria) this; - } - - public Criteria andLoadTestIsNull() { - addCriterion("load_test is null"); - return (Criteria) this; - } - - public Criteria andLoadTestIsNotNull() { - addCriterion("load_test is not null"); - return (Criteria) this; - } - - public Criteria andLoadTestEqualTo(Boolean value) { - addCriterion("load_test =", value, "loadTest"); - return (Criteria) this; - } - - public Criteria andLoadTestNotEqualTo(Boolean value) { - addCriterion("load_test <>", value, "loadTest"); - return (Criteria) this; - } - - public Criteria andLoadTestGreaterThan(Boolean value) { - addCriterion("load_test >", value, "loadTest"); - return (Criteria) this; - } - - public Criteria andLoadTestGreaterThanOrEqualTo(Boolean value) { - addCriterion("load_test >=", value, "loadTest"); - return (Criteria) this; - } - - public Criteria andLoadTestLessThan(Boolean value) { - addCriterion("load_test <", value, "loadTest"); - return (Criteria) this; - } - - public Criteria andLoadTestLessThanOrEqualTo(Boolean value) { - addCriterion("load_test <=", value, "loadTest"); - return (Criteria) this; - } - - public Criteria andLoadTestIn(List values) { - addCriterion("load_test in", values, "loadTest"); - return (Criteria) this; - } - - public Criteria andLoadTestNotIn(List values) { - addCriterion("load_test not in", values, "loadTest"); - return (Criteria) this; - } - - public Criteria andLoadTestBetween(Boolean value1, Boolean value2) { - addCriterion("load_test between", value1, value2, "loadTest"); - return (Criteria) this; - } - - public Criteria andLoadTestNotBetween(Boolean value1, Boolean value2) { - addCriterion("load_test not between", value1, value2, "loadTest"); - return (Criteria) this; - } - - public Criteria andUiTestIsNull() { - addCriterion("ui_test is null"); - return (Criteria) this; - } - - public Criteria andUiTestIsNotNull() { - addCriterion("ui_test is not null"); - return (Criteria) this; - } - - public Criteria andUiTestEqualTo(Boolean value) { - addCriterion("ui_test =", value, "uiTest"); - return (Criteria) this; - } - - public Criteria andUiTestNotEqualTo(Boolean value) { - addCriterion("ui_test <>", value, "uiTest"); - return (Criteria) this; - } - - public Criteria andUiTestGreaterThan(Boolean value) { - addCriterion("ui_test >", value, "uiTest"); - return (Criteria) this; - } - - public Criteria andUiTestGreaterThanOrEqualTo(Boolean value) { - addCriterion("ui_test >=", value, "uiTest"); - return (Criteria) this; - } - - public Criteria andUiTestLessThan(Boolean value) { - addCriterion("ui_test <", value, "uiTest"); - return (Criteria) this; - } - - public Criteria andUiTestLessThanOrEqualTo(Boolean value) { - addCriterion("ui_test <=", value, "uiTest"); - return (Criteria) this; - } - - public Criteria andUiTestIn(List values) { - addCriterion("ui_test in", values, "uiTest"); - return (Criteria) this; - } - - public Criteria andUiTestNotIn(List values) { - addCriterion("ui_test not in", values, "uiTest"); - return (Criteria) this; - } - - public Criteria andUiTestBetween(Boolean value1, Boolean value2) { - addCriterion("ui_test between", value1, value2, "uiTest"); - return (Criteria) this; - } - - public Criteria andUiTestNotBetween(Boolean value1, Boolean value2) { - addCriterion("ui_test not between", value1, value2, "uiTest"); - return (Criteria) this; - } - public Criteria andServerUrlIsNull() { addCriterion("server_url is null"); return (Criteria) this; diff --git a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/TestResourcePoolMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/system/mapper/TestResourcePoolMapper.xml index 891244e2a9..ae1892a9f3 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/system/mapper/TestResourcePoolMapper.xml +++ b/backend/framework/domain/src/main/java/io/metersphere/system/mapper/TestResourcePoolMapper.xml @@ -10,9 +10,6 @@ - - - @@ -77,7 +74,7 @@ id, `name`, `type`, description, `enable`, create_time, update_time, create_user, - api_test, load_test, ui_test, server_url, all_org, deleted + server_url, all_org, deleted