diff --git a/data/components/2c089bb8-0412-449e-94f1-212d35a50219/iot-websocket-component-0.4.3-SNAPSHOT.jar b/data/components/2c089bb8-0412-449e-94f1-212d35a50219/iot-websocket-component-0.4.5-SNAPSHOT.jar similarity index 94% rename from data/components/2c089bb8-0412-449e-94f1-212d35a50219/iot-websocket-component-0.4.3-SNAPSHOT.jar rename to data/components/2c089bb8-0412-449e-94f1-212d35a50219/iot-websocket-component-0.4.5-SNAPSHOT.jar index 4950e694..911b04b7 100644 Binary files a/data/components/2c089bb8-0412-449e-94f1-212d35a50219/iot-websocket-component-0.4.3-SNAPSHOT.jar and b/data/components/2c089bb8-0412-449e-94f1-212d35a50219/iot-websocket-component-0.4.5-SNAPSHOT.jar differ diff --git a/data/components/3ababc5e-15e9-45a7-8f38-2a6afd45c780/iot-http-biz-component-0.4.3-SNAPSHOT.jar b/data/components/305a8b86-4566-4f2a-a57f-f84ca47471a1/iot-http-biz-component-0.4.5-SNAPSHOT.jar similarity index 86% rename from data/components/3ababc5e-15e9-45a7-8f38-2a6afd45c780/iot-http-biz-component-0.4.3-SNAPSHOT.jar rename to data/components/305a8b86-4566-4f2a-a57f-f84ca47471a1/iot-http-biz-component-0.4.5-SNAPSHOT.jar index 8eee65fe..358f430f 100644 Binary files a/data/components/3ababc5e-15e9-45a7-8f38-2a6afd45c780/iot-http-biz-component-0.4.3-SNAPSHOT.jar and b/data/components/305a8b86-4566-4f2a-a57f-f84ca47471a1/iot-http-biz-component-0.4.5-SNAPSHOT.jar differ diff --git a/data/components/305a8b86-4566-4f2a-a57f-f84ca47471a1/iot-DLT645-component-0.4.3-SNAPSHOT.jar b/data/components/3ababc5e-15e9-45a7-8f38-2a6afd45c780/iot-DLT645-component-0.4.5-SNAPSHOT.jar similarity index 85% rename from data/components/305a8b86-4566-4f2a-a57f-f84ca47471a1/iot-DLT645-component-0.4.3-SNAPSHOT.jar rename to data/components/3ababc5e-15e9-45a7-8f38-2a6afd45c780/iot-DLT645-component-0.4.5-SNAPSHOT.jar index e6357919..bf72a0c4 100644 Binary files a/data/components/305a8b86-4566-4f2a-a57f-f84ca47471a1/iot-DLT645-component-0.4.3-SNAPSHOT.jar and b/data/components/3ababc5e-15e9-45a7-8f38-2a6afd45c780/iot-DLT645-component-0.4.5-SNAPSHOT.jar differ diff --git a/data/components/6c095554-35e7-4e9d-a8d2-bb919e9479f4/iot-emqx-component-0.4.3-SNAPSHOT.jar b/data/components/6c095554-35e7-4e9d-a8d2-bb919e9479f4/iot-emqx-component-0.4.5-SNAPSHOT.jar similarity index 73% rename from data/components/6c095554-35e7-4e9d-a8d2-bb919e9479f4/iot-emqx-component-0.4.3-SNAPSHOT.jar rename to data/components/6c095554-35e7-4e9d-a8d2-bb919e9479f4/iot-emqx-component-0.4.5-SNAPSHOT.jar index 75c801b8..e204d20b 100644 Binary files a/data/components/6c095554-35e7-4e9d-a8d2-bb919e9479f4/iot-emqx-component-0.4.3-SNAPSHOT.jar and b/data/components/6c095554-35e7-4e9d-a8d2-bb919e9479f4/iot-emqx-component-0.4.5-SNAPSHOT.jar differ diff --git a/data/components/eabb131d-8fd1-43a8-88d9-a198abfd3d42/iot-mqtt-component-0.4.3-SNAPSHOT.jar b/data/components/eabb131d-8fd1-43a8-88d9-a198abfd3d42/iot-mqtt-component-0.4.5-SNAPSHOT.jar similarity index 92% rename from data/components/eabb131d-8fd1-43a8-88d9-a198abfd3d42/iot-mqtt-component-0.4.3-SNAPSHOT.jar rename to data/components/eabb131d-8fd1-43a8-88d9-a198abfd3d42/iot-mqtt-component-0.4.5-SNAPSHOT.jar index 64d101d2..b1f79bef 100644 Binary files a/data/components/eabb131d-8fd1-43a8-88d9-a198abfd3d42/iot-mqtt-component-0.4.3-SNAPSHOT.jar and b/data/components/eabb131d-8fd1-43a8-88d9-a198abfd3d42/iot-mqtt-component-0.4.5-SNAPSHOT.jar differ diff --git a/data/init/protocolComponent.json b/data/init/protocolComponent.json index 64a67b00..b369914e 100644 --- a/data/init/protocolComponent.json +++ b/data/init/protocolComponent.json @@ -5,7 +5,7 @@ "name": "MQTT标准协议组件", "type": "device", "protocol": "mqtt", - "jarFile": "iot-mqtt-component-0.4.3-SNAPSHOT.jar", + "jarFile": "iot-mqtt-component-0.4.5-SNAPSHOT.jar", "config": "{\"port\":1883,\"ssl\":false,\"type\":\"server\"}", "converter": "6260396d67aced2696184053", "converType": "custom", @@ -18,7 +18,7 @@ "name": "EMQX标准协议组件", "type": "device", "protocol": "mqtt", - "jarFile": "iot-emqx-component-0.4.3-SNAPSHOT.jar", + "jarFile": "iot-emqx-component-0.4.5-SNAPSHOT.jar", "config": "{\"port\":\"1884\",\"ssl\":false,\"type\":\"client\",\"subscribeTopics\":[\"/sys/+/+/s/#\",\"/sys/client/connected\",\"/sys/client/disconnected\",\"/sys/session/subscribed\",\"/sys/session/unsubscribed\"],\"authPort\":\"8088\",\"broker\":\"127.0.0.1\",\"clientId\":\"test\",\"username\":\"test\",\"password\":\"123\"}", "converter": "6260396d67aced2696184053", "converType": "custom", @@ -31,7 +31,7 @@ "name": "小度音箱接入组件", "type": "biz", "protocol": "http", - "jarFile": "iot-http-biz-component-0.4.3-SNAPSHOT.jar", + "jarFile": "iot-http-biz-component-0.4.5-SNAPSHOT.jar", "config": "{\"port\":\"8084\"}", "converter": "", "converType": "", @@ -44,7 +44,7 @@ "name": "WEBSOCKET服务端", "type": "device", "protocol": "websocket", - "jarFile": "iot-websocket-component-0.4.3-SNAPSHOT.jar", + "jarFile": "iot-websocket-component-0.4.5-SNAPSHOT.jar", "config": "{\"port\":\"2454\",\"ssl\":false,\"type\":\"server\",\"ip\":\"\",\"url\":\"\",\"heartBeatTime\":10000,\"heartBeatData\":\"\",\"accessTokens\":[{\"id\":\"b4f02276-13d8-499d-89b3-8acd6330b310\",\"tokenName\":\"tokrn\",\"tokenStr\":\"NxW4nPt2SPnc87pdFXAQmCZY4Kb0nRsPDC6z4Qzpp1AtRWDJxg8iZMqFpcwZ2igi\"}]}", "converter": "d7e84930-5460-4638-aa3f-e0c2015628f4", "converType": "custom", @@ -58,7 +58,7 @@ "name": "DLT645电表通讯组件", "type": "device", "protocol": "tcp", - "jarFile": "iot-DLT645-component-0.4.3-SNAPSHOT.jar", + "jarFile": "iot-DLT645-component-0.4.5-SNAPSHOT.jar", "config": "{\"port\":2424,\"ssl\":false,\"type\":\"server\",\"parserType\":\"不处理\",\"parserConfiguration\":{\"delimited\":\"\",\"fix\":1,\"script\":\"\"},\"host\":\"127.0.0.1\"}", "converType": "static", "state": "stopped", diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/ProtocolController.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/ProtocolController.java index 80c2e95a..465c0b01 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/ProtocolController.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/ProtocolController.java @@ -51,8 +51,9 @@ public class ProtocolController { @ApiOperation("修改组件") @PostMapping("/editComponent") - public String saveComponent(@RequestBody @Validated Request bo) { - return protocolService.saveComponent(bo.getData()); + public boolean saveComponent(@RequestBody @Validated Request bo) { + protocolService.saveComponent(bo.getData()); + return true; } @ApiOperation("获取组件详情") diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/protocolcomponent/ProtocolComponentBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/protocolcomponent/ProtocolComponentBo.java index ffaa88d7..0897fb46 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/protocolcomponent/ProtocolComponentBo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/protocolcomponent/ProtocolComponentBo.java @@ -29,12 +29,11 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) @AutoMapper(target = ProtocolComponent.class, reverseConvertGenerate = false) public class ProtocolComponentBo extends BaseDto { + private static final long serialVersionUID = -1L; @ApiModelProperty(value = "") private String id; - private static final long serialVersionUID = -1L; - @ApiModelProperty(value = "") @Size(max = 65535, message = "长度不正确") private String config;