tangfudong
|
4a1ae2d75a
|
Merge remote-tracking branch 'origin/dev-V0.5.0' into dev-V0.5.0
|
2024-01-02 10:46:02 +08:00 |
xiwa
|
58883ecc81
|
!34 修复模拟设备下行属性调试报错，修复模拟设备下行属性日志记录报错
Merge pull request !34 from 胖虎/develop
|
2023-12-27 15:49:09 +00:00 |
李道甫
|
8bd516de55
|
fix：修复模拟设备下行属性调试报错，修复模拟设备下行属性日志记录报错
|
2023-12-27 17:59:00 +08:00 |
|
xiwa
|
7a4c5e7390
|
feat:支持无通道告警
|
2023-12-27 06:05:55 +08:00 |
|
xiwa
|
aec5a23b3f
|
feat:规则引擎支持关联告警
|
2023-12-24 19:46:17 +08:00 |
|
tangfudong
|
70c8d69444
|
Merge remote-tracking branch 'origin/dev-V0.5.0' into dev-V0.5.0
|
2023-12-21 16:27:35 +08:00 |
|
tangfudong
|
b66f500a5a
|
Merge branch 'dev-V0.4.5' into dev-V0.5.0
# Conflicts:
# data/components/750da259-ff77-4869-a5a5-12a5433b0e4c/component.js
# data/init/sys_app.json
# iot-common/iot-common-core/src/main/java/cc/iotkit/common/enums/ErrCode.java
# iot-common/iot-common-satoken/src/main/java/cc/iotkit/common/satoken/config/SaTokenConfig.java
# iot-common/iot-common-satoken/src/main/java/cc/iotkit/common/satoken/utils/LoginHelper.java
# iot-common/iot-script-engine/src/main/java/cc/iotkit/script/JavaScriptEngine.java
# iot-components/iot-component-server/src/main/java/cc/iotkit/comps/DeviceMessageHandler.java
# iot-components/iot-nb-component/src/main/java/cc/iotkit/comp/nb/NBVerticle.java
# iot-components/iot-nb-component/src/main/resources/component.js
# iot-starter/src/main/java/cc/iotkit/config/EmbeddedRedisConfig.java
# iot-starter/src/main/java/cc/iotkit/web/service/SysLoginService.java
|
2023-12-20 11:40:25 +08:00 |
|
tangfudong
|
24d4b28628
|
update：初始化中添加系统app的数据
|
2023-12-20 11:29:33 +08:00 |
|
xiwa
|
c9efb9b847
|
Merge branch 'dev-V0.5.0' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.5.0
|
2023-12-18 00:22:04 +08:00 |
|
xiwa
|
9ac5c81fc5
|
feat:更新脚本不用重启插件
|
2023-12-18 00:20:48 +08:00 |
|
xiwa
|
396eff2a36
|
update README.md.
Signed-off-by: xiwa <xw2sy@163.com>
|
2023-12-14 15:24:43 +00:00 |
|
xiwa
|
c6b2e0f820
|
update README.md.
Signed-off-by: xiwa <xw2sy@163.com>
|
2023-12-11 08:16:05 +00:00 |
|
xiwa
|
0c6edb011e
|
update README.md.
Signed-off-by: xiwa <xw2sy@163.com>
|
2023-12-11 02:39:15 +00:00 |
|
xiwa
|
4070f1cca3
|
feat:修复插件重启报错、增加iotdb支持
|
2023-12-10 23:05:24 +08:00 |
|
xiwa
|
20116e47ac
|
fix:action增加toString调用父类
|
2023-11-08 00:20:47 +08:00 |
|
xiwa
|
ce6988f9e3
|
fix:debug toString循环引用修复
|
2023-11-08 00:17:36 +08:00 |
|
xiwa
|
7217438afb
|
fix:bug#I8DLHU
|
2023-11-03 23:10:03 +08:00 |
|
xiwa
|
1934b743c2
|
fix:修复bug #I8DLHU
|
2023-11-03 22:58:29 +08:00 |
|
xiwa
|
723585f47c
|
fix:插件脚本引擎获取修改
|
2023-10-30 08:39:59 +08:00 |
|
xiwa
|
baea6416f4
|
fix:插件上传默认停止
|
2023-10-29 12:57:43 +08:00 |
|
xiwa
|
b0ef14f731
|
fix:插件支持脚本文件自动导入
|
2023-10-27 08:12:06 +08:00 |
|
xiwa
|
d159c2b8a7
|
fix:mysql配置缩进调整
|
2023-10-20 23:12:02 +08:00 |
|
xiwa
|
0a90c90498
|
fix:mysql配置缩进调整
|
2023-10-20 23:10:34 +08:00 |
|
xiwa
|
cbdc813f69
|
update README.md.
Signed-off-by: xiwa <xw2sy@163.com>
|
2023-10-20 15:07:39 +00:00 |
|
xiwa
|
7684f1e9ee
|
update README.md.
Signed-off-by: xiwa <xw2sy@163.com>
|
2023-10-20 15:07:04 +00:00 |
|
xiwa
|
03525e444f
|
fix:删除iot_admin角色校验
|
2023-10-20 23:02:55 +08:00 |
|
xiwa
|
5ef1c719c9
|
fix:补充dynamic-datasource依赖
|
2023-10-19 08:13:13 +08:00 |
|
xiwa
|
a636d3b283
|
fix:移除iot-test-mqtt到插件中
|
2023-10-16 08:00:40 +08:00 |
|
xiwa
|
99ce49f4c5
|
fix:合并dev-v0.4.6调整
|
2023-10-15 09:20:44 +08:00 |
|
xiwa
|
6c8dc8af9f
|
feat:核心模块、插件模块抽离，插件完善
|
2023-10-10 07:34:00 +08:00 |
jay
|
1229b668b9
|
revert application.yml
revert pom
|
2023-09-22 10:36:33 +08:00 |
|
jay
|
bc9e5abb77
|
Merge remote-tracking branch 'origin/dev-V0.4.5-postgre' into dev-V0.4.5
|
2023-09-20 13:17:54 +08:00 |
|
xiwa
|
21b8755751
|
feat:插件功能
|
2023-09-19 08:48:28 +08:00 |
|
jay
|
c866098564
|
fix: 新增产品时productKey校验
|
2023-09-18 14:51:12 +08:00 |
|
jay
|
de53e07304
|
fix: 退出登录接口
|
2023-09-18 11:19:03 +08:00 |
|
jay
|
39d7152b9c
|
update logo
|
2023-09-11 10:23:27 +08:00 |
|
jay
|
a1c84249e5
|
add: docker相关配置
|
2023-09-07 19:13:39 +08:00 |
|
jay
|
90298599ac
|
fix: 设备触发closehandler后,仍然能上报消息,设备状态不正确
|
2023-09-07 18:48:47 +08:00 |
|
xiwa
|
eb39aa408e
|
!32 修复td数据库初始化sql错误
Merge pull request !32 from while(true)/N/A
|
2023-09-06 09:54:26 +00:00 |
Remember to Smile *
|
79e868095a
|
修复td数据库初始化sql错误
Signed-off-by: Remember to Smile * <928255825@qq.com>
|
2023-09-06 03:14:43 +00:00 |
|
jay
|
27a541ed67
|
fix: 设备触发closehandler后,仍然能上报消息,设备状态不正确
|
2023-09-05 19:45:33 +08:00 |
|
jay
|
710ee6c293
|
fix: 设备触发closehandler后,仍然能上报消息,设备状态不正确
|
2023-09-05 11:35:10 +08:00 |
|
jay
|
97f48c4b16
|
fix: 微信默认配置为空
|
2023-09-05 11:07:56 +08:00 |
|
jay
|
5f68b99c90
|
Merge branch 'dev-V0.4.5' into dev-V0.4.5-postgre
# Conflicts:
# iot-starter/src/main/resources/application.yml
|
2023-08-30 19:07:53 +08:00 |
|
xiwa
|
d37bf272aa
|
!31 fix: 修复bug
Merge pull request !31 from 阳光男孩/dev-V0.4.5
|
2023-08-30 10:34:05 +00:00 |
zak
|
ceca2379b1
|
fix: 修复JavaScriptEngine日志输出args格式错误，并提取方法
|
2023-08-23 11:53:56 +08:00 |
|
zak
|
9772801a3c
|
fix: 修复规则引擎-执行日志Mapstruct映射字段错误
|
2023-08-21 11:03:16 +08:00 |
|
zak
|
9e48574170
|
fix: 修复规则引擎-执行日志Mapstruct转换类型错误
|
2023-08-18 17:31:10 +08:00 |
|
zak
|
4a316f6b87
|
fix: 修复按字段排序失效问题
|
2023-08-18 15:37:44 +08:00 |
|
xiwa
|
d39415328c
|
!27 fix: 修复mysql动态数据源配置缺失
Merge pull request !27 from 阳光男孩/dev-V0.4.5
|
2023-08-17 09:45:59 +00:00 |