suguo
/
jetlinks-community
mirror of https://gitee.com/jetlinks/jetlinks-community.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,145 Commits 26 Branches 21 Tags 73 MiB
Commit Graph

1145 Commits

Author SHA1 Message Date
dependabot[bot] dc4b582fe7
Bump json from 20180130 to 20230227 (#264) 
Bumps [json](https://github.com/douglascrockford/JSON-java) from 20180130 to 20230227.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-17 09:34:31 +08:00
zhouhao 037c790550 fix(TDEngine): 修复TDEngine数据库事件精度不是毫秒时无法按时间查询问题 2023-04-14 17:50:10 +08:00
zhouhao cf52a6ce68 Merge remote-tracking branch 'origin/master' 2023-04-13 16:58:16 +08:00
zhouhao 9a3d67e3fb refactor(配置): 本地地址使用127.0.0.1 2023-04-13 16:58:04 +08:00
bestfeng1020 b0d7b65148
feat(查询条件): 添加设备查询条件构造器 (#259) 2023-04-07 17:22:05 +08:00
bestfeng1020 e6e400b365
fix(阿里云短信): 解决短信模板和标签只能查询第一页数据问题 (#257) 2023-04-07 15:55:26 +08:00
zhouhao cb6ced51b5 Merge remote-tracking branch 'origin/master' 2023-04-07 10:35:36 +08:00
zhouhao 887bda8ebf feat(设备管理): 透传消息解析支持子设备会话创建 2023-04-07 10:35:23 +08:00
ayan 0ce219c04f fix（菜单管理）添加菜单ID为空时的默认值 2023-03-30 16:17:13 +08:00
zhouhao 8957c8b386 feat(日志): 访问日志增加过滤支持 2023-03-27 10:26:45 +08:00
zhouhao 4a421c980f feat(监控): 优化micrometer初始化逻辑，增加ignore配置 2023-03-27 10:19:46 +08:00
zhouhao 547e495d56 feat(设备管理): 增加产品保存时自动同步相关信息到设备表 2023-03-24 16:19:39 +08:00
zhouhao dd2ea79640 refactor(基础模块): 移除无用代码 2023-03-23 14:32:47 +08:00
zhouhao 67901c3732 feat(maven): Update new r2dbc-mysql driver #mirromutth/r2dbc-mysql/issues/251 2023-03-23 14:32:28 +08:00
zhouhao 552dfd550b fix(基础模块): 修复js脚本中无法使用console问题 2023-03-14 16:51:09 +08:00
zhouhao d0208967f0 fix(设备管理): 导入设备时，忽略空字符串的配置 2023-03-09 11:12:04 +08:00
zhouhao 3fc1b11e29 fix(设备管理): 修复注销产品后设备中心中的缓存未清理问题 2023-03-08 14:20:45 +08:00
zhouhao a6503b49e9 feat(TDEngine): 优化错误处理,查询时找不到表时不抛出错误。 2023-03-06 17:40:10 +08:00
zhouhao 6a186d6eba feat(设备管理): 优化设备详情的标签排序逻辑 2023-03-02 09:46:07 +08:00
zhouhao 703012c2c3 Merge remote-tracking branch 'origin/master' 2023-02-28 15:55:33 +08:00
zhouhao 0efeff2dd7 feat(repo): add build profile 2023-02-28 15:55:16 +08:00
bestfeng1020 d2262e278a
fix(接口缺失): 添加菜单和权限数据验证接口 (#245) 2023-02-27 15:08:40 +08:00
bestfeng1020 1e58dbb944
添加透传消息转换支持 (#237) 2023-02-15 13:52:10 +08:00
zhouhao 57211334c3 RUN true 2023-02-13 12:38:29 +08:00
zhouhao 6640f1bdf0 优化 2023-02-13 12:01:31 +08:00
zhouhao 2076a69a56 优化 2023-02-10 13:59:03 +08:00
zhouhao aaa6889b8d Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	README.md
 2023-02-10 13:57:11 +08:00
zhouhao 8172baf52a Merge branch '2.0' 
# Conflicts:
#	jetlinks-components/network-component/mqtt-component/src/main/java/org/jetlinks/community/network/mqtt/client/VertxMqttClient.java
#	jetlinks-components/network-component/mqtt-component/src/main/java/org/jetlinks/community/network/mqtt/gateway/device/MqttServerDeviceGateway.java
#	jetlinks-components/network-component/mqtt-component/src/main/java/org/jetlinks/community/network/mqtt/server/vertx/VertxMqttConnection.java
#	jetlinks-components/network-component/mqtt-component/src/main/java/org/jetlinks/community/network/mqtt/server/vertx/VertxMqttServerProvider.java
#	jetlinks-components/network-component/tcp-component/src/main/java/org/jetlinks/community/network/tcp/client/VertxTcpClient.java
#	jetlinks-components/network-component/tcp-component/src/main/java/org/jetlinks/community/network/tcp/server/TcpServerProvider.java
#	jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/measurements/message/DeviceMessageMeasurement.java
#	jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/service/DeviceMessageBusinessHandler.java
#	pom.xml
 2023-02-10 13:51:42 +08:00
zhouhao bf6e75876b 2.0 2023-02-10 13:50:53 +08:00
zhouhao 8a0728c566 升级依赖 2023-01-18 11:54:13 +08:00
zhouhao c1198ebdfe 优化http接入，增加websocket支持 2023-01-10 17:24:26 +08:00
zhouhao a0e1b6bad6 修复查询事件条件错误 2023-01-10 15:12:09 +08:00
zhouhao 661281b6ff Merge remote-tracking branch 'origin/2.0' into 2.0 2023-01-10 13:34:58 +08:00
zhouhao a77f5dbbc6 fixed #232 2023-01-10 13:34:44 +08:00
Zhang Ji 599ca456f3
更新README (#231) 2023-01-10 11:43:12 +08:00
Zhang Ji 203f97afc9
同步README文档链接 (#230) 2023-01-10 11:42:44 +08:00
zhouhao d76b599ddd 修复并行只执行第一个动作问题 2023-01-08 10:01:06 +08:00
zhouhao b32d2fddbc 增加长度字段粘拆包解析规则 2023-01-06 13:51:38 +08:00
zhouhao b81f0b176d 修复状态类型错误 2023-01-04 15:56:20 +08:00
ayan 29bc67e3a4 启动服务时自动启动场景 2023-01-04 14:32:04 +08:00
ayan 4701ac0c29 修改代码 @see 的包路径 2023-01-04 14:00:52 +08:00
ayan 778e06134b LocalWorker 2022-12-29 17:02:35 +08:00
zhouhao da4b53846e ClusterWorker 2022-12-29 15:46:14 +08:00
ayan 7004a92f57 Merge remote-tracking branch 'origin/2.0' into 2.0 2022-12-29 15:16:30 +08:00
ayan b6fbccacb1 更新官方jar文件 2022-12-29 15:16:14 +08:00
bestfeng1020 8cb5ebcd06
重构场景联动 (#227) 
* 重构场景联动
 2022-12-29 11:44:31 +08:00
老周 2c6b85e8af
Update README.md 2022-12-23 17:10:36 +08:00
zhouhao ecae631bd9 优化mqtt5支持 2022-12-22 15:05:17 +08:00
zhouhao 575d08c191 优化tcp 2022-12-22 15:05:11 +08:00
zhouhao b61f452d46 Merge remote-tracking branch 'origin/2.0' into 2.0 2022-12-13 18:05:55 +08:00