From d14da875ecad3d51587257c61d7dd582171cc2f1 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Tue, 15 Apr 2025 18:59:38 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E9=85=8D=E7=BD=AE-=E7=8E=AF=E5=A2=83=E5=B1=82=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E9=80=82=E9=85=8D=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E4=B8=BA=E7=A9=BA=E6=A0=87=E5=BF=97?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1399994194558976]应用配置-环境层配置文件适配变量增加设为空标志位 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1399994194558976 --- .../dao/mapper/DeployAppConfigMapper.xml | 32 ++++++++++++------- .../changelog/2025-04-15/neatlogic_tenant.sql | 3 ++ .../deploy/changelog/2025-04-15/version.json | 10 ++++++ .../resources/deploy/sqlscript/ddl.sql | 13 ++++---- 4 files changed, 40 insertions(+), 18 deletions(-) create mode 100644 src/main/resources/neatlogic/resources/deploy/changelog/2025-04-15/neatlogic_tenant.sql create mode 100644 src/main/resources/neatlogic/resources/deploy/changelog/2025-04-15/version.json diff --git a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml index daeca48b..81c83bb1 100644 --- a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml +++ b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml @@ -581,6 +581,7 @@ along with this program. If not, see .--> + @@ -592,7 +593,9 @@ along with this program. If not, see .--> daced.db_schema as dbSchema, daced.config as configStr, daeac.key, - daeac.value + daeac.value, + daeac.type, + daeac.is_empty as isEmpty FROM @{DATA_SCHEMA}.`scence_appinstance_env_appmodule_appsystem` a LEFT JOIN deploy_app_config_env_db daced on a.app_system_id = daced.app_system_id and a.app_module_id = daced.app_module_id and a.env_id = daced.env_id @@ -612,7 +615,9 @@ along with this program. If not, see .--> daced.db_schema as dbSchema, daced.config as configStr, daeac.key, - daeac.value + daeac.value, + daeac.type, + daeac.is_empty as isEmpty FROM deploy_app_config_env dace LEFT JOIN deploy_app_config_env_db daced on dace.app_system_id = daced.app_system_id and dace.app_module_id = daced.app_module_id and dace.env_id = @@ -729,7 +734,8 @@ along with this program. If not, see .--> resultType="neatlogic.framework.deploy.dto.app.DeployAppEnvAutoConfigKeyValueVo" useCache="false"> select `key`, `type`, - `value` + `value`, + `is_empty` as isEmpty from deploy_app_env_auto_config WHERE `app_system_id` = #{appSystemId} and `app_module_id` = #{appModuleId} @@ -837,7 +843,8 @@ along with this program. If not, see .--> daeac.`instance_id` AS instanceId, daeac.`key`, daeac.`type`, - daeac.`value` + daeac.`value`, + daeac.`is_empty` AS isEmpty FROM deploy_app_env_auto_config daeac WHERE daeac.`app_system_id` = #{appSystemId} @@ -1357,7 +1364,8 @@ along with this program. If not, see .--> `instance_id` AS instanceId, `key`, `type`, - `value` + `value`, + `is_empty` AS isEmpty from `deploy_app_env_auto_config` where `app_system_id` = #{systemId} and `app_module_id` = #{moduleId} @@ -1576,12 +1584,12 @@ along with this program. If not, see .--> INSERT INTO deploy_app_env_auto_config - (`app_system_id`,`app_module_id`,`env_id`,`instance_id`,`key`,`type`,`value`,`lcd`,`lcu`) + (`app_system_id`,`app_module_id`,`env_id`,`instance_id`,`key`,`type`,`value`,`is_empty`,`lcd`,`lcu`) VALUES - #{appSystemId},#{appModuleId},#{envId},#{instanceId},#{keyValue.key},#{keyValue.type},#{keyValue.value},#{lcd},#{lcu} + #{appSystemId},#{appModuleId},#{envId},#{instanceId},#{keyValue.key},#{keyValue.type},#{keyValue.value},#{keyValue.isEmpty},#{lcd},#{lcu} - ON DUPLICATE KEY UPDATE `key` = VALUES(`key`),`type` = VALUES(`type`),`value` = VALUES(`value`),`lcd`= VALUES(`lcd`),`lcu` = + ON DUPLICATE KEY UPDATE `key` = VALUES(`key`),`type` = VALUES(`type`),`value` = VALUES(`value`),`is_empty` = VALUES(`is_empty`),`lcd`= VALUES(`lcd`),`lcu` = VALUES(`lcu`) @@ -1598,21 +1606,21 @@ along with this program. If not, see .--> INSERT INTO deploy_app_env_auto_config - (`app_system_id`,`app_module_id`,`env_id`,`instance_id`,`key`,`value`,`lcd`,`lcu`) + (`app_system_id`,`app_module_id`,`env_id`,`instance_id`,`key`,`value`,`is_empty`,`lcd`,`lcu`) VALUES - #{appSystemId},#{appModuleId},#{envId},#{instanceId},#{keyValue.key},#{keyValue.value},now(3),#{lcu} + #{appSystemId},#{appModuleId},#{envId},#{instanceId},#{keyValue.key},#{keyValue.value},#{keyValue.isEmpty},now(3),#{lcu} ON DUPLICATE KEY UPDATE `key` = VALUES(`key`) INSERT INTO deploy_app_env_auto_config - (`app_system_id`,`app_module_id`,`env_id`,`instance_id`,`key`,`value`,`lcd`,`lcu`) + (`app_system_id`,`app_module_id`,`env_id`,`instance_id`,`key`,`type`,`value`,`is_empty`,`lcd`,`lcu`) VALUES - #{vo.appSystemId},#{vo.appModuleId},#{vo.envId},#{vo.instanceId},#{keyValue.key},#{keyValue.value},now(3),#{vo.lcu} + #{vo.appSystemId},#{vo.appModuleId},#{vo.envId},#{vo.instanceId},#{keyValue.key},#{keyValue.type},#{keyValue.value},#{keyValue.isEmpty},now(3),#{vo.lcu} ON DUPLICATE KEY UPDATE `key` = VALUES(`key`) diff --git a/src/main/resources/neatlogic/resources/deploy/changelog/2025-04-15/neatlogic_tenant.sql b/src/main/resources/neatlogic/resources/deploy/changelog/2025-04-15/neatlogic_tenant.sql new file mode 100644 index 00000000..b9e342b9 --- /dev/null +++ b/src/main/resources/neatlogic/resources/deploy/changelog/2025-04-15/neatlogic_tenant.sql @@ -0,0 +1,3 @@ +ALTER TABLE `deploy_app_env_auto_config` + ADD COLUMN `is_empty` TINYINT (1) DEFAULT 0 NOT NULL COMMENT '是否设为空' AFTER `value`; + diff --git a/src/main/resources/neatlogic/resources/deploy/changelog/2025-04-15/version.json b/src/main/resources/neatlogic/resources/deploy/changelog/2025-04-15/version.json new file mode 100644 index 00000000..2007aebf --- /dev/null +++ b/src/main/resources/neatlogic/resources/deploy/changelog/2025-04-15/version.json @@ -0,0 +1,10 @@ +{ + "content":[ + { + "type":"新增功能", + "detail":[ + {"msg":"应用配置-环境层配置文件适配变量增加设为空标志位"} + ] + } + ] +} diff --git a/src/main/resources/neatlogic/resources/deploy/sqlscript/ddl.sql b/src/main/resources/neatlogic/resources/deploy/sqlscript/ddl.sql index 4001f229..f801603a 100644 --- a/src/main/resources/neatlogic/resources/deploy/sqlscript/ddl.sql +++ b/src/main/resources/neatlogic/resources/deploy/sqlscript/ddl.sql @@ -94,18 +94,19 @@ CREATE TABLE `deploy_app_config_user` ( -- ---------------------------- -- Table structure for deploy_app_env_auto_config -- ---------------------------- -CREATE TABLE `deploy_app_env_auto_config` ( +CREATE TABLE `deploy_app_env_auto_config` ( `app_system_id` bigint NOT NULL COMMENT '应用id', `app_module_id` bigint NOT NULL COMMENT '模块id', `env_id` bigint NOT NULL COMMENT '环境资产id', `instance_id` bigint NOT NULL COMMENT '实例资产id', `key` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '变量名', - `type` enum('text','password') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'text' COMMENT '变量类型', - `value` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '变量值', + `type` enum('text','password') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'text' COMMENT '变量类型', + `value` varchar(200) 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 NULL DEFAULT NULL COMMENT '最后一次修改人', - PRIMARY KEY (`app_system_id`, `app_module_id`, `env_id`, `instance_id`, `key`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '发布应用环境变量配置'; + `lcu` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最后一次修改人', + PRIMARY KEY (`app_system_id`,`app_module_id`,`env_id`,`instance_id`,`key`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='发布应用环境变量配置'; -- ---------------------------- -- Table structure for deploy_app_module_runner_group -- Gitee