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 87e9922b6c9f5a03f3903620e257e7805ced7f5a..b6b6ed9c3b6e0ebe86297f715e2f4f43c2a60aa0 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); +// } +// } } } } 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 0000000000000000000000000000000000000000..b8bda9e4c087f5d71e463ce65511a95a5c6ff25a --- /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 0000000000000000000000000000000000000000..a6497bd85c8f3c8b9d02adcaa8af215e5d7b5a7f --- /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 37eeaba9918f31dbd712ebd13be783d05a8c898c..6d67cee7ae049cfbdcf590fa2e7e6a4b599414d1 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 '最后一次修改人',