Commit Graph

836 Commits

Author SHA1 Message Date
老周 bcf3720562
Merge pull request #175 from wujun8/fix-monoerror
fix: Mono in Mono error
2022-06-20 18:12:58 +08:00
Winston b1f34881a0 fix: Mono in Mono error 2022-06-20 18:10:35 +08:00
zhouhao f3c5ab68c1 升级依赖 2022-06-20 14:21:21 +08:00
zhouhao 6b68990230 add dependency jackson-dataformat-cbor 2022-06-20 14:00:42 +08:00
zhouhao b5c7a0e5b2 Merge remote-tracking branch 'origin/master' 2022-06-20 09:50:16 +08:00
zhouhao 2b102fe315 fixed https://github.com/jetlinks/jetlinks-community/issues/173 2022-06-20 09:50:02 +08:00
老周 b3702588f9
Merge pull request #171 from wujun8/delete-reg
批量删除设备,同时在注册中心取消激活已激活设备,并解绑子设备和网关.
2022-06-15 11:17:12 +08:00
Winston 5d8a7f4050 collectMultimap -> groupBy 2022-06-14 19:44:03 +08:00
Winston f50dd08430 DefaultAsyncEvent.async 不能正确处理 Flux 2022-06-14 19:27:01 +08:00
Winston 106ef49155 Optimize imports 2022-06-14 15:07:20 +08:00
Winston 00502e621c 删除设备后置处理 2022-06-14 14:47:23 +08:00
Winston 16cf97055c 批量删除设备,同时在注册中心取消激活已激活设备,并解绑子设备和网关. 2022-06-13 19:05:24 +08:00
老周 f4dc74b1d3
Merge pull request #170 from jetlinks/file-auth-support
静态文件授权支持
2022-06-13 17:02:54 +08:00
ayan 812749393d 静态文件授权支持 2022-06-13 15:38:37 +08:00
zhouhao 0996f140a9 Merge remote-tracking branch 'origin/master' 2022-06-13 14:52:59 +08:00
zhouhao 44241548f4 增加文件管理 2022-06-13 14:52:22 +08:00
老周 bf04b7f908
Merge pull request #168 from wujun8/master
ProtocolSupport.onChildBind onChildUnbind
2022-06-08 17:29:59 +08:00
Winston 189756ebfd ProtocolSupport.onChildBind onChildUnbind 2022-06-08 17:18:46 +08:00
zhouhao 87a922687f 优化 2022-05-24 16:58:47 +08:00
zhouhao b688e55cd2 fastjson 1.2.83 2022-05-24 15:08:26 +08:00
zhouhao e29672b66f 优化滚动查询 2022-05-11 15:10:08 +08:00
zhouhao 68e4acdfb0 优化es查询 2022-04-21 09:22:40 +08:00
zhouhao c987a5bb85 修复依赖冲突 2022-04-19 20:57:02 +08:00
zhouhao 44ba268306 Merge remote-tracking branch 'origin/master' 2022-04-11 10:49:16 +08:00
zhouhao 0c9b286558 优化会话管理 2022-04-11 10:48:42 +08:00
zhouhao 3621ef1ea8 Merge remote-tracking branch 'origin/master' 2022-04-06 18:23:00 +08:00
zhouhao 759176ec4a 修复设备告警定时触发可能不生效问题 2022-04-06 18:22:42 +08:00
zhouhao 4a8489fcb0 upgrade jsoup version 2022-02-09 15:23:06 +08:00
zhouhao c7e0676071 upgrade easy-orm version 2022-02-09 15:04:38 +08:00
zhouhao 13f7e87a5c 优化代码格式 2022-02-09 15:04:11 +08:00
zhouhao 7eb0a320d8 优化ElasticSearchService 2022-02-08 14:44:06 +08:00
zhouhao 0d62f1c9eb 1.13.0 2022-01-25 15:36:29 +08:00
zhouhao 393bff113c 升级依赖 2022-01-25 15:36:01 +08:00
zhouhao 5b103aaca7 1.13.0-SNAPSHOT 2022-01-17 16:17:38 +08:00
zhouhao 263701be8b 升级netty以及vertx版本 2022-01-17 16:17:21 +08:00
zhouhao 803b7af565 1.13.0-SNAPSHOT 2022-01-17 16:16:52 +08:00
zhouhao 888f776124 修复未激活设备无法获取标签信息 2022-01-13 11:09:43 +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 0a6869fa44 设备注册时,如果设备已经注册则更新配置等信息。 2022-01-05 15:00:13 +08:00
老周 884ecd8000
Merge pull request #133 from jetlinks/dependabot/maven/org.apache.logging.log4j-log4j-api-2.17.1
Bump log4j-api from 2.17.0 to 2.17.1
2022-01-05 09:03:49 +08:00
老周 be85d229c8
Merge pull request #134 from jetlinks/dependabot/maven/org.apache.logging.log4j-log4j-core-2.17.1
Bump log4j-core from 2.17.0 to 2.17.1
2022-01-05 09:03:24 +08:00
dependabot[bot] 20431fb2f5
Bump log4j-core from 2.17.0 to 2.17.1
Bumps log4j-core from 2.17.0 to 2.17.1.

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-core
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-04 16:56:48 +00:00
dependabot[bot] 262535221e
Bump log4j-api from 2.17.0 to 2.17.1
Bumps log4j-api from 2.17.0 to 2.17.1.

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-api
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-04 16:51:58 +00:00
zhouhao 0618d457d6 优化设备告警逻辑 2021-12-30 16:31:40 +08:00
zhouhao fc696856d6 添加消息全局UID 2021-12-30 16:22:46 +08:00
zhouhao e18c99afce 添加消息全局UID 2021-12-30 16:22:37 +08:00
zhouhao 4339bca003 Merge remote-tracking branch 'origin/master' 2021-12-30 16:14:43 +08:00
zhouhao da7e8093cf 修复无法转换非条件中属性值问题 2021-12-30 16:13:22 +08:00
老周 b75f39e005
Merge pull request #130 from zeje/feature-time-by-day-2
按日期来划分索引策略
2021-12-30 11:51:36 +08:00