From f933a9d4493bbdc1c87fb494e5edf511c858652d Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 18 Apr 2025 10:15:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20deploy=5Fapp=5Fenv?= =?UTF-8?q?=5Fauto=5Fconfig=E8=A1=A8=E7=9A=84value=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=94=B9=E6=88=90text=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1402001731059712]deploy_app_env_auto_config表的value字段改成text类型 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1402001731059712 --- .../deploy/changelog/2025-04-18/neatlogic_tenant.sql | 3 +++ .../resources/deploy/changelog/2025-04-18/version.json | 10 ++++++++++ .../neatlogic/resources/deploy/sqlscript/ddl.sql | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/neatlogic/resources/deploy/changelog/2025-04-18/neatlogic_tenant.sql create mode 100644 src/main/resources/neatlogic/resources/deploy/changelog/2025-04-18/version.json diff --git a/src/main/resources/neatlogic/resources/deploy/changelog/2025-04-18/neatlogic_tenant.sql b/src/main/resources/neatlogic/resources/deploy/changelog/2025-04-18/neatlogic_tenant.sql new file mode 100644 index 00000000..b8bda9e4 --- /dev/null +++ b/src/main/resources/neatlogic/resources/deploy/changelog/2025-04-18/neatlogic_tenant.sql @@ -0,0 +1,3 @@ +ALTER TABLE `deploy_app_env_auto_config` + CHANGE `value` `value` TEXT CHARSET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '变量值'; + diff --git a/src/main/resources/neatlogic/resources/deploy/changelog/2025-04-18/version.json b/src/main/resources/neatlogic/resources/deploy/changelog/2025-04-18/version.json new file mode 100644 index 00000000..a6497bd8 --- /dev/null +++ b/src/main/resources/neatlogic/resources/deploy/changelog/2025-04-18/version.json @@ -0,0 +1,10 @@ +{ + "content":[ + { + "type":"新增功能", + "detail":[ + {"msg":"deploy_app_env_auto_config表的value字段改成text类型"} + ] + } + ] +} diff --git a/src/main/resources/neatlogic/resources/deploy/sqlscript/ddl.sql b/src/main/resources/neatlogic/resources/deploy/sqlscript/ddl.sql index 37eeaba9..6d67cee7 100644 --- a/src/main/resources/neatlogic/resources/deploy/sqlscript/ddl.sql +++ b/src/main/resources/neatlogic/resources/deploy/sqlscript/ddl.sql @@ -101,7 +101,7 @@ CREATE TABLE `deploy_app_env_auto_config` ( `instance_id` bigint NOT NULL COMMENT '实例资产id', `key` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '变量名', `type` enum('text','password','textarea') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'text' COMMENT '变量类型', - `value` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '变量值', + `value` TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '变量值', `is_empty` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否设为空', `lcd` timestamp(3) NULL DEFAULT NULL COMMENT '最后一次修改时间', `lcu` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最后一次修改人', -- Gitee From f184f386c200d640d6218dcbc570efd2b653435d Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 18 Apr 2025 11:45:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20deploy=5Fapp=5Fenv?= =?UTF-8?q?=5Fauto=5Fconfig=E8=A1=A8=E7=9A=84value=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=94=B9=E6=88=90text=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1402001731059712]deploy_app_env_auto_config表的value字段改成text类型 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1402001731059712 --- .../SaveDeployAppConfigEnvAutoConfigApi.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/main/java/neatlogic/module/deploy/api/appconfig/env/SaveDeployAppConfigEnvAutoConfigApi.java b/src/main/java/neatlogic/module/deploy/api/appconfig/env/SaveDeployAppConfigEnvAutoConfigApi.java index 87e9922b..b6b6ed9c 100644 --- a/src/main/java/neatlogic/module/deploy/api/appconfig/env/SaveDeployAppConfigEnvAutoConfigApi.java +++ b/src/main/java/neatlogic/module/deploy/api/appconfig/env/SaveDeployAppConfigEnvAutoConfigApi.java @@ -103,6 +103,13 @@ public class SaveDeployAppConfigEnvAutoConfigApi extends PrivateApiComponentBase deployAppAuthorityService.checkOperationAuth(appSystemId, DeployAppConfigAction.EDIT); Set keySet = new HashSet<>(); for (DeployAppEnvAutoConfigKeyValueVo keyValueVo : keyValueList ) { + if (Objects.equals(keyValueVo.getIsEmpty(), 1)) { + keyValueVo.setValue(StringUtils.EMPTY); + } else { + if (StringUtils.isBlank(keyValueVo.getValue())) { + keyValueVo.setValue(null); + } + } if (keySet.contains(keyValueVo.getKey())) { throw new DeployAppConfigEnvAutoConfigKeyRepeatException(keyValueVo.getKey()); } @@ -155,8 +162,7 @@ public class SaveDeployAppConfigEnvAutoConfigApi extends PrivateApiComponentBase newKeyValueList.sort(Comparator.comparing(DeployAppEnvAutoConfigKeyValueVo::getKey)); JSONArray tbodyList = new JSONArray(); if (CollectionUtils.isNotEmpty(oldKeyValueList)) { - for (int index = 0; index < oldKeyValueList.size(); index++) { - DeployAppEnvAutoConfigKeyValueVo keyValueVo = oldKeyValueList.get(index); + for (DeployAppEnvAutoConfigKeyValueVo keyValueVo : oldKeyValueList) { JSONObject tbody = new JSONObject(); tbody.put("key", keyValueVo.getKey()); tbody.put("beforeType", keyValueVo.getType()); @@ -210,11 +216,12 @@ public class SaveDeployAppConfigEnvAutoConfigApi extends PrivateApiComponentBase String afterValue = tbody.getString("afterValue"); if (Objects.equals(beforeValue, afterValue)) { tbodyList.remove(index); - } else { - if (StringUtils.isBlank(beforeValue) && StringUtils.isBlank(afterValue)) { - tbodyList.remove(index); - } } +// else { +// if (StringUtils.isBlank(beforeValue) && StringUtils.isBlank(afterValue)) { +// tbodyList.remove(index); +// } +// } } } } -- Gitee