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

1145 Commits

Author SHA1 Message Date
老周 6259181f26
Update maven-wrapper.properties 2023-06-30 11:44:11 +08:00
Zhang Ji 563f9a328e
feat(设备): 导入设备数据，并提供日志下载 (#326) 
* feat(基础模块): 增加通用导入工具

* feat(设备): 导入设备数据，并提供日志下载
 2023-06-30 11:43:38 +08:00
zhouhao 81a5f8999a feat(基础模块): 优化链路追踪 2023-06-28 09:40:30 +08:00
zhouhao 2756a31a35 feat(基础模块): 优化设备指令下发变量获取逻辑 2023-06-26 19:39:44 +08:00
zhouhao f7e12a8306 Merge remote-tracking branch 'origin/master' 2023-06-26 11:45:05 +08:00
zhouhao d45adde412 feat(认证模块): 增加登录时密码加密以及限制密码错误次数 2023-06-26 11:44:52 +08:00
bestfeng1020 3df3b90bd9
fix(系统配置):解决批量保存系统配置可能导致的mysql死锁问题 (#324) 2023-06-26 10:28:59 +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
老周 6009a8a233
Update maven-wrapper.properties 2023-06-15 17:53:02 +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 122750aa93 feat(协议管理): 优化协议加载错误提示 2023-06-13 14:54:33 +08:00
zhouhao 52a35c353a Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	jetlinks-components/common-component/src/main/resources/i18n/common-component/messages_en.properties
#	jetlinks-components/common-component/src/main/resources/i18n/common-component/messages_zh.properties
 2023-06-13 13:37:40 +08:00
zhouhao 509afa40df feat(基础模块): 增加jvm异常处理 2023-06-13 13:37:13 +08:00
zhouhao d7c0806b84 fix: buffer size error 2023-06-10 16:48:23 +08:00
bestfeng1020 db1df5e121
feat(系统配置): base-path值正确性校验 (#318) 2023-06-09 19:27:22 +08:00
zhouhao 8b85aa305d feat(基础模块): 移除内存判断 2023-06-08 12:40:55 +08:00
zhouhao d20e705a21 feat(基础模块): 设备会话增加通过配置文件进行相关配置 2023-06-07 15:50:19 +08:00
Zhang Ji c4cb274569
fix(场景联动): 设备触发添加所属产品作为条件 (#314) 
---------

Co-authored-by: zhou-hao <zh.sqy@qq.com>
 2023-06-07 11:09:15 +08:00
zhouhao 1355f5209f Merge remote-tracking branch 'origin/master' 2023-06-07 10:29:12 +08:00
zhouhao 09636925a9 feat(基础模块): 优化脚本中的JSON支持 2023-06-07 10:29:02 +08:00
Zhang Ji 65ccee4f6d
fix(关系): 优化固定值的判断 (#313) 
* fix(阿里云短信): 解决短信模板和标签只能查询第一页数据问题 (#258)

* feat(查询条件): 添加设备查询条件构造器 (#260)

* feat(仪表盘): 系统监控添加历史记录支持

* fix(关系): 优化固定值的判断

value为空时可能抛出异常

* fix(关系): 优化固定值的判断

value为空时可能抛出异常

* fix(通知): 还原版本

---------

Co-authored-by: zhou-hao <zh.sqy@qq.com>
 2023-06-06 19:02:35 +08:00
bestfeng1020 5d739c43fb
fix(用户管理): 解决用户管理类型不存在问题 (#312) 2023-06-06 18:52:12 +08:00
zhangji 8fac4eab36 Revert "fix(关系): 优化固定值的判断" 
This reverts commit 015df6d6
 2023-06-06 17:37:19 +08:00
zhangji 015df6d6c9 fix(关系): 优化固定值的判断 
value为空时可能抛出异常
 2023-06-06 16:00:23 +08:00
bestfeng1020 8efe92cda0
fix(READEME): 修改产品文地址 (#307) 2023-06-02 17:44:54 +08:00
zhouhao ad66985fb1 feat(基础模块): 优化es查询条件值类型转换 2023-06-01 15:15:51 +08:00
bestfeng1020 ec66ae9ae7
fix(设备管理): 添加post方式的设备属性列表查询接口 (#302) 2023-06-01 15:15:17 +08:00
老周 3f01310a9d
doc: 修复注释错误 (#297) 2023-05-26 16:14:10 +08:00
老周 c7d1aac44c
Update README.md 2023-05-22 18:10:32 +08:00
zhouhao a7306ca921 Merge remote-tracking branch 'origin/master' 2023-05-19 14:34:51 +08:00
zhouhao 981351aaeb feat(网络组件): 增加模版配置,可通过jetlinks.network....设置网络组件的默认配置选项. 2023-05-19 14:34:35 +08:00
bestfeng1020 4c370c1924
feat(系统配置): base-path值正确性校验 (#286) 
* feat(系统配置): base-path值正确性校验

* feat(系统配置): base-path值正确性校验

* feat(系统配置): base-path值正确性校验
 2023-05-19 11:59:58 +08:00
Zhang Ji 015570066a
feat(仪表盘): 系统监控添加历史记录支持 (#284) 2023-05-16 19:02:32 +08:00
zhouhao 7f49a4e932 feat(maven): 升级依赖版本 2023-05-11 19:21:41 +08:00
zhouhao f8a3199138 fix(设备消息): 修复设备上线消息错误 2023-05-10 13:42:31 +08:00
zhouhao 3f3f06a8e6 fix(系统配置): 修复可能无法报错系统配置 2023-05-09 15:51:00 +08:00
zhouhao a2cd2688cb Merge remote-tracking branch 'origin/master' 2023-05-08 16:45:36 +08:00
zhouhao a9b906a0d5 fix(设备会话): 修复设置DeviceOnlineMessage header无效 2023-05-08 16:45:22 +08:00
老周 72362b2508
Update README.md 2023-05-05 19:16:32 +08:00
zeje edb692d1a4
优化重置设备配置信息 (#277) 
Co-authored-by: 蔡泽智 <czz@eviewgps.com>
 2023-05-05 12:02:22 +08:00
bestfeng1020 309e5a57dc
修复通过场景联动发送阿里云短信失败问题 (#279) 2023-05-04 16:46:09 +08:00
bestfeng1020 fc5f9a5a25
fix(docker镜像版本): 修改前端镜像版本 (#278) 2023-04-27 16:24:25 +08:00
bestfeng1020 6a2035fee6
feat(通知订阅): 支持告警消息站内信通知 (#274) 2023-04-21 20:20:37 +08:00
bestfeng1020 d51aa6ac1f
fix(网络组件): 设置支持路由设置类型的网络组件可以被复用 (#273) 2023-04-21 18:22:35 +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 3f4297ed06 refactor(基础模块): 优化协议加载日志打印 2023-04-20 10:10:23 +08:00
zhouhao 32a3452f7b feat(maven): 2.1.0-SNAPSHOT 2023-04-20 10:09:58 +08:00
bestfeng1020 5fc41d5bf1
feat(产品): 根据指定的接入方式获取产品需要的配置定义 (#266) 2023-04-18 15:52:30 +08:00