xiwa
|
fc9325700c
|
Merge branch 'dev-V0.5.0' of https://gitee.com/open-iita/iotkit-parent into dev-V0.5.0
|
2024-02-24 23:30:32 +08:00 |
|
xiwa
|
7ea874c5ac
|
feat:增加子设备注册关联
|
2024-02-24 23:30:26 +08:00 |
|
xiwa
|
b685ca69cf
|
update README.md.
Signed-off-by: xiwa <xw2sy@163.com>
|
2024-02-24 05:40:57 +00:00 |
|
xiwa
|
062c9568a9
|
!40 fix: 修复获取虚拟设备列表分页BUG
Merge pull request !40 from 张鹏翔/dev-V0.5.0
|
2024-02-24 02:09:36 +00:00 |
zhangpengxiang
|
6e6c3290be
|
修复获取虚拟设备列表接口分页BUG
|
2024-02-23 13:45:41 +08:00 |
|
xiwa
|
c06bf77aa2
|
!39 fix: 修改新增虚拟设备字段信息为NULL的BUG
Merge pull request !39 from 张鹏翔/dev-V0.5.0
|
2024-02-22 09:19:29 +00:00 |
|
zhangpengxiang
|
5eea178ab5
|
修改新增虚拟设备字段信息为NULL的问题
|
2024-02-22 16:03:12 +08:00 |
gaoyoulong
|
183a58c3d4
|
fix: 删除docker-compose包，docker-compose使用项目根目录的配置
|
2024-02-22 15:44:43 +08:00 |
|
gaoyoulong
|
93ca44ebb2
|
fix: application.yml h2数据库配置更新，与mysql配置格式保持统一，方便切换mysql
|
2024-02-22 15:43:49 +08:00 |
|
xiwa
|
92efe63919
|
!38 feat：docker-compose文件更新
Merge pull request !38 from 高友龙/dev-V0.5.0-docker-compose-pr
|
2024-02-22 05:53:48 +00:00 |
|
gaoyoulong
|
ca61e03202
|
feat: docker-compose
|
2024-02-22 13:46:48 +08:00 |
|
xiwa
|
69845a7638
|
feat:添加Dockerfile和docker启动说明
|
2024-02-21 23:06:39 +08:00 |
|
xiwa
|
181a8af8fa
|
Merge branch 'dev-V0.5.0' of https://gitee.com/open-iita/iotkit-parent into dev-V0.5.0
|
2024-02-20 21:13:56 +08:00 |
|
xiwa
|
62c3be6ea0
|
fix:数据初始化、插件上报等修改
|
2024-02-20 21:13:37 +08:00 |
|
xiwa
|
5e10533d50
|
!36 fix: 企业微信，钉钉群机器人消息bug调整, get方法应改成post
Merge pull request !36 from 高友龙/dev-V0.5.0
|
2024-02-20 03:35:19 +00:00 |
|
gaoyoulong
|
b0bcea7d81
|
企业微信通知，钉钉通知，get方法给post方法
|
2024-02-20 11:02:27 +08:00 |
|
xiwa
|
85988e297f
|
feat:初始数据修复
|
2024-02-19 12:34:53 +08:00 |
|
xiwa
|
35e0610eb8
|
feat:初始化数据、演示地址修改
|
2024-02-19 12:07:36 +08:00 |
|
xiwa
|
9213704d02
|
feat:初始化数据调整、增加系统数据导出
|
2024-02-18 20:47:01 +08:00 |
|
xiwa
|
6361bb399c
|
fix:插件上传、下行日志bug修复
|
2024-02-14 15:19:09 +08:00 |
|
xiwa
|
1fcf5035dc
|
feat:迁移plugin-core到iot-core
|
2024-02-09 00:12:27 +08:00 |
|
xiwa
|
ef0de940f1
|
feat:增加插件自启动
|
2024-02-03 20:27:42 +08:00 |
|
xiwa
|
e85dc4e0ea
|
Merge branch 'dev-V0.5.0' of https://gitee.com/open-iita/iotkit-parent into dev-V0.5.0
|
2024-02-03 19:54:31 +08:00 |
|
xiwa
|
c25318d60f
|
fix:规则引擎问题修复
|
2024-02-03 19:54:17 +08:00 |
|
xiwa
|
0d04a302a8
|
fix:属性过滤取值错误修复
|
2024-01-17 21:31:58 +08:00 |
|
xiwa
|
2da3174e01
|
feat:插件上传调整
|
2024-01-12 07:55:56 +08:00 |
tangfudong
|
3ee1343b80
|
fix：配置文件中内置缓存端口修改
|
2024-01-11 17:06:03 +08:00 |
|
xiwa
|
01abec31c4
|
fix:初始数据修改
|
2024-01-09 22:17:46 +08:00 |
|
xiwa
|
2406165072
|
feat:去掉租户数据，切换租户报错修复
|
2024-01-07 18:58:47 +08:00 |
|
xiwa
|
c4ab4c90f3
|
Merge branch 'dev-V0.5.0' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.5.0
|
2024-01-06 22:43:26 +08:00 |
|
xiwa
|
69df507ae3
|
feat:独立spring-brick仓库
|
2024-01-06 22:43:18 +08:00 |
|
tangfudong
|
eb434732cf
|
fix：小程序的登录接口添加
|
2024-01-04 17:35:19 +08:00 |
|
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 |