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

1300 Commits

Author SHA1 Message Date
zhouhao 270583033a Merge remote-tracking branch 'origin/master' 2023-12-28 15:58:10 +08:00
zhouhao 0b6c8451d3 refactor: 优化设备数据查询 2023-12-28 15:57:46 +08:00
PengyuDeng 454fa46df1
add(文件管理): 增加删除文件接口 (#466) 
---------

Co-authored-by: 老周 <zh.sqy@qq.com>
 2023-12-27 16:32:15 +08:00
zhouhao 73fa7607e9 Merge remote-tracking branch 'origin/master' 2023-12-27 10:06:23 +08:00
zhouhao a7114c6591 refactor: 优化包含字符串的处理逻辑 2023-12-27 10:06:09 +08:00
fighter-wang 46360dfa66
fix(设备管理): 修复数据查询设备指定属性列表数据不全问题 (#463) 2023-12-26 13:59:29 +08:00
PengyuDeng 9b87ed740c
fix: 配置文件增加接口扫描路径 (#464) 2023-12-26 13:59:06 +08:00
zhouhao a20814b68d refactor: 初始化数据时不触发crud事件 2023-12-21 10:13:10 +08:00
zhouhao 27ff0510a6 refactor: 优化文件导入 2023-12-20 14:58:58 +08:00
老周 7f028885fe
fix(基础模块): 修复在极端情况下物属性缓存可能出现污染. (#458) 2023-12-18 17:48:22 +08:00
tancong a780869dd3
fix(订阅模块): 其他用户无法订阅消息修复 (#455) 2023-12-12 17:39:32 +08:00
liusq 51f7afc9e1
feat(文档): 更新项目结构说明 (#453) 2023-12-06 18:24:38 +08:00
liusq 4cb4422537
feat(角色分组): 社区版移植角色分组功能 (#451) 2023-12-01 13:36:53 +08:00
ningqingsheng a5b3039be9
feat: 文件管理api文档补充 (#447) 2023-11-30 10:28:09 +08:00
zhouhao eb2dabeebb Merge remote-tracking branch 'origin/master' 2023-11-28 17:02:44 +08:00
zhouhao acf38bc7e1 refactor: 优化规则日志记录逻辑 2023-11-28 17:02:34 +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
tancong af02ab4fb5
fix(用户): 超级管理员初始化类型修改 (#443) 2023-11-16 10:13:31 +08:00
tancong 47975b0da2
feat(告警模块): 其他类型的告警，每个场景联动产生一条告警记录。告警日志添加告警说明 (#441) 2023-11-13 19:03:40 +08:00
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