Commit Graph

772 Commits

Author SHA1 Message Date
zhou-hao 8cbcc43024 优化配置说明 2021-11-29 16:38:41 +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
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 ddbf17b7f5 升级依赖 2021-10-13 14:47:44 +08:00
zhou-hao cee26b5c1c 修复子设备状态设置错误 2021-10-12 15:51:19 +08:00
zhou-hao 182de36567 增加循环依赖检查 2021-10-12 15:06:36 +08:00
zhou-hao 16529b93c1 优化es 2021-10-12 09:39:34 +08:00
zhou-hao 2a96d6896d 优化菜单管理 2021-10-12 09:39:11 +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 1b29bd5e9f 优化设备告警逻辑 2021-09-07 11:19:31 +08:00
zhou-hao ea91293b31 优化ElasticsearchClient,增加兼容性 2021-09-07 09:29:16 +08:00
zhou-hao eeebe4db1c ignore data 2021-08-23 16:17:46 +08:00
zhou-hao ecd470c9dc 1.11.0 2021-08-23 16:16:36 +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
zhou-hao 07b3028e67 修复已禁用设备会被自动注册问题 2021-08-16 09:52:41 +08:00
老周 67e3021ebc
Merge pull request #92 from jetlinks/dependabot/maven/jetlinks-components/network-component/network-core/org.bouncycastle-bcprov-jdk15on-1.67
Bump bcprov-jdk15on from 1.64 to 1.67 in /jetlinks-components/network-component/network-core
2021-08-14 00:25:17 +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 600e7a881c 1.11.0-SNAPSHOT 2021-08-05 10:43:48 +08:00
zhou-hao ed7ea1e0fc 1.11.0-SNAPSHOT 2021-08-05 10:41:45 +08:00
zhou-hao 3592b74aec Merge remote-tracking branch 'origin/master' 2021-08-05 09:41:26 +08:00
zhou-hao d27d54a234 优化消息日志处理逻辑 2021-08-05 09:39:43 +08:00
zhouhao 27471ca990 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/web/OrganizationController.java
2021-08-04 20:41:44 +08:00
zhouhao 49165a593a Merge branch '1.8' 2021-08-04 20:41:17 +08:00
zhouhao 270aec11f3 优化 2021-08-04 20:40:47 +08:00
zhou-hao 84a3418521 1.10.0 2021-08-02 11:09:45 +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