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

545 Commits

Author SHA1 Message Date
ayan 778e06134b LocalWorker 2022-12-29 17:02:35 +08:00
zhouhao da4b53846e ClusterWorker 2022-12-29 15:46:14 +08:00
bestfeng1020 8cb5ebcd06
重构场景联动 (#227) 
* 重构场景联动
 2022-12-29 11:44:31 +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
zhouhao d4c14be015 优化通知 2022-12-13 18:02:16 +08:00
zhouhao 9975d3ea00 优化webhook通知 2022-12-13 18:02:05 +08:00
zhouhao 4c1de801ac 优化邮件通知 2022-12-13 18:01:52 +08:00
zhouhao 8cae9a395e 优化初始化顺序 2022-12-06 11:16:16 +08:00
liujq 6607301e59 重构场景联动 2022-11-29 14:51:50 +08:00
zhouhao d3e0e524db 默认js 2022-11-24 21:18:32 +08:00
zhouhao 4c5ec7cfdf 优化脚本 2022-11-24 11:06:20 +08:00
zhouhao 07fa602ede 优化脚本功能 2022-11-24 10:55:28 +08:00
zhouhao 5c238cd789 relativePath 2022-11-17 17:32:43 +08:00
zhouhao 8ee311a9ef 增加tdengine 2022-11-17 11:36:28 +08:00
liujq 95ac6b7af3 支持local协议 2022-11-11 10:53:37 +08:00
liujq a219e6414e 支持local协议 2022-11-10 16:25:14 +08:00
zhouhao db89b37be8 Merge remote-tracking branch 'origin/2.0' into 2.0 2022-11-10 09:46:26 +08:00
zhouhao a96e189af1 fix password error 2022-11-10 09:45:58 +08:00
zhouhao 1e3d888c22 注册DeviceMessageSendTaskExecutorProvider 2022-11-08 11:02:02 +08:00
zhouhao 9b2b6d224f getLong 2022-11-07 10:28:53 +08:00
zhouhao fbba69a28f 优化资源释放 2022-11-02 18:20:23 +08:00
zhouhao c67d7b99ce 优化资源释放 2022-11-02 18:13:30 +08:00
zhouhao 7540ab9cac 修复tcp可能内存泄漏 2022-11-02 16:58:12 +08:00
zhouhao a83af4ba9f 修复tcp可能内存泄漏 2022-11-02 16:57:42 +08:00
zhouhao 6a4e1d9617 修复列式模式查询结果错误 2022-11-01 18:18:38 +08:00
zhouhao 812ecd26b3 增加自动刷新会话 2022-11-01 10:23:25 +08:00
zhouhao 1f36074090 增加自动刷新会话 2022-11-01 10:22:54 +08:00
ayan bea90951a9 添加设备调试websocket支持 2022-10-28 15:16:25 +08:00
ayan 47ebc48edb 增加默认协议添加接口 2022-10-26 17:20:26 +08:00
bestfeng1020 88b94ac837
代码优化 (#212) 
* 阿里云通知被叫号码支持空值

* 修改订阅状态显示文案

* docker启动配置文件更新
 2022-10-25 14:46:10 +08:00
dependabot[bot] c939f28248
Bump commons-text from 1.9 to 1.10.0 (#210) 
Bumps commons-text from 1.9 to 1.10.0.

---
updated-dependencies:
- dependency-name: org.apache.commons:commons-text
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-10-24 17:22:57 +08:00
zhouhao 9e4baa2993 Merge remote-tracking branch 'origin/master' 2022-10-24 11:12:45 +08:00
zhouhao eda3a24a80 优化子设备会话处理 2022-10-24 11:12:32 +08:00
zhouhao cc0db07345 优化子设备会话处理 2022-10-24 11:11:42 +08:00
zhouhao 6dcb26c02a Merge remote-tracking branch 'origin/2.0' into 2.0 2022-10-24 11:06:06 +08:00
zhouhao ae3dbc5ddf 优化 2022-10-24 11:05:29 +08:00
bestfeng1020 f408d72159
同步2.0相关功能代码 (#206) 2022-10-21 19:06:52 +08:00
ayan 7d7a6f2d93 优化协议处理 2022-10-18 17:39:44 +08:00
vvsd d5f8a6f7b0 update org.bouncycastle:bcprov-jdk15on 1.67 to 1.69 2022-10-12 15:21:39 +08:00
zhouhao 779eddd4c8 优化线程池逻辑 2022-10-09 17:05:09 +08:00
zhouhao 4c18ef264f 优化线程池逻辑 2022-10-09 13:53:07 +08:00
zhouhao c7f4b19ed1 2.0 2022-09-28 17:56:32 +08:00
zhouhao 0490e3a6e2 优化依赖 2022-09-28 10:03:30 +08:00
zhouhao bd3bf2fa91 2.0 2022-09-26 17:40:16 +08:00
zhouhao 2c84fee332 优化配置 2022-09-26 17:38:29 +08:00
zhouhao 0242ce4188 优化配置 2022-09-26 17:28:55 +08:00
zhouhao 279e21a5d3 使用es实现物数据存储 2022-09-26 17:28:42 +08:00
zhouhao b8adab7af3 增加通用物模块 2022-09-26 17:27:59 +08:00
zhouhao 8d2d26a28a 使用新的script api 2022-09-26 17:27:37 +08:00
zhouhao c2e39e9ca9 增加脚本模块 2022-09-26 17:25:35 +08:00
zhouhao 14cc4224ef 增加通用配置功能 2022-09-26 17:25:24 +08:00
zhouhao d5598e2c71 fix error 2022-09-21 11:08:26 +08:00
zhouhao 0aac04ba10 优化es数据写入性能 2022-09-20 15:34:23 +08:00
zhouhao 74b2837435 使用parallel线程池处理数据 2022-09-15 11:06:00 +08:00
zhouhao c671a1cb52 Merge remote-tracking branch 'origin/master' 2022-09-07 20:50:25 +08:00
zhouhao a8595c9aec 优化类型 2022-09-07 20:50:13 +08:00
dependabot[bot] ecdb1db3f0
Bump jsoup in /jetlinks-components/notify-component/notify-email 
Bumps [jsoup](https://github.com/jhy/jsoup) from 1.14.3 to 1.15.3.
- [Release notes](https://github.com/jhy/jsoup/releases)
- [Changelog](https://github.com/jhy/jsoup/blob/master/CHANGES)
- [Commits](https://github.com/jhy/jsoup/compare/jsoup-1.14.3...jsoup-1.15.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-01 23:48:20 +00:00
zhouhao 24a45f5b67 优化mqtt client topic处理 2022-08-19 13:38:56 +08:00
zhouhao a3d080d1ee RpcDeviceOperationBroker 2022-08-11 18:04:51 +08:00
zhouhao a00016018a 优化使用脚本作为粘拆包规则时的tcp性能 2022-08-05 19:05:01 +08:00
zhouhao f31f71dc14 优化自动注册以及设备会话管理 2022-08-03 17:43:43 +08:00
zhouhao a895e9e5d3 fix package error 2022-07-28 12:27:58 +08:00
zhouhao 90d5ea7872 优化文件管理 2022-07-27 10:14:27 +08:00
zhouhao 65e8988639 优化es索引管理 2022-07-14 14:08:29 +08:00
zhouhao cc992f8207 优化设备会话 2022-07-12 20:51:36 +08:00
zhouhao bc5f21fe20 优化设备会话 2022-07-12 19:40:09 +08:00
zhouhao 9daee536f9 优化设备会话 2022-07-12 19:31:48 +08:00
zhouhao 1b3dd4400a 优化dashboard 2022-07-08 17:02:35 +08:00
zhouhao 3fc16470b0 优化设备会话处理 2022-06-27 18:17:37 +08:00
zhouhao bc985539e2 优化MQTT 2022-06-27 15:40:37 +08:00
zhouhao 0a683684ed 优化设备会话处理 2022-06-27 15:36:39 +08:00
zhouhao e5cb557787 优化说明 2022-06-20 14:38:51 +08:00
zhouhao a9594d28c4 优化设备会话处理 2022-06-20 14:35:29 +08:00
zhouhao 291cfec2c7 停止时压缩文件 2022-06-20 14:35:21 +08:00
zhouhao 35947b3567 修复windows下文件名可能非法问题 2022-06-15 10:23:58 +08:00
zhouhao cabc095367 优化 2022-06-14 17:51:43 +08:00
zhouhao 5f871ebd13 优化 2022-06-14 17:09:41 +08:00
zhouhao ede32aa7fc Merge branch 'master' into 1.20 
# Conflicts:
#	jetlinks-components/io-component/pom.xml
#	jetlinks-components/io-component/src/main/java/org/jetlinks/community/io/file/FileManagerConfiguration.java
#	jetlinks-components/io-component/src/main/java/org/jetlinks/community/io/file/FileProperties.java
#	jetlinks-components/io-component/src/main/java/org/jetlinks/community/io/file/web/FileManagerController.java
#	jetlinks-components/network-component/tcp-component/src/main/java/org/jetlinks/community/network/tcp/parser/strateies/DelimitedPayloadParserBuilder.java
#	jetlinks-components/notify-component/notify-email/src/main/java/org/jetlinks/community/notify/email/embedded/DefaultEmailNotifier.java
#	pom.xml
 2022-06-14 17:07:28 +08:00
ayan 812749393d 静态文件授权支持 2022-06-13 15:38:37 +08:00
zhouhao 44241548f4 增加文件管理 2022-06-13 14:52:22 +08:00
zhouhao 79e3db9266 增加文件管理 2022-06-13 14:45:34 +08:00
zhouhao aab9215293 优化 2022-05-24 17:22:40 +08:00
zhouhao 72e3011946 优化 2022-05-24 17:20:40 +08:00
zhouhao 87a922687f 优化 2022-05-24 16:58:47 +08:00
zhouhao 34cb265917 优化 2022-05-17 18:01:08 +08:00
zhouhao 890fe14b31 优化集群 2022-05-17 17:51:39 +08:00
zhouhao e29672b66f 优化滚动查询 2022-05-11 15:10:08 +08:00
zhouhao 47c14686c1 优化滚动查询 2022-05-11 15:09:33 +08:00
zhouhao fc412d652e Merge remote-tracking branch 'origin/1.20' into 1.20 2022-05-10 16:53:22 +08:00
zhouhao e35ee69588 优化在线数量统计 2022-05-10 16:53:08 +08:00
zhouhao cf8d1285eb 修复状态错误 2022-05-08 13:32:15 +08:00
zhouhao 024c3d9649 1.20.0-SNAPSHOT 2022-05-07 14:15:09 +08:00
zhouhao 68e4acdfb0 优化es查询 2022-04-21 09:22:40 +08:00
zhouhao c987a5bb85 修复依赖冲突 2022-04-19 20:57:02 +08:00
zhouhao 0c9b286558 优化会话管理 2022-04-11 10:48:42 +08:00
zhouhao 4a8489fcb0 upgrade jsoup version 2022-02-09 15:23:06 +08:00
zhouhao 7eb0a320d8 优化ElasticSearchService 2022-02-08 14:44:06 +08:00
zhouhao 803b7af565 1.13.0-SNAPSHOT 2022-01-17 16:16:52 +08:00
zhouhao 1794e3d33a 1.12.0 2022-01-07 14:15:22 +08:00
zhouhao 20a72c5caf 优化mqtt重复deviceId会话注销逻辑 2022-01-05 16:29:20 +08:00
zhouhao 0618d457d6 优化设备告警逻辑 2021-12-30 16:31:40 +08:00
zhouhao fc696856d6 添加消息全局UID 2021-12-30 16:22:46 +08:00
zeje c88d29afbd 按日期来划分索引策略 2021-12-30 11:40:59 +08:00
zhou-hao 4294f218a5 升级cron-utils版本 2021-12-08 10:59:44 +08:00
zhou-hao ec414a3cc4 优化聚合查询 2021-12-08 10:54:26 +08:00
zhou-hao 7a13499887 Subscribe注解可以使用表达式来引用配置值，如: ${a.b.c} 2021-12-08 10:51:32 +08:00
zhou-hao 72becbaadb remove onErrorContinue 2021-11-30 11:54:50 +08:00
zhou-hao 1f3bba8726 优化子设备会话处理 2021-11-17 14:40:58 +08:00
zhou-hao 6846b7415a 优化地址获取 2021-10-18 12:33:04 +08:00
zhou-hao d99931fd88 1.12.0-SNAPSHOT 2021-10-13 14:55:50 +08:00
zhou-hao caf5e54d37 1.11.0 2021-10-13 14:53:38 +08:00
zhou-hao 16529b93c1 优化es 2021-10-12 09:39:34 +08:00
zhou-hao 70b45ee12c 优化消息提示 2021-09-28 15:59:05 +08:00
zhou-hao cb11d4ce16 优化邮件发送 2021-09-28 15:57:22 +08:00
zhou-hao e2d5ffd965 修复依赖错误 2021-09-24 17:06:58 +08:00
zhou-hao a029da90e4 增加自定义r2dbc配置 2021-09-24 17:03:49 +08:00
zhou-hao ea91293b31 优化ElasticsearchClient,增加兼容性 2021-09-07 09:29:16 +08:00
zhou-hao 4daa0bb4ab add include_type_name 2021-08-23 16:16:26 +08:00
zhou-hao 48068ab06f Merge remote-tracking branch 'origin/master' 2021-08-16 09:53:30 +08:00
zhou-hao d22ff38384 优化代码结构 2021-08-16 09:52:51 +08:00
dependabot[bot] ce593a4fc0
Bump bcprov-jdk15on 
Bumps [bcprov-jdk15on](https://github.com/bcgit/bc-java) from 1.64 to 1.67.
- [Release notes](https://github.com/bcgit/bc-java/releases)
- [Changelog](https://github.com/bcgit/bc-java/blob/master/docs/releasenotes.html)
- [Commits](https://github.com/bcgit/bc-java/commits)

---
updated-dependencies:
- dependency-name: org.bouncycastle:bcprov-jdk15on
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-13 15:35:32 +00:00
zhou-hao ed7ea1e0fc 1.11.0-SNAPSHOT 2021-08-05 10:41:45 +08:00
zhou-hao d27d54a234 优化消息日志处理逻辑 2021-08-05 09:39:43 +08:00
zhou-hao bd03dbd72a 1.10.0 2021-08-02 11:08:06 +08:00
zhou-hao 9280f7b1c4 add spring-webflux 2021-07-30 19:28:09 +08:00
zhou-hao 331f31a62b 优化设备指令发送规则执行器 2021-07-28 14:45:18 +08:00
zhou-hao 311166b983 优化异常处理 2021-07-27 15:35:54 +08:00
zhou-hao a577a3270d 增加newBuffer()方法 2021-07-15 18:26:58 +08:00
zhou-hao 4ccb2d2ec7 修复qos错误 2021-07-13 16:24:49 +08:00
zhou-hao fe5b364a94 mqtt client网关支持qos 2021-07-08 16:16:26 +08:00
zhou-hao 750418a92a i18n part 0 2021-07-02 13:36:56 +08:00
zhou-hao fdf6d232f9 优化 2021-06-21 18:42:32 +08:00
Tensai bd0b936a56 docs(网络组件&设备网关): 网络组件（TCP）启动、管理、收发数据&解析 
Signed-off-by: Tensai <517634644@qq.com>
 2021-06-04 16:41:35 +08:00
zhou-hao 1585916776 增加属性源时间支持 2021-06-04 08:51:12 +08:00
zhou-hao c1ee8618ae 优化 2021-06-02 15:04:38 +08:00
zhou-hao 5666c23af1 1.10.0-SNAPSHOT 2021-06-02 13:46:18 +08:00
zhou-hao 3fa9c47af3 1.9.0 2021-05-31 09:31:03 +08:00
Tensai 9c65346a6c docs(数据流【设备网关-->物模型转换->时序入库】): 增加数据流入库的代码注释 优化代码结构 
Signed-off-by: Tensai <517634644@qq.com>
 2021-05-28 14:06:12 +08:00
Tensai 6a8a11338e Merge branch 'master' of https://github.com/jetlinks/jetlinks-community 
 Conflicts:
	jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/service/data/AbstractDeviceDataStoragePolicy.java
 2021-05-28 11:52:50 +08:00
Tensai f991c63403 Merge branch 'master' of https://github.com/qq517634644/jetlinks-community 2021-05-28 11:00:11 +08:00
Tensai 84ba163992 docs(数据流【设备网关-->物模型转换->时序入库】): 增加数据流入库的代码注释 优化代码结构 
Signed-off-by: Tensai <517634644@qq.com>
 2021-05-28 10:57:38 +08:00
zhou-hao efe03f7318 websocket支持ping pong 2021-05-25 16:51:44 +08:00
zhou-hao a3e46f128c 优化参数命名 2021-05-24 16:37:45 +08:00
zhou-hao e945969963 use jakarta.mail 2021-05-20 16:52:30 +08:00
zhou-hao 98e89d8c9b 属性增加手动写值,当物模型配置了手动写值时,下发修改属性指令将不再发送到设备,而是直接入库并返回成功。 2021-05-20 16:29:43 +08:00
dependabot[bot] 1425a5a598
Bump commons-io from 2.6 to 2.7 in /jetlinks-components/io-component 
Bumps commons-io from 2.6 to 2.7.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-26 20:04:07 +00:00
zhou-hao babc2d7711 tcp 支持 onClientConnect 2021-04-26 16:45:33 +08:00
zhou-hao 127028d32a 优化子设备状态管理 2021-04-25 18:44:35 +08:00
zhou-hao e06f1d2608 修复topics错误 2021-04-22 09:31:05 +08:00
zhou-hao e0b9c4f170 优化websocket消息订阅 2021-04-19 15:41:56 +08:00
zhou-hao 74084f057b upgrade elasticsearch version to 7.10.2 2021-04-19 10:16:27 +08:00
zhou-hao 9e8efece31 优化强制在线 2021-04-14 11:54:41 +08:00
zhou-hao 4ee4c92d5e 优化tcp KeepAliveTimeout 2021-03-30 18:20:34 +08:00
zhouhao 51b786646b 优化网络组件 2021-03-19 20:09:03 +08:00
zhouhao 4a0f0780a2 Merge remote-tracking branch 'origin/master' 2021-03-13 18:44:04 +08:00
zhouhao bf3a8e3d73 修复ReactorQL节点有上游节点时,header无法传递的问题 2021-03-13 18:43:49 +08:00
zhou-hao 57d2f5fdc9 删除已经废弃的功能 2021-03-11 14:30:11 +08:00
zhou-hao fd102bd793 1.9.0-SNAPSHOT 2021-02-24 18:46:25 +08:00
zhou-hao a9fe82aa06 Merge remote-tracking branch 'origin/master' 2021-02-24 18:39:28 +08:00
zhou-hao 1fee2614a8 1.9.0-SNAPSHOT 2021-02-24 18:28:06 +08:00
zhouhao 15d5fd9229 修复规则功能调用参数表达式错误 2021-02-09 14:38:46 +08:00
zhou-hao db91c5a98e 优化es7.2以上版本的聚合查询 2021-01-13 16:22:18 +08:00
zhou-hao f7d030e69a 修复interval无法反序列化 2021-01-13 16:21:56 +08:00
zhou-hao 7c22ccd3da Merge remote-tracking branch 'origin/master' 2021-01-12 10:17:33 +08:00
zhou-hao 8a74c22996 1.8.0 2021-01-11 09:45:02 +08:00
zhouhao cf9787fe55 ignore IllegalStateException 2021-01-07 22:43:11 +08:00
zhou-hao 02facde6ff merge from jetlinks-pro 2020-12-31 10:14:13 +08:00
zhou-hao 17ce3d2ecd 修复es索引中存在多个mapping时无法解析的问题 2020-12-28 11:05:46 +08:00
zhou-hao a7842cfb68 1.8-SNAPSHOT 2020-12-12 17:57:47 +08:00
zhou-hao 9718d2aa5f 修复tcp可能无法获取到session的问题 2020-12-10 17:55:48 +08:00
zhou-hao 2227defc5f 优化通知缓存处理 2020-12-01 16:12:44 +08:00
zhou-hao 33dc75439d 1.7.0 release 2020-12-01 15:14:14 +08:00
zhou-hao f6dc39a668 优化tcp client 关闭时,释放FluxProcessor 2020-11-30 19:32:57 +08:00
zhou-hao fdd5be785c 优化子设备离线消息处理 2020-11-30 19:12:48 +08:00
zhou-hao 0438fe7167 优化设备消息转发到机构topic 2020-11-30 18:51:03 +08:00
zhou-hao e813d23beb 优化子设备消息处理 2020-11-30 18:30:14 +08:00
zhou-hao 1ce8d1e0d9 优化子设备消息处理 2020-11-30 17:57:43 +08:00
zhou-hao f45cf90c3f 忽略子设备消息 2020-11-30 16:48:32 +08:00
zhou-hao d8f050c84c 优化设备网关 2020-11-30 14:48:08 +08:00
zhou-hao c919a42f19 优化子设备消息处理 2020-11-27 16:31:07 +08:00
zhou-hao a8d4703c7a 优化消息释放 2020-11-23 19:00:37 +08:00
zhou-hao b0e383005e 优化TopicMessage释放 2020-11-19 09:31:06 +08:00
zhou-hao 90849d57c6 优化设备消息转发 2020-11-17 18:50:07 +08:00
zhou-hao c45634dda4 修复tcp保持会话断开连接后重新连接无法恢复session 2020-11-16 20:09:44 +08:00
zhou-hao d2a9902058 优化 2020-11-13 18:44:09 +08:00
zhou-hao c7a4a8f08a decode时可以通过context获取指定的设备id 2020-11-09 09:40:25 +08:00
zhou-hao 369491154e 1.7.0-SNAPSHOT 2020-11-05 10:31:24 +08:00
zhou-hao 61d74313c4 优化tcp server 网关 2020-11-05 10:17:36 +08:00
zhou-hao 91915a85dd 修复mqtt client 用户密码错误 2020-11-04 16:28:22 +08:00
zhou-hao 8bb8f6b3d5 1.6.0 2020-10-30 10:58:23 +08:00
zhou-hao 3e0c6cb2bc 优化聚合查询 2020-10-23 18:24:13 +08:00
zhou-hao ca4130e51e fix test error 2020-10-21 17:52:45 +08:00
zhou-hao e2b974a187 Merge branch '1.5' 
# Conflicts:
#	jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/enums/TermTypeEnum.java
 2020-10-21 12:05:33 +08:00
zhou-hao 20554909a4 优化参数类型转换 2020-10-21 12:04:48 +08:00
zhou-hao f4fb93a40d 优化参数类型转换 2020-10-21 12:03:10 +08:00
zhou-hao fdaef09362 优化参数类型转换 2020-10-21 12:02:43 +08:00
zhou-hao 208c56cb9c mqtt client增加emqx 共享订阅支持 2020-10-20 11:57:28 +08:00
zhou-hao b316993505 1.6.0-SNAPSHOT 2020-10-19 19:40:07 +08:00