Commit Graph

146 Commits

Author SHA1 Message Date
zhouhao e395e4041e build: 升级依赖 2025-07-23 10:06:47 +08:00
zhouhao e134dfec6f build: 升级依赖版本 2025-06-30 13:54:01 +08:00
zhouhao 3a45ac86da refactor: 升级依赖 2025-06-19 16:05:08 +08:00
老周 7fdfe87e9d
build: 2.3 版本发布 (#615)
* build: 2.3 版本发布

* feat: 更新网关及设备管理相关模块代码 (#614)

Co-authored-by: fighter-wang <11291691+fighter-wang@user.noreply.gitee.com>

* feat(community): 场景联动以及通知模块2.3相关功能更新 (#612)

* feat(community): 场景联动以及通知模块2.3相关功能更新

* Update pull_request.yml

* feat(community): 场景联动清除资产相关代码

* fix(场景联动): 修复场景初始化问题

* feat(community): 注册个人订阅通道

* fix(通知模块): 订阅通道初始化

* fix(通知模块): 删除无用类

* fix(community): 解决合并冲突

---------

Co-authored-by: fighter-wang <11291691+fighter-wang@user.noreply.gitee.com>
Co-authored-by: 老周 <zh.sqy@qq.com>

* build: 升级依赖版本

* feat(community): 认证模块更新2.3相关功能 (#616)

* feat(community): 认证模块更新2.3相关功能

* fix(community): 修复自定义查询报错的问题

* fix(community): 优化邮件附件名称获取

---------

Co-authored-by: fighter-wang <11291691+fighter-wang@user.noreply.gitee.com>

* feat(community): 补充国际化相关内容,修复设备上线/离线没有日志的问题 (#619)

* feat(community): 补充国际化相关内容,修复设备上线/离线没有日志的问题

* feat(community): 补充设备物模型映射接口

---------

Co-authored-by: fighter-wang <11291691+fighter-wang@user.noreply.gitee.com>

* fix(notify): 修复消息通知相关问题 (#620)

* fix(notify): 修复消息通知相关问题

* fix(notify): 修复订阅管理数据展示错误问题

---------

Co-authored-by: fighter-wang <11291691+fighter-wang@user.noreply.gitee.com>

* fix(rule-engine): 场景联动相关bug修复 (#621)

* fix(rule-engine): 场景联动相关bug修复

* fix(rule-engine): 场景联动相关bug修复

* fix(rule-engine): 场景联动相关bug修复

* fix(rule-engine): 修复程序启动时订阅提供商禁用,但用户已订阅仍加载成功并订阅的问题

---------

Co-authored-by: fighter-wang <11291691+fighter-wang@user.noreply.gitee.com>

* fix(community): 修复认证中心以及设备相关的bug (#622)

Co-authored-by: fighter-wang <11291691+fighter-wang@user.noreply.gitee.com>

* feat(auth): 增加密码校验功能 (#625)

Co-authored-by: fighter-wang <11291691+fighter-wang@user.noreply.gitee.com>

* fix(auth): 修复组织父节点清除失败问题 (#627)

* fix(auth): 修复组织父节点清除失败问题

* fix(store): 补充存储模式名称国际化方法

---------

Co-authored-by: fighter-wang <11291691+fighter-wang@user.noreply.gitee.com>

* fix(auth): 修复用户绑定组织,查询用户关联组织失败的问题 (#628)

Co-authored-by: fighter-wang <11291691+fighter-wang@user.noreply.gitee.com>

* build: 升级依赖版本

---------

Co-authored-by: fighter-wang <118291973+fighter-wang@users.noreply.github.com>
Co-authored-by: fighter-wang <11291691+fighter-wang@user.noreply.gitee.com>
2025-04-25 19:15:32 +08:00
Zhang Ji 27a9fd6618
feat(场景联动): 添加设备数据执行动作,扩展数组条件,优化国际化 (#605) 2025-01-23 18:57:15 +08:00
dependabot[bot] cc55f4ad6c
build(deps): bump org.elasticsearch:elasticsearch (#546)
Bumps [org.elasticsearch:elasticsearch](https://github.com/elastic/elasticsearch) from 7.17.13 to 7.17.23.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.13...v7.17.23)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-10-08 09:41:40 +08:00
zhouhao e3d7831073 build(maven): 2.3.0-SNAPSHOT 2024-09-27 11:09:22 +08:00
zhouhao f1733e5880 build: 升级jetlinks-core版本1.2.3-SNAPSHOT 2024-09-12 15:41:05 +08:00
老周 39687d8302
build(maven): Release 2.2.0 (#557)
* build(maven): Release 2.2.0

* build(maven): 升级spring版本
2024-08-21 11:44:58 +08:00
liusq f754740646
feat(rule-engine): 告警场景2.2相关功能更新 (#552) 2024-08-21 10:58:03 +08:00
zhouhao 86b073b389 refactor: 统一bouncycastle版本 2024-05-21 17:42:57 +08:00
dependabot[bot] 884d7ea34f
build(deps): bump org.bouncycastle:bcprov-jdk18on from 1.76 to 1.78 (#501)
* build(deps): bump org.bouncycastle:bcprov-jdk18on from 1.76 to 1.78

Bumps [org.bouncycastle:bcprov-jdk18on](https://github.com/bcgit/bc-java) from 1.76 to 1.78.
- [Changelog](https://github.com/bcgit/bc-java/blob/main/docs/releasenotes.html)
- [Commits](https://github.com/bcgit/bc-java/commits)

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

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

* Update pom.xml

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: 老周 <zh.sqy@qq.com>
2024-05-06 17:44:07 +08:00
zhouhao b77cdcb606 refactor: 优化设备接入网关,支持decodeContext.handleMessage 2024-01-25 16:34:33 +08:00
dependabot[bot] 6203f481d9
build(deps): bump org.elasticsearch:elasticsearch (#446)
Bumps [org.elasticsearch:elasticsearch](https://github.com/elastic/elasticsearch) from 7.17.13 to 7.17.14.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.13...v7.17.14)

---
updated-dependencies:
- dependency-name: org.elasticsearch:elasticsearch
  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-11-23 10:02:29 +08:00
dependabot[bot] a1e88bc608
build(deps): bump org.json:json from 20230227 to 20231013 (#435)
Bumps [org.json:json](https://github.com/douglascrockford/JSON-java) from 20230227 to 20231013.
- [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-10-31 17:05:07 +08:00
dependabot[bot] 827dc1ef6b
build(deps): bump org.elasticsearch:elasticsearch from 7.17.5 to 7.17.13 (#434)
Bumps [org.elasticsearch:elasticsearch](https://github.com/elastic/elasticsearch) from 7.17.5 to 7.17.13.
- [Release notes](https://github.com/elastic/elasticsearch/releases)
- [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch/compare/v7.17.5...v7.17.13)

---
updated-dependencies:
- dependency-name: org.elasticsearch:elasticsearch
  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-10-31 16:02:49 +08:00
zhouhao 9ef7f41aa9 revert: 回退reactor版本到 2020.0.31 2023-10-16 17:39:25 +08:00
老周 0fe35ae1ec
build:使用bcprov-jdk18on替代bcprov-jdk15on (#424) 2023-10-06 20:55:01 -05:00
老周 5e849c882c
build: 升级依赖版本 (#422) 2023-09-19 02:28:38 -05:00
老周 fcfbeaa373
build: 升级guava版本到32.1.2-jre (#416) 2023-08-29 09:22:52 +08:00
老周 f84621178b
fix: 修复开启链路追踪后可能报错问题 (#407) 2023-08-17 16:10:52 +08:00
老周 85b35bc320
build: 升级 jetlinks core,easyorm,hsweb 依赖版本 (#405)
jetlinks.version:1.2.2-SNAPSHOT
easyorm.version:4.1.2-SNAPSHOT
hsweb.framework.version: 4.0.17-SNAPSHOT
2023-08-17 14:32:16 +08:00
老周 7ffcf4bc4b
build: 升级依赖 reactor-excel:1.0.6-SNAPSHOT (#402) 2023-08-08 16:58:11 +08:00
zhouhao 276ffdf100 build: 开启下一个版本 2.2.0-SNAPSHOT 2023-08-07 14:03:58 +08:00
zhouhao ec53681151 build: 升级maven依赖版本 2023-08-04 18:42:30 +08:00
老周 714b2cadd2
build: 修改nexus私服地址 2023-08-01 16:15:22 +08:00
dependabot[bot] d6aa72bee9
Bump snakeyaml from 1.32 to 2.0 (#253)
Bumps [snakeyaml](https://bitbucket.org/snakeyaml/snakeyaml) from 1.32 to 2.0.
- [Commits](https://bitbucket.org/snakeyaml/snakeyaml/branches/compare/snakeyaml-2.0..snakeyaml-1.32)

---
updated-dependencies:
- dependency-name: org.yaml:snakeyaml
  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-06-25 15:40:17 +08:00
dependabot[bot] f28098e3c1
build(deps): bump guava from 31.0.1-jre to 32.0.0-jre (#320)
Bumps [guava](https://github.com/google/guava) from 31.0.1-jre to 32.0.0-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  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-06-15 17:50:49 +08:00
zhouhao 7f49a4e932 feat(maven): 升级依赖版本 2023-05-11 19:21:41 +08:00
zhouhao 7eb601b849 refactor(maven): 升级reactor 2020.0.31 2023-04-20 10:25:08 +08:00
zhouhao b89aa1138a refactor(maven): 升级依赖版本 2023-04-20 10:15:48 +08:00
zhouhao c145abb6b3 refactor(maven): 升级依赖版本 2023-04-20 10:15:30 +08:00
zhouhao 32a3452f7b feat(maven): 2.1.0-SNAPSHOT 2023-04-20 10:09:58 +08:00
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 0efeff2dd7 feat(repo): add build profile 2023-02-28 15:55:16 +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 1a0d2637e6 统一依赖版本 2022-11-02 13:39:53 +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 0242ce4188 优化配置 2022-09-26 17:28:55 +08:00
zhouhao def407d81d upgrade netty.version 2022-07-01 10:16:09 +08:00
zhouhao dcad116f3b hsweb 4.0.15-SNAPSHOT 2022-06-27 18:17:55 +08:00
zhouhao 2968cf9b4f 升级依赖 2022-06-20 14:32:20 +08:00
zhouhao cabc095367 优化 2022-06-14 17:51:43 +08:00
zhouhao 72e3011946 优化 2022-05-24 17:20:40 +08:00
zhouhao e41ce546dd fastjson 1.2.83 2022-05-24 15:04:30 +08:00
zhouhao 024c3d9649 1.20.0-SNAPSHOT 2022-05-07 14:15:09 +08:00
zhouhao c7e0676071 upgrade easy-orm version 2022-02-09 15:04:38 +08:00