From 01abec31c40301448bbccbf886e7ba5ffd3c391e Mon Sep 17 00:00:00 2001 From: xiwa Date: Tue, 9 Jan 2024 22:17:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=88=9D=E5=A7=8B=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/init/channelConfig.json | 18 +++---------- data/init/sys_config.json | 9 ------- data/init/sys_menu.json | 50 ------------------------------------ data/init/sys_role.json | 2 +- data/init/sys_role_menu.json | 10 -------- data/init/thingModel.json | 44 ------------------------------- pom.xml | 2 +- 7 files changed, 5 insertions(+), 130 deletions(-) diff --git a/data/init/channelConfig.json b/data/init/channelConfig.json index 17a4b165..ccd80a7d 100644 --- a/data/init/channelConfig.json +++ b/data/init/channelConfig.json @@ -3,33 +3,21 @@ "id": 1312312, "channelId": 3, "title": "告警邮件配置", - "param": { - "userName":"xxx", - "passWord":"xxx", - "host":"smtp.qq.com", - "port":465, - "mailSmtpAuth":true, - "from":"1111111@qq.com", - "to":"abcdef@yeah.net,1211111@qq.com" - }, + "param": "{\"userName\":\"xxx@163.com\",\"passWord\":\"xxx\",\"host\":\"smtp.163.com\",\"port\":465,\"mailSmtpAuth\":true,\"from\":\"xxxx@163.com\",\"to\":\"xxxx@163.com\"}\t", "createAt": 1683816661690 }, { "id": 1313123, "channelId": 1, "title": "告警钉钉配置", - "param": { - "dingTalkWebhook":"xxxxxxxxxxxxxxxx" - }, + "param": "{\"dingTalkWebhook\":\"xxxxxxxxxxxxxxxx\",\"dingTalkSecret\":\"xxxx\"}", "createAt": 1683816661690 }, { "id": 32141342, "channelId": 2, "title": "告警企业微信配置", - "param": { - "qyWechatWebhook":"xxxxxxxxxxxxxxxx" - }, + "param": "{\"qyWechatWebhook\":\"xxxxxxxxxxxxxxxx\"}", "createAt": 1683816661690 } ] diff --git a/data/init/sys_config.json b/data/init/sys_config.json index 679452bd..7a3e8004 100644 --- a/data/init/sys_config.json +++ b/data/init/sys_config.json @@ -99,14 +99,5 @@ "configValue": "false", "remark": "是否开启注册用户功能（true开启，false关闭）", "tenantId": "452748015218757" - }, - { - "id": 452767972708422, - "configKey": "sys.oss.previewListResource", - "configName": "OSS预览列表资源开关", - "configType": "Y", - "configValue": "true", - "remark": "true:开启, false:关闭", - "tenantId": "452748015218757" } ] diff --git a/data/init/sys_menu.json b/data/init/sys_menu.json index 49926717..c832a55b 100644 --- a/data/init/sys_menu.json +++ b/data/init/sys_menu.json @@ -49,31 +49,6 @@ ] }, - { - "createDept":103, - "createBy":1, - "createTime":null, - "updateBy":1, - "updateTime":null, - "id":3, - "menuName":"系统工具", - "parentId":0, - "orderNum":24, - "path":"tool", - "component":null, - "queryParam":"", - "isFrame":"1", - "isCache":"0", - "menuType":"M", - "visible":"0", - "status":"0", - "perms":"", - "icon":"tool", - "remark":"系统工具目录", - "children":[ - - ] - }, { "createDept":103, "createBy":1, @@ -3048,31 +3023,6 @@ ] }, - { - "createDept":103, - "createBy":1, - "createTime":null, - "updateBy":1, - "updateTime":null, - "id":2224, - "menuName":"平台建设", - "parentId":0, - "orderNum":1, - "path":"contributor", - "component":"contributor/index", - "queryParam":null, - "isFrame":"1", - "isCache":"0", - "menuType":"C", - "visible":"0", - "status":"0", - "perms":null, - "icon":"color", - "remark":"", - "children":[ - - ] - }, { "createDept":103, "createBy":1, diff --git a/data/init/sys_role.json b/data/init/sys_role.json index 3a62f08d..204f865b 100644 --- a/data/init/sys_role.json +++ b/data/init/sys_role.json @@ -34,5 +34,5 @@ "updateBy": null, "updateTime": null, "remark": "普通角色" - }, + } ] diff --git a/data/init/sys_role_menu.json b/data/init/sys_role_menu.json index 9ff28d87..8509534e 100644 --- a/data/init/sys_role_menu.json +++ b/data/init/sys_role_menu.json @@ -399,11 +399,6 @@ "roleId": 2, "menuId": 2215 }, - { - "id": 447227041763408, - "roleId": 2, - "menuId": 2224 - }, { "id": 447227041767493, "roleId": 2, @@ -644,11 +639,6 @@ "roleId": 2, "menuId": 1046 }, - { - "id": 447227041783878, - "roleId": 2, - "menuId": 3 - }, { "id": 447227041783879, "roleId": 2, diff --git a/data/init/thingModel.json b/data/init/thingModel.json index fbf91c62..689757fd 100755 --- a/data/init/thingModel.json +++ b/data/init/thingModel.json @@ -1838,17 +1838,6 @@ "name": "实时运行状态", "accessMode": "rw" }, - { - "identifier": "Time", - "dataType": { - "type": "text", - "specs": { - "length": "255" - } - }, - "name": "时间戳", - "accessMode": "rw" - }, { "identifier": "TimeModeSet", "dataType": { @@ -2197,17 +2186,6 @@ "name": "实时运行状态", "required": false }, - { - "identifier": "Time", - "dataType": { - "type": "text", - "specs": { - "length": "255" - } - }, - "name": "时间戳", - "required": false - }, { "identifier": "TimeModeSet", "dataType": { @@ -2763,17 +2741,6 @@ "name": "实时运行状态", "required": false }, - { - "identifier": "Time", - "dataType": { - "type": "text", - "specs": { - "length": "255" - } - }, - "name": "时间戳", - "required": false - }, { "identifier": "TimeModeSet", "dataType": { @@ -3318,17 +3285,6 @@ "name": "实时运行状态", "required": false }, - { - "identifier": "Time", - "dataType": { - "type": "text", - "specs": { - "length": "255" - } - }, - "name": "时间戳", - "required": false - }, { "identifier": "TimeModeSet", "dataType": { diff --git a/pom.xml b/pom.xml index 399eaa67..77a9f030 100755 --- a/pom.xml +++ b/pom.xml @@ -373,7 +373,7 @@ cc.iotkit iot-message-bus - ${project.version} + ${iot-iita-core.version}