Commit Graph

1181 Commits

Author SHA1 Message Date
tancong d9603381e0
feat(用户模块): 添加用户类型查询 (#438) 2023-11-08 10:53:33 +08:00
zhouhao 4f1c89ccc2 Merge remote-tracking branch 'origin/master' 2023-11-06 17:32:43 +08:00
zhouhao f0a59a6e07 refactor: 优化MQTT设备接入网关 2023-11-06 17:32:31 +08:00
ningqingsheng b078d88f82
fix: 修复并完善ReactorUtils.limit()方法 (#436) 2023-11-03 11:31:16 +08:00
zhouhao efad62a75b refactor: 优化设备接入网关 2023-11-02 14:16:30 +08:00
zhouhao edd1b9aba2 Merge remote-tracking branch 'origin/master' 2023-11-01 09:26:47 +08:00
zhouhao 865b0ec8ec refactor: 优化通知模版处理逻辑 2023-11-01 09:26:37 +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
老周 2814fac218
fix: 修复在设备里单独定义物模型时,订阅的数据格式不对问题. (#432)
* fix: 修复在设备里单独定义物模型时,订阅的数据格式不对问题.

* fix: 修复编译错误
2023-10-31 16:03:14 +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
老周 a46c4fd07c
fix: 修复阿里云语音通知可能提示参数过长问题 (#433) 2023-10-30 10:06:46 +08:00
Zhang Ji 807f1629ca
fix(设备消息): 修复设备消息订阅报错 (#431)
PropertyMessage类型没有默认的解码实现,已改为订阅ThingMessage
2023-10-26 14:08:30 +08:00
zhouhao 7746a59b03 fix: 修复启动报错 2023-10-20 12:38:58 +08:00
老周 98861ac1ed
refactor: 使用新的eventbus实现,增加相关订阅优先级支持. (#430) 2023-10-20 11:37:21 +08:00
老周 00997d9ee2
fix: 修复ThingsDataManager获取属性缓存数据可能错误. (#429) 2023-10-20 09:45:20 +08:00
老周 8b4ae09cf5
refactor: 设备接入网关同一个连接上报的消息使用串行处理. (#427) 2023-10-18 22:12:17 -05:00
bestfeng1020 cb17ae9d8b
定价修改 (#426)
修改硬件支持定价为699
2023-10-17 06:10:36 -05: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
zhouhao 19f90e3cef refactor: 设置默认externalHost为127.0.0.1 2023-09-26 10:12:49 +08:00
zhouhao 448b132c56 Merge remote-tracking branch 'origin/master' 2023-09-19 15:31:19 +08:00
zhouhao 1cfecd50ec build: 统一bouncycastle版本 2023-09-19 15:31:07 +08:00
老周 5e849c882c
build: 升级依赖版本 (#422) 2023-09-19 02:28:38 -05:00
bestfeng1020 f79ca77c9d
fix(ES查询): 解决动态terms条件转ES查询条件错误问题 (#421) 2023-09-13 14:49:53 +08:00
bestfeng1020 fdc0cbd7e0
feat(联系方式): 添加qq群5联系方式 (#418)
* feat(联系方式): 添加qq群5联系方式

* Update README.md

---------

Co-authored-by: 老周 <zh.sqy@qq.com>
2023-08-31 10:25:40 +08:00
老周 fcfbeaa373
build: 升级guava版本到32.1.2-jre (#416) 2023-08-29 09:22:52 +08:00
bestfeng1020 6abafda194
fix(docker): 规范社区办docker镜像命名 (#415)
* fix(docker): 规范社区办docker镜像命名

* fix(docker): 规范社区办docker镜像命名
2023-08-29 09:20:31 +08:00
zhouhao 4de7de6148 build: 优化.editorconfig配置内容 2023-08-28 14:45:09 +08:00
老周 b0027125ea
feat: 切换新的DeviceDataManager实现,使用ThingsDataManager桥接实现。 (#412) 2023-08-18 11:50:11 +08:00
老周 d972bde5c6
feat: 透传数据解析脚本中增加json()和jsonArray() api. (#410) 2023-08-18 10:36:33 +08:00
老周 3420f36110
fix: 修复透传解析脚本无法使用onDownstream,onUpstream函数注册回调. (#409) 2023-08-18 09:44:22 +08:00
老周 f84621178b
fix: 修复开启链路追踪后可能报错问题 (#407) 2023-08-17 16:10:52 +08:00
老周 7d750a1e0c
build: 优化maven子模块的relativePath配置 (#406) 2023-08-17 16:10:35 +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
tancong 0ec335c2d9
feat(tcp解析): 粘拆包脚本解析器相关补全提示 (#404) 2023-08-16 13:47:21 +08:00
tancong 20276d0c19
refactor(设备模块): 添加指标查询和保存指标功能 (#403) 2023-08-09 11:57:58 +08:00
老周 7ffcf4bc4b
build: 升级依赖 reactor-excel:1.0.6-SNAPSHOT (#402) 2023-08-08 16:58:11 +08:00
tancong 118065b15c
fix(场景联动): 解决指标场景告警不触发问题 (#398) 2023-08-08 10:50:17 +08:00
zhouhao 276ffdf100 build: 开启下一个版本 2.2.0-SNAPSHOT 2023-08-07 14:03:58 +08:00
PengyuDeng dacee03833
doc(告警模块):修改有歧义的字段描述(#396) 2023-08-07 09:21:58 +08:00
tancong 25da12e83c
fix(场景联动): 解决并行场景告警不触发问题 (#394) 2023-08-04 21:00:26 +08:00
zhouhao 66eee1bf26 Merge remote-tracking branch 'origin/master' 2023-08-04 18:42:42 +08:00
zhouhao ec53681151 build: 升级maven依赖版本 2023-08-04 18:42:30 +08:00
tancong 21646b4024
fix(设备模块): 解决tag枚举类型设置无参数问题 (#393) 2023-08-04 15:48:19 +08:00
老周 e0f980aed9
Update maven-wrapper.properties 2023-08-04 15:46:30 +08:00
zhouhao ab7e603706 fix(规则引擎): 修复mysql下索引长度错误问题 2023-08-03 14:17:06 +08:00
zhouhao 83a6f39ea0 feat(基础模块): 增加更高效的对象属性操作器 2023-08-02 10:40:51 +08:00
zhouhao 92ba89714f refactor(规则引擎): 优化定时任务 2023-08-02 10:33:10 +08:00
tancong b1319225e8
fix(设备模块): 解决修改设备物模型后,设备物模型脱离产品物模型问题 (#387)
* fix(设备模块): 解决修改设备物模型后,设备物模型脱离产品物模型问题
2023-08-02 09:20:24 +08:00
tancong 943d0739da
fix(设备模块): 解决设备tag没有返回dataType字段 (#389) 2023-08-01 16:32:44 +08:00