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

1003 Commits

Author SHA1 Message Date
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
zeje c88d29afbd 按日期来划分索引策略 2021-12-30 11:40:59 +08:00
zhouhao 1e1fb62b54 修复多个告警条件可能不触发的问题 2021-12-23 18:30:28 +08:00
zhouhao adddec3082 upgrade logback 1.2.9 2021-12-23 13:58:02 +08:00
zhouhao be122e8a6f 升级log4j 2.17.0 2021-12-20 09:32:10 +08:00
zhouhao b5cec7dba6 升级log4j 2.16.0 2021-12-15 09:27:34 +08:00
zhou-hao 3f6445527f 升级log4j版本 2021-12-10 11:27:25 +08:00
zhou-hao 4294f218a5 升级cron-utils版本 2021-12-08 10:59:44 +08:00
zhou-hao af20c81032 升级依赖版本 2021-12-08 10:57:09 +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 8ba8941d78 优化设备状态同步逻辑 2021-12-01 14:35:17 +08:00
zhou-hao 72becbaadb remove onErrorContinue 2021-11-30 11:54:50 +08:00
zhou-hao 1a353d05fa Merge remote-tracking branch 'origin/master' 2021-11-29 16:38:57 +08:00
zhou-hao 8cbcc43024 优化配置说明 2021-11-29 16:38:41 +08:00
老周 3259f3f30a
Update README.md 2021-11-25 10:19:00 +08:00
zhou-hao 5583a5f50d 优化菜单赋权逻辑 2021-11-18 17:10:27 +08:00
zhou-hao f2fdb4d4b5 优化菜单赋权逻辑 2021-11-18 17:10:06 +08:00
zhou-hao 0096f67553 Merge remote-tracking branch 'origin/master' 2021-11-17 14:41:39 +08:00
zhou-hao 1f3bba8726 优化子设备会话处理 2021-11-17 14:40:58 +08:00
zhouhao 35cac66804 修复初始化数据格式错误 2021-11-12 16:09:57 +08:00
zhou-hao 663fc062bb hsweb-framework 4.0.13-SNAPSHOT 2021-11-11 18:33:34 +08:00
zhou-hao 7f9b0f6ed5 1.12.0-SNAPSHOT 2021-11-10 18:01:21 +08:00
zhou-hao f46b9fb673 Merge remote-tracking branch 'origin/master' 2021-11-10 15:29:15 +08:00
zhou-hao 1d0514292e fix error 2021-11-10 15:28:43 +08:00
老周 36de16e287
删除重复依赖 2021-11-09 16:30:55 +08:00
zhou-hao f98de97c4b feat: 增加根据设备告警记录查询设备相关数据条件 
传入查询条件
where = id dev-alarm 'state eq newer'
等同于
{
"column":"id",
"termType":"dev-alarm",
"value":"state eq newer"
}
 2021-10-28 12:44:25 +08:00
zhou-hao 2e5087c9bd 升级依赖 2021-10-26 16:57:31 +08:00
zhou-hao 89fd9bf38c 修复未回复子设备指令问题 2021-10-20 09:18:16 +08:00
zhou-hao 684daa6e4c 去除环境判断 2021-10-19 11:50:40 +08:00
zhou-hao 0aa9b3d887 修复未调用初始化访问 2021-10-19 11:48:19 +08:00
zhou-hao 6846b7415a 优化地址获取 2021-10-18 12:33:04 +08:00
zhou-hao 0136c7e4ea 使用EventBusDeviceOperationBroker 2021-10-18 11:32:03 +08:00
zhou-hao 3f10bc0642 1.12.0 2021-10-15 11:16:57 +08:00