diff --git a/data/components/eabb131d-8fd1-43a8-88d9-a198abfd3d42/mqtt-component-0.3.0-SNAPSHOT.jar b/data/components/eabb131d-8fd1-43a8-88d9-a198abfd3d42/iot-mqtt-component-0.3.1-SNAPSHOT.jar similarity index 95% rename from data/components/eabb131d-8fd1-43a8-88d9-a198abfd3d42/mqtt-component-0.3.0-SNAPSHOT.jar rename to data/components/eabb131d-8fd1-43a8-88d9-a198abfd3d42/iot-mqtt-component-0.3.1-SNAPSHOT.jar index ccb0a63d..6dfec6da 100644 Binary files a/data/components/eabb131d-8fd1-43a8-88d9-a198abfd3d42/mqtt-component-0.3.0-SNAPSHOT.jar and b/data/components/eabb131d-8fd1-43a8-88d9-a198abfd3d42/iot-mqtt-component-0.3.1-SNAPSHOT.jar differ diff --git a/data/init/protocolComponent.json b/data/init/protocolComponent.json index 5564f84e..941b6c6f 100644 --- a/data/init/protocolComponent.json +++ b/data/init/protocolComponent.json @@ -17,7 +17,7 @@ "name": "MQTT标准协议组件", "type": "device", "protocol": "mqtt", - "jarFile": "mqtt-component-0.2.1-SNAPSHOT.jar", + "jarFile": "iot-mqtt-component-0.3.1-SNAPSHOT.jar", "config": "{\"port\":1883,\"ssl\":false,\"type\":\"server\"}", "converter": "6260396d67aced2696184053", "state": "running", diff --git a/oauth2-server/pom.xml b/iot-auth-server/pom.xml old mode 100755 new mode 100644 similarity index 91% rename from oauth2-server/pom.xml rename to iot-auth-server/pom.xml index 61b33095..37c7953a --- a/oauth2-server/pom.xml +++ b/iot-auth-server/pom.xml @@ -5,11 +5,11 @@ iotkit-parent cc.iotkit - 0.3.0-SNAPSHOT + 0.3.1-SNAPSHOT 4.0.0 - oauth2-server + iot-auth-server @@ -45,7 +45,7 @@ cc.iotkit - dao + iot-dao diff --git a/iot-auth-server/readme.txt b/iot-auth-server/readme.txt new file mode 100644 index 00000000..44d079b1 --- /dev/null +++ b/iot-auth-server/readme.txt @@ -0,0 +1 @@ +此模块为认证服务，提供oauth2认证界面和接口 diff --git a/oauth2-server/src/main/java/cc/iotkit/oauth/controller/AuthClientController.java b/iot-auth-server/src/main/java/cc/iotkit/oauth/controller/AuthClientController.java old mode 100755 new mode 100644 similarity index 100% rename from oauth2-server/src/main/java/cc/iotkit/oauth/controller/AuthClientController.java rename to iot-auth-server/src/main/java/cc/iotkit/oauth/controller/AuthClientController.java diff --git a/oauth2-server/src/main/java/cc/iotkit/oauth/controller/AuthServerController.java b/iot-auth-server/src/main/java/cc/iotkit/oauth/controller/AuthServerController.java old mode 100755 new mode 100644 similarity index 100% rename from oauth2-server/src/main/java/cc/iotkit/oauth/controller/AuthServerController.java rename to iot-auth-server/src/main/java/cc/iotkit/oauth/controller/AuthServerController.java diff --git a/oauth2-server/src/main/java/cc/iotkit/oauth/service/SaOAuth2TemplateImpl.java b/iot-auth-server/src/main/java/cc/iotkit/oauth/service/SaOAuth2TemplateImpl.java old mode 100755 new mode 100644 similarity index 100% rename from oauth2-server/src/main/java/cc/iotkit/oauth/service/SaOAuth2TemplateImpl.java rename to iot-auth-server/src/main/java/cc/iotkit/oauth/service/SaOAuth2TemplateImpl.java diff --git a/oauth2-server/src/main/java/cc/iotkit/oauth/service/StpInterfaceImpl.java b/iot-auth-server/src/main/java/cc/iotkit/oauth/service/StpInterfaceImpl.java old mode 100755 new mode 100644 similarity index 100% rename from oauth2-server/src/main/java/cc/iotkit/oauth/service/StpInterfaceImpl.java rename to iot-auth-server/src/main/java/cc/iotkit/oauth/service/StpInterfaceImpl.java diff --git a/oauth2-server/src/main/java/cc/iotkit/oauth/service/TokenRequestHandler.java b/iot-auth-server/src/main/java/cc/iotkit/oauth/service/TokenRequestHandler.java old mode 100755 new mode 100644 similarity index 100% rename from oauth2-server/src/main/java/cc/iotkit/oauth/service/TokenRequestHandler.java rename to iot-auth-server/src/main/java/cc/iotkit/oauth/service/TokenRequestHandler.java diff --git a/oauth2-server/src/main/java/cc/iotkit/oauth/vo/UserInfoVo.java b/iot-auth-server/src/main/java/cc/iotkit/oauth/vo/UserInfoVo.java similarity index 100% rename from oauth2-server/src/main/java/cc/iotkit/oauth/vo/UserInfoVo.java rename to iot-auth-server/src/main/java/cc/iotkit/oauth/vo/UserInfoVo.java diff --git a/oauth2-server/src/main/java/cc/iotkit/utils/AuthUtil.java b/iot-auth-server/src/main/java/cc/iotkit/utils/AuthUtil.java old mode 100755 new mode 100644 similarity index 100% rename from oauth2-server/src/main/java/cc/iotkit/utils/AuthUtil.java rename to iot-auth-server/src/main/java/cc/iotkit/utils/AuthUtil.java diff --git a/oauth2-server/src/main/java/cc/iotkit/utils/SoMap.java b/iot-auth-server/src/main/java/cc/iotkit/utils/SoMap.java old mode 100755 new mode 100644 similarity index 100% rename from oauth2-server/src/main/java/cc/iotkit/utils/SoMap.java rename to iot-auth-server/src/main/java/cc/iotkit/utils/SoMap.java diff --git a/oauth2-server/src/main/resources/templates/confirm.html b/iot-auth-server/src/main/resources/templates/confirm.html old mode 100755 new mode 100644 similarity index 100% rename from oauth2-server/src/main/resources/templates/confirm.html rename to iot-auth-server/src/main/resources/templates/confirm.html diff --git a/oauth2-server/src/main/resources/templates/login.html b/iot-auth-server/src/main/resources/templates/login.html old mode 100755 new mode 100644 similarity index 100% rename from oauth2-server/src/main/resources/templates/login.html rename to iot-auth-server/src/main/resources/templates/login.html diff --git a/oauth2-server/src/test/java/GenPwdSecret.java b/iot-auth-server/src/test/java/GenPwdSecret.java similarity index 100% rename from oauth2-server/src/test/java/GenPwdSecret.java rename to iot-auth-server/src/test/java/GenPwdSecret.java diff --git a/common/pom.xml b/iot-common/pom.xml old mode 100755 new mode 100644 similarity index 94% rename from common/pom.xml rename to iot-common/pom.xml index 8c5debc0..e1889e96 --- a/common/pom.xml +++ b/iot-common/pom.xml @@ -5,11 +5,11 @@ iotkit-parent cc.iotkit - 0.3.0-SNAPSHOT + 0.3.1-SNAPSHOT 4.0.0 - common + iot-common diff --git a/iot-common/readme.txt b/iot-common/readme.txt new file mode 100644 index 00000000..539c28cd --- /dev/null +++ b/iot-common/readme.txt @@ -0,0 +1 @@ +此模块为通用业务逻辑或工具类 diff --git a/common/src/main/java/cc/iotkit/common/ComponentClassLoader.java b/iot-common/src/main/java/cc/iotkit/common/ComponentClassLoader.java old mode 100755 new mode 100644 similarity index 97% rename from common/src/main/java/cc/iotkit/common/ComponentClassLoader.java rename to iot-common/src/main/java/cc/iotkit/common/ComponentClassLoader.java index dd715ed5..7f4aa254 --- a/common/src/main/java/cc/iotkit/common/ComponentClassLoader.java +++ b/iot-common/src/main/java/cc/iotkit/common/ComponentClassLoader.java @@ -58,7 +58,7 @@ public class ComponentClassLoader { public static T getComponent(String name, File jarFile) throws Exception { String className = addUrl(name, jarFile); Class componentClass = findClass(name, className); - return componentClass.newInstance(); + return componentClass.getDeclaredConstructor().newInstance(); } } diff --git a/common/src/main/java/cc/iotkit/common/Constants.java b/iot-common/src/main/java/cc/iotkit/common/Constants.java old mode 100755 new mode 100644 similarity index 100% rename from common/src/main/java/cc/iotkit/common/Constants.java rename to iot-common/src/main/java/cc/iotkit/common/Constants.java diff --git a/common/src/main/java/cc/iotkit/common/exception/BizException.java b/iot-common/src/main/java/cc/iotkit/common/exception/BizException.java old mode 100755 new mode 100644 similarity index 100% rename from common/src/main/java/cc/iotkit/common/exception/BizException.java rename to iot-common/src/main/java/cc/iotkit/common/exception/BizException.java diff --git a/common/src/main/java/cc/iotkit/common/exception/NotFoundException.java b/iot-common/src/main/java/cc/iotkit/common/exception/NotFoundException.java old mode 100755 new mode 100644 similarity index 100% rename from common/src/main/java/cc/iotkit/common/exception/NotFoundException.java rename to iot-common/src/main/java/cc/iotkit/common/exception/NotFoundException.java diff --git a/common/src/main/java/cc/iotkit/common/exception/OfflineException.java b/iot-common/src/main/java/cc/iotkit/common/exception/OfflineException.java old mode 100755 new mode 100644 similarity index 100% rename from common/src/main/java/cc/iotkit/common/exception/OfflineException.java rename to iot-common/src/main/java/cc/iotkit/common/exception/OfflineException.java diff --git a/common/src/main/java/cc/iotkit/common/thing/ThingService.java b/iot-common/src/main/java/cc/iotkit/common/thing/ThingService.java similarity index 100% rename from common/src/main/java/cc/iotkit/common/thing/ThingService.java rename to iot-common/src/main/java/cc/iotkit/common/thing/ThingService.java diff --git a/common/src/main/java/cc/iotkit/common/utils/CodecUtil.java b/iot-common/src/main/java/cc/iotkit/common/utils/CodecUtil.java old mode 100755 new mode 100644 similarity index 100% rename from common/src/main/java/cc/iotkit/common/utils/CodecUtil.java rename to iot-common/src/main/java/cc/iotkit/common/utils/CodecUtil.java diff --git a/common/src/main/java/cc/iotkit/common/utils/DeviceUtil.java b/iot-common/src/main/java/cc/iotkit/common/utils/DeviceUtil.java old mode 100755 new mode 100644 similarity index 100% rename from common/src/main/java/cc/iotkit/common/utils/DeviceUtil.java rename to iot-common/src/main/java/cc/iotkit/common/utils/DeviceUtil.java diff --git a/common/src/main/java/cc/iotkit/common/utils/HexUtil.java b/iot-common/src/main/java/cc/iotkit/common/utils/HexUtil.java old mode 100755 new mode 100644 similarity index 100% rename from common/src/main/java/cc/iotkit/common/utils/HexUtil.java rename to iot-common/src/main/java/cc/iotkit/common/utils/HexUtil.java diff --git a/common/src/main/java/cc/iotkit/common/utils/JsonUtil.java b/iot-common/src/main/java/cc/iotkit/common/utils/JsonUtil.java old mode 100755 new mode 100644 similarity index 100% rename from common/src/main/java/cc/iotkit/common/utils/JsonUtil.java rename to iot-common/src/main/java/cc/iotkit/common/utils/JsonUtil.java diff --git a/common/src/main/java/cc/iotkit/common/utils/ReflectUtil.java b/iot-common/src/main/java/cc/iotkit/common/utils/ReflectUtil.java old mode 100755 new mode 100644 similarity index 100% rename from common/src/main/java/cc/iotkit/common/utils/ReflectUtil.java rename to iot-common/src/main/java/cc/iotkit/common/utils/ReflectUtil.java diff --git a/common/src/main/java/cc/iotkit/common/utils/ThreadUtil.java b/iot-common/src/main/java/cc/iotkit/common/utils/ThreadUtil.java old mode 100755 new mode 100644 similarity index 100% rename from common/src/main/java/cc/iotkit/common/utils/ThreadUtil.java rename to iot-common/src/main/java/cc/iotkit/common/utils/ThreadUtil.java diff --git a/common/src/main/java/cc/iotkit/common/utils/UniqueIdUtil.java b/iot-common/src/main/java/cc/iotkit/common/utils/UniqueIdUtil.java old mode 100755 new mode 100644 similarity index 100% rename from common/src/main/java/cc/iotkit/common/utils/UniqueIdUtil.java rename to iot-common/src/main/java/cc/iotkit/common/utils/UniqueIdUtil.java diff --git a/iot-components/.DS_Store b/iot-components/.DS_Store new file mode 100644 index 00000000..e86ca519 Binary files /dev/null and b/iot-components/.DS_Store differ diff --git a/protocol-gateway/mqtt-client-simulator/.DS_Store b/iot-components/iot-component-base/.DS_Store old mode 100755 new mode 100644 similarity index 82% rename from protocol-gateway/mqtt-client-simulator/.DS_Store rename to iot-components/iot-component-base/.DS_Store index a3c148ab..5008ddfc Binary files a/protocol-gateway/mqtt-client-simulator/.DS_Store and b/iot-components/iot-component-base/.DS_Store differ diff --git a/protocol-gateway/component/pom.xml b/iot-components/iot-component-base/pom.xml old mode 100755 new mode 100644 similarity index 78% rename from protocol-gateway/component/pom.xml rename to iot-components/iot-component-base/pom.xml index aa43b9f3..74b0a514 --- a/protocol-gateway/component/pom.xml +++ b/iot-components/iot-component-base/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - protocol-gateway + iot-components cc.iotkit - 0.3.0-SNAPSHOT + 0.3.1-SNAPSHOT 4.0.0 - component + iot-component-base 8 @@ -19,13 +19,13 @@ - cc.iotkit - converter + org.projectlombok + lombok - org.projectlombok - lombok + cc.iotkit + iot-component-converter diff --git a/protocol-gateway/component/src/main/java/cc/iotkit/comp/AbstractDeviceComponent.java b/iot-components/iot-component-base/src/main/java/cc/iotkit/comp/AbstractDeviceComponent.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/component/src/main/java/cc/iotkit/comp/AbstractDeviceComponent.java rename to iot-components/iot-component-base/src/main/java/cc/iotkit/comp/AbstractDeviceComponent.java diff --git a/protocol-gateway/component/src/main/java/cc/iotkit/comp/CompConfig.java b/iot-components/iot-component-base/src/main/java/cc/iotkit/comp/CompConfig.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/component/src/main/java/cc/iotkit/comp/CompConfig.java rename to iot-components/iot-component-base/src/main/java/cc/iotkit/comp/CompConfig.java diff --git a/protocol-gateway/component/src/main/java/cc/iotkit/comp/IComponent.java b/iot-components/iot-component-base/src/main/java/cc/iotkit/comp/IComponent.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/component/src/main/java/cc/iotkit/comp/IComponent.java rename to iot-components/iot-component-base/src/main/java/cc/iotkit/comp/IComponent.java diff --git a/protocol-gateway/component/src/main/java/cc/iotkit/comp/IDeviceComponent.java b/iot-components/iot-component-base/src/main/java/cc/iotkit/comp/IDeviceComponent.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/component/src/main/java/cc/iotkit/comp/IDeviceComponent.java rename to iot-components/iot-component-base/src/main/java/cc/iotkit/comp/IDeviceComponent.java diff --git a/protocol-gateway/component/src/main/java/cc/iotkit/comp/IMessageHandler.java b/iot-components/iot-component-base/src/main/java/cc/iotkit/comp/IMessageHandler.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/component/src/main/java/cc/iotkit/comp/IMessageHandler.java rename to iot-components/iot-component-base/src/main/java/cc/iotkit/comp/IMessageHandler.java diff --git a/protocol-gateway/component/src/main/java/cc/iotkit/comp/model/AuthInfo.java b/iot-components/iot-component-base/src/main/java/cc/iotkit/comp/model/AuthInfo.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/component/src/main/java/cc/iotkit/comp/model/AuthInfo.java rename to iot-components/iot-component-base/src/main/java/cc/iotkit/comp/model/AuthInfo.java diff --git a/protocol-gateway/component/src/main/java/cc/iotkit/comp/model/DeviceState.java b/iot-components/iot-component-base/src/main/java/cc/iotkit/comp/model/DeviceState.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/component/src/main/java/cc/iotkit/comp/model/DeviceState.java rename to iot-components/iot-component-base/src/main/java/cc/iotkit/comp/model/DeviceState.java diff --git a/protocol-gateway/component/src/main/java/cc/iotkit/comp/model/ReceiveResult.java b/iot-components/iot-component-base/src/main/java/cc/iotkit/comp/model/ReceiveResult.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/component/src/main/java/cc/iotkit/comp/model/ReceiveResult.java rename to iot-components/iot-component-base/src/main/java/cc/iotkit/comp/model/ReceiveResult.java diff --git a/protocol-gateway/component/src/main/java/cc/iotkit/comp/model/RegisterInfo.java b/iot-components/iot-component-base/src/main/java/cc/iotkit/comp/model/RegisterInfo.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/component/src/main/java/cc/iotkit/comp/model/RegisterInfo.java rename to iot-components/iot-component-base/src/main/java/cc/iotkit/comp/model/RegisterInfo.java diff --git a/protocol-gateway/component/src/main/java/cc/iotkit/comp/utils/SpringUtils.java b/iot-components/iot-component-base/src/main/java/cc/iotkit/comp/utils/SpringUtils.java similarity index 100% rename from protocol-gateway/component/src/main/java/cc/iotkit/comp/utils/SpringUtils.java rename to iot-components/iot-component-base/src/main/java/cc/iotkit/comp/utils/SpringUtils.java diff --git a/protocol-gateway/.DS_Store b/iot-components/iot-component-converter/.DS_Store old mode 100755 new mode 100644 similarity index 69% rename from protocol-gateway/.DS_Store rename to iot-components/iot-component-converter/.DS_Store index b7222f61..5008ddfc Binary files a/protocol-gateway/.DS_Store and b/iot-components/iot-component-converter/.DS_Store differ diff --git a/protocol-gateway/converter/pom.xml b/iot-components/iot-component-converter/pom.xml old mode 100755 new mode 100644 similarity index 84% rename from protocol-gateway/converter/pom.xml rename to iot-components/iot-component-converter/pom.xml index 4e09d878..9081ef3e --- a/protocol-gateway/converter/pom.xml +++ b/iot-components/iot-component-converter/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - protocol-gateway + iot-components cc.iotkit - 0.3.0-SNAPSHOT + 0.3.1-SNAPSHOT 4.0.0 - converter + iot-component-converter 8 @@ -29,13 +29,13 @@ - cc.iotkit - model + org.projectlombok + lombok - org.projectlombok - lombok + cc.iotkit + iot-model diff --git a/protocol-gateway/converter/src/main/java/cc/iotkit/converter/Device.java b/iot-components/iot-component-converter/src/main/java/cc/iotkit/converter/Device.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/converter/src/main/java/cc/iotkit/converter/Device.java rename to iot-components/iot-component-converter/src/main/java/cc/iotkit/converter/Device.java diff --git a/protocol-gateway/converter/src/main/java/cc/iotkit/converter/DeviceMessage.java b/iot-components/iot-component-converter/src/main/java/cc/iotkit/converter/DeviceMessage.java similarity index 100% rename from protocol-gateway/converter/src/main/java/cc/iotkit/converter/DeviceMessage.java rename to iot-components/iot-component-converter/src/main/java/cc/iotkit/converter/DeviceMessage.java diff --git a/protocol-gateway/converter/src/main/java/cc/iotkit/converter/IConverter.java b/iot-components/iot-component-converter/src/main/java/cc/iotkit/converter/IConverter.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/converter/src/main/java/cc/iotkit/converter/IConverter.java rename to iot-components/iot-component-converter/src/main/java/cc/iotkit/converter/IConverter.java diff --git a/protocol-gateway/converter/src/main/java/cc/iotkit/converter/ScriptConverter.java b/iot-components/iot-component-converter/src/main/java/cc/iotkit/converter/ScriptConverter.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/converter/src/main/java/cc/iotkit/converter/ScriptConverter.java rename to iot-components/iot-component-converter/src/main/java/cc/iotkit/converter/ScriptConverter.java diff --git a/iot-components/iot-component-server/.DS_Store b/iot-components/iot-component-server/.DS_Store new file mode 100644 index 00000000..5008ddfc Binary files /dev/null and b/iot-components/iot-component-server/.DS_Store differ diff --git a/protocol-gateway/component-server/pom.xml b/iot-components/iot-component-server/pom.xml old mode 100755 new mode 100644 similarity index 83% rename from protocol-gateway/component-server/pom.xml rename to iot-components/iot-component-server/pom.xml index a51cb786..fd6e9792 --- a/protocol-gateway/component-server/pom.xml +++ b/iot-components/iot-component-server/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - protocol-gateway + iot-components cc.iotkit - 0.3.0-SNAPSHOT + 0.3.1-SNAPSHOT 4.0.0 - component-server + iot-component-server @@ -64,32 +64,32 @@ cc.iotkit - common + iot-common cc.iotkit - converter + iot-component-converter cc.iotkit - model + iot-model cc.iotkit - dao + iot-dao cc.iotkit - component + iot-component-base cc.iotkit - message-bus + iot-message-bus diff --git a/protocol-gateway/component-server/src/main/java/cc/iotkit/comps/ApiTool.java b/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/ApiTool.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/component-server/src/main/java/cc/iotkit/comps/ApiTool.java rename to iot-components/iot-component-server/src/main/java/cc/iotkit/comps/ApiTool.java diff --git a/protocol-gateway/component-server/src/main/java/cc/iotkit/comps/BizComponentManager.java b/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/BizComponentManager.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/component-server/src/main/java/cc/iotkit/comps/BizComponentManager.java rename to iot-components/iot-component-server/src/main/java/cc/iotkit/comps/BizComponentManager.java diff --git a/protocol-gateway/component-server/src/main/java/cc/iotkit/comps/ComponentManager.java b/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/ComponentManager.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/component-server/src/main/java/cc/iotkit/comps/ComponentManager.java rename to iot-components/iot-component-server/src/main/java/cc/iotkit/comps/ComponentManager.java diff --git a/protocol-gateway/component-server/src/main/java/cc/iotkit/comps/DeviceComponentManager.java b/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/DeviceComponentManager.java old mode 100755 new mode 100644 similarity index 97% rename from protocol-gateway/component-server/src/main/java/cc/iotkit/comps/DeviceComponentManager.java rename to iot-components/iot-component-server/src/main/java/cc/iotkit/comps/DeviceComponentManager.java index 991a9d53..cd54a89f --- a/protocol-gateway/component-server/src/main/java/cc/iotkit/comps/DeviceComponentManager.java +++ b/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/DeviceComponentManager.java @@ -94,7 +94,7 @@ public class DeviceComponentManager { try { componentInstance = ComponentClassLoader.getComponent(component.getId(), file); } catch (Throwable e) { - throw new BizException("get device component instance error"); + throw new BizException("get device component instance error", e); } componentInstance.create(new CompConfig(300, component.getConfig())); @@ -204,17 +204,17 @@ public class DeviceComponentManager { } String sendMid = message.getMid(); - long timeout=deviceComponent.getConfig().getCmdTimeout(); + long timeout = deviceComponent.getConfig().getCmdTimeout(); //保存设备端mid与平台mid对应关系 - saveMidMapping(message,timeout,service.getMid()); + saveMidMapping(message, timeout, service.getMid()); //发送消息给设备 message = deviceComponent.send(message); //mid发生改变 if (!sendMid.equals(message.getMid())) { //重新保存消息id映射 - saveMidMapping(message,timeout,service.getMid()); + saveMidMapping(message, timeout, service.getMid()); } //产生下发消息 diff --git a/protocol-gateway/component-server/src/main/java/cc/iotkit/comps/DeviceMessageHandler.java b/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/DeviceMessageHandler.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/component-server/src/main/java/cc/iotkit/comps/DeviceMessageHandler.java rename to iot-components/iot-component-server/src/main/java/cc/iotkit/comps/DeviceMessageHandler.java diff --git a/protocol-gateway/component-server/src/main/java/cc/iotkit/comps/DeviceRouter.java b/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/DeviceRouter.java similarity index 100% rename from protocol-gateway/component-server/src/main/java/cc/iotkit/comps/DeviceRouter.java rename to iot-components/iot-component-server/src/main/java/cc/iotkit/comps/DeviceRouter.java diff --git a/protocol-gateway/component-server/src/main/java/cc/iotkit/comps/config/CacheKey.java b/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/config/CacheKey.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/component-server/src/main/java/cc/iotkit/comps/config/CacheKey.java rename to iot-components/iot-component-server/src/main/java/cc/iotkit/comps/config/CacheKey.java diff --git a/protocol-gateway/component-server/src/main/java/cc/iotkit/comps/config/ComponentConfig.java b/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/config/ComponentConfig.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/component-server/src/main/java/cc/iotkit/comps/config/ComponentConfig.java rename to iot-components/iot-component-server/src/main/java/cc/iotkit/comps/config/ComponentConfig.java diff --git a/protocol-gateway/component-server/src/main/java/cc/iotkit/comps/service/DeviceBehaviourService.java b/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/service/DeviceBehaviourService.java old mode 100755 new mode 100644 similarity index 99% rename from protocol-gateway/component-server/src/main/java/cc/iotkit/comps/service/DeviceBehaviourService.java rename to iot-components/iot-component-server/src/main/java/cc/iotkit/comps/service/DeviceBehaviourService.java index 268d0e26..820c334b --- a/protocol-gateway/component-server/src/main/java/cc/iotkit/comps/service/DeviceBehaviourService.java +++ b/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/service/DeviceBehaviourService.java @@ -80,7 +80,7 @@ public class DeviceBehaviourService { } Optional optProduct = productRepository.findById(pk); - if (!optProduct.isPresent()) { + if (optProduct.isEmpty()) { throw new BizException("Product does not exist"); } Product product = optProduct.get(); diff --git a/protocol-gateway/component-server/src/main/java/cc/iotkit/comps/service/DeviceMessageConsumer.java b/iot-components/iot-component-server/src/main/java/cc/iotkit/comps/service/DeviceMessageConsumer.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/component-server/src/main/java/cc/iotkit/comps/service/DeviceMessageConsumer.java rename to iot-components/iot-component-server/src/main/java/cc/iotkit/comps/service/DeviceMessageConsumer.java diff --git a/iot-components/iot-ctwing-component/.DS_Store b/iot-components/iot-ctwing-component/.DS_Store new file mode 100644 index 00000000..5008ddfc Binary files /dev/null and b/iot-components/iot-ctwing-component/.DS_Store differ diff --git a/protocol-gateway/ctwing-component/lib/ag-sdk-biz-84356.tar.gz-20220603.182201-SNAPSHOT.jar b/iot-components/iot-ctwing-component/lib/ag-sdk-biz-84356.tar.gz-20220603.182201-SNAPSHOT.jar similarity index 100% rename from protocol-gateway/ctwing-component/lib/ag-sdk-biz-84356.tar.gz-20220603.182201-SNAPSHOT.jar rename to iot-components/iot-ctwing-component/lib/ag-sdk-biz-84356.tar.gz-20220603.182201-SNAPSHOT.jar diff --git a/protocol-gateway/ctwing-component/lib/ctg-ag-sdk-core-2.5.0-20220512.061430-51.jar b/iot-components/iot-ctwing-component/lib/ctg-ag-sdk-core-2.5.0-20220512.061430-51.jar similarity index 100% rename from protocol-gateway/ctwing-component/lib/ctg-ag-sdk-core-2.5.0-20220512.061430-51.jar rename to iot-components/iot-ctwing-component/lib/ctg-ag-sdk-core-2.5.0-20220512.061430-51.jar diff --git a/protocol-gateway/ctwing-component/pom.xml b/iot-components/iot-ctwing-component/pom.xml similarity index 93% rename from protocol-gateway/ctwing-component/pom.xml rename to iot-components/iot-ctwing-component/pom.xml index 62d3b79b..98a90fe5 100644 --- a/protocol-gateway/ctwing-component/pom.xml +++ b/iot-components/iot-ctwing-component/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - protocol-gateway + iot-components cc.iotkit - 0.3.0-SNAPSHOT + 0.3.1-SNAPSHOT 4.0.0 - ctwing-component + iot-ctwing-component @@ -29,11 +29,6 @@ vertx-web-proxy - - cc.iotkit - component - - com.ctg.ag ctg-ag-sdk-core @@ -46,6 +41,11 @@ 20220603.182201-SNAPSHOT + + cc.iotkit + iot-component-base + + diff --git a/protocol-gateway/ctwing-component/src/main/java/cc/iotkit/comp/http/CtwingConfig.java b/iot-components/iot-ctwing-component/src/main/java/cc/iotkit/comp/http/CtwingConfig.java similarity index 100% rename from protocol-gateway/ctwing-component/src/main/java/cc/iotkit/comp/http/CtwingConfig.java rename to iot-components/iot-ctwing-component/src/main/java/cc/iotkit/comp/http/CtwingConfig.java diff --git a/protocol-gateway/ctwing-component/src/main/java/cc/iotkit/comp/http/CtwingDeviceComponent.java b/iot-components/iot-ctwing-component/src/main/java/cc/iotkit/comp/http/CtwingDeviceComponent.java similarity index 100% rename from protocol-gateway/ctwing-component/src/main/java/cc/iotkit/comp/http/CtwingDeviceComponent.java rename to iot-components/iot-ctwing-component/src/main/java/cc/iotkit/comp/http/CtwingDeviceComponent.java diff --git a/protocol-gateway/ctwing-component/src/main/java/cc/iotkit/comp/http/ProtocolUtil.java b/iot-components/iot-ctwing-component/src/main/java/cc/iotkit/comp/http/ProtocolUtil.java similarity index 100% rename from protocol-gateway/ctwing-component/src/main/java/cc/iotkit/comp/http/ProtocolUtil.java rename to iot-components/iot-ctwing-component/src/main/java/cc/iotkit/comp/http/ProtocolUtil.java diff --git a/protocol-gateway/ctwing-component/src/main/resources/component.js b/iot-components/iot-ctwing-component/src/main/resources/component.js similarity index 100% rename from protocol-gateway/ctwing-component/src/main/resources/component.js rename to iot-components/iot-ctwing-component/src/main/resources/component.js diff --git a/protocol-gateway/ctwing-component/src/main/resources/component.spi b/iot-components/iot-ctwing-component/src/main/resources/component.spi similarity index 100% rename from protocol-gateway/ctwing-component/src/main/resources/component.spi rename to iot-components/iot-ctwing-component/src/main/resources/component.spi diff --git a/iot-components/iot-emqx-component/.DS_Store b/iot-components/iot-emqx-component/.DS_Store new file mode 100644 index 00000000..5008ddfc Binary files /dev/null and b/iot-components/iot-emqx-component/.DS_Store differ diff --git a/protocol-gateway/emqx-component/dependency-reduced-pom.xml b/iot-components/iot-emqx-component/dependency-reduced-pom.xml similarity index 84% rename from protocol-gateway/emqx-component/dependency-reduced-pom.xml rename to iot-components/iot-emqx-component/dependency-reduced-pom.xml index 63478637..d00e9956 100644 --- a/protocol-gateway/emqx-component/dependency-reduced-pom.xml +++ b/iot-components/iot-emqx-component/dependency-reduced-pom.xml @@ -1,12 +1,12 @@ - protocol-gateway + iot-components cc.iotkit - 0.3.0-SNAPSHOT + 0.3.1-SNAPSHOT 4.0.0 - emqx-component + iot-emqx-component @@ -73,24 +73,6 @@ 4.2.2 provided - - cc.iotkit - model - 0.3.0-SNAPSHOT - compile - - - cc.iotkit - common - 0.3.0-SNAPSHOT - compile - - - cc.iotkit - component - 0.3.0-SNAPSHOT - compile - org.luaj luaj-jse @@ -99,8 +81,26 @@ cc.iotkit - dao - 0.3.0-SNAPSHOT + iot-model + 0.3.1-SNAPSHOT + compile + + + cc.iotkit + iot-dao + 0.3.1-SNAPSHOT + compile + + + cc.iotkit + iot-common + 0.3.1-SNAPSHOT + compile + + + cc.iotkit + iot-component-base + 0.3.1-SNAPSHOT compile diff --git a/protocol-gateway/emqx-component/pom.xml b/iot-components/iot-emqx-component/pom.xml old mode 100755 new mode 100644 similarity index 91% rename from protocol-gateway/emqx-component/pom.xml rename to iot-components/iot-emqx-component/pom.xml index 5e58fdc7..7f2265b4 --- a/protocol-gateway/emqx-component/pom.xml +++ b/iot-components/iot-emqx-component/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - protocol-gateway + iot-components cc.iotkit - 0.3.0-SNAPSHOT + 0.3.1-SNAPSHOT 4.0.0 - emqx-component + iot-emqx-component @@ -28,21 +28,6 @@ vertx-mqtt - - cc.iotkit - model - - - - cc.iotkit - common - - - - cc.iotkit - component - - org.luaj luaj-jse @@ -50,8 +35,24 @@ cc.iotkit - dao + iot-model + + + cc.iotkit + iot-dao + + + + cc.iotkit + iot-common + + + + cc.iotkit + iot-component-base + + diff --git a/protocol-gateway/emqx-component/src/main/java/cc/iotkit/comp/emqx/AuthVerticle.java b/iot-components/iot-emqx-component/src/main/java/cc/iotkit/comp/emqx/AuthVerticle.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/emqx-component/src/main/java/cc/iotkit/comp/emqx/AuthVerticle.java rename to iot-components/iot-emqx-component/src/main/java/cc/iotkit/comp/emqx/AuthVerticle.java diff --git a/protocol-gateway/emqx-component/src/main/java/cc/iotkit/comp/emqx/EmqxConfig.java b/iot-components/iot-emqx-component/src/main/java/cc/iotkit/comp/emqx/EmqxConfig.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/emqx-component/src/main/java/cc/iotkit/comp/emqx/EmqxConfig.java rename to iot-components/iot-emqx-component/src/main/java/cc/iotkit/comp/emqx/EmqxConfig.java diff --git a/protocol-gateway/emqx-component/src/main/java/cc/iotkit/comp/emqx/EmqxDeviceComponent.java b/iot-components/iot-emqx-component/src/main/java/cc/iotkit/comp/emqx/EmqxDeviceComponent.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/emqx-component/src/main/java/cc/iotkit/comp/emqx/EmqxDeviceComponent.java rename to iot-components/iot-emqx-component/src/main/java/cc/iotkit/comp/emqx/EmqxDeviceComponent.java diff --git a/protocol-gateway/emqx-component/src/main/java/cc/iotkit/comp/emqx/IScripter.java b/iot-components/iot-emqx-component/src/main/java/cc/iotkit/comp/emqx/IScripter.java similarity index 100% rename from protocol-gateway/emqx-component/src/main/java/cc/iotkit/comp/emqx/IScripter.java rename to iot-components/iot-emqx-component/src/main/java/cc/iotkit/comp/emqx/IScripter.java diff --git a/protocol-gateway/emqx-component/src/main/java/cc/iotkit/comp/emqx/JsScripter.java b/iot-components/iot-emqx-component/src/main/java/cc/iotkit/comp/emqx/JsScripter.java similarity index 100% rename from protocol-gateway/emqx-component/src/main/java/cc/iotkit/comp/emqx/JsScripter.java rename to iot-components/iot-emqx-component/src/main/java/cc/iotkit/comp/emqx/JsScripter.java diff --git a/protocol-gateway/emqx-component/src/main/java/cc/iotkit/comp/emqx/LuaScripter.java b/iot-components/iot-emqx-component/src/main/java/cc/iotkit/comp/emqx/LuaScripter.java similarity index 100% rename from protocol-gateway/emqx-component/src/main/java/cc/iotkit/comp/emqx/LuaScripter.java rename to iot-components/iot-emqx-component/src/main/java/cc/iotkit/comp/emqx/LuaScripter.java diff --git a/protocol-gateway/emqx-component/src/main/java/cc/iotkit/comp/emqx/TransparentConverter.java b/iot-components/iot-emqx-component/src/main/java/cc/iotkit/comp/emqx/TransparentConverter.java similarity index 100% rename from protocol-gateway/emqx-component/src/main/java/cc/iotkit/comp/emqx/TransparentConverter.java rename to iot-components/iot-emqx-component/src/main/java/cc/iotkit/comp/emqx/TransparentConverter.java diff --git a/protocol-gateway/emqx-component/src/main/java/cc/iotkit/comp/emqx/TransparentMsg.java b/iot-components/iot-emqx-component/src/main/java/cc/iotkit/comp/emqx/TransparentMsg.java similarity index 100% rename from protocol-gateway/emqx-component/src/main/java/cc/iotkit/comp/emqx/TransparentMsg.java rename to iot-components/iot-emqx-component/src/main/java/cc/iotkit/comp/emqx/TransparentMsg.java diff --git a/protocol-gateway/emqx-component/src/main/resources/component.js b/iot-components/iot-emqx-component/src/main/resources/component.js similarity index 100% rename from protocol-gateway/emqx-component/src/main/resources/component.js rename to iot-components/iot-emqx-component/src/main/resources/component.js diff --git a/protocol-gateway/emqx-component/src/main/resources/component.spi b/iot-components/iot-emqx-component/src/main/resources/component.spi old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/emqx-component/src/main/resources/component.spi rename to iot-components/iot-emqx-component/src/main/resources/component.spi diff --git a/protocol-gateway/http-biz-component/.DS_Store b/iot-components/iot-http-biz-component/.DS_Store old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/http-biz-component/.DS_Store rename to iot-components/iot-http-biz-component/.DS_Store diff --git a/protocol-gateway/http-biz-component/dependency-reduced-pom.xml b/iot-components/iot-http-biz-component/dependency-reduced-pom.xml similarity index 87% rename from protocol-gateway/http-biz-component/dependency-reduced-pom.xml rename to iot-components/iot-http-biz-component/dependency-reduced-pom.xml index 4ad03fef..adc65c19 100644 --- a/protocol-gateway/http-biz-component/dependency-reduced-pom.xml +++ b/iot-components/iot-http-biz-component/dependency-reduced-pom.xml @@ -1,12 +1,12 @@ - protocol-gateway + iot-components cc.iotkit - 0.3.0-SNAPSHOT + 0.3.1-SNAPSHOT 4.0.0 - http-biz-component + iot-http-biz-component @@ -57,8 +57,8 @@ cc.iotkit - component - 0.3.0-SNAPSHOT + iot-component-base + 0.3.1-SNAPSHOT compile diff --git a/protocol-gateway/http-biz-component/pom.xml b/iot-components/iot-http-biz-component/pom.xml old mode 100755 new mode 100644 similarity index 92% rename from protocol-gateway/http-biz-component/pom.xml rename to iot-components/iot-http-biz-component/pom.xml index 56230461..44ffdf04 --- a/protocol-gateway/http-biz-component/pom.xml +++ b/iot-components/iot-http-biz-component/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - protocol-gateway + iot-components cc.iotkit - 0.3.0-SNAPSHOT + 0.3.1-SNAPSHOT 4.0.0 - http-biz-component + iot-http-biz-component 8 @@ -30,7 +30,7 @@ cc.iotkit - component + iot-component-base diff --git a/protocol-gateway/http-biz-component/src/main/java/cc/iotkit/comp/biz/HttpBizComponent.java b/iot-components/iot-http-biz-component/src/main/java/cc/iotkit/comp/biz/HttpBizComponent.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/http-biz-component/src/main/java/cc/iotkit/comp/biz/HttpBizComponent.java rename to iot-components/iot-http-biz-component/src/main/java/cc/iotkit/comp/biz/HttpBizComponent.java diff --git a/protocol-gateway/http-biz-component/src/main/java/cc/iotkit/comp/biz/HttpConfig.java b/iot-components/iot-http-biz-component/src/main/java/cc/iotkit/comp/biz/HttpConfig.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/http-biz-component/src/main/java/cc/iotkit/comp/biz/HttpConfig.java rename to iot-components/iot-http-biz-component/src/main/java/cc/iotkit/comp/biz/HttpConfig.java diff --git a/protocol-gateway/http-biz-component/src/main/resources/component.spi b/iot-components/iot-http-biz-component/src/main/resources/component.spi old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/http-biz-component/src/main/resources/component.spi rename to iot-components/iot-http-biz-component/src/main/resources/component.spi diff --git a/protocol-gateway/http-biz-component/src/main/resources/onenet接入脚本示例.js b/iot-components/iot-http-biz-component/src/main/resources/onenet接入脚本示例.js similarity index 100% rename from protocol-gateway/http-biz-component/src/main/resources/onenet接入脚本示例.js rename to iot-components/iot-http-biz-component/src/main/resources/onenet接入脚本示例.js diff --git a/protocol-gateway/http-biz-component/src/main/resources/小度音箱接入脚本示例.js b/iot-components/iot-http-biz-component/src/main/resources/小度音箱接入脚本示例.js similarity index 100% rename from protocol-gateway/http-biz-component/src/main/resources/小度音箱接入脚本示例.js rename to iot-components/iot-http-biz-component/src/main/resources/小度音箱接入脚本示例.js diff --git a/protocol-gateway/mqtt-component/.DS_Store b/iot-components/iot-mqtt-component/.DS_Store old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/mqtt-component/.DS_Store rename to iot-components/iot-mqtt-component/.DS_Store diff --git a/protocol-gateway/mqtt-component/dependency-reduced-pom.xml b/iot-components/iot-mqtt-component/dependency-reduced-pom.xml similarity index 84% rename from protocol-gateway/mqtt-component/dependency-reduced-pom.xml rename to iot-components/iot-mqtt-component/dependency-reduced-pom.xml index 0f6512e6..2a0b2e8f 100644 --- a/protocol-gateway/mqtt-component/dependency-reduced-pom.xml +++ b/iot-components/iot-mqtt-component/dependency-reduced-pom.xml @@ -1,12 +1,12 @@ - protocol-gateway + iot-components cc.iotkit - 0.3.0-SNAPSHOT + 0.3.1-SNAPSHOT 4.0.0 - mqtt-component + iot-mqtt-component @@ -79,20 +79,20 @@ cc.iotkit - common - 0.3.0-SNAPSHOT + iot-common + 0.3.1-SNAPSHOT compile cc.iotkit - component - 0.3.0-SNAPSHOT + iot-component-base + 0.3.1-SNAPSHOT compile cc.iotkit - dao - 0.3.0-SNAPSHOT + iot-dao + 0.3.1-SNAPSHOT compile diff --git a/protocol-gateway/mqtt-component/pom.xml b/iot-components/iot-mqtt-component/pom.xml old mode 100755 new mode 100644 similarity index 90% rename from protocol-gateway/mqtt-component/pom.xml rename to iot-components/iot-mqtt-component/pom.xml index 17f77486..4d2a04c9 --- a/protocol-gateway/mqtt-component/pom.xml +++ b/iot-components/iot-mqtt-component/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - protocol-gateway + iot-components cc.iotkit - 0.3.0-SNAPSHOT + 0.3.1-SNAPSHOT 4.0.0 - mqtt-component + iot-mqtt-component @@ -45,17 +45,17 @@ cc.iotkit - common + iot-common cc.iotkit - component + iot-component-base cc.iotkit - dao + iot-dao diff --git a/protocol-gateway/mqtt-component/src/main/java/cc/iotkit/comp/mqtt/IScripter.java b/iot-components/iot-mqtt-component/src/main/java/cc/iotkit/comp/mqtt/IScripter.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/mqtt-component/src/main/java/cc/iotkit/comp/mqtt/IScripter.java rename to iot-components/iot-mqtt-component/src/main/java/cc/iotkit/comp/mqtt/IScripter.java diff --git a/protocol-gateway/mqtt-component/src/main/java/cc/iotkit/comp/mqtt/JsScripter.java b/iot-components/iot-mqtt-component/src/main/java/cc/iotkit/comp/mqtt/JsScripter.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/mqtt-component/src/main/java/cc/iotkit/comp/mqtt/JsScripter.java rename to iot-components/iot-mqtt-component/src/main/java/cc/iotkit/comp/mqtt/JsScripter.java diff --git a/protocol-gateway/mqtt-component/src/main/java/cc/iotkit/comp/mqtt/LuaScripter.java b/iot-components/iot-mqtt-component/src/main/java/cc/iotkit/comp/mqtt/LuaScripter.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/mqtt-component/src/main/java/cc/iotkit/comp/mqtt/LuaScripter.java rename to iot-components/iot-mqtt-component/src/main/java/cc/iotkit/comp/mqtt/LuaScripter.java diff --git a/protocol-gateway/mqtt-component/src/main/java/cc/iotkit/comp/mqtt/MqttConfig.java b/iot-components/iot-mqtt-component/src/main/java/cc/iotkit/comp/mqtt/MqttConfig.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/mqtt-component/src/main/java/cc/iotkit/comp/mqtt/MqttConfig.java rename to iot-components/iot-mqtt-component/src/main/java/cc/iotkit/comp/mqtt/MqttConfig.java diff --git a/protocol-gateway/mqtt-component/src/main/java/cc/iotkit/comp/mqtt/MqttDeviceComponent.java b/iot-components/iot-mqtt-component/src/main/java/cc/iotkit/comp/mqtt/MqttDeviceComponent.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/mqtt-component/src/main/java/cc/iotkit/comp/mqtt/MqttDeviceComponent.java rename to iot-components/iot-mqtt-component/src/main/java/cc/iotkit/comp/mqtt/MqttDeviceComponent.java diff --git a/protocol-gateway/mqtt-component/src/main/java/cc/iotkit/comp/mqtt/MqttVerticle.java b/iot-components/iot-mqtt-component/src/main/java/cc/iotkit/comp/mqtt/MqttVerticle.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/mqtt-component/src/main/java/cc/iotkit/comp/mqtt/MqttVerticle.java rename to iot-components/iot-mqtt-component/src/main/java/cc/iotkit/comp/mqtt/MqttVerticle.java diff --git a/protocol-gateway/mqtt-component/src/main/java/cc/iotkit/comp/mqtt/TransparentConverter.java b/iot-components/iot-mqtt-component/src/main/java/cc/iotkit/comp/mqtt/TransparentConverter.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/mqtt-component/src/main/java/cc/iotkit/comp/mqtt/TransparentConverter.java rename to iot-components/iot-mqtt-component/src/main/java/cc/iotkit/comp/mqtt/TransparentConverter.java diff --git a/protocol-gateway/mqtt-component/src/main/java/cc/iotkit/comp/mqtt/TransparentMsg.java b/iot-components/iot-mqtt-component/src/main/java/cc/iotkit/comp/mqtt/TransparentMsg.java old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/mqtt-component/src/main/java/cc/iotkit/comp/mqtt/TransparentMsg.java rename to iot-components/iot-mqtt-component/src/main/java/cc/iotkit/comp/mqtt/TransparentMsg.java diff --git a/protocol-gateway/mqtt-component/src/main/resources/component.js b/iot-components/iot-mqtt-component/src/main/resources/component.js old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/mqtt-component/src/main/resources/component.js rename to iot-components/iot-mqtt-component/src/main/resources/component.js diff --git a/protocol-gateway/mqtt-component/src/main/resources/component.spi b/iot-components/iot-mqtt-component/src/main/resources/component.spi old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/mqtt-component/src/main/resources/component.spi rename to iot-components/iot-mqtt-component/src/main/resources/component.spi diff --git a/protocol-gateway/mqtt-component/src/main/resources/converter.js b/iot-components/iot-mqtt-component/src/main/resources/converter.js old mode 100755 new mode 100644 similarity index 100% rename from protocol-gateway/mqtt-component/src/main/resources/converter.js rename to iot-components/iot-mqtt-component/src/main/resources/converter.js diff --git a/protocol-gateway/pom.xml b/iot-components/pom.xml old mode 100755 new mode 100644 similarity index 52% rename from protocol-gateway/pom.xml rename to iot-components/pom.xml index 88b4f207..fb430dd8 --- a/protocol-gateway/pom.xml +++ b/iot-components/pom.xml @@ -5,21 +5,20 @@ iotkit-parent cc.iotkit - 0.3.0-SNAPSHOT + 0.3.1-SNAPSHOT 4.0.0 - protocol-gateway + iot-components pom - component-server - converter - mqtt-component - emqx-component - component - mqtt-client-simulator - http-biz-component - + iot-component-server + iot-component-converter + iot-mqtt-component + iot-emqx-component + iot-component-base + iot-http-biz-component + \ No newline at end of file diff --git a/iot-components/readme.txt b/iot-components/readme.txt new file mode 100644 index 00000000..12b6291c --- /dev/null +++ b/iot-components/readme.txt @@ -0,0 +1 @@ +此模块为通讯组件模块，存放通讯组件接口、组件服务端和各通讯组件模块(如mqtt通讯组件) diff --git a/iot-data-service/.DS_Store b/iot-data-service/.DS_Store new file mode 100644 index 00000000..3e1fa331 Binary files /dev/null and b/iot-data-service/.DS_Store differ diff --git a/iot-data-service/iot-dao/.DS_Store b/iot-data-service/iot-dao/.DS_Store new file mode 100644 index 00000000..5008ddfc Binary files /dev/null and b/iot-data-service/iot-dao/.DS_Store differ diff --git a/dao/pom.xml b/iot-data-service/iot-dao/pom.xml old mode 100755 new mode 100644 similarity index 83% rename from dao/pom.xml rename to iot-data-service/iot-dao/pom.xml index 779e1960..a9979d06 --- a/dao/pom.xml +++ b/iot-data-service/iot-dao/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - iotkit-parent + iot-data-service cc.iotkit - 0.3.0-SNAPSHOT + 0.3.1-SNAPSHOT 4.0.0 - dao + iot-dao @@ -30,7 +30,7 @@ cc.iotkit - model + iot-model diff --git a/dao/src/main/java/cc/iotkit/dao/AligenieDeviceRepository.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/AligenieDeviceRepository.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/AligenieDeviceRepository.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/AligenieDeviceRepository.java diff --git a/dao/src/main/java/cc/iotkit/dao/AligenieProductRepository.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/AligenieProductRepository.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/AligenieProductRepository.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/AligenieProductRepository.java diff --git a/dao/src/main/java/cc/iotkit/dao/AppDesignRepository.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/AppDesignRepository.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/AppDesignRepository.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/AppDesignRepository.java diff --git a/dao/src/main/java/cc/iotkit/dao/AppInfoRepository.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/AppInfoRepository.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/AppInfoRepository.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/AppInfoRepository.java diff --git a/dao/src/main/java/cc/iotkit/dao/CategoryCache.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/CategoryCache.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/CategoryCache.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/CategoryCache.java diff --git a/dao/src/main/java/cc/iotkit/dao/CategoryRepository.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/CategoryRepository.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/CategoryRepository.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/CategoryRepository.java diff --git a/dao/src/main/java/cc/iotkit/dao/CommonDao.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/CommonDao.java similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/CommonDao.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/CommonDao.java diff --git a/dao/src/main/java/cc/iotkit/dao/DeviceCache.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/DeviceCache.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/DeviceCache.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/DeviceCache.java diff --git a/dao/src/main/java/cc/iotkit/dao/DeviceDao.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/DeviceDao.java old mode 100755 new mode 100644 similarity index 90% rename from dao/src/main/java/cc/iotkit/dao/DeviceDao.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/DeviceDao.java index 2d722896..7f442b0d --- a/dao/src/main/java/cc/iotkit/dao/DeviceDao.java +++ b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/DeviceDao.java @@ -9,6 +9,7 @@ */ package cc.iotkit.dao; +import cc.iotkit.dao.config.EmbeddedEs; import cc.iotkit.model.Paging; import cc.iotkit.model.device.DeviceInfo; import cc.iotkit.model.product.Category; @@ -61,6 +62,7 @@ public class DeviceDao { for (SearchHit searchHit : searchHits) { list.add(searchHit.getContent()); } + return new Paging<>(total, list); } @@ -71,18 +73,26 @@ public class DeviceDao { if (properties == null) { return; } + //外置es采用脚本更新 + if (EmbeddedEs.disabled) { + Map param = new HashMap<>(); + param.put("property", BeanUtil.beanToMap(properties)); + param.put("keys", properties.keySet()); - Map param = new HashMap<>(); - param.put("property", BeanUtil.beanToMap(properties)); - param.put("keys", properties.keySet()); - - UpdateQuery updateQuery = UpdateQuery.builder(new CriteriaQuery(new Criteria() - .and("deviceId").is(deviceId))) - .withParams(param) - .withScript("for(key in params.keys){ctx._source.property[key]=params.property[key];}") - .withScriptType(ScriptType.INLINE) - .build(); - elasticsearchRestTemplate.updateByQuery(updateQuery, IndexCoordinates.of("device_info")); + UpdateQuery updateQuery = UpdateQuery.builder(new CriteriaQuery(new Criteria() + .and("deviceId").is(deviceId))) + .withParams(param) + .withScript("for(key in params.keys){ctx._source.property[key]=params.property[key];}") + .withScriptType(ScriptType.INLINE) + .build(); + elasticsearchRestTemplate.updateByQuery(updateQuery, IndexCoordinates.of("device_info")); + } else { + //内置es采用文档更新 + DeviceInfo deviceInfo = deviceInfoRepository.findByDeviceId(deviceId); + Map oldProps = deviceInfo.getProperty(); + oldProps.putAll(properties); + deviceInfoRepository.save(deviceInfo); + } } /** diff --git a/dao/src/main/java/cc/iotkit/dao/DeviceGroupRepository.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/DeviceGroupRepository.java similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/DeviceGroupRepository.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/DeviceGroupRepository.java diff --git a/dao/src/main/java/cc/iotkit/dao/DeviceInfoRepository.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/DeviceInfoRepository.java similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/DeviceInfoRepository.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/DeviceInfoRepository.java diff --git a/dao/src/main/java/cc/iotkit/dao/DevicePropertyDao.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/DevicePropertyDao.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/DevicePropertyDao.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/DevicePropertyDao.java diff --git a/dao/src/main/java/cc/iotkit/dao/DevicePropertyRepository.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/DevicePropertyRepository.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/DevicePropertyRepository.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/DevicePropertyRepository.java diff --git a/dao/src/main/java/cc/iotkit/dao/DeviceReportDao.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/DeviceReportDao.java similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/DeviceReportDao.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/DeviceReportDao.java diff --git a/dao/src/main/java/cc/iotkit/dao/DeviceReportRepository.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/DeviceReportRepository.java similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/DeviceReportRepository.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/DeviceReportRepository.java diff --git a/dao/src/main/java/cc/iotkit/dao/HomeRepository.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/HomeRepository.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/HomeRepository.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/HomeRepository.java diff --git a/dao/src/main/java/cc/iotkit/dao/OauthClientCache.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/OauthClientCache.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/OauthClientCache.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/OauthClientCache.java diff --git a/dao/src/main/java/cc/iotkit/dao/OauthClientRepository.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/OauthClientRepository.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/OauthClientRepository.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/OauthClientRepository.java diff --git a/dao/src/main/java/cc/iotkit/dao/ProductCache.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/ProductCache.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/ProductCache.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/ProductCache.java diff --git a/dao/src/main/java/cc/iotkit/dao/ProductModelRepository.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/ProductModelRepository.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/ProductModelRepository.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/ProductModelRepository.java diff --git a/dao/src/main/java/cc/iotkit/dao/ProductRepository.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/ProductRepository.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/ProductRepository.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/ProductRepository.java diff --git a/dao/src/main/java/cc/iotkit/dao/ProtocolComponentRepository.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/ProtocolComponentRepository.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/ProtocolComponentRepository.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/ProtocolComponentRepository.java diff --git a/dao/src/main/java/cc/iotkit/dao/ProtocolConverterRepository.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/ProtocolConverterRepository.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/ProtocolConverterRepository.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/ProtocolConverterRepository.java diff --git a/dao/src/main/java/cc/iotkit/dao/RuleInfoRepository.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/RuleInfoRepository.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/RuleInfoRepository.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/RuleInfoRepository.java diff --git a/dao/src/main/java/cc/iotkit/dao/RuleLogRepository.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/RuleLogRepository.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/RuleLogRepository.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/RuleLogRepository.java diff --git a/dao/src/main/java/cc/iotkit/dao/SpaceCache.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/SpaceCache.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/SpaceCache.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/SpaceCache.java diff --git a/dao/src/main/java/cc/iotkit/dao/SpaceDeviceRepository.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/SpaceDeviceRepository.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/SpaceDeviceRepository.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/SpaceDeviceRepository.java diff --git a/dao/src/main/java/cc/iotkit/dao/SpaceRepository.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/SpaceRepository.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/SpaceRepository.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/SpaceRepository.java diff --git a/dao/src/main/java/cc/iotkit/dao/TaskInfoRepository.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/TaskInfoRepository.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/TaskInfoRepository.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/TaskInfoRepository.java diff --git a/dao/src/main/java/cc/iotkit/dao/TaskLogRepository.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/TaskLogRepository.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/TaskLogRepository.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/TaskLogRepository.java diff --git a/dao/src/main/java/cc/iotkit/dao/ThingModelMessageDao.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/ThingModelMessageDao.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/ThingModelMessageDao.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/ThingModelMessageDao.java diff --git a/dao/src/main/java/cc/iotkit/dao/ThingModelMessageRepository.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/ThingModelMessageRepository.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/ThingModelMessageRepository.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/ThingModelMessageRepository.java diff --git a/dao/src/main/java/cc/iotkit/dao/ThingModelRepository.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/ThingModelRepository.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/ThingModelRepository.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/ThingModelRepository.java diff --git a/dao/src/main/java/cc/iotkit/dao/ThirdUserSessionRepository.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/ThirdUserSessionRepository.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/ThirdUserSessionRepository.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/ThirdUserSessionRepository.java diff --git a/dao/src/main/java/cc/iotkit/dao/UserActionLogRepository.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/UserActionLogRepository.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/UserActionLogRepository.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/UserActionLogRepository.java diff --git a/dao/src/main/java/cc/iotkit/dao/UserInfoCache.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/UserInfoCache.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/UserInfoCache.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/UserInfoCache.java diff --git a/dao/src/main/java/cc/iotkit/dao/UserInfoRepository.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/UserInfoRepository.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/UserInfoRepository.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/UserInfoRepository.java diff --git a/dao/src/main/java/cc/iotkit/dao/VirtualDeviceLogRepository.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/VirtualDeviceLogRepository.java similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/VirtualDeviceLogRepository.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/VirtualDeviceLogRepository.java diff --git a/dao/src/main/java/cc/iotkit/dao/VirtualDeviceRepository.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/VirtualDeviceRepository.java similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/VirtualDeviceRepository.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/VirtualDeviceRepository.java diff --git a/dao/src/main/java/cc/iotkit/dao/config/ElasticsearchConfiguration.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/config/ElasticsearchConfiguration.java old mode 100755 new mode 100644 similarity index 100% rename from dao/src/main/java/cc/iotkit/dao/config/ElasticsearchConfiguration.java rename to iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/config/ElasticsearchConfiguration.java diff --git a/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/config/EmbeddedEs.java b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/config/EmbeddedEs.java new file mode 100644 index 00000000..86622a31 --- /dev/null +++ b/iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/config/EmbeddedEs.java @@ -0,0 +1,7 @@ +package cc.iotkit.dao.config; + +public interface EmbeddedEs { + + boolean disabled = "true".equals(System.getProperty("disabledEmbeddedEs")); + +} diff --git a/iot-data-service/iot-model/.DS_Store b/iot-data-service/iot-model/.DS_Store new file mode 100644 index 00000000..5008ddfc Binary files /dev/null and b/iot-data-service/iot-model/.DS_Store differ diff --git a/model/pom.xml b/iot-data-service/iot-model/pom.xml old mode 100755 new mode 100644 similarity index 81% rename from model/pom.xml rename to iot-data-service/iot-model/pom.xml index 610d60fb..1954f319 --- a/model/pom.xml +++ b/iot-data-service/iot-model/pom.xml @@ -3,14 +3,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - iotkit-parent + iot-data-service cc.iotkit - 0.3.0-SNAPSHOT + 0.3.1-SNAPSHOT - 0.3.0-SNAPSHOT + 0.3.1-SNAPSHOT 4.0.0 - model + iot-model @@ -32,7 +32,7 @@ cc.iotkit - common + iot-common diff --git a/model/src/main/java/cc/iotkit/model/AppInfo.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/AppInfo.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/AppInfo.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/AppInfo.java diff --git a/model/src/main/java/cc/iotkit/model/InvokeResult.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/InvokeResult.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/InvokeResult.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/InvokeResult.java diff --git a/model/src/main/java/cc/iotkit/model/OauthClient.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/OauthClient.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/OauthClient.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/OauthClient.java diff --git a/model/src/main/java/cc/iotkit/model/Owned.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/Owned.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/Owned.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/Owned.java diff --git a/model/src/main/java/cc/iotkit/model/Paging.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/Paging.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/Paging.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/Paging.java diff --git a/model/src/main/java/cc/iotkit/model/Role.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/Role.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/Role.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/Role.java diff --git a/model/src/main/java/cc/iotkit/model/SendCmd.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/SendCmd.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/SendCmd.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/SendCmd.java diff --git a/model/src/main/java/cc/iotkit/model/ThirdUserSession.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/ThirdUserSession.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/ThirdUserSession.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/ThirdUserSession.java diff --git a/model/src/main/java/cc/iotkit/model/UserActionLog.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/UserActionLog.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/UserActionLog.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/UserActionLog.java diff --git a/model/src/main/java/cc/iotkit/model/UserInfo.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/UserInfo.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/UserInfo.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/UserInfo.java diff --git a/model/src/main/java/cc/iotkit/model/alert/AlertConfig.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/alert/AlertConfig.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/alert/AlertConfig.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/alert/AlertConfig.java diff --git a/model/src/main/java/cc/iotkit/model/aligenie/AligenieDevice.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/aligenie/AligenieDevice.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/aligenie/AligenieDevice.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/aligenie/AligenieDevice.java diff --git a/model/src/main/java/cc/iotkit/model/aligenie/AligenieProduct.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/aligenie/AligenieProduct.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/aligenie/AligenieProduct.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/aligenie/AligenieProduct.java diff --git a/model/src/main/java/cc/iotkit/model/device/DeviceGroup.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/device/DeviceGroup.java similarity index 100% rename from model/src/main/java/cc/iotkit/model/device/DeviceGroup.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/device/DeviceGroup.java diff --git a/model/src/main/java/cc/iotkit/model/device/DeviceInfo.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/device/DeviceInfo.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/device/DeviceInfo.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/device/DeviceInfo.java diff --git a/model/src/main/java/cc/iotkit/model/device/VirtualDevice.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/device/VirtualDevice.java similarity index 100% rename from model/src/main/java/cc/iotkit/model/device/VirtualDevice.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/device/VirtualDevice.java diff --git a/model/src/main/java/cc/iotkit/model/device/VirtualDeviceLog.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/device/VirtualDeviceLog.java similarity index 100% rename from model/src/main/java/cc/iotkit/model/device/VirtualDeviceLog.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/device/VirtualDeviceLog.java diff --git a/model/src/main/java/cc/iotkit/model/device/message/DeviceProperty.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/device/message/DeviceProperty.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/device/message/DeviceProperty.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/device/message/DeviceProperty.java diff --git a/model/src/main/java/cc/iotkit/model/device/message/DeviceReport.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/device/message/DeviceReport.java similarity index 100% rename from model/src/main/java/cc/iotkit/model/device/message/DeviceReport.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/device/message/DeviceReport.java diff --git a/model/src/main/java/cc/iotkit/model/device/message/ThingModelMessage.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/device/message/ThingModelMessage.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/device/message/ThingModelMessage.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/device/message/ThingModelMessage.java diff --git a/model/src/main/java/cc/iotkit/model/product/AppDesign.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/product/AppDesign.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/product/AppDesign.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/product/AppDesign.java diff --git a/model/src/main/java/cc/iotkit/model/product/Category.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/product/Category.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/product/Category.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/product/Category.java diff --git a/model/src/main/java/cc/iotkit/model/product/Product.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/product/Product.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/product/Product.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/product/Product.java diff --git a/model/src/main/java/cc/iotkit/model/product/ProductModel.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/product/ProductModel.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/product/ProductModel.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/product/ProductModel.java diff --git a/model/src/main/java/cc/iotkit/model/product/ThingModel.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/product/ThingModel.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/product/ThingModel.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/product/ThingModel.java diff --git a/model/src/main/java/cc/iotkit/model/protocol/ProtocolComponent.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/protocol/ProtocolComponent.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/protocol/ProtocolComponent.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/protocol/ProtocolComponent.java diff --git a/model/src/main/java/cc/iotkit/model/protocol/ProtocolConverter.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/protocol/ProtocolConverter.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/protocol/ProtocolConverter.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/protocol/ProtocolConverter.java diff --git a/model/src/main/java/cc/iotkit/model/rule/RuleAction.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/rule/RuleAction.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/rule/RuleAction.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/rule/RuleAction.java diff --git a/model/src/main/java/cc/iotkit/model/rule/RuleInfo.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/rule/RuleInfo.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/rule/RuleInfo.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/rule/RuleInfo.java diff --git a/model/src/main/java/cc/iotkit/model/rule/RuleLog.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/rule/RuleLog.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/rule/RuleLog.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/rule/RuleLog.java diff --git a/model/src/main/java/cc/iotkit/model/rule/TaskInfo.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/rule/TaskInfo.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/rule/TaskInfo.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/rule/TaskInfo.java diff --git a/model/src/main/java/cc/iotkit/model/rule/TaskLog.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/rule/TaskLog.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/rule/TaskLog.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/rule/TaskLog.java diff --git a/model/src/main/java/cc/iotkit/model/space/Home.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/space/Home.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/space/Home.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/space/Home.java diff --git a/model/src/main/java/cc/iotkit/model/space/Space.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/space/Space.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/space/Space.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/space/Space.java diff --git a/model/src/main/java/cc/iotkit/model/space/SpaceDevice.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/space/SpaceDevice.java old mode 100755 new mode 100644 similarity index 100% rename from model/src/main/java/cc/iotkit/model/space/SpaceDevice.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/space/SpaceDevice.java diff --git a/model/src/main/java/cc/iotkit/model/stats/DataItem.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/stats/DataItem.java similarity index 100% rename from model/src/main/java/cc/iotkit/model/stats/DataItem.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/stats/DataItem.java diff --git a/model/src/main/java/cc/iotkit/model/stats/TimeData.java b/iot-data-service/iot-model/src/main/java/cc/iotkit/model/stats/TimeData.java similarity index 100% rename from model/src/main/java/cc/iotkit/model/stats/TimeData.java rename to iot-data-service/iot-model/src/main/java/cc/iotkit/model/stats/TimeData.java diff --git a/iot-data-service/pom.xml b/iot-data-service/pom.xml new file mode 100644 index 00000000..276d5d0b --- /dev/null +++ b/iot-data-service/pom.xml @@ -0,0 +1,21 @@ + + + + iotkit-parent + cc.iotkit + 0.3.1-SNAPSHOT + + 4.0.0 + pom + + + iot-model + iot-dao + + + iot-data-service + + + \ No newline at end of file diff --git a/iot-data-service/readme.txt b/iot-data-service/readme.txt new file mode 100644 index 00000000..236af5ad --- /dev/null +++ b/iot-data-service/readme.txt @@ -0,0 +1 @@ +与数据存取相关内容的模块 diff --git a/iot-message-bus/.DS_Store b/iot-message-bus/.DS_Store new file mode 100644 index 00000000..5008ddfc Binary files /dev/null and b/iot-message-bus/.DS_Store differ diff --git a/message-bus/pom.xml b/iot-message-bus/pom.xml similarity index 86% rename from message-bus/pom.xml rename to iot-message-bus/pom.xml index 151329a1..05ac0f68 100644 --- a/message-bus/pom.xml +++ b/iot-message-bus/pom.xml @@ -5,11 +5,11 @@ iotkit-parent cc.iotkit - 0.3.0-SNAPSHOT + 0.3.1-SNAPSHOT 4.0.0 - message-bus + iot-message-bus @@ -29,7 +29,7 @@ cc.iotkit - common + iot-common diff --git a/iot-message-bus/readme.txt b/iot-message-bus/readme.txt new file mode 100644 index 00000000..6ea1f220 --- /dev/null +++ b/iot-message-bus/readme.txt @@ -0,0 +1 @@ +消息队列适配模块，用于提供默认消息队列和适配不同消息队列接入 \ No newline at end of file diff --git a/message-bus/src/main/java/cc/iotkit/mq/ConsumerHandler.java b/iot-message-bus/src/main/java/cc/iotkit/mq/ConsumerHandler.java similarity index 100% rename from message-bus/src/main/java/cc/iotkit/mq/ConsumerHandler.java rename to iot-message-bus/src/main/java/cc/iotkit/mq/ConsumerHandler.java diff --git a/message-bus/src/main/java/cc/iotkit/mq/MqConsumer.java b/iot-message-bus/src/main/java/cc/iotkit/mq/MqConsumer.java similarity index 100% rename from message-bus/src/main/java/cc/iotkit/mq/MqConsumer.java rename to iot-message-bus/src/main/java/cc/iotkit/mq/MqConsumer.java diff --git a/message-bus/src/main/java/cc/iotkit/mq/MqProducer.java b/iot-message-bus/src/main/java/cc/iotkit/mq/MqProducer.java similarity index 100% rename from message-bus/src/main/java/cc/iotkit/mq/MqProducer.java rename to iot-message-bus/src/main/java/cc/iotkit/mq/MqProducer.java diff --git a/message-bus/src/main/java/cc/iotkit/mq/vertx/BeanCodec.java b/iot-message-bus/src/main/java/cc/iotkit/mq/vertx/BeanCodec.java similarity index 100% rename from message-bus/src/main/java/cc/iotkit/mq/vertx/BeanCodec.java rename to iot-message-bus/src/main/java/cc/iotkit/mq/vertx/BeanCodec.java diff --git a/message-bus/src/main/java/cc/iotkit/mq/vertx/VertxManager.java b/iot-message-bus/src/main/java/cc/iotkit/mq/vertx/VertxManager.java similarity index 100% rename from message-bus/src/main/java/cc/iotkit/mq/vertx/VertxManager.java rename to iot-message-bus/src/main/java/cc/iotkit/mq/vertx/VertxManager.java diff --git a/message-bus/src/main/java/cc/iotkit/mq/vertx/VertxMqConsumer.java b/iot-message-bus/src/main/java/cc/iotkit/mq/vertx/VertxMqConsumer.java similarity index 100% rename from message-bus/src/main/java/cc/iotkit/mq/vertx/VertxMqConsumer.java rename to iot-message-bus/src/main/java/cc/iotkit/mq/vertx/VertxMqConsumer.java diff --git a/message-bus/src/main/java/cc/iotkit/mq/vertx/VertxMqProducer.java b/iot-message-bus/src/main/java/cc/iotkit/mq/vertx/VertxMqProducer.java similarity index 100% rename from message-bus/src/main/java/cc/iotkit/mq/vertx/VertxMqProducer.java rename to iot-message-bus/src/main/java/cc/iotkit/mq/vertx/VertxMqProducer.java diff --git a/message-bus/src/test/java/test/MsgPubConsumeTest.java b/iot-message-bus/src/test/java/test/MsgPubConsumeTest.java similarity index 100% rename from message-bus/src/test/java/test/MsgPubConsumeTest.java rename to iot-message-bus/src/test/java/test/MsgPubConsumeTest.java diff --git a/iot-package/.DS_Store b/iot-package/.DS_Store new file mode 100644 index 00000000..5008ddfc Binary files /dev/null and b/iot-package/.DS_Store differ diff --git a/standalone-package/pom.xml b/iot-package/pom.xml old mode 100755 new mode 100644 similarity index 91% rename from standalone-package/pom.xml rename to iot-package/pom.xml index 36a457f3..66492b97 --- a/standalone-package/pom.xml +++ b/iot-package/pom.xml @@ -5,11 +5,11 @@ iotkit-parent cc.iotkit - 0.3.0-SNAPSHOT + 0.3.1-SNAPSHOT 4.0.0 - standalone-package + iot-package diff --git a/iot-package/readme.txt b/iot-package/readme.txt new file mode 100644 index 00000000..e884bd18 --- /dev/null +++ b/iot-package/readme.txt @@ -0,0 +1,14 @@ +用于将程序组织打包成zip包 + +打包后的结构： +lib + xx.jar + ... + + +打包后启动脚本： +如linux: +java -classpath ".:lib/*" cc.iotkit.manager.Application + + + diff --git a/standalone-package/src/main/resources/assemblies/standalone-package.xml b/iot-package/src/main/resources/assemblies/standalone-package.xml old mode 100755 new mode 100644 similarity index 100% rename from standalone-package/src/main/resources/assemblies/standalone-package.xml rename to iot-package/src/main/resources/assemblies/standalone-package.xml diff --git a/iot-rule-engine/.DS_Store b/iot-rule-engine/.DS_Store new file mode 100644 index 00000000..5008ddfc Binary files /dev/null and b/iot-rule-engine/.DS_Store differ diff --git a/rule-engine/pom.xml b/iot-rule-engine/pom.xml old mode 100755 new mode 100644 similarity index 86% rename from rule-engine/pom.xml rename to iot-rule-engine/pom.xml index 6d84b369..969064e2 --- a/rule-engine/pom.xml +++ b/iot-rule-engine/pom.xml @@ -5,11 +5,11 @@ iotkit-parent cc.iotkit - 0.3.0-SNAPSHOT + 0.3.1-SNAPSHOT 4.0.0 - rule-engine + iot-rule-engine @@ -53,27 +53,27 @@ cc.iotkit - model + iot-model cc.iotkit - common + iot-common cc.iotkit - dao + iot-dao cc.iotkit - component-server + iot-component-server cc.iotkit - message-bus + iot-message-bus diff --git a/iot-rule-engine/readme.txt b/iot-rule-engine/readme.txt new file mode 100644 index 00000000..eadfa1c2 --- /dev/null +++ b/iot-rule-engine/readme.txt @@ -0,0 +1 @@ +规则引擎模块，包含场景引擎、数据流转等 \ No newline at end of file diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/action/Action.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/Action.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/action/Action.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/Action.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/action/AlertAction.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/AlertAction.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/action/AlertAction.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/AlertAction.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/action/AlertService.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/AlertService.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/action/AlertService.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/AlertService.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/action/DeviceAction.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/DeviceAction.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/action/DeviceAction.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/DeviceAction.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/action/DeviceActionService.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/DeviceActionService.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/action/DeviceActionService.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/DeviceActionService.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/action/HttpAction.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/HttpAction.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/action/HttpAction.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/HttpAction.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/action/HttpService.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/HttpService.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/action/HttpService.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/HttpService.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/action/ScriptService.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/ScriptService.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/action/ScriptService.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/action/ScriptService.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/alert/Alerter.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/alert/Alerter.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/alert/Alerter.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/alert/Alerter.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/alert/DingdRobotAlerter.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/alert/DingdRobotAlerter.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/alert/DingdRobotAlerter.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/alert/DingdRobotAlerter.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/alert/EmailAlerter.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/alert/EmailAlerter.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/alert/EmailAlerter.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/alert/EmailAlerter.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/config/JobFactory.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/config/JobFactory.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/config/JobFactory.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/config/JobFactory.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/config/QuartzConfiguration.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/config/QuartzConfiguration.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/config/QuartzConfiguration.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/config/QuartzConfiguration.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/config/RuleConfiguration.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/config/RuleConfiguration.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/config/RuleConfiguration.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/config/RuleConfiguration.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/expression/BaseComparator.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/expression/BaseComparator.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/expression/BaseComparator.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/expression/BaseComparator.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/expression/Comparator.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/expression/Comparator.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/expression/Comparator.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/expression/Comparator.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/expression/EqComparator.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/expression/EqComparator.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/expression/EqComparator.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/expression/EqComparator.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/expression/Expression.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/expression/Expression.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/expression/Expression.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/expression/Expression.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/expression/GtComparator.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/expression/GtComparator.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/expression/GtComparator.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/expression/GtComparator.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/expression/LtComparator.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/expression/LtComparator.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/expression/LtComparator.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/expression/LtComparator.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/expression/NeqComparator.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/expression/NeqComparator.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/expression/NeqComparator.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/expression/NeqComparator.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/filter/DeviceCondition.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/filter/DeviceCondition.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/filter/DeviceCondition.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/filter/DeviceCondition.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/filter/DeviceFilter.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/filter/DeviceFilter.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/filter/DeviceFilter.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/filter/DeviceFilter.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/filter/Filter.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/filter/Filter.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/filter/Filter.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/filter/Filter.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/handler/DeviceMessageHandler.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/handler/DeviceMessageHandler.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/handler/DeviceMessageHandler.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/handler/DeviceMessageHandler.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/handler/RuleDeviceConsumer.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/handler/RuleDeviceConsumer.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/handler/RuleDeviceConsumer.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/handler/RuleDeviceConsumer.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/listener/DeviceCondition.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/listener/DeviceCondition.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/listener/DeviceCondition.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/listener/DeviceCondition.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/listener/DeviceListener.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/listener/DeviceListener.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/listener/DeviceListener.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/listener/DeviceListener.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/listener/Listener.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/listener/Listener.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/listener/Listener.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/listener/Listener.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/rule/Rule.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/rule/Rule.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/rule/Rule.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/rule/Rule.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/rule/RuleExecutor.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/rule/RuleExecutor.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/rule/RuleExecutor.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/rule/RuleExecutor.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/rule/RuleManager.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/rule/RuleManager.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/rule/RuleManager.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/rule/RuleManager.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/rule/RuleMessageHandler.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/rule/RuleMessageHandler.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/rule/RuleMessageHandler.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/rule/RuleMessageHandler.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/task/ActionExecutor.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/task/ActionExecutor.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/task/ActionExecutor.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/task/ActionExecutor.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/task/ActionExecutorManager.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/task/ActionExecutorManager.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/task/ActionExecutorManager.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/task/ActionExecutorManager.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/task/CommonJob.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/task/CommonJob.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/task/CommonJob.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/task/CommonJob.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/task/DeviceActionExecutor.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/task/DeviceActionExecutor.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/task/DeviceActionExecutor.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/task/DeviceActionExecutor.java diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/task/TaskManager.java b/iot-rule-engine/src/main/java/cc/iotkit/ruleengine/task/TaskManager.java old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/java/cc/iotkit/ruleengine/task/TaskManager.java rename to iot-rule-engine/src/main/java/cc/iotkit/ruleengine/task/TaskManager.java diff --git a/rule-engine/src/main/resources/spring.factories b/iot-rule-engine/src/main/resources/spring.factories old mode 100755 new mode 100644 similarity index 100% rename from rule-engine/src/main/resources/spring.factories rename to iot-rule-engine/src/main/resources/spring.factories diff --git a/manager/.DS_Store b/iot-standalone/.DS_Store old mode 100755 new mode 100644 similarity index 100% rename from manager/.DS_Store rename to iot-standalone/.DS_Store diff --git a/manager/pom.xml b/iot-standalone/pom.xml old mode 100755 new mode 100644 similarity index 89% rename from manager/pom.xml rename to iot-standalone/pom.xml index 9099f1ec..fd7534ed --- a/manager/pom.xml +++ b/iot-standalone/pom.xml @@ -5,11 +5,11 @@ iotkit-parent cc.iotkit - 0.3.0-SNAPSHOT + 0.3.1-SNAPSHOT 4.0.0 - manager + iot-standalone @@ -97,47 +97,47 @@ cc.iotkit - model + iot-model cc.iotkit - common + iot-common cc.iotkit - rule-engine + iot-rule-engine cc.iotkit - dao + iot-dao cc.iotkit - component-server + iot-component-server cc.iotkit - converter + iot-component-converter cc.iotkit - oauth2-server + iot-auth-server cc.iotkit - virtual-device + iot-virtual-device cc.iotkit - message-bus + iot-message-bus @@ -162,7 +162,7 @@ cc.iotkit - standalone-package + iot-package ${project.version} diff --git a/iot-standalone/readme.txt b/iot-standalone/readme.txt new file mode 100644 index 00000000..fad1e9a5 --- /dev/null +++ b/iot-standalone/readme.txt @@ -0,0 +1 @@ +程序入口模块，引用集成了其它所有模块的功能，并提供web api接口和实现。 diff --git a/manager/src/main/java/cc/iotkit/manager/Application.java b/iot-standalone/src/main/java/cc/iotkit/manager/Application.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/Application.java rename to iot-standalone/src/main/java/cc/iotkit/manager/Application.java diff --git a/manager/src/main/java/cc/iotkit/manager/config/AliyunConfig.java b/iot-standalone/src/main/java/cc/iotkit/manager/config/AliyunConfig.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/config/AliyunConfig.java rename to iot-standalone/src/main/java/cc/iotkit/manager/config/AliyunConfig.java diff --git a/manager/src/main/java/cc/iotkit/manager/config/CacheConfig.java b/iot-standalone/src/main/java/cc/iotkit/manager/config/CacheConfig.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/config/CacheConfig.java rename to iot-standalone/src/main/java/cc/iotkit/manager/config/CacheConfig.java diff --git a/manager/src/main/java/cc/iotkit/manager/config/CrossConfig.java b/iot-standalone/src/main/java/cc/iotkit/manager/config/CrossConfig.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/config/CrossConfig.java rename to iot-standalone/src/main/java/cc/iotkit/manager/config/CrossConfig.java diff --git a/manager/src/main/java/cc/iotkit/manager/config/EmbeddedElasticSearchConfig.java b/iot-standalone/src/main/java/cc/iotkit/manager/config/EmbeddedElasticSearchConfig.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/config/EmbeddedElasticSearchConfig.java rename to iot-standalone/src/main/java/cc/iotkit/manager/config/EmbeddedElasticSearchConfig.java diff --git a/manager/src/main/java/cc/iotkit/manager/config/EmbeddedRedisConfig.java b/iot-standalone/src/main/java/cc/iotkit/manager/config/EmbeddedRedisConfig.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/config/EmbeddedRedisConfig.java rename to iot-standalone/src/main/java/cc/iotkit/manager/config/EmbeddedRedisConfig.java diff --git a/manager/src/main/java/cc/iotkit/manager/config/GlobalExceptionHandler.java b/iot-standalone/src/main/java/cc/iotkit/manager/config/GlobalExceptionHandler.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/config/GlobalExceptionHandler.java rename to iot-standalone/src/main/java/cc/iotkit/manager/config/GlobalExceptionHandler.java diff --git a/manager/src/main/java/cc/iotkit/manager/config/ResponseResultHandler.java b/iot-standalone/src/main/java/cc/iotkit/manager/config/ResponseResultHandler.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/config/ResponseResultHandler.java rename to iot-standalone/src/main/java/cc/iotkit/manager/config/ResponseResultHandler.java diff --git a/manager/src/main/java/cc/iotkit/manager/config/SaTokenConfigure.java b/iot-standalone/src/main/java/cc/iotkit/manager/config/SaTokenConfigure.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/config/SaTokenConfigure.java rename to iot-standalone/src/main/java/cc/iotkit/manager/config/SaTokenConfigure.java diff --git a/manager/src/main/java/cc/iotkit/manager/controller/AppController.java b/iot-standalone/src/main/java/cc/iotkit/manager/controller/AppController.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/controller/AppController.java rename to iot-standalone/src/main/java/cc/iotkit/manager/controller/AppController.java diff --git a/manager/src/main/java/cc/iotkit/manager/controller/DeviceController.java b/iot-standalone/src/main/java/cc/iotkit/manager/controller/DeviceController.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/controller/DeviceController.java rename to iot-standalone/src/main/java/cc/iotkit/manager/controller/DeviceController.java diff --git a/manager/src/main/java/cc/iotkit/manager/controller/ProductController.java b/iot-standalone/src/main/java/cc/iotkit/manager/controller/ProductController.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/controller/ProductController.java rename to iot-standalone/src/main/java/cc/iotkit/manager/controller/ProductController.java diff --git a/manager/src/main/java/cc/iotkit/manager/controller/ProtocolController.java b/iot-standalone/src/main/java/cc/iotkit/manager/controller/ProtocolController.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/controller/ProtocolController.java rename to iot-standalone/src/main/java/cc/iotkit/manager/controller/ProtocolController.java diff --git a/manager/src/main/java/cc/iotkit/manager/controller/RuleEngineController.java b/iot-standalone/src/main/java/cc/iotkit/manager/controller/RuleEngineController.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/controller/RuleEngineController.java rename to iot-standalone/src/main/java/cc/iotkit/manager/controller/RuleEngineController.java diff --git a/manager/src/main/java/cc/iotkit/manager/controller/SpaceController.java b/iot-standalone/src/main/java/cc/iotkit/manager/controller/SpaceController.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/controller/SpaceController.java rename to iot-standalone/src/main/java/cc/iotkit/manager/controller/SpaceController.java diff --git a/manager/src/main/java/cc/iotkit/manager/controller/SpaceDeviceController.java b/iot-standalone/src/main/java/cc/iotkit/manager/controller/SpaceDeviceController.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/controller/SpaceDeviceController.java rename to iot-standalone/src/main/java/cc/iotkit/manager/controller/SpaceDeviceController.java diff --git a/manager/src/main/java/cc/iotkit/manager/controller/StatsController.java b/iot-standalone/src/main/java/cc/iotkit/manager/controller/StatsController.java similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/controller/StatsController.java rename to iot-standalone/src/main/java/cc/iotkit/manager/controller/StatsController.java diff --git a/manager/src/main/java/cc/iotkit/manager/controller/ThirdAuthController.java b/iot-standalone/src/main/java/cc/iotkit/manager/controller/ThirdAuthController.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/controller/ThirdAuthController.java rename to iot-standalone/src/main/java/cc/iotkit/manager/controller/ThirdAuthController.java diff --git a/manager/src/main/java/cc/iotkit/manager/controller/UserInfoController.java b/iot-standalone/src/main/java/cc/iotkit/manager/controller/UserInfoController.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/controller/UserInfoController.java rename to iot-standalone/src/main/java/cc/iotkit/manager/controller/UserInfoController.java diff --git a/manager/src/main/java/cc/iotkit/manager/controller/VirtualDeviceController.java b/iot-standalone/src/main/java/cc/iotkit/manager/controller/VirtualDeviceController.java similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/controller/VirtualDeviceController.java rename to iot-standalone/src/main/java/cc/iotkit/manager/controller/VirtualDeviceController.java diff --git a/manager/src/main/java/cc/iotkit/manager/controller/aligenie/AligenieDeviceController.java b/iot-standalone/src/main/java/cc/iotkit/manager/controller/aligenie/AligenieDeviceController.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/controller/aligenie/AligenieDeviceController.java rename to iot-standalone/src/main/java/cc/iotkit/manager/controller/aligenie/AligenieDeviceController.java diff --git a/manager/src/main/java/cc/iotkit/manager/controller/aligenie/AligenieProductController.java b/iot-standalone/src/main/java/cc/iotkit/manager/controller/aligenie/AligenieProductController.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/controller/aligenie/AligenieProductController.java rename to iot-standalone/src/main/java/cc/iotkit/manager/controller/aligenie/AligenieProductController.java diff --git a/manager/src/main/java/cc/iotkit/manager/controller/api/AccountController.java b/iot-standalone/src/main/java/cc/iotkit/manager/controller/api/AccountController.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/controller/api/AccountController.java rename to iot-standalone/src/main/java/cc/iotkit/manager/controller/api/AccountController.java diff --git a/manager/src/main/java/cc/iotkit/manager/controller/api/DeviceController.java b/iot-standalone/src/main/java/cc/iotkit/manager/controller/api/DeviceController.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/controller/api/DeviceController.java rename to iot-standalone/src/main/java/cc/iotkit/manager/controller/api/DeviceController.java diff --git a/manager/src/main/java/cc/iotkit/manager/controller/api/HomeController.java b/iot-standalone/src/main/java/cc/iotkit/manager/controller/api/HomeController.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/controller/api/HomeController.java rename to iot-standalone/src/main/java/cc/iotkit/manager/controller/api/HomeController.java diff --git a/manager/src/main/java/cc/iotkit/manager/controller/api/ProductController.java b/iot-standalone/src/main/java/cc/iotkit/manager/controller/api/ProductController.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/controller/api/ProductController.java rename to iot-standalone/src/main/java/cc/iotkit/manager/controller/api/ProductController.java diff --git a/manager/src/main/java/cc/iotkit/manager/controller/api/SpaceController.java b/iot-standalone/src/main/java/cc/iotkit/manager/controller/api/SpaceController.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/controller/api/SpaceController.java rename to iot-standalone/src/main/java/cc/iotkit/manager/controller/api/SpaceController.java diff --git a/manager/src/main/java/cc/iotkit/manager/model/aligenie/AligenieProductVo.java b/iot-standalone/src/main/java/cc/iotkit/manager/model/aligenie/AligenieProductVo.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/model/aligenie/AligenieProductVo.java rename to iot-standalone/src/main/java/cc/iotkit/manager/model/aligenie/AligenieProductVo.java diff --git a/manager/src/main/java/cc/iotkit/manager/model/query/DeviceQuery.java b/iot-standalone/src/main/java/cc/iotkit/manager/model/query/DeviceQuery.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/model/query/DeviceQuery.java rename to iot-standalone/src/main/java/cc/iotkit/manager/model/query/DeviceQuery.java diff --git a/manager/src/main/java/cc/iotkit/manager/model/stats/MainStats.java b/iot-standalone/src/main/java/cc/iotkit/manager/model/stats/MainStats.java similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/model/stats/MainStats.java rename to iot-standalone/src/main/java/cc/iotkit/manager/model/stats/MainStats.java diff --git a/manager/src/main/java/cc/iotkit/manager/model/vo/AppDesignVo.java b/iot-standalone/src/main/java/cc/iotkit/manager/model/vo/AppDesignVo.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/model/vo/AppDesignVo.java rename to iot-standalone/src/main/java/cc/iotkit/manager/model/vo/AppDesignVo.java diff --git a/manager/src/main/java/cc/iotkit/manager/model/vo/AppPageNode.java b/iot-standalone/src/main/java/cc/iotkit/manager/model/vo/AppPageNode.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/model/vo/AppPageNode.java rename to iot-standalone/src/main/java/cc/iotkit/manager/model/vo/AppPageNode.java diff --git a/manager/src/main/java/cc/iotkit/manager/model/vo/DeviceLog.java b/iot-standalone/src/main/java/cc/iotkit/manager/model/vo/DeviceLog.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/model/vo/DeviceLog.java rename to iot-standalone/src/main/java/cc/iotkit/manager/model/vo/DeviceLog.java diff --git a/manager/src/main/java/cc/iotkit/manager/model/vo/FindDeviceVo.java b/iot-standalone/src/main/java/cc/iotkit/manager/model/vo/FindDeviceVo.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/model/vo/FindDeviceVo.java rename to iot-standalone/src/main/java/cc/iotkit/manager/model/vo/FindDeviceVo.java diff --git a/manager/src/main/java/cc/iotkit/manager/model/vo/LoginResult.java b/iot-standalone/src/main/java/cc/iotkit/manager/model/vo/LoginResult.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/model/vo/LoginResult.java rename to iot-standalone/src/main/java/cc/iotkit/manager/model/vo/LoginResult.java diff --git a/manager/src/main/java/cc/iotkit/manager/model/vo/MessageVo.java b/iot-standalone/src/main/java/cc/iotkit/manager/model/vo/MessageVo.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/model/vo/MessageVo.java rename to iot-standalone/src/main/java/cc/iotkit/manager/model/vo/MessageVo.java diff --git a/manager/src/main/java/cc/iotkit/manager/model/vo/SpaceDeviceVo.java b/iot-standalone/src/main/java/cc/iotkit/manager/model/vo/SpaceDeviceVo.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/model/vo/SpaceDeviceVo.java rename to iot-standalone/src/main/java/cc/iotkit/manager/model/vo/SpaceDeviceVo.java diff --git a/manager/src/main/java/cc/iotkit/manager/model/vo/SpaceInfo.java b/iot-standalone/src/main/java/cc/iotkit/manager/model/vo/SpaceInfo.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/model/vo/SpaceInfo.java rename to iot-standalone/src/main/java/cc/iotkit/manager/model/vo/SpaceInfo.java diff --git a/manager/src/main/java/cc/iotkit/manager/service/AppDesignService.java b/iot-standalone/src/main/java/cc/iotkit/manager/service/AppDesignService.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/service/AppDesignService.java rename to iot-standalone/src/main/java/cc/iotkit/manager/service/AppDesignService.java diff --git a/manager/src/main/java/cc/iotkit/manager/service/DataOwnerService.java b/iot-standalone/src/main/java/cc/iotkit/manager/service/DataOwnerService.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/service/DataOwnerService.java rename to iot-standalone/src/main/java/cc/iotkit/manager/service/DataOwnerService.java diff --git a/manager/src/main/java/cc/iotkit/manager/service/DeferredDataConsumer.java b/iot-standalone/src/main/java/cc/iotkit/manager/service/DeferredDataConsumer.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/service/DeferredDataConsumer.java rename to iot-standalone/src/main/java/cc/iotkit/manager/service/DeferredDataConsumer.java diff --git a/manager/src/main/java/cc/iotkit/manager/service/DeviceService.java b/iot-standalone/src/main/java/cc/iotkit/manager/service/DeviceService.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/service/DeviceService.java rename to iot-standalone/src/main/java/cc/iotkit/manager/service/DeviceService.java diff --git a/manager/src/main/java/cc/iotkit/manager/service/DeviceStateCheckTask.java b/iot-standalone/src/main/java/cc/iotkit/manager/service/DeviceStateCheckTask.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/service/DeviceStateCheckTask.java rename to iot-standalone/src/main/java/cc/iotkit/manager/service/DeviceStateCheckTask.java diff --git a/manager/src/main/java/cc/iotkit/manager/service/ExampleDataInit.java b/iot-standalone/src/main/java/cc/iotkit/manager/service/ExampleDataInit.java similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/service/ExampleDataInit.java rename to iot-standalone/src/main/java/cc/iotkit/manager/service/ExampleDataInit.java diff --git a/manager/src/main/java/cc/iotkit/manager/service/SpaceDeviceService.java b/iot-standalone/src/main/java/cc/iotkit/manager/service/SpaceDeviceService.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/service/SpaceDeviceService.java rename to iot-standalone/src/main/java/cc/iotkit/manager/service/SpaceDeviceService.java diff --git a/manager/src/main/java/cc/iotkit/manager/service/ThingModelService.java b/iot-standalone/src/main/java/cc/iotkit/manager/service/ThingModelService.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/service/ThingModelService.java rename to iot-standalone/src/main/java/cc/iotkit/manager/service/ThingModelService.java diff --git a/manager/src/main/java/cc/iotkit/manager/service/WeChatService.java b/iot-standalone/src/main/java/cc/iotkit/manager/service/WeChatService.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/service/WeChatService.java rename to iot-standalone/src/main/java/cc/iotkit/manager/service/WeChatService.java diff --git a/manager/src/main/java/cc/iotkit/manager/utils/WeChatUtil.java b/iot-standalone/src/main/java/cc/iotkit/manager/utils/WeChatUtil.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/java/cc/iotkit/manager/utils/WeChatUtil.java rename to iot-standalone/src/main/java/cc/iotkit/manager/utils/WeChatUtil.java diff --git a/manager/src/main/resources/logback-spring.xml b/iot-standalone/src/main/resources/logback-spring.xml old mode 100755 new mode 100644 similarity index 100% rename from manager/src/main/resources/logback-spring.xml rename to iot-standalone/src/main/resources/logback-spring.xml diff --git a/manager/src/test/java/JsTest.java b/iot-standalone/src/test/java/JsTest.java old mode 100755 new mode 100644 similarity index 100% rename from manager/src/test/java/JsTest.java rename to iot-standalone/src/test/java/JsTest.java diff --git a/iot-test-tool/.DS_Store b/iot-test-tool/.DS_Store new file mode 100644 index 00000000..7b18c8b4 Binary files /dev/null and b/iot-test-tool/.DS_Store differ diff --git a/protocol-gateway/mqtt-client-simulator/pom.xml b/iot-test-tool/iot-test-mqtt/pom.xml old mode 100755 new mode 100644 similarity index 85% rename from protocol-gateway/mqtt-client-simulator/pom.xml rename to iot-test-tool/iot-test-mqtt/pom.xml index 17ca676e..53fd520d --- a/protocol-gateway/mqtt-client-simulator/pom.xml +++ b/iot-test-tool/iot-test-mqtt/pom.xml @@ -3,27 +3,20 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - protocol-gateway + iot-test-tool cc.iotkit - 0.3.0-SNAPSHOT + 0.3.1-SNAPSHOT 4.0.0 - mqtt客户端模拟器 - mqtt-client-simulator + iot-test-mqtt + - - org.eclipse.paho - org.eclipse.paho.client.mqttv3 + io.vertx + vertx-mqtt - - - cc.iotkit - common - - org.slf4j slf4j-api @@ -44,6 +37,11 @@ lombok + + cc.iotkit + iot-common + + diff --git a/protocol-gateway/mqtt-client-simulator/src/main/java/cc/iotkit/simulator/Application.java b/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/Simulator.java old mode 100755 new mode 100644 similarity index 60% rename from protocol-gateway/mqtt-client-simulator/src/main/java/cc/iotkit/simulator/Application.java rename to iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/Simulator.java index eb225d75..802096d6 --- a/protocol-gateway/mqtt-client-simulator/src/main/java/cc/iotkit/simulator/Application.java +++ b/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/Simulator.java @@ -1,29 +1,21 @@ -/* - * +---------------------------------------------------------------------- - * | Copyright (c) 奇特物联 2021-2022 All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed 未经许可不能去掉「奇特物联」相关版权 - * +---------------------------------------------------------------------- - * | Author: xw2sy@163.com - * +---------------------------------------------------------------------- - */ -package cc.iotkit.simulator; +package cc.iotkit.test.mqtt; -import cc.iotkit.simulator.config.Mqtt; -import cc.iotkit.simulator.service.Gateway; +import cc.iotkit.test.mqtt.config.Mqtt; +import cc.iotkit.test.mqtt.service.Gateway; import java.io.IOException; -public class Application { +public class Simulator { public static void main(String[] args) throws IOException { if (args.length == 0) { - Mqtt.broker = "tcp://127.0.0.1:1883"; -// Mqtt.broker = "tcp://120.76.96.206:1883"; +// Mqtt.brokerHost = "127.0.0.1"; + Mqtt.brokerHost = "120.76.96.206"; } else { - Mqtt.broker = args[0]; + Mqtt.brokerHost = args[0]; } + new Thread(() -> { Gateway gateway = new Gateway("hbtgIA0SuVw9lxjB", "AA:BB:CC:DD:22"); gateway.addSubDevice("Rf4QSjbm65X45753", "ABC12300002", "S01"); diff --git a/protocol-gateway/mqtt-client-simulator/src/main/java/cc/iotkit/simulator/config/Mqtt.java b/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/config/Mqtt.java old mode 100755 new mode 100644 similarity index 81% rename from protocol-gateway/mqtt-client-simulator/src/main/java/cc/iotkit/simulator/config/Mqtt.java rename to iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/config/Mqtt.java index 0c7f3af9..2c2c5f44 --- a/protocol-gateway/mqtt-client-simulator/src/main/java/cc/iotkit/simulator/config/Mqtt.java +++ b/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/config/Mqtt.java @@ -7,10 +7,11 @@ * | Author: xw2sy@163.com * +---------------------------------------------------------------------- */ -package cc.iotkit.simulator.config; +package cc.iotkit.test.mqtt.config; public class Mqtt { - public static String broker; + public static String brokerHost; + public static int brokerPort = 1883; } diff --git a/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/model/Request.java b/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/model/Request.java new file mode 100644 index 00000000..a0952ef7 --- /dev/null +++ b/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/model/Request.java @@ -0,0 +1,15 @@ +package cc.iotkit.test.mqtt.model; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class Request { + + private String id; + + private Object params; +} \ No newline at end of file diff --git a/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/model/Response.java b/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/model/Response.java new file mode 100644 index 00000000..e901abbc --- /dev/null +++ b/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/model/Response.java @@ -0,0 +1,20 @@ +package cc.iotkit.test.mqtt.model; + + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Map; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class Response { + + private String id; + + private int code; + + private Map data; +} \ No newline at end of file diff --git a/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/performance/ConnectionTest.java b/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/performance/ConnectionTest.java new file mode 100644 index 00000000..26bf1c1c --- /dev/null +++ b/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/performance/ConnectionTest.java @@ -0,0 +1,67 @@ +/* + * +---------------------------------------------------------------------- + * | Copyright (c) 奇特物联 2021-2022 All rights reserved. + * +---------------------------------------------------------------------- + * | Licensed 未经许可不能去掉「奇特物联」相关版权 + * +---------------------------------------------------------------------- + * | Author: xw2sy@163.com + * +---------------------------------------------------------------------- + */ +package cc.iotkit.test.mqtt.performance; + +import cc.iotkit.test.mqtt.config.Mqtt; +import cc.iotkit.test.mqtt.service.Gateway; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; + +import java.io.IOException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +/** + * 连接压力测试 + */ +@Slf4j +public class ConnectionTest { + + public static void main(String[] args) throws IOException { + + if (args.length == 0) { + Mqtt.brokerHost = "127.0.0.1"; +// Mqtt.brokerHost = "120.76.96.206"; + } else { + Mqtt.brokerHost = args[0]; + } + + int total = 1000; + if (args.length > 1) { + total = Integer.parseInt(args[1]); + } + + ExecutorService executor = Executors.newCachedThreadPool(); + for (int i = 0; i < total; i++) { + int finalI = i; + executor.submit(() -> { + log.info("start gateway " + (finalI + 1)); + Gateway gateway = new Gateway("hbtgIA0SuVw9lxjB", + "TEST:GW:" + StringUtils.leftPad(finalI + "", 6, "0")); + + gateway.addSubDevice("Rf4QSjbm65X45753", + "TEST_SW_" + StringUtils.leftPad(finalI + "", 6, "0"), + "S01"); + + gateway.addSubDevice("cGCrkK7Ex4FESAwe", + "TEST_SC_" + StringUtils.leftPad(finalI + "", 6, "0"), + "S01"); + + gateway.addSubDevice("xpsYHExTKPFaQMS7", + "TEST_LT_" + StringUtils.leftPad(finalI + "", 6, "0"), + "L01"); + + gateway.start(); + }); + } + + System.in.read(); + } +} diff --git a/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/performance/ReportTest.java b/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/performance/ReportTest.java new file mode 100644 index 00000000..e78f1b24 --- /dev/null +++ b/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/performance/ReportTest.java @@ -0,0 +1,94 @@ +/* + * +---------------------------------------------------------------------- + * | Copyright (c) 奇特物联 2021-2022 All rights reserved. + * +---------------------------------------------------------------------- + * | Licensed 未经许可不能去掉「奇特物联」相关版权 + * +---------------------------------------------------------------------- + * | Author: xw2sy@163.com + * +---------------------------------------------------------------------- + */ +package cc.iotkit.test.mqtt.performance; + +import cc.iotkit.test.mqtt.config.Mqtt; +import cc.iotkit.test.mqtt.model.Request; +import cc.iotkit.test.mqtt.service.Gateway; +import cc.iotkit.test.mqtt.service.ReportTask; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +/** + * 上报压力测试 + */ +@Slf4j +public class ReportTest { + + public static void main(String[] args) throws IOException { + + + if (args.length == 0) { + Mqtt.brokerHost = "127.0.0.1"; +// Mqtt.brokerHost = "120.76.96.206"; + } else { + Mqtt.brokerHost = args[0]; + } + + int total = 1000; + if (args.length > 1) { + total = Integer.parseInt(args[1]); + } + + ExecutorService executor = Executors.newCachedThreadPool(); + for (int i = 0; i < total; i++) { + int finalI = i; + executor.submit(() -> { + log.info("start gateway " + (finalI + 1)); + Gateway gateway = new Gateway("hbtgIA0SuVw9lxjB", + "TEST:GW:" + StringUtils.leftPad(finalI + "", 6, "0")); + + gateway.addSubDevice("Rf4QSjbm65X45753", + "TEST_SW_" + StringUtils.leftPad(finalI + "", 6, "0"), + "S01"); + + gateway.addSubDevice("cGCrkK7Ex4FESAwe", + "TEST_SC_" + StringUtils.leftPad(finalI + "", 6, "0"), + "S01"); + + gateway.addSubDevice("xpsYHExTKPFaQMS7", + "TEST_LT_" + StringUtils.leftPad(finalI + "", 6, "0"), + "L01"); + + gateway.onDeviceOnline((device) -> { + String pk = device.getProductKey(); + if (!"Rf4QSjbm65X45753".equals(pk)) { + return; + } + + //设备上线后添加上报定时任务 + ReportTask reportTask = new ReportTask(gateway.getClient()); + reportTask.addTask(String.format("/sys/%s/%s/s/event/property/post", + pk, device.getDeviceName()), + () -> { + Request request = new Request(); + request.setId(UUID.randomUUID().toString()); + Map param = new HashMap<>(); + param.put("volt", Math.round(Math.random()*100)); + request.setParams(param); + return request; + }); + reportTask.start(10); + }); + + gateway.start(); + }); + } + + System.in.read(); + } +} diff --git a/protocol-gateway/mqtt-client-simulator/src/main/java/cc/iotkit/simulator/service/Device.java b/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/service/Device.java old mode 100755 new mode 100644 similarity index 95% rename from protocol-gateway/mqtt-client-simulator/src/main/java/cc/iotkit/simulator/service/Device.java rename to iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/service/Device.java index cf964df0..c3c8e299 --- a/protocol-gateway/mqtt-client-simulator/src/main/java/cc/iotkit/simulator/service/Device.java +++ b/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/service/Device.java @@ -7,7 +7,7 @@ * | Author: xw2sy@163.com * +---------------------------------------------------------------------- */ -package cc.iotkit.simulator.service; +package cc.iotkit.test.mqtt.service; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/service/Gateway.java b/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/service/Gateway.java new file mode 100644 index 00000000..f8892f09 --- /dev/null +++ b/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/service/Gateway.java @@ -0,0 +1,123 @@ +/* + * +---------------------------------------------------------------------- + * | Copyright (c) 奇特物联 2021-2022 All rights reserved. + * +---------------------------------------------------------------------- + * | Licensed 未经许可不能去掉「奇特物联」相关版权 + * +---------------------------------------------------------------------- + * | Author: xw2sy@163.com + * +---------------------------------------------------------------------- + */ +package cc.iotkit.test.mqtt.service; + +import cc.iotkit.common.Constants; +import cc.iotkit.common.utils.JsonUtil; +import cc.iotkit.test.mqtt.config.Mqtt; +import cc.iotkit.test.mqtt.model.Request; +import io.netty.handler.codec.mqtt.MqttQoS; +import io.vertx.core.AsyncResult; +import io.vertx.core.Handler; +import io.vertx.core.buffer.Buffer; +import io.vertx.mqtt.MqttClient; +import io.vertx.mqtt.MqttClientOptions; +import io.vertx.mqtt.messages.MqttConnAckMessage; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.codec.digest.DigestUtils; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; +import java.util.concurrent.CountDownLatch; +import java.util.function.Consumer; + +@Slf4j +@EqualsAndHashCode(callSuper = true) +@Data +public class Gateway extends Device { + + private List subDevices = new ArrayList<>(); + + private Consumer deviceOnlineListener; + + private MqttClient client; + + public Gateway(String productKey, String deviceName) { + super(productKey, deviceName, "GW01"); + } + + @SneakyThrows + public void start() { + String clientId = String.format("%s_%s_%s", productKey, deviceName, getModel()); + + try { + MqttClientOptions options = new MqttClientOptions(); + options.setUsername(this.deviceName); + options.setPassword(DigestUtils.md5Hex(Constants.PRODUCT_SECRET + clientId)); + options.setCleanSession(true); + options.setKeepAliveInterval(30); + options.setClientId(clientId); + options.setReconnectInterval(3000); + options.setReconnectAttempts(100); + + client = MqttClient.create(Vertxs.getVertx(), options); + + CountDownLatch countDownLatch = new CountDownLatch(1); + client.connect(Mqtt.brokerPort, Mqtt.brokerHost, s -> { + if (s.succeeded()) { + log.info("mqtt connected,clientId:{}", clientId); + countDownLatch.countDown(); + } else { + log.info("mqtt connect failed,clientId:{}", clientId); + } + }); + countDownLatch.await(); + + // 订阅 + String topic = String.format("/sys/%s/%s/c/#", productKey, deviceName); + log.info("subscribe topic:{}", topic); + + client.subscribe(topic, 1, r -> { + //注册子设备 + for (Device subDevice : subDevices) { + log.info("start register sub device,pk:{},dn:{}", subDevice.getProductKey(), subDevice.getDeviceName()); + Request request = new Request(); + request.setId(UUID.randomUUID().toString()); + request.setParams(subDevice); + String registerTopic = String.format("/sys/%s/%s/s/register", productKey, deviceName); + String payload = JsonUtil.toJsonString(request); + client.publish(registerTopic, Buffer.buffer(payload), MqttQoS.AT_LEAST_ONCE, false, false); + log.info("publish message,topic:{},payload:{}", registerTopic, payload); + } + }); + + client.publishHandler(new MessageHandler(client, this, deviceOnlineListener)); + + client.closeHandler((v) -> { + log.info("{} closed", deviceName); + }); + + } catch (Throwable e) { + log.error("connect mqtt-broker error", e); + } + } + + public void addSubDevice(String productKey, String deviceName, String model) { + subDevices.add(new Device(productKey, deviceName, model)); + } + + public void onDeviceOnline(Consumer listener) { + this.deviceOnlineListener = listener; + } + + + public static class OnConnected implements Handler> { + + @Override + public void handle(AsyncResult mqttConnAckMessageAsyncResult) { + + } + } + +} diff --git a/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/service/MessageHandler.java b/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/service/MessageHandler.java new file mode 100644 index 00000000..ae7f42cd --- /dev/null +++ b/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/service/MessageHandler.java @@ -0,0 +1,90 @@ +package cc.iotkit.test.mqtt.service; + + +import cc.iotkit.common.utils.JsonUtil; +import cc.iotkit.test.mqtt.model.Request; +import cc.iotkit.test.mqtt.model.Response; +import io.netty.handler.codec.mqtt.MqttQoS; +import io.vertx.core.Handler; +import io.vertx.core.buffer.Buffer; +import io.vertx.mqtt.MqttClient; +import io.vertx.mqtt.messages.MqttPublishMessage; +import lombok.Data; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; + +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; +import java.util.function.Consumer; + +@Slf4j +@Data +public class MessageHandler implements Handler { + + private MqttClient client; + private Gateway gateway; + private Consumer deviceOnlineListener; + + public MessageHandler(MqttClient client, Gateway gateway, Consumer deviceOnlineListener) { + this.client = client; + this.gateway = gateway; + this.deviceOnlineListener = deviceOnlineListener; + } + + @SneakyThrows + + @Override + public void handle(MqttPublishMessage msg) { + try { + String topic = msg.topicName(); + String payload = msg.payload().toString(); + + log.info("received msg,topic:{},payload:{}", topic, payload); + + if (topic.endsWith("register_reply")) { + Response response = JsonUtil.parse(payload, Response.class); + //子设备注册成功 + if (response.getCode() == 0) { + Map data = response.getData(); + String productKey = data.get("productKey").toString(); + if (StringUtils.isBlank(productKey)) { + return; + } + String deviceName = data.get("deviceName").toString(); + + //订阅子设备消息 + String subTopic = String.format("/sys/%s/%s/c/#", productKey, deviceName); + log.info("subscribe topic:{}", subTopic); + client.subscribe(subTopic, 1, r -> { + if (deviceOnlineListener != null) { + deviceOnlineListener.accept(new Device(productKey, deviceName, "")); + } + }); + } + } + + if (topic.endsWith("_reply")) { + return; + } + Request request = JsonUtil.parse(payload, Request.class); + + Response response = new Response(request.getId(), 0, new HashMap<>()); + client.publish(topic.replace("/c/", "/s/") + "_reply", + Buffer.buffer(JsonUtil.toJsonString(response)), MqttQoS.AT_LEAST_ONCE, false, false); + + //属性设置后上报属性 + String setTopic = "/c/service/property/set"; + if (topic.endsWith(setTopic)) { + request.setId(UUID.randomUUID().toString()); + client.publish(topic.replace(setTopic, "/s/event/property/post"), + Buffer.buffer(JsonUtil.toJsonString(request)), MqttQoS.AT_LEAST_ONCE, false, false); + } + } catch (Throwable e) { + log.info("receive msg error", e); + } + } + + +} diff --git a/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/service/ReportTask.java b/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/service/ReportTask.java new file mode 100644 index 00000000..c9efc256 --- /dev/null +++ b/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/service/ReportTask.java @@ -0,0 +1,58 @@ +package cc.iotkit.test.mqtt.service; + +import cc.iotkit.common.utils.JsonUtil; +import cc.iotkit.test.mqtt.model.Request; +import io.netty.handler.codec.mqtt.MqttQoS; +import io.vertx.core.buffer.Buffer; +import io.vertx.mqtt.MqttClient; +import lombok.extern.slf4j.Slf4j; + +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.Callable; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; + +@Slf4j +public class ReportTask { + + private final MqttClient client; + private final Map> taskMap = new HashMap<>(); + private ScheduledExecutorService taskService = null; + + public ReportTask(MqttClient client) { + this.client = client; + } + + public void start(int interval) { + if (taskService == null) { + taskService = Executors.newScheduledThreadPool(1); + taskService.scheduleWithFixedDelay(this::send, 3, interval, TimeUnit.SECONDS); + } + } + + private void send() { + taskMap.forEach((topic, action) -> { + try { + Request request = action.call(); + if (request == null) { + return; + } + if (!client.isConnected()) { + return; + } + String msg = JsonUtil.toJsonString(request); + log.info("send msg,topic:{},payload:{}", topic, msg); + client.publish(topic, Buffer.buffer(msg), MqttQoS.AT_LEAST_ONCE, false, false); + + } catch (Throwable e) { + log.error("send error", e); + } + }); + } + + public void addTask(String topic, Callable callable) { + taskMap.put(topic, callable); + } +} diff --git a/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/service/Vertxs.java b/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/service/Vertxs.java new file mode 100644 index 00000000..bfeb6d16 --- /dev/null +++ b/iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/service/Vertxs.java @@ -0,0 +1,12 @@ +package cc.iotkit.test.mqtt.service; + +import io.vertx.core.Vertx; + +public class Vertxs { + + private static final Vertx INSTANCE = Vertx.vertx(); + + public static Vertx getVertx() { + return INSTANCE; + } +} diff --git a/iot-test-tool/iot-test-mqtt/src/main/resources/log4j2.xml b/iot-test-tool/iot-test-mqtt/src/main/resources/log4j2.xml new file mode 100644 index 00000000..88c12b39 --- /dev/null +++ b/iot-test-tool/iot-test-mqtt/src/main/resources/log4j2.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + ${FILE_LOG_PATTERN} + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/iot-test-tool/iot-test-mqtt/src/main/resources/vertx-default-jul-logging.properties b/iot-test-tool/iot-test-mqtt/src/main/resources/vertx-default-jul-logging.properties new file mode 100644 index 00000000..ccd56e56 --- /dev/null +++ b/iot-test-tool/iot-test-mqtt/src/main/resources/vertx-default-jul-logging.properties @@ -0,0 +1 @@ +.level=DEBUG \ No newline at end of file diff --git a/iot-test-tool/pom.xml b/iot-test-tool/pom.xml new file mode 100644 index 00000000..9864af4c --- /dev/null +++ b/iot-test-tool/pom.xml @@ -0,0 +1,20 @@ + + + + iotkit-parent + cc.iotkit + 0.3.1-SNAPSHOT + + 4.0.0 + pom + + + iot-test-mqtt + + + iot-test-tool + + + \ No newline at end of file diff --git a/iot-test-tool/readme.txt b/iot-test-tool/readme.txt new file mode 100644 index 00000000..665412cd --- /dev/null +++ b/iot-test-tool/readme.txt @@ -0,0 +1 @@ +提供用于测试的相关工具的模块 diff --git a/iot-virtual-device/.DS_Store b/iot-virtual-device/.DS_Store new file mode 100644 index 00000000..5008ddfc Binary files /dev/null and b/iot-virtual-device/.DS_Store differ diff --git a/virtual-device/pom.xml b/iot-virtual-device/pom.xml similarity index 80% rename from virtual-device/pom.xml rename to iot-virtual-device/pom.xml index 00170656..3eaf2c98 100644 --- a/virtual-device/pom.xml +++ b/iot-virtual-device/pom.xml @@ -5,11 +5,11 @@ iotkit-parent cc.iotkit - 0.3.0-SNAPSHOT + 0.3.1-SNAPSHOT 4.0.0 - virtual-device + iot-virtual-device @@ -26,17 +26,17 @@ cc.iotkit - model + iot-model cc.iotkit - dao + iot-dao cc.iotkit - component-server + iot-component-server diff --git a/iot-virtual-device/readme.txt b/iot-virtual-device/readme.txt new file mode 100644 index 00000000..7051f096 --- /dev/null +++ b/iot-virtual-device/readme.txt @@ -0,0 +1 @@ +虚拟设备模块，用于虚拟真实设备数据上报 diff --git a/virtual-device/src/main/java/cc/iotkit/virtualdevice/VirtualExecutor.java b/iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/VirtualExecutor.java similarity index 100% rename from virtual-device/src/main/java/cc/iotkit/virtualdevice/VirtualExecutor.java rename to iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/VirtualExecutor.java diff --git a/virtual-device/src/main/java/cc/iotkit/virtualdevice/VirtualManager.java b/iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/VirtualManager.java similarity index 100% rename from virtual-device/src/main/java/cc/iotkit/virtualdevice/VirtualManager.java rename to iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/VirtualManager.java diff --git a/virtual-device/src/main/java/cc/iotkit/virtualdevice/config/VirtualConfig.java b/iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/config/VirtualConfig.java similarity index 100% rename from virtual-device/src/main/java/cc/iotkit/virtualdevice/config/VirtualConfig.java rename to iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/config/VirtualConfig.java diff --git a/virtual-device/src/main/java/cc/iotkit/virtualdevice/trigger/RandomScheduleBuilder.java b/iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/trigger/RandomScheduleBuilder.java similarity index 100% rename from virtual-device/src/main/java/cc/iotkit/virtualdevice/trigger/RandomScheduleBuilder.java rename to iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/trigger/RandomScheduleBuilder.java diff --git a/virtual-device/src/main/java/cc/iotkit/virtualdevice/trigger/RandomTrigger.java b/iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/trigger/RandomTrigger.java similarity index 100% rename from virtual-device/src/main/java/cc/iotkit/virtualdevice/trigger/RandomTrigger.java rename to iot-virtual-device/src/main/java/cc/iotkit/virtualdevice/trigger/RandomTrigger.java diff --git a/virtual-device/src/main/resources/spring.factories b/iot-virtual-device/src/main/resources/spring.factories similarity index 100% rename from virtual-device/src/main/resources/spring.factories rename to iot-virtual-device/src/main/resources/spring.factories diff --git a/manager/src/main/resources/application-dev.yml b/manager/src/main/resources/application-dev.yml deleted file mode 100755 index baf8c348..00000000 --- a/manager/src/main/resources/application-dev.yml +++ /dev/null @@ -1,55 +0,0 @@ -server: - port: 8086 - -spring: - servlet: - multipart: - enabled: true - max-file-size: 10MB - max-request-size: 12MB - - elasticsearch: - rest: - #使用内置es的配置 - uris: http://127.0.0.1:9200 - username: - password: - connection-timeout: 10s - - redis: - #使用内置redis的配置 - host: 127.0.0.1 - port: 6379 - database: 0 - password: - - mvc: - pathmatch: - matching-strategy: ant_path_matcher - -#图片存储用的是阿里云oss，如果需要上传产品图片才需要配置 -aliyun: - bucketId: iotkit-img - endpoint: oss-cn-shenzhen.aliyuncs.com - accessKeyId: 填写阿里云accessKeyId - accessKeySecret: 填写阿里云accessKeySecret - -sa-token: - # token名称 (同时也是cookie名称) - token-name: token - # token有效期，单位s 默认30天, -1代表永不过期 - timeout: 2592000 - # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒 - activity-timeout: -1 - # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) - is-concurrent: true - # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) - is-share: false - # token风格 - token-style: uuid - # 是否输出操作日志 - is-log: false - -#认证中心地址 -oauth2: - auth-server-url: http://127.0.0.1:8086 diff --git a/manager/src/main/resources/application.yml b/manager/src/main/resources/application.yml deleted file mode 100755 index baf8c348..00000000 --- a/manager/src/main/resources/application.yml +++ /dev/null @@ -1,55 +0,0 @@ -server: - port: 8086 - -spring: - servlet: - multipart: - enabled: true - max-file-size: 10MB - max-request-size: 12MB - - elasticsearch: - rest: - #使用内置es的配置 - uris: http://127.0.0.1:9200 - username: - password: - connection-timeout: 10s - - redis: - #使用内置redis的配置 - host: 127.0.0.1 - port: 6379 - database: 0 - password: - - mvc: - pathmatch: - matching-strategy: ant_path_matcher - -#图片存储用的是阿里云oss，如果需要上传产品图片才需要配置 -aliyun: - bucketId: iotkit-img - endpoint: oss-cn-shenzhen.aliyuncs.com - accessKeyId: 填写阿里云accessKeyId - accessKeySecret: 填写阿里云accessKeySecret - -sa-token: - # token名称 (同时也是cookie名称) - token-name: token - # token有效期，单位s 默认30天, -1代表永不过期 - timeout: 2592000 - # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒 - activity-timeout: -1 - # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) - is-concurrent: true - # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) - is-share: false - # token风格 - token-style: uuid - # 是否输出操作日志 - is-log: false - -#认证中心地址 -oauth2: - auth-server-url: http://127.0.0.1:8086 diff --git a/pom.xml b/pom.xml index 8d5ea488..cbc260eb 100755 --- a/pom.xml +++ b/pom.xml @@ -4,16 +4,16 @@ 4.0.0 pom - model - rule-engine - common - manager - dao - protocol-gateway - standalone-package - oauth2-server - virtual-device - message-bus + iot-rule-engine + iot-common + iot-standalone + iot-components + iot-package + iot-auth-server + iot-virtual-device + iot-message-bus + iot-test-tool + iot-data-service org.springframework.boot @@ -24,7 +24,7 @@ cc.iotkit iotkit-parent - 0.3.0-SNAPSHOT + 0.3.1-SNAPSHOT iotkit-parent iotkit parent @@ -222,73 +222,73 @@ cc.iotkit - model + iot-model ${project.version} cc.iotkit - common + iot-dao ${project.version} cc.iotkit - dao + iot-common ${project.version} cc.iotkit - rule-engine + iot-rule-engine ${project.version} cc.iotkit - component + iot-component-base ${project.version} cc.iotkit - converter + iot-component-converter ${project.version} cc.iotkit - component-server + iot-component-server ${project.version} cc.iotkit - mqtt-component + iot-mqtt-component ${project.version} cc.iotkit - standalone-package + iot-package ${project.version} cc.iotkit - oauth2-server + iot-auth-server ${project.version} cc.iotkit - virtual-device + iot-virtual-device ${project.version} cc.iotkit - message-bus + iot-message-bus ${project.version} diff --git a/protocol-gateway/ctwing-component/dependency-reduced-pom.xml b/protocol-gateway/ctwing-component/dependency-reduced-pom.xml deleted file mode 100644 index 088f2b7d..00000000 --- a/protocol-gateway/ctwing-component/dependency-reduced-pom.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - protocol-gateway - cc.iotkit - 0.3.0-SNAPSHOT - - 4.0.0 - ctwing-component - - - - maven-shade-plugin - 3.2.4 - - - package - - shade - - - - - - - io.vertx:vertx-web-proxy - io.vertx:vertx-web - io.vertx:vertx-bridge-common - io.vertx:vertx-http-proxy - io.vertx:vertx-core - io.netty:netty-codec-http2 - com.ctg.ag:ctg-ag-sdk-core - com.ctg.ag:ag-sdk-biz-84356.tar.gz - org.apache.httpcomponents:httpasyncclient - - - - - - maven-compiler-plugin - - 8 - 8 - - - - - - - org.projectlombok - lombok - 1.18.22 - compile - - - io.vertx - vertx-web-proxy - 4.2.2 - provided - - - cc.iotkit - component - 0.3.0-SNAPSHOT - compile - - - com.ctg.ag - ctg-ag-sdk-core - 2.5.0-SNAPSHOT - provided - - - com.ctg.ag - ag-sdk-biz-84356.tar.gz - 20220603.182201-SNAPSHOT - provided - - - - 8 - 8 - - diff --git a/protocol-gateway/mqtt-client-simulator/src/main/java/cc/iotkit/simulator/service/Gateway.java b/protocol-gateway/mqtt-client-simulator/src/main/java/cc/iotkit/simulator/service/Gateway.java deleted file mode 100755 index 2ce5647c..00000000 --- a/protocol-gateway/mqtt-client-simulator/src/main/java/cc/iotkit/simulator/service/Gateway.java +++ /dev/null @@ -1,195 +0,0 @@ -/* - * +---------------------------------------------------------------------- - * | Copyright (c) 奇特物联 2021-2022 All rights reserved. - * +---------------------------------------------------------------------- - * | Licensed 未经许可不能去掉「奇特物联」相关版权 - * +---------------------------------------------------------------------- - * | Author: xw2sy@163.com - * +---------------------------------------------------------------------- - */ -package cc.iotkit.simulator.service; - -import cc.iotkit.common.Constants; -import cc.iotkit.common.utils.JsonUtil; -import cc.iotkit.simulator.config.Mqtt; -import lombok.*; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.codec.digest.DigestUtils; -import org.apache.commons.lang3.StringUtils; -import org.eclipse.paho.client.mqttv3.*; -import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; - -import java.net.ConnectException; -import java.util.*; - -@Slf4j -@EqualsAndHashCode(callSuper = true) -@Data -public class Gateway extends Device { - - private MqttClient client; - - private List subDevices = new ArrayList<>(); - - public Gateway(String productKey, String deviceName) { - super(productKey, deviceName, "GW01"); - } - - @SneakyThrows - public void start() { - String broker = Mqtt.broker; - - String clientId = String.format("%s_%s_%s", productKey, deviceName, getModel()); - MemoryPersistence persistence = new MemoryPersistence(); - - try { - MqttClient client = new MqttClient(broker, clientId, persistence); - - // MQTT 连接选项 - MqttConnectOptions connOpts = new MqttConnectOptions(); - connOpts.setUserName(this.deviceName); - connOpts.setPassword(DigestUtils.md5Hex(Constants.PRODUCT_SECRET + clientId).toCharArray()); - // 保留会话 - connOpts.setCleanSession(true); - connOpts.setKeepAliveInterval(10); - - // 设置回调 - client.setCallback(new OnMessageCallback(client, this)); - - // 建立连接 - log.info("Connecting to broker:{} ", broker); - try { - IMqttToken result = client.connectWithResult(connOpts); - result.waitForCompletion(); - } catch (Throwable e) { - log.error("connect failed,reconnect..."); - Thread.sleep(3000); - this.start(); - } - - log.info("Connected"); - // 订阅 - String topic = String.format("/sys/%s/%s/c/#", productKey, deviceName); - log.info("subscribe topic:{}", topic); - while (!client.isConnected()) { - Thread.sleep(100); - } - - IMqttToken mqttToken = client.subscribeWithResponse(topic); - if (mqttToken.isComplete()) { - //注册子设备 - for (Device subDevice : subDevices) { - Request request = new Request(); - request.setId(UUID.randomUUID().toString()); - request.setParams(subDevice); - topic = String.format("/sys/%s/%s/s/register", productKey, deviceName); - String payload = JsonUtil.toJsonString(request); - client.publish(String.format("/sys/%s/%s/s/register", productKey, deviceName), - new MqttMessage(payload.getBytes()) - ); - log.info("publish message,topic:{},payload:{}", topic, payload); - } - } - } catch (Throwable e) { - log.error("connect mqtt-broker error", e); - } - } - - public void addSubDevice(String productKey, String deviceName, String model) { - subDevices.add(new Device(productKey, deviceName, model)); - } - - @Data - public static class OnMessageCallback implements MqttCallback { - - private MqttClient client; - private Gateway gateway; - - public OnMessageCallback(MqttClient client, Gateway gateway) { - this.client = client; - this.gateway = gateway; - } - - @SneakyThrows - public void connectionLost(Throwable cause) { - log.info("连接断开，重连..."); - Thread.sleep(3000); - client.close(); - gateway.start(); - } - - @SneakyThrows - public void messageArrived(String topic, MqttMessage message) { - try { - log.info("接收消息,topic:{},payload:{}", topic, - new String(message.getPayload())); - - if (topic.endsWith("register_reply")) { - String payload = new String(message.getPayload()); - Response response = JsonUtil.parse(payload, Response.class); - //子设备注册成功 - if (response.code == 0) { - Map data = response.getData(); - String productKey = data.get("productKey").toString(); - if (StringUtils.isBlank(productKey)) { - return; - } - - //订阅子设备消息 - String subTopic = String.format("/sys/%s/%s/c/#", - productKey, data.get("deviceName")); - log.info("subscribe topic:{}", subTopic); - client.subscribe(subTopic); - } - } - - if (topic.endsWith("_reply")) { - return; - } - String payload = new String(message.getPayload()); - Request request = JsonUtil.parse(payload, Request.class); - - Response response = new Response(request.getId(), 0, new HashMap<>()); - client.publish(topic.replace("/c/", "/s/") + "_reply", - new MqttMessage(JsonUtil.toJsonString(response).getBytes())); - - //属性设置后上报属性 - String setTopic = "/c/service/property/set"; - if (topic.endsWith(setTopic)) { - request.setId(UUID.randomUUID().toString()); - client.publish(topic.replace(setTopic, "/s/event/property/post"), - new MqttMessage(JsonUtil.toJsonString(request).getBytes())); - } - } catch (Throwable e) { - log.info("receive msg error", e); - } - } - - public void deliveryComplete(IMqttDeliveryToken token) { - log.info("deliveryComplete,topic:{},result:{}", token.getTopics(), token.isComplete()); - } - } - - @Data - @NoArgsConstructor - @AllArgsConstructor - public static class Request { - - private String id; - - private Object params; - } - - @Data - @NoArgsConstructor - @AllArgsConstructor - public static class Response { - - private String id; - - private int code; - - private Map data; - } - -}