diff --git a/dao/src/main/java/cc/iotkit/dao/DeviceDao.java b/dao/src/main/java/cc/iotkit/dao/DeviceDao.java old mode 100644 new mode 100755 diff --git a/dao/src/main/java/cc/iotkit/dao/DevicePropertyDao.java b/dao/src/main/java/cc/iotkit/dao/DevicePropertyDao.java old mode 100644 new mode 100755 diff --git a/dao/src/main/java/cc/iotkit/dao/ThingModelMessageDao.java b/dao/src/main/java/cc/iotkit/dao/ThingModelMessageDao.java old mode 100644 new mode 100755 diff --git a/manager/src/main/java/cc/iotkit/manager/model/vo/DeviceLog.java b/manager/src/main/java/cc/iotkit/manager/model/vo/DeviceLog.java old mode 100644 new mode 100755 diff --git a/manager/src/main/resources/application-dev.yml b/manager/src/main/resources/application-dev.yml index 8c3f5c39..2a9c0ec1 100755 --- a/manager/src/main/resources/application-dev.yml +++ b/manager/src/main/resources/application-dev.yml @@ -11,6 +11,12 @@ spring: password: 密码 connection-timeout: 10s + redis: + host: redis地址 + port: 6379 + database: 0 + password: redis密码 + cache: cache-names: foo,bar caffeine: @@ -47,6 +53,10 @@ keycloak-admin-clientid : 填写keycloak中定义的clientId keycloak-admin-user : 填写keycloak中添加的管理员用户名 keycloak-admin-password : 填写keycloak中添加的管理员密码 +pulsar: + broker: pulsar://pulsar broker地址:6650 + service: http://pulsar 服务地址:8080 + app: systemRole: iot_system_user diff --git a/manager/src/main/resources/application.yml b/manager/src/main/resources/application.yml index 8c3f5c39..8973fa15 100755 --- a/manager/src/main/resources/application.yml +++ b/manager/src/main/resources/application.yml @@ -7,10 +7,14 @@ spring: elasticsearch: rest: uris: http://elasticsearch 连接地址 - username: elasticsearch 用户名 - password: 密码 connection-timeout: 10s + redis: + host: redis地址 + port: 6379 + database: 0 + password: + cache: cache-names: foo,bar caffeine: @@ -47,6 +51,10 @@ keycloak-admin-clientid : 填写keycloak中定义的clientId keycloak-admin-user : 填写keycloak中添加的管理员用户名 keycloak-admin-password : 填写keycloak中添加的管理员密码 +pulsar: + broker: pulsar://pulsar broker地址:6650 + service: http://pulsar 服务地址:8080 + app: systemRole: iot_system_user diff --git a/model/src/main/java/cc/iotkit/model/device/message/DeviceProperty.java b/model/src/main/java/cc/iotkit/model/device/message/DeviceProperty.java old mode 100644 new mode 100755 diff --git a/protocol-gateway/component-server/src/main/java/cc/iotkit/comps/config/CacheKey.java b/protocol-gateway/component-server/src/main/java/cc/iotkit/comps/config/CacheKey.java old mode 100644 new mode 100755 diff --git a/protocol-gateway/component-server/src/main/java/cc/iotkit/comps/service/DeviceStateHolder.java b/protocol-gateway/component-server/src/main/java/cc/iotkit/comps/service/DeviceStateHolder.java old mode 100644 new mode 100755 diff --git a/protocol-gateway/component/src/main/java/cc/iotkit/comp/AbstractComponent.java b/protocol-gateway/component/src/main/java/cc/iotkit/comp/AbstractComponent.java index 81e7936f..7fd6ebbb 100755 --- a/protocol-gateway/component/src/main/java/cc/iotkit/comp/AbstractComponent.java +++ b/protocol-gateway/component/src/main/java/cc/iotkit/comp/AbstractComponent.java @@ -1,5 +1,8 @@ package cc.iotkit.comp; +import cc.iotkit.comp.model.AuthInfo; +import cc.iotkit.comp.model.DeviceState; +import cc.iotkit.comp.model.RegisterInfo; import cc.iotkit.converter.IConverter; import lombok.Data; @@ -17,6 +20,18 @@ public abstract class AbstractComponent implements IComponent { this.config=config; } + @Override + public void onDeviceRegister(RegisterInfo info) { + } + + @Override + public void onDeviceAuth(AuthInfo authInfo) { + } + + @Override + public void onDeviceStateChange(DeviceState state) { + } + @Override public CompConfig getConfig() { return config; diff --git a/protocol-gateway/component/src/main/java/cc/iotkit/comp/CompConfig.java b/protocol-gateway/component/src/main/java/cc/iotkit/comp/CompConfig.java old mode 100644 new mode 100755 diff --git a/protocol-gateway/component/src/main/java/cc/iotkit/comp/IComponent.java b/protocol-gateway/component/src/main/java/cc/iotkit/comp/IComponent.java index 110e89c5..7f42d4fe 100755 --- a/protocol-gateway/component/src/main/java/cc/iotkit/comp/IComponent.java +++ b/protocol-gateway/component/src/main/java/cc/iotkit/comp/IComponent.java @@ -1,5 +1,6 @@ package cc.iotkit.comp; +import cc.iotkit.comp.model.AuthInfo; import cc.iotkit.comp.model.DeviceState; import cc.iotkit.comp.model.RegisterInfo; import cc.iotkit.converter.DeviceMessage; @@ -15,6 +16,10 @@ public interface IComponent { void destroy(); + void onDeviceAuth(AuthInfo authInfo); + + void onDeviceRegister(RegisterInfo info); + void onDeviceStateChange(DeviceState state); void send(DeviceMessage message); diff --git a/protocol-gateway/component/src/main/java/cc/iotkit/comp/model/ReceiveResult.java b/protocol-gateway/component/src/main/java/cc/iotkit/comp/model/ReceiveResult.java old mode 100644 new mode 100755 diff --git a/protocol-gateway/emqx-component/pom.xml b/protocol-gateway/emqx-component/pom.xml old mode 100644 new mode 100755 diff --git a/protocol-gateway/emqx-component/src/main/java/cc/iotkit/comp/emqx/AuthVerticle.java b/protocol-gateway/emqx-component/src/main/java/cc/iotkit/comp/emqx/AuthVerticle.java old mode 100644 new mode 100755 diff --git a/protocol-gateway/emqx-component/src/main/java/cc/iotkit/comp/emqx/EmqxComponent.java b/protocol-gateway/emqx-component/src/main/java/cc/iotkit/comp/emqx/EmqxComponent.java old mode 100644 new mode 100755 diff --git a/protocol-gateway/emqx-component/src/main/java/cc/iotkit/comp/emqx/EmqxConfig.java b/protocol-gateway/emqx-component/src/main/java/cc/iotkit/comp/emqx/EmqxConfig.java old mode 100644 new mode 100755 diff --git a/protocol-gateway/mqtt-component/.DS_Store b/protocol-gateway/mqtt-component/.DS_Store new file mode 100644 index 00000000..827186b4 Binary files /dev/null and b/protocol-gateway/mqtt-component/.DS_Store differ diff --git a/protocol-gateway/mqtt-component/pom.xml b/protocol-gateway/mqtt-component/pom.xml index 9119c3b3..bf24884b 100755 --- a/protocol-gateway/mqtt-component/pom.xml +++ b/protocol-gateway/mqtt-component/pom.xml @@ -45,4 +45,38 @@ + + + + org.apache.maven.plugins + maven-shade-plugin + 3.2.4 + + + package + + shade + + + + + + + io.vertx:vertx-core + io.vertx:vertx-mqtt + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 8 + 8 + + + + + \ No newline at end of file diff --git a/protocol-gateway/mqtt-component/src/main/resources/component.js b/protocol-gateway/mqtt-component/src/main/resources/component.js old mode 100644 new mode 100755 diff --git a/protocol-gateway/mqtt-component/src/main/resources/converter.js b/protocol-gateway/mqtt-component/src/main/resources/converter.js old mode 100644 new mode 100755 diff --git a/protocol-gateway/pom.xml b/protocol-gateway/pom.xml index 71ac04b7..81409a9e 100755 --- a/protocol-gateway/pom.xml +++ b/protocol-gateway/pom.xml @@ -17,6 +17,7 @@ mqtt-component emqx-component component + mqtt-client-simulator \ No newline at end of file diff --git a/rule-engine/src/main/java/cc/iotkit/ruleengine/action/DeviceActionService.java b/rule-engine/src/main/java/cc/iotkit/ruleengine/action/DeviceActionService.java old mode 100644 new mode 100755