xiwa
|
dded5a0635
|
Merge branch 'dev'
|
2023-04-29 23:04:56 +08:00 |
|
xiwa
|
d4ea4d5b59
|
版本号修正
|
2023-04-29 23:03:57 +08:00 |
tangfudong
|
c160f95864
|
Merge branch 'dev'
|
2023-04-28 10:11:14 +08:00 |
|
tangfudong
|
e71bc323e6
|
Merge branch 'master' of https://gitee.com/iotkit-open-source/iotkit-parent
|
2023-04-28 10:10:39 +08:00 |
|
tangfudong
|
d82f5f7265
|
智能电表产品key修复
|
2023-04-24 11:11:45 +08:00 |
|
tangfudong
|
9b4d042b6e
|
优化pom文件
添加ws协议服务端脚本
|
2023-04-24 11:09:55 +08:00 |
|
tangfudong
|
658c49d17d
|
解决版本冲突
|
2023-04-20 14:02:07 +08:00 |
|
tangfudong
|
b236d517e5
|
Merge remote-tracking branch 'remotes/openOrigin/dev' into dev
# Conflicts:
# iot-components/iot-component-server/src/main/java/cc/iotkit/comps/DeviceComponentManager.java
# iot-components/iot-websocket-component/src/main/java/cc/iotkit/comp/websocket/server/WebSocketServerVerticle.java
|
2023-04-20 13:53:38 +08:00 |
|
tangfudong
|
ddaca67a95
|
添加xml遗漏文件
|
2023-04-20 12:02:14 +08:00 |
|
tangfudong
|
2ccbfe73c3
|
WEBSOCKET服务端新增令牌访问
|
2023-04-20 11:51:34 +08:00 |
|
tangfudong
|
5e99867ae9
|
添加支持DLT6451997协议支持
添加设备列表新增时手动绑定父设备功能
|
2023-04-20 11:40:07 +08:00 |
|
xiwa
|
5d106c4e4d
|
emqx-component启动优化
|
2023-04-16 14:49:11 +08:00 |
|
xiwa
|
6f7cf24770
|
emqx-component增加对emqx5.0兼容
|
2023-04-15 07:16:07 +08:00 |
|
xiwa
|
5d2647f8a1
|
jar版本更新
|
2023-04-09 15:33:21 +08:00 |
|
xiwa
|
cd23c577bb
|
代码合并
|
2023-04-09 14:44:33 +08:00 |
|
xiwa
|
210ef152ac
|
用graal替换nashorn
|
2023-04-09 09:06:58 +08:00 |
|
tangfudong
|
afc87ebfa7
|
WEBSOCKET服务端新增令牌访问
|
2023-04-07 09:06:56 +08:00 |
|
tangfudong
|
50ecc1a6de
|
新增小程序家庭切换
新增小程序设备收藏
|
2023-04-06 10:36:57 +08:00 |
jay
|
82b9608f89
|
fix 物模型日志不兼容 property.get
|
2023-03-25 16:49:09 +08:00 |
|
jay
|
86b01a6b29
|
Merge branch 'feature-devicesimulator' into dev
|
2023-03-24 21:01:57 +08:00 |
|
jay
|
26d48a890f
|
add 添加设备属性设置
|
2023-03-24 18:10:58 +08:00 |
|
jay
|
0744d84292
|
add 添加设备属性设置
|
2023-03-24 18:09:19 +08:00 |
|
jay
|
3070b60470
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-03-22 08:59:30 +08:00 |
|
jay
|
1a7be286e9
|
add mqtt over websocket
|
2023-03-21 22:07:23 +08:00 |
|
tangfudong
|
99c2f1d881
|
webocket通讯协议服务端优化
|
2023-03-20 13:41:39 +08:00 |
|
jay
|
27fc96d567
|
fix 时序数据库 timescaledb 物模型-数据格式
|
2023-03-19 16:10:07 +08:00 |
15173476162
|
a25cb06dd7
|
修复设备上下线状态消息重复问题
|
2023-03-15 15:40:33 +08:00 |
|
tangfudong
|
883205a810
|
功能新增
1、通讯协议中新增websocket协议
|
2023-03-15 15:17:22 +08:00 |
|
jay
|
5451dcd135
|
fix 时序数据库 timescaledb 物模型-数据库数据格式对应关系
|
2023-03-14 16:28:46 +08:00 |
|
jay
|
ae75747a12
|
Merge branch 'feature-js' into dev
|
2023-03-12 19:59:03 +08:00 |
|
jay
|
4ff091f68a
|
add timescale时序数据库支持
|
2023-03-12 19:56:50 +08:00 |
|
jay
|
d307d130bf
|
fix JsGraalJsScriptEngine invokeMethod
|
2023-03-11 16:45:03 +08:00 |
|
xiwa
|
456a4c9bab
|
update README.md.
Signed-off-by: xiwa <xw2sy@163.com>
|
2023-03-08 11:35:20 +00:00 |
|
jay
|
b84d4789c8
|
组件脚本-添加脚本类型js,graaljs
|
2023-03-02 15:52:36 +08:00 |
|
jay
|
26f8570ea7
|
feature 消息转换脚本-添加脚本类型js,graaljs
(cherry picked from commit bca93a25e7ffa32213d058b53d6db3bfb35b4e96)
|
2023-03-02 10:43:46 +08:00 |
|
jay
|
7331a9d8ed
|
update for ali 属性上报
(cherry picked from commit 30d85e6cb5e5fbd84f1febab9a0aab41ffe85246)
|
2023-03-02 10:43:29 +08:00 |
|
jay
|
a6c9df4a24
|
update 脚本引擎
|
2023-03-02 10:42:41 +08:00 |
|
jay
|
33a5c3cfba
|
update 使用依赖注入 注册convert对象
(cherry picked from commit b77fcacc8f2c00ec204b69a63f1daa0a64d1166c)
|
2023-03-02 10:40:42 +08:00 |
|
jay
|
63a905c01f
|
添加 covert脚本 js解析
|
2023-03-02 10:39:49 +08:00 |
|
xiwa
|
e3461e1082
|
es依赖修复
|
2023-01-17 10:29:02 +08:00 |
|
xiwa
|
3c7b5a1082
|
bean名称错误修复
|
2023-01-08 15:38:13 +08:00 |
|
xiwa
|
d35fe5a02c
|
!8 TCP网络组件 和 规则引擎ACTION-TCP数据转发
Merge pull request !8 from yljun/master
|
2022-12-18 02:18:27 +00:00 |
|
xiwa
|
3ae07f781c
|
update README.md.
Signed-off-by: xiwa <xw2sy@163.com>
|
2022-12-16 06:51:45 +00:00 |
huangwenlong
|
3bbb9004cf
|
注解，javaScript脚本分包
|
2022-12-14 21:30:32 +08:00 |
|
huangwenlong
|
fabdb00c4b
|
1.tcp网络组件
2.组件停止,jar仍然被占用解决
|
2022-12-14 19:04:28 +08:00 |
|
xiwa
|
d471dec26c
|
update README.md.
Signed-off-by: xiwa <xw2sy@163.com>
|
2022-12-14 03:16:33 +00:00 |
|
huangwenlong
|
c1071b71ff
|
TCP网络组件
|
2022-12-13 23:09:37 +08:00 |
|
xiwa
|
0ae6fbab69
|
Merge branch 'master' of https://gitee.com/iotkit-open-source/iotkit-parent
|
2022-12-13 07:15:52 +08:00 |
|
xiwa
|
e67129dec7
|
透传设备接入完善
|
2022-12-13 07:15:44 +08:00 |
|
xiwa
|
541f1f71ab
|
update README.md.
Signed-off-by: xiwa <xw2sy@163.com>
|
2022-12-12 07:20:11 +00:00 |