From 758f6e12f8d08fa2105270d8d771d0131f2e764f Mon Sep 17 00:00:00 2001 From: xiwa Date: Mon, 28 Mar 2022 19:02:35 +0800 Subject: [PATCH] =?UTF-8?q?pom=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cc/iotkit/dao/DeviceDao.java | 0 .../java/cc/iotkit/dao/DevicePropertyDao.java | 0 .../cc/iotkit/dao/ThingModelMessageDao.java | 0 .../cc/iotkit/manager/model/vo/DeviceLog.java | 0 .../src/main/resources/application-dev.yml | 10 ++++++ manager/src/main/resources/application.yml | 12 +++++-- .../model/device/message/DeviceProperty.java | 0 .../java/cc/iotkit/comps/config/CacheKey.java | 0 .../comps/service/DeviceStateHolder.java | 0 .../cc/iotkit/comp/AbstractComponent.java | 15 ++++++++ .../main/java/cc/iotkit/comp/CompConfig.java | 0 .../main/java/cc/iotkit/comp/IComponent.java | 5 +++ .../cc/iotkit/comp/model/ReceiveResult.java | 0 protocol-gateway/emqx-component/pom.xml | 0 .../cc/iotkit/comp/emqx/AuthVerticle.java | 0 .../cc/iotkit/comp/emqx/EmqxComponent.java | 0 .../java/cc/iotkit/comp/emqx/EmqxConfig.java | 0 protocol-gateway/mqtt-component/.DS_Store | Bin 0 -> 8196 bytes protocol-gateway/mqtt-component/pom.xml | 34 ++++++++++++++++++ .../src/main/resources/component.js | 0 .../src/main/resources/converter.js | 0 protocol-gateway/pom.xml | 1 + .../action/DeviceActionService.java | 0 23 files changed, 75 insertions(+), 2 deletions(-) mode change 100644 => 100755 dao/src/main/java/cc/iotkit/dao/DeviceDao.java mode change 100644 => 100755 dao/src/main/java/cc/iotkit/dao/DevicePropertyDao.java mode change 100644 => 100755 dao/src/main/java/cc/iotkit/dao/ThingModelMessageDao.java mode change 100644 => 100755 manager/src/main/java/cc/iotkit/manager/model/vo/DeviceLog.java mode change 100644 => 100755 model/src/main/java/cc/iotkit/model/device/message/DeviceProperty.java mode change 100644 => 100755 protocol-gateway/component-server/src/main/java/cc/iotkit/comps/config/CacheKey.java mode change 100644 => 100755 protocol-gateway/component-server/src/main/java/cc/iotkit/comps/service/DeviceStateHolder.java mode change 100644 => 100755 protocol-gateway/component/src/main/java/cc/iotkit/comp/CompConfig.java mode change 100644 => 100755 protocol-gateway/component/src/main/java/cc/iotkit/comp/model/ReceiveResult.java mode change 100644 => 100755 protocol-gateway/emqx-component/pom.xml mode change 100644 => 100755 protocol-gateway/emqx-component/src/main/java/cc/iotkit/comp/emqx/AuthVerticle.java mode change 100644 => 100755 protocol-gateway/emqx-component/src/main/java/cc/iotkit/comp/emqx/EmqxComponent.java mode change 100644 => 100755 protocol-gateway/emqx-component/src/main/java/cc/iotkit/comp/emqx/EmqxConfig.java create mode 100644 protocol-gateway/mqtt-component/.DS_Store mode change 100644 => 100755 protocol-gateway/mqtt-component/src/main/resources/component.js mode change 100644 => 100755 protocol-gateway/mqtt-component/src/main/resources/converter.js mode change 100644 => 100755 rule-engine/src/main/java/cc/iotkit/ruleengine/action/DeviceActionService.java 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 0000000000000000000000000000000000000000..827186b49513595a75535f93cfc68c54c4dafbbd GIT binary patch literal 8196 zcmeHMO^g&p6n?LFS-Rw}7TKR31V&Z?aR{@Ei^!r5JG=ZS1Z4IfbnKaKc02TTuhTs< z2(H;gjL|3>e{O2R#RG|GjEU&M6BkYJpc{h1!Gm7Bc+r42Usd%GSePSXLRV7ts_MO0 z)$jH9y5`jY0QQ!xPJng*(5VW_7f^GHBKV@-RJ3TOktmWrfDK`x8cY>jzi^XuJP~^! z_CV}`*aNW#Vh{WuJV0l*D0-c9Uvc9$_CV}`yV3*V`;eq6XeOdFipoz1H8KStDpCMh zs84x-)JaA(6VVw(r7EqdvImS*F-kE|sS`gb#EE7iI-{sk2UO~S(asoUC@6O)y`&Te z%qSYSu?J!g-0T4nK1~pU2_+bxlfQpem~x#UOs6lP*3dYwX}&&RU!XsmoA9f-&rMqdJ0G{>qp=9=UNm8`mw zXlSUJbg^a*kzeb}$m!M?=vY3;a@;m4YJ<>592LUn=zXO@)r{1w(czAj;U8g)J*q zuX#A#z4giL&OQ5Q7cE}G*;2M_xZ(s(!L?^P|idt|)8y z)6rzlHfD?z{mDr(C1}P}G@YTHpA$RpF@td5l9lAa$c-t+@wq|)-d+V;< zhA|dQm?e8(l`zJC6i-U?dud+2IO2$v`Yk8)OA+%K$>fe#aR|Wl3KWiYUGK=OQ!tV) z?Z~9nh>LT{fD}9dJ75fo;6WAMgty=%d<37s8Tb;uh40{dI1fL-PjDH2gFoOe_#3Xk zRYbf8+t9!SF2@Hjjh)zqJ($5>%wiwz#RE8igE)kFv~e6K(7_TO!Lds zhpfcu4d|9Ql`nPI!86w!nQIB9^N=>5N@|U&KL&~)U38rR@Zr5WY)#y zDL4(E!&x{-xV!+D;8*yQun5?M99s#G0*xzh4X(w9a6P858#m(?e2kFUhyAz{ci~f* zBV-QYFpgpYi)i6t^l^&N8DN>PIfJj@349e#;@gDMcL}E-;;A{P+f~DxqIh~P>MFUC z=lb3_&DW56qe?uw-5zLA8?=l3zrX(d|LuN^c>UM|u?Oy;2e7d(*VjuAQ13%5a_uD5 z=c$S! + + + + 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