From 57fce9102a8a3dda4af997e5c764f933b4cb1f1b Mon Sep 17 00:00:00 2001 From: xiwa Date: Thu, 30 Jun 2022 15:08:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=90=8D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ... => iot-mqtt-component-0.3.1-SNAPSHOT.jar} | Bin 2038748 -> 2038771 bytes data/init/protocolComponent.json | 2 +- {oauth2-server => iot-auth-server}/pom.xml | 6 +- iot-auth-server/readme.txt | 1 + .../controller/AuthClientController.java | 0 .../controller/AuthServerController.java | 0 .../oauth/service/SaOAuth2TemplateImpl.java | 0 .../oauth/service/StpInterfaceImpl.java | 0 .../oauth/service/TokenRequestHandler.java | 0 .../java/cc/iotkit/oauth/vo/UserInfoVo.java | 0 .../main/java/cc/iotkit/utils/AuthUtil.java | 0 .../src/main/java/cc/iotkit/utils/SoMap.java | 0 .../src/main/resources/templates/confirm.html | 0 .../src/main/resources/templates/login.html | 0 .../src/test/java/GenPwdSecret.java | 0 {common => iot-common}/pom.xml | 4 +- iot-common/readme.txt | 1 + .../iotkit/common/ComponentClassLoader.java | 2 +- .../main/java/cc/iotkit/common/Constants.java | 0 .../iotkit/common/exception/BizException.java | 0 .../common/exception/NotFoundException.java | 0 .../common/exception/OfflineException.java | 0 .../cc/iotkit/common/thing/ThingService.java | 0 .../cc/iotkit/common/utils/CodecUtil.java | 0 .../cc/iotkit/common/utils/DeviceUtil.java | 0 .../java/cc/iotkit/common/utils/HexUtil.java | 0 .../java/cc/iotkit/common/utils/JsonUtil.java | 0 .../cc/iotkit/common/utils/ReflectUtil.java | 0 .../cc/iotkit/common/utils/ThreadUtil.java | 0 .../cc/iotkit/common/utils/UniqueIdUtil.java | 0 iot-components/.DS_Store | Bin 0 -> 18436 bytes .../iot-component-base}/.DS_Store | Bin 6148 -> 6148 bytes .../iot-component-base}/pom.xml | 14 +- .../iotkit/comp/AbstractDeviceComponent.java | 0 .../main/java/cc/iotkit/comp/CompConfig.java | 0 .../main/java/cc/iotkit/comp/IComponent.java | 0 .../java/cc/iotkit/comp/IDeviceComponent.java | 0 .../java/cc/iotkit/comp/IMessageHandler.java | 0 .../java/cc/iotkit/comp/model/AuthInfo.java | 0 .../cc/iotkit/comp/model/DeviceState.java | 0 .../cc/iotkit/comp/model/ReceiveResult.java | 0 .../cc/iotkit/comp/model/RegisterInfo.java | 0 .../cc/iotkit/comp/utils/SpringUtils.java | 0 .../iot-component-converter}/.DS_Store | Bin 8196 -> 6148 bytes .../iot-component-converter}/pom.xml | 14 +- .../main/java/cc/iotkit/converter/Device.java | 0 .../cc/iotkit/converter/DeviceMessage.java | 0 .../java/cc/iotkit/converter/IConverter.java | 0 .../cc/iotkit/converter/ScriptConverter.java | 0 iot-components/iot-component-server/.DS_Store | Bin 0 -> 6148 bytes .../iot-component-server}/pom.xml | 18 +- .../main/java/cc/iotkit/comps/ApiTool.java | 0 .../cc/iotkit/comps/BizComponentManager.java | 0 .../cc/iotkit/comps/ComponentManager.java | 0 .../iotkit/comps/DeviceComponentManager.java | 8 +- .../cc/iotkit/comps/DeviceMessageHandler.java | 0 .../java/cc/iotkit/comps/DeviceRouter.java | 0 .../java/cc/iotkit/comps/config/CacheKey.java | 0 .../iotkit/comps/config/ComponentConfig.java | 0 .../comps/service/DeviceBehaviourService.java | 2 +- .../comps/service/DeviceMessageConsumer.java | 0 iot-components/iot-ctwing-component/.DS_Store | Bin 0 -> 6148 bytes ...-84356.tar.gz-20220603.182201-SNAPSHOT.jar | Bin ...g-ag-sdk-core-2.5.0-20220512.061430-51.jar | Bin .../iot-ctwing-component}/pom.xml | 16 +- .../cc/iotkit/comp/http/CtwingConfig.java | 0 .../comp/http/CtwingDeviceComponent.java | 0 .../cc/iotkit/comp/http/ProtocolUtil.java | 0 .../src/main/resources/component.js | 0 .../src/main/resources/component.spi | 0 iot-components/iot-emqx-component/.DS_Store | Bin 0 -> 6148 bytes .../dependency-reduced-pom.xml | 46 ++--- .../iot-emqx-component}/pom.xml | 39 ++-- .../cc/iotkit/comp/emqx/AuthVerticle.java | 0 .../java/cc/iotkit/comp/emqx/EmqxConfig.java | 0 .../iotkit/comp/emqx/EmqxDeviceComponent.java | 0 .../java/cc/iotkit/comp/emqx/IScripter.java | 0 .../java/cc/iotkit/comp/emqx/JsScripter.java | 0 .../java/cc/iotkit/comp/emqx/LuaScripter.java | 0 .../comp/emqx/TransparentConverter.java | 0 .../cc/iotkit/comp/emqx/TransparentMsg.java | 0 .../src/main/resources/component.js | 0 .../src/main/resources/component.spi | 0 .../iot-http-biz-component}/.DS_Store | Bin .../dependency-reduced-pom.xml | 10 +- .../iot-http-biz-component}/pom.xml | 8 +- .../cc/iotkit/comp/biz/HttpBizComponent.java | 0 .../java/cc/iotkit/comp/biz/HttpConfig.java | 0 .../src/main/resources/component.spi | 0 .../src/main/resources/onenet接入脚本示例.js | 0 .../main/resources/小度音箱接入脚本示例.js | 0 .../iot-mqtt-component}/.DS_Store | Bin .../dependency-reduced-pom.xml | 18 +- .../iot-mqtt-component}/pom.xml | 12 +- .../java/cc/iotkit/comp/mqtt/IScripter.java | 0 .../java/cc/iotkit/comp/mqtt/JsScripter.java | 0 .../java/cc/iotkit/comp/mqtt/LuaScripter.java | 0 .../java/cc/iotkit/comp/mqtt/MqttConfig.java | 0 .../iotkit/comp/mqtt/MqttDeviceComponent.java | 0 .../cc/iotkit/comp/mqtt/MqttVerticle.java | 0 .../comp/mqtt/TransparentConverter.java | 0 .../cc/iotkit/comp/mqtt/TransparentMsg.java | 0 .../src/main/resources/component.js | 0 .../src/main/resources/component.spi | 0 .../src/main/resources/converter.js | 0 {protocol-gateway => iot-components}/pom.xml | 19 +- iot-components/readme.txt | 1 + iot-data-service/.DS_Store | Bin 0 -> 10244 bytes iot-data-service/iot-dao/.DS_Store | Bin 0 -> 6148 bytes {dao => iot-data-service/iot-dao}/pom.xml | 8 +- .../iotkit/dao/AligenieDeviceRepository.java | 0 .../iotkit/dao/AligenieProductRepository.java | 0 .../cc/iotkit/dao/AppDesignRepository.java | 0 .../java/cc/iotkit/dao/AppInfoRepository.java | 0 .../java/cc/iotkit/dao/CategoryCache.java | 0 .../cc/iotkit/dao/CategoryRepository.java | 0 .../main/java/cc/iotkit/dao/CommonDao.java | 0 .../main/java/cc/iotkit/dao/DeviceCache.java | 0 .../main/java/cc/iotkit/dao/DeviceDao.java | 32 ++- .../cc/iotkit/dao/DeviceGroupRepository.java | 0 .../cc/iotkit/dao/DeviceInfoRepository.java | 0 .../java/cc/iotkit/dao/DevicePropertyDao.java | 0 .../iotkit/dao/DevicePropertyRepository.java | 0 .../java/cc/iotkit/dao/DeviceReportDao.java | 0 .../cc/iotkit/dao/DeviceReportRepository.java | 0 .../java/cc/iotkit/dao/HomeRepository.java | 0 .../java/cc/iotkit/dao/OauthClientCache.java | 0 .../cc/iotkit/dao/OauthClientRepository.java | 0 .../main/java/cc/iotkit/dao/ProductCache.java | 0 .../cc/iotkit/dao/ProductModelRepository.java | 0 .../java/cc/iotkit/dao/ProductRepository.java | 0 .../dao/ProtocolComponentRepository.java | 0 .../dao/ProtocolConverterRepository.java | 0 .../cc/iotkit/dao/RuleInfoRepository.java | 0 .../java/cc/iotkit/dao/RuleLogRepository.java | 0 .../main/java/cc/iotkit/dao/SpaceCache.java | 0 .../cc/iotkit/dao/SpaceDeviceRepository.java | 0 .../java/cc/iotkit/dao/SpaceRepository.java | 0 .../cc/iotkit/dao/TaskInfoRepository.java | 0 .../java/cc/iotkit/dao/TaskLogRepository.java | 0 .../cc/iotkit/dao/ThingModelMessageDao.java | 0 .../dao/ThingModelMessageRepository.java | 0 .../cc/iotkit/dao/ThingModelRepository.java | 0 .../dao/ThirdUserSessionRepository.java | 0 .../iotkit/dao/UserActionLogRepository.java | 0 .../java/cc/iotkit/dao/UserInfoCache.java | 0 .../cc/iotkit/dao/UserInfoRepository.java | 0 .../dao/VirtualDeviceLogRepository.java | 0 .../iotkit/dao/VirtualDeviceRepository.java | 0 .../config/ElasticsearchConfiguration.java | 0 .../java/cc/iotkit/dao/config/EmbeddedEs.java | 7 + iot-data-service/iot-model/.DS_Store | Bin 0 -> 6148 bytes {model => iot-data-service/iot-model}/pom.xml | 10 +- .../main/java/cc/iotkit/model/AppInfo.java | 0 .../java/cc/iotkit/model/InvokeResult.java | 0 .../java/cc/iotkit/model/OauthClient.java | 0 .../src/main/java/cc/iotkit/model/Owned.java | 0 .../src/main/java/cc/iotkit/model/Paging.java | 0 .../src/main/java/cc/iotkit/model/Role.java | 0 .../main/java/cc/iotkit/model/SendCmd.java | 0 .../cc/iotkit/model/ThirdUserSession.java | 0 .../java/cc/iotkit/model/UserActionLog.java | 0 .../main/java/cc/iotkit/model/UserInfo.java | 0 .../cc/iotkit/model/alert/AlertConfig.java | 0 .../iotkit/model/aligenie/AligenieDevice.java | 0 .../model/aligenie/AligenieProduct.java | 0 .../cc/iotkit/model/device/DeviceGroup.java | 0 .../cc/iotkit/model/device/DeviceInfo.java | 0 .../cc/iotkit/model/device/VirtualDevice.java | 0 .../iotkit/model/device/VirtualDeviceLog.java | 0 .../model/device/message/DeviceProperty.java | 0 .../model/device/message/DeviceReport.java | 0 .../device/message/ThingModelMessage.java | 0 .../cc/iotkit/model/product/AppDesign.java | 0 .../cc/iotkit/model/product/Category.java | 0 .../java/cc/iotkit/model/product/Product.java | 0 .../cc/iotkit/model/product/ProductModel.java | 0 .../cc/iotkit/model/product/ThingModel.java | 0 .../model/protocol/ProtocolComponent.java | 0 .../model/protocol/ProtocolConverter.java | 0 .../java/cc/iotkit/model/rule/RuleAction.java | 0 .../java/cc/iotkit/model/rule/RuleInfo.java | 0 .../java/cc/iotkit/model/rule/RuleLog.java | 0 .../java/cc/iotkit/model/rule/TaskInfo.java | 0 .../java/cc/iotkit/model/rule/TaskLog.java | 0 .../main/java/cc/iotkit/model/space/Home.java | 0 .../java/cc/iotkit/model/space/Space.java | 0 .../cc/iotkit/model/space/SpaceDevice.java | 0 .../java/cc/iotkit/model/stats/DataItem.java | 0 .../java/cc/iotkit/model/stats/TimeData.java | 0 iot-data-service/pom.xml | 21 ++ iot-data-service/readme.txt | 1 + iot-message-bus/.DS_Store | Bin 0 -> 6148 bytes {message-bus => iot-message-bus}/pom.xml | 6 +- iot-message-bus/readme.txt | 1 + .../java/cc/iotkit/mq/ConsumerHandler.java | 0 .../main/java/cc/iotkit/mq/MqConsumer.java | 0 .../main/java/cc/iotkit/mq/MqProducer.java | 0 .../java/cc/iotkit/mq/vertx/BeanCodec.java | 0 .../java/cc/iotkit/mq/vertx/VertxManager.java | 0 .../cc/iotkit/mq/vertx/VertxMqConsumer.java | 0 .../cc/iotkit/mq/vertx/VertxMqProducer.java | 0 .../src/test/java/test/MsgPubConsumeTest.java | 0 iot-package/.DS_Store | Bin 0 -> 6148 bytes {standalone-package => iot-package}/pom.xml | 4 +- iot-package/readme.txt | 14 ++ .../assemblies/standalone-package.xml | 0 iot-rule-engine/.DS_Store | Bin 0 -> 6148 bytes {rule-engine => iot-rule-engine}/pom.xml | 14 +- iot-rule-engine/readme.txt | 1 + .../cc/iotkit/ruleengine/action/Action.java | 0 .../iotkit/ruleengine/action/AlertAction.java | 0 .../ruleengine/action/AlertService.java | 0 .../ruleengine/action/DeviceAction.java | 0 .../action/DeviceActionService.java | 0 .../iotkit/ruleengine/action/HttpAction.java | 0 .../iotkit/ruleengine/action/HttpService.java | 0 .../ruleengine/action/ScriptService.java | 0 .../cc/iotkit/ruleengine/alert/Alerter.java | 0 .../ruleengine/alert/DingdRobotAlerter.java | 0 .../iotkit/ruleengine/alert/EmailAlerter.java | 0 .../iotkit/ruleengine/config/JobFactory.java | 0 .../config/QuartzConfiguration.java | 0 .../ruleengine/config/RuleConfiguration.java | 0 .../ruleengine/expression/BaseComparator.java | 0 .../ruleengine/expression/Comparator.java | 0 .../ruleengine/expression/EqComparator.java | 0 .../ruleengine/expression/Expression.java | 0 .../ruleengine/expression/GtComparator.java | 0 .../ruleengine/expression/LtComparator.java | 0 .../ruleengine/expression/NeqComparator.java | 0 .../ruleengine/filter/DeviceCondition.java | 0 .../ruleengine/filter/DeviceFilter.java | 0 .../cc/iotkit/ruleengine/filter/Filter.java | 0 .../handler/DeviceMessageHandler.java | 0 .../handler/RuleDeviceConsumer.java | 0 .../ruleengine/listener/DeviceCondition.java | 0 .../ruleengine/listener/DeviceListener.java | 0 .../iotkit/ruleengine/listener/Listener.java | 0 .../java/cc/iotkit/ruleengine/rule/Rule.java | 0 .../iotkit/ruleengine/rule/RuleExecutor.java | 0 .../iotkit/ruleengine/rule/RuleManager.java | 0 .../ruleengine/rule/RuleMessageHandler.java | 0 .../ruleengine/task/ActionExecutor.java | 0 .../task/ActionExecutorManager.java | 0 .../cc/iotkit/ruleengine/task/CommonJob.java | 0 .../ruleengine/task/DeviceActionExecutor.java | 0 .../iotkit/ruleengine/task/TaskManager.java | 0 .../src/main/resources/spring.factories | 0 {manager => iot-standalone}/.DS_Store | Bin {manager => iot-standalone}/pom.xml | 24 +-- iot-standalone/readme.txt | 1 + .../java/cc/iotkit/manager/Application.java | 0 .../iotkit/manager/config/AliyunConfig.java | 0 .../cc/iotkit/manager/config/CacheConfig.java | 0 .../cc/iotkit/manager/config/CrossConfig.java | 0 .../config/EmbeddedElasticSearchConfig.java | 0 .../manager/config/EmbeddedRedisConfig.java | 0 .../config/GlobalExceptionHandler.java | 0 .../manager/config/ResponseResultHandler.java | 0 .../manager/config/SaTokenConfigure.java | 0 .../manager/controller/AppController.java | 0 .../manager/controller/DeviceController.java | 0 .../manager/controller/ProductController.java | 0 .../controller/ProtocolController.java | 0 .../controller/RuleEngineController.java | 0 .../manager/controller/SpaceController.java | 0 .../controller/SpaceDeviceController.java | 0 .../manager/controller/StatsController.java | 0 .../controller/ThirdAuthController.java | 0 .../controller/UserInfoController.java | 0 .../controller/VirtualDeviceController.java | 0 .../aligenie/AligenieDeviceController.java | 0 .../aligenie/AligenieProductController.java | 0 .../controller/api/AccountController.java | 0 .../controller/api/DeviceController.java | 0 .../controller/api/HomeController.java | 0 .../controller/api/ProductController.java | 0 .../controller/api/SpaceController.java | 0 .../model/aligenie/AligenieProductVo.java | 0 .../manager/model/query/DeviceQuery.java | 0 .../iotkit/manager/model/stats/MainStats.java | 0 .../iotkit/manager/model/vo/AppDesignVo.java | 0 .../iotkit/manager/model/vo/AppPageNode.java | 0 .../cc/iotkit/manager/model/vo/DeviceLog.java | 0 .../iotkit/manager/model/vo/FindDeviceVo.java | 0 .../iotkit/manager/model/vo/LoginResult.java | 0 .../cc/iotkit/manager/model/vo/MessageVo.java | 0 .../manager/model/vo/SpaceDeviceVo.java | 0 .../cc/iotkit/manager/model/vo/SpaceInfo.java | 0 .../manager/service/AppDesignService.java | 0 .../manager/service/DataOwnerService.java | 0 .../manager/service/DeferredDataConsumer.java | 0 .../iotkit/manager/service/DeviceService.java | 0 .../manager/service/DeviceStateCheckTask.java | 0 .../manager/service/ExampleDataInit.java | 0 .../manager/service/SpaceDeviceService.java | 0 .../manager/service/ThingModelService.java | 0 .../iotkit/manager/service/WeChatService.java | 0 .../cc/iotkit/manager/utils/WeChatUtil.java | 0 .../src/main/resources/logback-spring.xml | 0 .../src/test/java/JsTest.java | 0 iot-test-tool/.DS_Store | Bin 0 -> 8196 bytes .../iot-test-mqtt}/pom.xml | 24 +-- .../java/cc/iotkit/test/mqtt/Simulator.java | 24 +-- .../cc/iotkit/test/mqtt}/config/Mqtt.java | 5 +- .../cc/iotkit/test/mqtt/model/Request.java | 15 ++ .../cc/iotkit/test/mqtt/model/Response.java | 20 ++ .../test/mqtt/performance/ConnectionTest.java | 67 ++++++ .../test/mqtt/performance/ReportTest.java | 94 +++++++++ .../cc/iotkit/test/mqtt}/service/Device.java | 2 +- .../cc/iotkit/test/mqtt/service/Gateway.java | 123 +++++++++++ .../test/mqtt/service/MessageHandler.java | 90 ++++++++ .../iotkit/test/mqtt/service/ReportTask.java | 58 ++++++ .../cc/iotkit/test/mqtt/service/Vertxs.java | 12 ++ .../src/main/resources/log4j2.xml | 36 ++++ .../vertx-default-jul-logging.properties | 1 + iot-test-tool/pom.xml | 20 ++ iot-test-tool/readme.txt | 1 + iot-virtual-device/.DS_Store | Bin 0 -> 6148 bytes .../pom.xml | 10 +- iot-virtual-device/readme.txt | 1 + .../iotkit/virtualdevice/VirtualExecutor.java | 0 .../iotkit/virtualdevice/VirtualManager.java | 0 .../virtualdevice/config/VirtualConfig.java | 0 .../trigger/RandomScheduleBuilder.java | 0 .../virtualdevice/trigger/RandomTrigger.java | 0 .../src/main/resources/spring.factories | 0 .../src/main/resources/application-dev.yml | 55 ----- manager/src/main/resources/application.yml | 55 ----- pom.xml | 46 ++--- .../dependency-reduced-pom.xml | 84 -------- .../cc/iotkit/simulator/service/Gateway.java | 195 ------------------ 333 files changed, 811 insertions(+), 612 deletions(-) rename data/components/eabb131d-8fd1-43a8-88d9-a198abfd3d42/{mqtt-component-0.3.0-SNAPSHOT.jar => iot-mqtt-component-0.3.1-SNAPSHOT.jar} (95%) rename {oauth2-server => iot-auth-server}/pom.xml (91%) mode change 100755 => 100644 create mode 100644 iot-auth-server/readme.txt rename {oauth2-server => iot-auth-server}/src/main/java/cc/iotkit/oauth/controller/AuthClientController.java (100%) mode change 100755 => 100644 rename {oauth2-server => iot-auth-server}/src/main/java/cc/iotkit/oauth/controller/AuthServerController.java (100%) mode change 100755 => 100644 rename {oauth2-server => iot-auth-server}/src/main/java/cc/iotkit/oauth/service/SaOAuth2TemplateImpl.java (100%) mode change 100755 => 100644 rename {oauth2-server => iot-auth-server}/src/main/java/cc/iotkit/oauth/service/StpInterfaceImpl.java (100%) mode change 100755 => 100644 rename {oauth2-server => iot-auth-server}/src/main/java/cc/iotkit/oauth/service/TokenRequestHandler.java (100%) mode change 100755 => 100644 rename {oauth2-server => iot-auth-server}/src/main/java/cc/iotkit/oauth/vo/UserInfoVo.java (100%) rename {oauth2-server => iot-auth-server}/src/main/java/cc/iotkit/utils/AuthUtil.java (100%) mode change 100755 => 100644 rename {oauth2-server => iot-auth-server}/src/main/java/cc/iotkit/utils/SoMap.java (100%) mode change 100755 => 100644 rename {oauth2-server => iot-auth-server}/src/main/resources/templates/confirm.html (100%) mode change 100755 => 100644 rename {oauth2-server => iot-auth-server}/src/main/resources/templates/login.html (100%) mode change 100755 => 100644 rename {oauth2-server => iot-auth-server}/src/test/java/GenPwdSecret.java (100%) rename {common => iot-common}/pom.xml (94%) mode change 100755 => 100644 create mode 100644 iot-common/readme.txt rename {common => iot-common}/src/main/java/cc/iotkit/common/ComponentClassLoader.java (97%) mode change 100755 => 100644 rename {common => iot-common}/src/main/java/cc/iotkit/common/Constants.java (100%) mode change 100755 => 100644 rename {common => iot-common}/src/main/java/cc/iotkit/common/exception/BizException.java (100%) mode change 100755 => 100644 rename {common => iot-common}/src/main/java/cc/iotkit/common/exception/NotFoundException.java (100%) mode change 100755 => 100644 rename {common => iot-common}/src/main/java/cc/iotkit/common/exception/OfflineException.java (100%) mode change 100755 => 100644 rename {common => iot-common}/src/main/java/cc/iotkit/common/thing/ThingService.java (100%) rename {common => iot-common}/src/main/java/cc/iotkit/common/utils/CodecUtil.java (100%) mode change 100755 => 100644 rename {common => iot-common}/src/main/java/cc/iotkit/common/utils/DeviceUtil.java (100%) mode change 100755 => 100644 rename {common => iot-common}/src/main/java/cc/iotkit/common/utils/HexUtil.java (100%) mode change 100755 => 100644 rename {common => iot-common}/src/main/java/cc/iotkit/common/utils/JsonUtil.java (100%) mode change 100755 => 100644 rename {common => iot-common}/src/main/java/cc/iotkit/common/utils/ReflectUtil.java (100%) mode change 100755 => 100644 rename {common => iot-common}/src/main/java/cc/iotkit/common/utils/ThreadUtil.java (100%) mode change 100755 => 100644 rename {common => iot-common}/src/main/java/cc/iotkit/common/utils/UniqueIdUtil.java (100%) mode change 100755 => 100644 create mode 100644 iot-components/.DS_Store rename {protocol-gateway/mqtt-client-simulator => iot-components/iot-component-base}/.DS_Store (82%) mode change 100755 => 100644 rename {protocol-gateway/component => iot-components/iot-component-base}/pom.xml (78%) mode change 100755 => 100644 rename {protocol-gateway/component => iot-components/iot-component-base}/src/main/java/cc/iotkit/comp/AbstractDeviceComponent.java (100%) mode change 100755 => 100644 rename {protocol-gateway/component => iot-components/iot-component-base}/src/main/java/cc/iotkit/comp/CompConfig.java (100%) mode change 100755 => 100644 rename {protocol-gateway/component => iot-components/iot-component-base}/src/main/java/cc/iotkit/comp/IComponent.java (100%) mode change 100755 => 100644 rename {protocol-gateway/component => iot-components/iot-component-base}/src/main/java/cc/iotkit/comp/IDeviceComponent.java (100%) mode change 100755 => 100644 rename {protocol-gateway/component => iot-components/iot-component-base}/src/main/java/cc/iotkit/comp/IMessageHandler.java (100%) mode change 100755 => 100644 rename {protocol-gateway/component => iot-components/iot-component-base}/src/main/java/cc/iotkit/comp/model/AuthInfo.java (100%) mode change 100755 => 100644 rename {protocol-gateway/component => iot-components/iot-component-base}/src/main/java/cc/iotkit/comp/model/DeviceState.java (100%) mode change 100755 => 100644 rename {protocol-gateway/component => iot-components/iot-component-base}/src/main/java/cc/iotkit/comp/model/ReceiveResult.java (100%) mode change 100755 => 100644 rename {protocol-gateway/component => iot-components/iot-component-base}/src/main/java/cc/iotkit/comp/model/RegisterInfo.java (100%) mode change 100755 => 100644 rename {protocol-gateway/component => iot-components/iot-component-base}/src/main/java/cc/iotkit/comp/utils/SpringUtils.java (100%) rename {protocol-gateway => iot-components/iot-component-converter}/.DS_Store (69%) mode change 100755 => 100644 rename {protocol-gateway/converter => iot-components/iot-component-converter}/pom.xml (84%) mode change 100755 => 100644 rename {protocol-gateway/converter => iot-components/iot-component-converter}/src/main/java/cc/iotkit/converter/Device.java (100%) mode change 100755 => 100644 rename {protocol-gateway/converter => iot-components/iot-component-converter}/src/main/java/cc/iotkit/converter/DeviceMessage.java (100%) rename {protocol-gateway/converter => iot-components/iot-component-converter}/src/main/java/cc/iotkit/converter/IConverter.java (100%) mode change 100755 => 100644 rename {protocol-gateway/converter => iot-components/iot-component-converter}/src/main/java/cc/iotkit/converter/ScriptConverter.java (100%) mode change 100755 => 100644 create mode 100644 iot-components/iot-component-server/.DS_Store rename {protocol-gateway/component-server => iot-components/iot-component-server}/pom.xml (83%) mode change 100755 => 100644 rename {protocol-gateway/component-server => iot-components/iot-component-server}/src/main/java/cc/iotkit/comps/ApiTool.java (100%) mode change 100755 => 100644 rename {protocol-gateway/component-server => iot-components/iot-component-server}/src/main/java/cc/iotkit/comps/BizComponentManager.java (100%) mode change 100755 => 100644 rename {protocol-gateway/component-server => iot-components/iot-component-server}/src/main/java/cc/iotkit/comps/ComponentManager.java (100%) mode change 100755 => 100644 rename {protocol-gateway/component-server => iot-components/iot-component-server}/src/main/java/cc/iotkit/comps/DeviceComponentManager.java (97%) mode change 100755 => 100644 rename {protocol-gateway/component-server => iot-components/iot-component-server}/src/main/java/cc/iotkit/comps/DeviceMessageHandler.java (100%) mode change 100755 => 100644 rename {protocol-gateway/component-server => iot-components/iot-component-server}/src/main/java/cc/iotkit/comps/DeviceRouter.java (100%) rename {protocol-gateway/component-server => iot-components/iot-component-server}/src/main/java/cc/iotkit/comps/config/CacheKey.java (100%) mode change 100755 => 100644 rename {protocol-gateway/component-server => iot-components/iot-component-server}/src/main/java/cc/iotkit/comps/config/ComponentConfig.java (100%) mode change 100755 => 100644 rename {protocol-gateway/component-server => iot-components/iot-component-server}/src/main/java/cc/iotkit/comps/service/DeviceBehaviourService.java (99%) mode change 100755 => 100644 rename {protocol-gateway/component-server => iot-components/iot-component-server}/src/main/java/cc/iotkit/comps/service/DeviceMessageConsumer.java (100%) mode change 100755 => 100644 create mode 100644 iot-components/iot-ctwing-component/.DS_Store rename {protocol-gateway/ctwing-component => iot-components/iot-ctwing-component}/lib/ag-sdk-biz-84356.tar.gz-20220603.182201-SNAPSHOT.jar (100%) rename {protocol-gateway/ctwing-component => iot-components/iot-ctwing-component}/lib/ctg-ag-sdk-core-2.5.0-20220512.061430-51.jar (100%) rename {protocol-gateway/ctwing-component => iot-components/iot-ctwing-component}/pom.xml (93%) rename {protocol-gateway/ctwing-component => iot-components/iot-ctwing-component}/src/main/java/cc/iotkit/comp/http/CtwingConfig.java (100%) rename {protocol-gateway/ctwing-component => iot-components/iot-ctwing-component}/src/main/java/cc/iotkit/comp/http/CtwingDeviceComponent.java (100%) rename {protocol-gateway/ctwing-component => iot-components/iot-ctwing-component}/src/main/java/cc/iotkit/comp/http/ProtocolUtil.java (100%) rename {protocol-gateway/ctwing-component => iot-components/iot-ctwing-component}/src/main/resources/component.js (100%) rename {protocol-gateway/ctwing-component => iot-components/iot-ctwing-component}/src/main/resources/component.spi (100%) create mode 100644 iot-components/iot-emqx-component/.DS_Store rename {protocol-gateway/emqx-component => iot-components/iot-emqx-component}/dependency-reduced-pom.xml (84%) rename {protocol-gateway/emqx-component => iot-components/iot-emqx-component}/pom.xml (91%) mode change 100755 => 100644 rename {protocol-gateway/emqx-component => iot-components/iot-emqx-component}/src/main/java/cc/iotkit/comp/emqx/AuthVerticle.java (100%) mode change 100755 => 100644 rename {protocol-gateway/emqx-component => iot-components/iot-emqx-component}/src/main/java/cc/iotkit/comp/emqx/EmqxConfig.java (100%) mode change 100755 => 100644 rename {protocol-gateway/emqx-component => iot-components/iot-emqx-component}/src/main/java/cc/iotkit/comp/emqx/EmqxDeviceComponent.java (100%) mode change 100755 => 100644 rename {protocol-gateway/emqx-component => iot-components/iot-emqx-component}/src/main/java/cc/iotkit/comp/emqx/IScripter.java (100%) rename {protocol-gateway/emqx-component => iot-components/iot-emqx-component}/src/main/java/cc/iotkit/comp/emqx/JsScripter.java (100%) rename {protocol-gateway/emqx-component => iot-components/iot-emqx-component}/src/main/java/cc/iotkit/comp/emqx/LuaScripter.java (100%) rename {protocol-gateway/emqx-component => iot-components/iot-emqx-component}/src/main/java/cc/iotkit/comp/emqx/TransparentConverter.java (100%) rename {protocol-gateway/emqx-component => iot-components/iot-emqx-component}/src/main/java/cc/iotkit/comp/emqx/TransparentMsg.java (100%) rename {protocol-gateway/emqx-component => iot-components/iot-emqx-component}/src/main/resources/component.js (100%) rename {protocol-gateway/emqx-component => iot-components/iot-emqx-component}/src/main/resources/component.spi (100%) mode change 100755 => 100644 rename {protocol-gateway/http-biz-component => iot-components/iot-http-biz-component}/.DS_Store (100%) mode change 100755 => 100644 rename {protocol-gateway/http-biz-component => iot-components/iot-http-biz-component}/dependency-reduced-pom.xml (87%) rename {protocol-gateway/http-biz-component => iot-components/iot-http-biz-component}/pom.xml (92%) mode change 100755 => 100644 rename {protocol-gateway/http-biz-component => iot-components/iot-http-biz-component}/src/main/java/cc/iotkit/comp/biz/HttpBizComponent.java (100%) mode change 100755 => 100644 rename {protocol-gateway/http-biz-component => iot-components/iot-http-biz-component}/src/main/java/cc/iotkit/comp/biz/HttpConfig.java (100%) mode change 100755 => 100644 rename {protocol-gateway/http-biz-component => iot-components/iot-http-biz-component}/src/main/resources/component.spi (100%) mode change 100755 => 100644 rename {protocol-gateway/http-biz-component => iot-components/iot-http-biz-component}/src/main/resources/onenet接入脚本示例.js (100%) rename {protocol-gateway/http-biz-component => iot-components/iot-http-biz-component}/src/main/resources/小度音箱接入脚本示例.js (100%) rename {protocol-gateway/mqtt-component => iot-components/iot-mqtt-component}/.DS_Store (100%) mode change 100755 => 100644 rename {protocol-gateway/mqtt-component => iot-components/iot-mqtt-component}/dependency-reduced-pom.xml (84%) rename {protocol-gateway/mqtt-component => iot-components/iot-mqtt-component}/pom.xml (90%) mode change 100755 => 100644 rename {protocol-gateway/mqtt-component => iot-components/iot-mqtt-component}/src/main/java/cc/iotkit/comp/mqtt/IScripter.java (100%) mode change 100755 => 100644 rename {protocol-gateway/mqtt-component => iot-components/iot-mqtt-component}/src/main/java/cc/iotkit/comp/mqtt/JsScripter.java (100%) mode change 100755 => 100644 rename {protocol-gateway/mqtt-component => iot-components/iot-mqtt-component}/src/main/java/cc/iotkit/comp/mqtt/LuaScripter.java (100%) mode change 100755 => 100644 rename {protocol-gateway/mqtt-component => iot-components/iot-mqtt-component}/src/main/java/cc/iotkit/comp/mqtt/MqttConfig.java (100%) mode change 100755 => 100644 rename {protocol-gateway/mqtt-component => iot-components/iot-mqtt-component}/src/main/java/cc/iotkit/comp/mqtt/MqttDeviceComponent.java (100%) mode change 100755 => 100644 rename {protocol-gateway/mqtt-component => iot-components/iot-mqtt-component}/src/main/java/cc/iotkit/comp/mqtt/MqttVerticle.java (100%) mode change 100755 => 100644 rename {protocol-gateway/mqtt-component => iot-components/iot-mqtt-component}/src/main/java/cc/iotkit/comp/mqtt/TransparentConverter.java (100%) mode change 100755 => 100644 rename {protocol-gateway/mqtt-component => iot-components/iot-mqtt-component}/src/main/java/cc/iotkit/comp/mqtt/TransparentMsg.java (100%) mode change 100755 => 100644 rename {protocol-gateway/mqtt-component => iot-components/iot-mqtt-component}/src/main/resources/component.js (100%) mode change 100755 => 100644 rename {protocol-gateway/mqtt-component => iot-components/iot-mqtt-component}/src/main/resources/component.spi (100%) mode change 100755 => 100644 rename {protocol-gateway/mqtt-component => iot-components/iot-mqtt-component}/src/main/resources/converter.js (100%) mode change 100755 => 100644 rename {protocol-gateway => iot-components}/pom.xml (52%) mode change 100755 => 100644 create mode 100644 iot-components/readme.txt create mode 100644 iot-data-service/.DS_Store create mode 100644 iot-data-service/iot-dao/.DS_Store rename {dao => iot-data-service/iot-dao}/pom.xml (83%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/AligenieDeviceRepository.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/AligenieProductRepository.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/AppDesignRepository.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/AppInfoRepository.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/CategoryCache.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/CategoryRepository.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/CommonDao.java (100%) rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/DeviceCache.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/DeviceDao.java (90%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/DeviceGroupRepository.java (100%) rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/DeviceInfoRepository.java (100%) rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/DevicePropertyDao.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/DevicePropertyRepository.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/DeviceReportDao.java (100%) rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/DeviceReportRepository.java (100%) rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/HomeRepository.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/OauthClientCache.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/OauthClientRepository.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/ProductCache.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/ProductModelRepository.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/ProductRepository.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/ProtocolComponentRepository.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/ProtocolConverterRepository.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/RuleInfoRepository.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/RuleLogRepository.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/SpaceCache.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/SpaceDeviceRepository.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/SpaceRepository.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/TaskInfoRepository.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/TaskLogRepository.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/ThingModelMessageDao.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/ThingModelMessageRepository.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/ThingModelRepository.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/ThirdUserSessionRepository.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/UserActionLogRepository.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/UserInfoCache.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/UserInfoRepository.java (100%) mode change 100755 => 100644 rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/VirtualDeviceLogRepository.java (100%) rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/VirtualDeviceRepository.java (100%) rename {dao => iot-data-service/iot-dao}/src/main/java/cc/iotkit/dao/config/ElasticsearchConfiguration.java (100%) mode change 100755 => 100644 create mode 100644 iot-data-service/iot-dao/src/main/java/cc/iotkit/dao/config/EmbeddedEs.java create mode 100644 iot-data-service/iot-model/.DS_Store rename {model => iot-data-service/iot-model}/pom.xml (81%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/AppInfo.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/InvokeResult.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/OauthClient.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/Owned.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/Paging.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/Role.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/SendCmd.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/ThirdUserSession.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/UserActionLog.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/UserInfo.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/alert/AlertConfig.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/aligenie/AligenieDevice.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/aligenie/AligenieProduct.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/device/DeviceGroup.java (100%) rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/device/DeviceInfo.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/device/VirtualDevice.java (100%) rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/device/VirtualDeviceLog.java (100%) rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/device/message/DeviceProperty.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/device/message/DeviceReport.java (100%) rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/device/message/ThingModelMessage.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/product/AppDesign.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/product/Category.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/product/Product.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/product/ProductModel.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/product/ThingModel.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/protocol/ProtocolComponent.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/protocol/ProtocolConverter.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/rule/RuleAction.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/rule/RuleInfo.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/rule/RuleLog.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/rule/TaskInfo.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/rule/TaskLog.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/space/Home.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/space/Space.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/space/SpaceDevice.java (100%) mode change 100755 => 100644 rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/stats/DataItem.java (100%) rename {model => iot-data-service/iot-model}/src/main/java/cc/iotkit/model/stats/TimeData.java (100%) create mode 100644 iot-data-service/pom.xml create mode 100644 iot-data-service/readme.txt create mode 100644 iot-message-bus/.DS_Store rename {message-bus => iot-message-bus}/pom.xml (86%) create mode 100644 iot-message-bus/readme.txt rename {message-bus => iot-message-bus}/src/main/java/cc/iotkit/mq/ConsumerHandler.java (100%) rename {message-bus => iot-message-bus}/src/main/java/cc/iotkit/mq/MqConsumer.java (100%) rename {message-bus => iot-message-bus}/src/main/java/cc/iotkit/mq/MqProducer.java (100%) rename {message-bus => iot-message-bus}/src/main/java/cc/iotkit/mq/vertx/BeanCodec.java (100%) rename {message-bus => iot-message-bus}/src/main/java/cc/iotkit/mq/vertx/VertxManager.java (100%) rename {message-bus => iot-message-bus}/src/main/java/cc/iotkit/mq/vertx/VertxMqConsumer.java (100%) rename {message-bus => iot-message-bus}/src/main/java/cc/iotkit/mq/vertx/VertxMqProducer.java (100%) rename {message-bus => iot-message-bus}/src/test/java/test/MsgPubConsumeTest.java (100%) create mode 100644 iot-package/.DS_Store rename {standalone-package => iot-package}/pom.xml (91%) mode change 100755 => 100644 create mode 100644 iot-package/readme.txt rename {standalone-package => iot-package}/src/main/resources/assemblies/standalone-package.xml (100%) mode change 100755 => 100644 create mode 100644 iot-rule-engine/.DS_Store rename {rule-engine => iot-rule-engine}/pom.xml (86%) mode change 100755 => 100644 create mode 100644 iot-rule-engine/readme.txt rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/action/Action.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/action/AlertAction.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/action/AlertService.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/action/DeviceAction.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/action/DeviceActionService.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/action/HttpAction.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/action/HttpService.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/action/ScriptService.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/alert/Alerter.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/alert/DingdRobotAlerter.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/alert/EmailAlerter.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/config/JobFactory.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/config/QuartzConfiguration.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/config/RuleConfiguration.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/expression/BaseComparator.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/expression/Comparator.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/expression/EqComparator.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/expression/Expression.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/expression/GtComparator.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/expression/LtComparator.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/expression/NeqComparator.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/filter/DeviceCondition.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/filter/DeviceFilter.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/filter/Filter.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/handler/DeviceMessageHandler.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/handler/RuleDeviceConsumer.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/listener/DeviceCondition.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/listener/DeviceListener.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/listener/Listener.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/rule/Rule.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/rule/RuleExecutor.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/rule/RuleManager.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/rule/RuleMessageHandler.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/task/ActionExecutor.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/task/ActionExecutorManager.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/task/CommonJob.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/task/DeviceActionExecutor.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/java/cc/iotkit/ruleengine/task/TaskManager.java (100%) mode change 100755 => 100644 rename {rule-engine => iot-rule-engine}/src/main/resources/spring.factories (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/.DS_Store (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/pom.xml (89%) mode change 100755 => 100644 create mode 100644 iot-standalone/readme.txt rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/Application.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/config/AliyunConfig.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/config/CacheConfig.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/config/CrossConfig.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/config/EmbeddedElasticSearchConfig.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/config/EmbeddedRedisConfig.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/config/GlobalExceptionHandler.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/config/ResponseResultHandler.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/config/SaTokenConfigure.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/controller/AppController.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/controller/DeviceController.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/controller/ProductController.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/controller/ProtocolController.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/controller/RuleEngineController.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/controller/SpaceController.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/controller/SpaceDeviceController.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/controller/StatsController.java (100%) rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/controller/ThirdAuthController.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/controller/UserInfoController.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/controller/VirtualDeviceController.java (100%) rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/controller/aligenie/AligenieDeviceController.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/controller/aligenie/AligenieProductController.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/controller/api/AccountController.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/controller/api/DeviceController.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/controller/api/HomeController.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/controller/api/ProductController.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/controller/api/SpaceController.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/model/aligenie/AligenieProductVo.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/model/query/DeviceQuery.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/model/stats/MainStats.java (100%) rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/model/vo/AppDesignVo.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/model/vo/AppPageNode.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/model/vo/DeviceLog.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/model/vo/FindDeviceVo.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/model/vo/LoginResult.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/model/vo/MessageVo.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/model/vo/SpaceDeviceVo.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/model/vo/SpaceInfo.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/service/AppDesignService.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/service/DataOwnerService.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/service/DeferredDataConsumer.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/service/DeviceService.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/service/DeviceStateCheckTask.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/service/ExampleDataInit.java (100%) rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/service/SpaceDeviceService.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/service/ThingModelService.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/service/WeChatService.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/java/cc/iotkit/manager/utils/WeChatUtil.java (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/main/resources/logback-spring.xml (100%) mode change 100755 => 100644 rename {manager => iot-standalone}/src/test/java/JsTest.java (100%) mode change 100755 => 100644 create mode 100644 iot-test-tool/.DS_Store rename {protocol-gateway/mqtt-client-simulator => iot-test-tool/iot-test-mqtt}/pom.xml (85%) mode change 100755 => 100644 rename protocol-gateway/mqtt-client-simulator/src/main/java/cc/iotkit/simulator/Application.java => iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/Simulator.java (60%) mode change 100755 => 100644 rename {protocol-gateway/mqtt-client-simulator/src/main/java/cc/iotkit/simulator => iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt}/config/Mqtt.java (81%) mode change 100755 => 100644 create mode 100644 iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/model/Request.java create mode 100644 iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/model/Response.java create mode 100644 iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/performance/ConnectionTest.java create mode 100644 iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/performance/ReportTest.java rename {protocol-gateway/mqtt-client-simulator/src/main/java/cc/iotkit/simulator => iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt}/service/Device.java (95%) mode change 100755 => 100644 create mode 100644 iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/service/Gateway.java create mode 100644 iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/service/MessageHandler.java create mode 100644 iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/service/ReportTask.java create mode 100644 iot-test-tool/iot-test-mqtt/src/main/java/cc/iotkit/test/mqtt/service/Vertxs.java create mode 100644 iot-test-tool/iot-test-mqtt/src/main/resources/log4j2.xml create mode 100644 iot-test-tool/iot-test-mqtt/src/main/resources/vertx-default-jul-logging.properties create mode 100644 iot-test-tool/pom.xml create mode 100644 iot-test-tool/readme.txt create mode 100644 iot-virtual-device/.DS_Store rename {virtual-device => iot-virtual-device}/pom.xml (80%) create mode 100644 iot-virtual-device/readme.txt rename {virtual-device => iot-virtual-device}/src/main/java/cc/iotkit/virtualdevice/VirtualExecutor.java (100%) rename {virtual-device => iot-virtual-device}/src/main/java/cc/iotkit/virtualdevice/VirtualManager.java (100%) rename {virtual-device => iot-virtual-device}/src/main/java/cc/iotkit/virtualdevice/config/VirtualConfig.java (100%) rename {virtual-device => iot-virtual-device}/src/main/java/cc/iotkit/virtualdevice/trigger/RandomScheduleBuilder.java (100%) rename {virtual-device => iot-virtual-device}/src/main/java/cc/iotkit/virtualdevice/trigger/RandomTrigger.java (100%) rename {virtual-device => iot-virtual-device}/src/main/resources/spring.factories (100%) delete mode 100755 manager/src/main/resources/application-dev.yml delete mode 100755 manager/src/main/resources/application.yml delete mode 100644 protocol-gateway/ctwing-component/dependency-reduced-pom.xml delete mode 100755 protocol-gateway/mqtt-client-simulator/src/main/java/cc/iotkit/simulator/service/Gateway.java 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 ccb0a63d330d6258d1c882b6631499769b9e0d1b..6dfec6da263265986bdf2c9d138275068ecd095e 100644 GIT binary patch delta 24382 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 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 0000000000000000000000000000000000000000..e86ca519b3a620fcb651ee3d2e1136b84888db77 GIT binary patch literal 18436 zcmeHPYitx%6h5aEm>G(lLZL2UaiM?|T3jelUX|?wX?X-<3oXxOc6VqeZfBOA+1)~^ zsliu_(fCNz_=rLOLE#g3o;`EF^Ucg%0Km>vY!g5T03=FGsx<)B3P6BlkWzMI^(;->=1>VzT285&^Z^`b zfhbro0*Ps@MS-w@u)s{RKoxa{CAxQ^9t^r~^Y32^OwcK@GMjQqNV9$1PIpD(R)kbv ziX`HO?F56juxd{A+Qj#x~ONsXa(+$miP$c>>OKcqR|2O9|)df*iO@CmpKPs20tEW8SD!!>vh zK7>!<27Crzz*q1+`~<(iZ}2<(0e`~ZD4~oB)}RkpVI!`_Anw4OxC`5{6A$1)JcNg_ zA5Y^M45Nlan85RxLBZ{VBw4!(~c;C1{6KgKWdYrM((SH+-* zZHKtX?(ql8&84&`=h8X>(s>xo1E-vGr~8s-+%ku#J(4GXoAYE@k{8OS`^aJY9L-7D zom%oFJ368{!x1mvZ&~qNUW*(fmkz7-U6$!+hN&lAWpXoWa%zBnS}W6OrOcS^o~Msj zNHSe0tTv2|wQg-~4s0H84vcLIwzV|}+O};OAD5+uHJjRd&yHNUICg3L;g|U!F+22H zew^FCLb?1q*?|lh!GxhZ44q>)DM$-)`XVDNAS@s(z%9ULnE)jwL!O-A(w%^4$HE6z z&q4@yqdf5dw=CevkS8a&bX7^mRVB$)(W4m1)u}wdnv)E9a)L{)4#?F3y(^=~P|&?P z=>^>8fFUl$URXd_V7dj^ZL>5NC=FAz?@*}M0ud^^c!#LLiDc{qkN@FDHvX@GsHr3y z2o5AT(9GvRrMk3tTUVXQ-q!iF-oN(&rRV>l_21PnE?>83as84Njq6%Ax9#r8(cLKw zH=k^~{F)PJmsn?svrBVtXY0g^ean>P{-Z?F^wCMS&)I+WS%5m9F>Q&lXx}~lm41~` zY<{@fzt*o-(Nh3^*yP`!sB?(p%WmV1O3<&)B|6V*Ta~SfT1|YP*KSvK`qg>F?0Idw zvPV&YJ(1wmvVW~2$)&UOD{vLA!zb`LvGZ@>NB9|jg};cI%UFvI#LJhVA6MYL*o5n` z8C!50ZYPeu3wPsQ+=o55pLlvd9>W1VjwdjRI-bK}G+dUR!VHe$BX}7fC9eJ?K8Mc} zUw@JK`W1YOV@!^n_uh^MInaiW<8BCjm|~ADoJH zWdTY8l*$82MS0{DFuEPv#F4PTY_ot&9iH_3?7RD1Amu&@(AfLGiVvv@j9r9OBBYv4 zAyr{l79o`gsmdKv74XO@Ayq@}Vf3AJSeeN`L?Px+pQBVLER|>l0Z;;1=gfgC`l-4>;jYo zD9wCOD%O<+APGP!4U+FM&U zt@~`PU4YVAN^E28Cb)D}Xy+}*b2DsBQ4b~7?uaMPGRZb7o8Zz_rDLvIwuOM+zW|7p T{Ig>vzu^DuFChN=6)gV%f$0ID literal 0 HcmV?d00001 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 a3c148ab93c7cf32694845be75a6aeb0e3f13311..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch delta 70 zcmZoMXfc=|#>AjHu~2NHo+1YW5HK<@2yAv_KE|>+fcX{EW_AvK4xj>{$am(+{342+ UKzW7)kiy9(Jj$D6L{=~Z044qo@Bjb+ delta 385 zcmZoMXfc=|#>B)qF;Q%yo}wrd0|Nsi1A_nqLn=c_Qh9MfQcix-#>C}}^&lBGh7yKE zh9ZV^WLcp2*QA1+%;FLQgBy%Y%q*;I>>Qk2+??Ee+}yFj8TsYGC5a`a#ZHMu@d7fz znJKABiACX=DJ2;psd=tBsb#5o{zX2CC8L^s3n;YmTm>8SY)^c)kNUFO9#g#Vo&6>Sr>9XaA4uf?uFapDafx!TX z1t9`(@(7TH5+r58MR_^-dFeoL#*K;RSSA~Yux#e$;N}1Z@W#aN%#-;=6j?z5sW914 LM0#_8$QEV*#BgYo 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 b7222f61a338dd7d8d2c5a6d83b3ebf010b31331..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch delta 105 zcmZp1XfcprU|?W$DortDU=RQ@Ie-{MGpJ516q~502;ws^0>w5KPGg_gAhnpCgF}!R pBnTAa1`@77th%xAJM(0I8AV3M$)+;eJWLRCKt?lcj^~-f3;-`E4{!hg literal 8196 zcmeHMTWl0n82-O)OJ|q}(^_d!H@jtl5-jN!u?8`)^rH3xZD?y-RNB3abmDYo*_qvP ziE&Ld8a3*ZH=;cFVnlti-k!WYX!J?y1H=aniI)d8!50!^;(zAM653MJCqrP)=A7@$ ze>rE*pYNZOf0u~RS;2C!U!ylfT-Q;X_`F#OhGM1C!oS)C+Ez|Xq$#aNQRoASl zRn*m*c0;tUe_-GK!AV^&y2b&+N_%F>=uUfvJE^aAr=8i}tYZ%qjFM^0j%6LIIAgP> zE}OQpMK(6}TGp_6Tv}%fj%5uwuIZVMJu&VXM?Ikv3oTHMA9S69*X1uZZu0uls$T3d zm>16O{YJrMRMpdK8e)}XB$E19mDv5e7KGv`fDq}{Ax=S=(X zK{IFAp82q86x2Gjsv~xK#+a{fT7UB`w??Cjtt+dH7c=IOqUjye6N)1DXpSaSeNK5W z$0yw9)5?g;=aoyeY3-`+sw0n>cHp{0>rnKZ zI%=geh9y_qsqIqqes!!Qk1K@@+8#w6&pIB{CI-}i+{*`h_Y&?*5y}`U;^WNfU z_cTYN6GFZ>mosvTq9iJWNu;*OX(BcCqd)Tll1L?`SQqc_C?%R7_(T9GFVG3zvk%Nf> zToh5l2|R%(@f4oM^LQDr;5D4Yn|KHB;yrwbPw^SPz?V3KAMi7N!LRrY7w~taI-*AE z<@byP*9Q&B=gJsq;Mq#^ARpwx$t&kU?B4r&`}(`C+B`VBMv(u;hMU$k#y4$k+p%+Z z=Ov0PV#Vd`^a&{$=QFXwG@l3y=`FKFi;Xg2jibvYi(V@dOPLqe%^PAdUC>fKZf@bn z2&avFysb5+=~bK*s&AZZ*J64N^IvN3=+HF1niE87@7l%MRh$Y^yC=$83Upm9ybu(1 z<;4C^T7OO7(NFX{6Z#_kgBq+xBjQZuR&-!D6S)iB=)ryr;Q)p)f`>54l+G}zE!fE8 z2ow7R9>rrQ<8eHL=a|+n;6=R3w0<3L;1u4%+c?bxpJRG|gpctF6Z~6zk8_LYJWwIB zM4VqKolC<7+j8u~Y+p%@g-eA`*K7pD-OsH_)c-xp|NieAg+myDFapIqGy3H?nH^ 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 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 - 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 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 - 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 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 - 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 0000000000000000000000000000000000000000..3e1fa3314ab1e111fc4e3fde69ca9f02dba32ff6 GIT binary patch literal 10244 zcmeHMTWl3Y82i=2D8k8ZGIx@xSWXEk!U07%VB9mtI~3%-Q=G}&0aHTC zS|T73n27*;ZRUdu0YtFj=KXt+Are-aQ|>9&^kFVy}CW{Bg^%j91nJFhg^>JxxO8Yw*`6M4*7Gs zg@JdJ)@vpvnwp#H&5e`w=0sz%rKR3%*}Q3TQdMeJH@0@27&&ux;@spTFN=v`{BeNF zqKUpTbCzB>)}Ha$EX!Uh%<}s5EVTtj*IsRZT3<9qgFiSLxq%-Zc5)%fv|bs~guAkV ze<_fvp(6pZD+@|g?Clznzp#QZ_EwdjOQG&!mQ)lu0PZ}?%L7t z0O93F?n&3lscIEo@A0h>=i1#h_vpq_V_6|e_}++B^jf7qpK(v+-RO+y!!TEMb+(I z&&oJntlF}bRQvkI1e&q3^#O%OU*De%Mn-5pp->xb?TVsb9b|p)x5DV)sN+-je0HX> zM^TP2%P!k?Y^64}R;)TlK&?$BV-hG}Km(=o+EBFz9j9=o{cukD2tU%fW@pxl_ zKTxCS)g;o=(HbZ1U@6ijc0Z_f{y(Jsu7WYOYSH5ACCh8qZrIqeW7qUz7OmgSRO0Lr z^x(89(1I`Gtz4v4HBPE7~)z6rCMSfeTG zf9K#uxCB?=6Zo9C_YM3AKf|x^7x7NTN~|H)EyV;b$NR7j*I_+wz|FXY7`PpG;BMT5 zow%1+*n@|$50BsgX3@cuIE*gmU>?WuG(L*w@iAiJllUAyPi%aV*mx1&D&k&O5%(_7 zU7c=q2yuHo8^gv-#adGl$fbZ9x{2{{>h^>ab*IL31oH>ND2NG zC6QaRj=YlyNCajNfjOcplb!$X{`dd?XKz5VCy9VWVAc`9@{aC~HtM!;5>Y&YGE$gy zouG>q<~JoI521>=Fg-txryF*z$j@U)S2&1a_EhXQB_wI6%=(`Je8VsI|1f>_B=`TE Qh$Rn>OZ<$z1NQ&_01=1=VgLXD literal 0 HcmV?d00001 diff --git a/iot-data-service/iot-dao/.DS_Store b/iot-data-service/iot-dao/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 - 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 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 - 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 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 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 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 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 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 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 0000000000000000000000000000000000000000..7b18c8b4297ce6d50d772e53b90246e3da7bda2e GIT binary patch literal 8196 zcmeHMTTC2P82l>l-E;plfvw*E-N8llS>jQ9>4`19BM0JY?*hU2oMMm z2oMMm2oMMmxE&CnJDU|@g?pb{gEl}QK;VulYNFhm5>WtY|B**OHX^j zhNhFtP`_bm_EfW-u{6gUC(aGtLiX4URlllO=q%&??3cXcK=rw_b;tiI*v-633=lrZL53S zHEhf2)6)*ggq-gX6dftsI-b^r$OS3YOl3^f)tgK+Zk*Gd0au@PS#Qv> z({79Bn2_a+qd%yVpE0SolD9Kp&~VI6M)6YK=J58iJ<-~R!>tP&?#h=XX;WeUq~RDz zQ$L|PDc#ZxYovF|(A?2MLeg@LGlrfP#R9zAW2s~M!rev1vQnaK$wqPCYq5e{DhydwWO5qrU13ap;i0Kth!GW zWvAyMdfhx!s@W%qves*=N!|2S^#@3GtbdZD=_?!W7ijer11WoKjP~PjwbI-o2=e?e zo4ZqW-0pGRqUpWeMU*3gaDrKyG)>op(%3G}2M+7U?l_iY#dT(SY@j)q(wuF0$clz`-mUGr;&w#v+F-&0WQSJ$E z3(JgJ{BcLPEG&nJ{rs^!yhoCAh})v)TqQ-r@*1Ksx7J9tlAKFC=hk|uAuO*YMssVU zbXbysokVUH!)1~nuAZG2;SyYdPvCQ6lgq4?9!^+8c+A?ixgkrKRzj3(W=@uc7!^bIR`G4EWzyIH&*@9sL1OfzZ zM+7jpHQw4xD_iM%%W~}q)zeg2VSaO5dLh&>7pC{pagvMwFr){O3Oe S_ - 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 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 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; - } - -}