From e9d9c4234c41f00d3916f120b187a44ef7ed5b7c Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Tue, 6 May 2025 15:43:01 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E8=B5=84=E4=BA=A7=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=A7=81=E6=9C=89=E5=B8=90=E5=8F=B7=E6=97=B6=EF=BC=8C=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E5=90=8D=E7=A7=B0=E9=95=BF=E5=BA=A6=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1415211095916544]配置管理-资产添加私有帐号时，校验名称长度异常 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1415211095916544 --- .../account/AccountProtocolSaveApi.java | 2 +- .../api/resourcecenter/account/AccountSaveApi.java | 4 ++-- .../cmdb/changelog/2025-05-06/neatlogic_tenant.sql | 4 ++++ .../resources/cmdb/changelog/2025-05-06/version.json | 12 ++++++++++++ .../neatlogic/resources/cmdb/sqlscript/ddl.sql | 4 ++-- 5 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/neatlogic/resources/cmdb/changelog/2025-05-06/neatlogic_tenant.sql create mode 100644 src/main/resources/neatlogic/resources/cmdb/changelog/2025-05-06/version.json diff --git a/src/main/java/neatlogic/module/cmdb/api/resourcecenter/account/AccountProtocolSaveApi.java b/src/main/java/neatlogic/module/cmdb/api/resourcecenter/account/AccountProtocolSaveApi.java index edca5c7d..f1327f57 100644 --- a/src/main/java/neatlogic/module/cmdb/api/resourcecenter/account/AccountProtocolSaveApi.java +++ b/src/main/java/neatlogic/module/cmdb/api/resourcecenter/account/AccountProtocolSaveApi.java @@ -56,7 +56,7 @@ public class AccountProtocolSaveApi extends PrivateApiComponentBase { @Input({ @Param(name = "id", type = ApiParamType.LONG, desc = "common.id"), - @Param(name = "name", type = ApiParamType.STRING, isRequired = true, desc = "common.name"), + @Param(name = "name", type = ApiParamType.STRING, isRequired = true, maxLength = 50, desc = "common.name"), @Param(name = "port", type = ApiParamType.INTEGER, desc = "term.cmdb.port"), }) @Output({ diff --git a/src/main/java/neatlogic/module/cmdb/api/resourcecenter/account/AccountSaveApi.java b/src/main/java/neatlogic/module/cmdb/api/resourcecenter/account/AccountSaveApi.java index 4c2e9c45..abf799d8 100644 --- a/src/main/java/neatlogic/module/cmdb/api/resourcecenter/account/AccountSaveApi.java +++ b/src/main/java/neatlogic/module/cmdb/api/resourcecenter/account/AccountSaveApi.java @@ -73,8 +73,8 @@ public class AccountSaveApi extends PrivateApiComponentBase { @Input({ @Param(name = "id", type = ApiParamType.LONG, desc = "账号ID"), - @Param(name = "name", type = ApiParamType.STRING, maxLength = 50, isRequired = true, desc = "名称"), - @Param(name = "account", type = ApiParamType.STRING, maxLength = 50, desc = "用户名"), + @Param(name = "name", type = ApiParamType.STRING, maxLength = 200, isRequired = true, desc = "名称"), + @Param(name = "account", type = ApiParamType.STRING, maxLength = 80, desc = "用户名"), @Param(name = "passwordPlain", type = ApiParamType.STRING, isRequired = false, desc = "密码"), @Param(name = "protocolId", type = ApiParamType.LONG, isRequired = true, desc = "协议id"), @Param(name = "port", type = ApiParamType.INTEGER, isRequired = false, desc = "端口"), diff --git a/src/main/resources/neatlogic/resources/cmdb/changelog/2025-05-06/neatlogic_tenant.sql b/src/main/resources/neatlogic/resources/cmdb/changelog/2025-05-06/neatlogic_tenant.sql new file mode 100644 index 00000000..b3b19587 --- /dev/null +++ b/src/main/resources/neatlogic/resources/cmdb/changelog/2025-05-06/neatlogic_tenant.sql @@ -0,0 +1,4 @@ +ALTER TABLE `cmdb_resourcecenter_account` + CHANGE `name` `name` VARCHAR (255) CHARSET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称'; +ALTER TABLE `cmdb_resourcecenter_account` + CHANGE `account` `account` VARCHAR (100) CHARSET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '账号'; \ No newline at end of file diff --git a/src/main/resources/neatlogic/resources/cmdb/changelog/2025-05-06/version.json b/src/main/resources/neatlogic/resources/cmdb/changelog/2025-05-06/version.json new file mode 100644 index 00000000..690bf7d4 --- /dev/null +++ b/src/main/resources/neatlogic/resources/cmdb/changelog/2025-05-06/version.json @@ -0,0 +1,12 @@ +{ + "content": [ + { + "type": "修复功能", + "detail": [ + { + "msg": "1、配置管理-资产添加私有帐号时，校验名称长度异常" + } + ] + } + ] +} diff --git a/src/main/resources/neatlogic/resources/cmdb/sqlscript/ddl.sql b/src/main/resources/neatlogic/resources/cmdb/sqlscript/ddl.sql index 455edd9f..b1cc0af7 100644 --- a/src/main/resources/neatlogic/resources/cmdb/sqlscript/ddl.sql +++ b/src/main/resources/neatlogic/resources/cmdb/sqlscript/ddl.sql @@ -903,8 +903,8 @@ CREATE TABLE `cmdb_reltype` CREATE TABLE `cmdb_resourcecenter_account` ( `id` bigint NOT NULL COMMENT '主键id', - `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', - `account` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '账号', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称', + `account` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '账号', `password` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '密码', `protocol_id` bigint NOT NULL COMMENT '协议id', `type` enum ('public','private') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '类型', -- Gitee