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

1268 Commits

Author SHA1 Message Date
老周 f70f761067
Merge pull request #596 from zxl1951/fix-td-save-2.2 
fix(存储策略): 涛思数据库存储使用无模式写入创建表缺失messageId列
 2024-12-13 14:37:49 +08:00
ZxL dea91e8353 fix(存储策略): 涛思数据库存储使用无模式写入创建表缺失messageId列 2024-12-13 12:06:04 +08:00
zhouhao 01d0a033d3 Merge remote-tracking branch 'origin/master' 2024-09-12 15:41:18 +08:00
zhouhao f1733e5880 build: 升级jetlinks-core版本1.2.3-SNAPSHOT 2024-09-12 15:41:05 +08:00
fighter-wang 0f78fec18f
feat(设备管理): 增加解析文件为属性物模型功能 (#569) 
Co-authored-by: fighter-wang <11291691+fighter-wang@user.noreply.gitee.com>
 2024-09-12 11:57:10 +08:00
bestfeng1020 4d9e8c5b00
fix(README): 修正二次开发文档链接 (#571) 
fix(README): 修正二次开发文档链接
 2024-09-11 16:41:26 +08:00
zhouhao 600766c4a5 Merge remote-tracking branch 'origin/master' 2024-09-10 17:06:53 +08:00
zhouhao e8b6f27afe feat: 优化LocalFileThingsDataManager性能 2024-09-10 17:06:39 +08:00
fighter-wang 824466037b
feat(菜单管理): 新增清空菜单授权功能 (#570) 
Co-authored-by: fighter-wang <11291691+fighter-wang@user.noreply.gitee.com>
 2024-09-06 14:55:20 +08:00
fighter-wang bf7e19c92e
fix(邮件通知): 优化获取邮件附件，过大时的抛错国际化 (#568) 
* fix(邮件通知): 优化获取邮件附件，过大时的抛错国际化

* fix(邮件通知): 优化使用通用的国际化信息

* fix(邮件通知): 代码优化

---------

Co-authored-by: fighter-wang <11291691+fighter-wang@user.noreply.gitee.com>
 2024-09-03 18:32:39 +08:00
Zhang Ji 3ce520ebe6
fix(场景联动): 修复重启服务后，场景联动未初始化的问题 (#566) 2024-09-02 12:23:46 +08:00
PengyuDeng 412fbd6e2c
feat(权限管理): 分页获取用户详情，新增组织信息 (#560) 2024-09-02 09:33:12 +08:00
jk9991xx 594b2937d5
refactor: 移除重复代码 
Co-authored-by: lmx <18570651508@wo.cn>
 2024-09-02 09:32:15 +08:00
fighter-wang bf5ba69bcb
fix(场景联动): 修复场景联动使用指标值无法触发问题 (#562) 
Co-authored-by: fighter-wang <11291691+fighter-wang@user.noreply.gitee.com>
 2024-08-29 15:50:38 +08:00
zhouhao 845206fe76 feat: 优化topic解析 2024-08-29 12:02:32 +08:00
fighter-wang 99e15697db
fix(场景联动): 修复场景联动中设备属性翻译问题 (#561) 2024-08-28 16:39:53 +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
PengyuDeng f946c97ce5
refactor(基础模块): 优化菜单ID生成策略. (#556) 2024-08-19 17:17:58 +08:00
fighter-wang 65e5ac9046
fix(场景联动): 修复保存场景联动时缺少actionId以及features字段问题 (#549) 2024-08-07 10:17:57 +08:00
zhouhao c2ae9306a2 Merge remote-tracking branch 'origin/master' 2024-08-02 16:28:00 +08:00
zhouhao 7322bf1fe7 refactor(基础模块): 优化存储策略以及ID生成策略. 2024-08-02 16:27:49 +08:00
PengyuDeng a9b2754a41
feat(系统监控): 监控信息推送至消息总线。 (#544) 2024-07-19 15:00:19 +08:00
PengyuDeng 19604d8328
add(场景联动): 增加批量启动、禁用场景的接口 (#539) 2024-07-16 09:36:18 +08:00
老周 2dd0ef3c93
feat(基础模块): MqttClient设备会话支持可恢复. (#538) 2024-07-10 10:59:22 +08:00
PengyuDeng 8b3509442f
refactor(告警模块)：告警级别信息增加拓展 (#536) 
用户可能需要对告警级别所含信息进行拓展，如我司每个告警级别对应一个不同的播报音。播报音在前端配置，由浏览器读出。
 2024-07-08 16:27:50 +08:00
PengyuDeng ed6540fbca
add(规则引擎-场景联动): 场景联动增加读取属性后回复触发场景联动的拓展 (#533) 
需要结合前端一起拓展，前端的实现基于属性上报，把属性上报reportProperty修改为eadPropertyReply即可。
 2024-07-08 10:12:07 +08:00
fighter-wang a4b48c7ec5
fix(消息通知管理): 修复订阅管理中订阅配置关闭后，查看个人中心依然展示订阅配置及通道问题 (#534) 2024-07-05 17:12:38 +08:00
PengyuDeng 1ad1e448ee
refactor(基础模块): 优化es索引配置,增加拓展性。 (#526) 2024-06-24 10:34:59 +08:00
fighter-wang fee733672c
fix(消息通知模块): 修复场景联动设备告警短信通知无法发送问题 (#525) 2024-06-21 16:01:55 +08:00
fighter-wang fdd8f4004c
fix(设备模块): 新增网关设备批量解绑网关子设备功能 (#522) 2024-06-19 09:44:01 +08:00
bestfeng1020 8515c9b385
fix(告警记录): 添加通过告警配置Id查询告警日志接口 (#520) 2024-06-17 12:40:45 +08:00
zhouhao 7e24f3d006 refactor: 优化PersistenceBuffer逻辑 2024-06-11 11:05:41 +08:00
zhouhao af11c55ad9 refactor: 优化tcp判断 2024-05-31 10:18:18 +08:00
zhouhao 0bdc14668e Merge remote-tracking branch 'origin/master' 2024-05-30 18:25:40 +08:00
zhouhao 173680bd92 refactor: ThingsDataManager增加标签实现 2024-05-30 18:25:26 +08:00
Zhang Ji 76d1b07210
fix(TDengine): 修复like条件语法错误 (#514) 2024-05-30 10:02:59 +08:00
zhouhao 3d722235c0 refactor: 优化系统配置逻辑 2024-05-27 17:27:11 +08:00
Zhang Ji 53a5d0c8e5
fix(网络组件): 修复关闭mqtt网关禁用逻辑错误 (#512) 2024-05-24 16:44:56 +08:00
tancong 2b8f571e9a
feat(规则引擎): 增加场景分支executeAnyway配置.优化场景条件分支逻辑. (#511) 2024-05-23 17:12:50 +08:00
zhouhao 86b073b389 refactor: 统一bouncycastle版本 2024-05-21 17:42:57 +08:00
zhouhao a0c17312cc Merge branch 'refactor-session-duration' 2024-05-21 16:50:34 +08:00
zhouhao 39eb4eb47d Merge branch 'master' of github.com:jetlinks/jetlinks-community 2024-05-21 16:50:26 +08:00
zhouhao a819096019 refactor: 优化索引模版创建逻辑 2024-05-21 09:45:44 +08:00
老周 dcc43cb47a
refactor: 修改设备会话统计时长类型为long (#510) 2024-05-14 10:45:28 +08:00
zhouhao 3d7d3efc86 refactor: 修改设备会话统计时长类型为long 2024-05-14 10:41:43 +08:00
fighter-wang 8d7d900289
fix(短信通知模块): 修复产品/设备发生告警，短信通知内置函数未进行格式化问题 (#507) 2024-05-09 19:23:38 +08:00
fighter-wang ff0f7ddfa2
fix(场景联动): 修复场景联动触发条件，当选择为事件时，json参数为enum，没有enum枚举选项问题 (#503) 2024-05-06 17:44:31 +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
fighter-wang 16599ba067
fix(消息通知): 修复产品类型告警，展示产品ID 转换为 展示产品名称 (#499) 2024-04-24 14:01:15 +08:00