Commit Graph

1267 Commits

Author SHA1 Message Date
tancongsir d0484545c4 feat(订阅模块): 企业版订阅模块迁移 2023-07-24 14:48:02 +08:00
bestfeng1020 045c5f6848
fix(服务支持): 修改服务支持的联系二维码不显示的问题 (#374) 2023-07-24 11:25:35 +08:00
bestfeng1020 c64f2421b1
feat(服务支持): 添加付费服务支持联系二维码 (#370) 2023-07-21 18:09:17 +08:00
bestfeng1020 c15a1fd7fe
feat(服务支持): 添加JetLinks服务器支持说明 (#369) 2023-07-21 13:22:12 +08:00
tancong 679ceb6858
fix(认证模块): 修复更新不存在的角色可能报错问题 (#368) 2023-07-20 18:52:05 +08:00
zhouhao 142c720f39 feat(基础模块): 增加脚本默认允许访问的类 2023-07-19 10:15:05 +08:00
zhouhao 2bf841c408 feat(设备管理): 增加查询列式存储时全部属性的API 2023-07-19 10:14:44 +08:00
tancong 69282edfce
fix(设备管理): 删除设备后,解绑子设备 (#365) 2023-07-18 19:37:25 +08:00
tancong 85f3e65fdb
fix(设备管理): 修复设备导入空指针异常 (#362) 2023-07-18 14:14:21 +08:00
tancong 0d8b175a15
refactor(认证模块): 加密key校验 (#364) 2023-07-18 14:09:49 +08:00
tancong ae7f083e95
fix(告警中心): 新增告警配置时默认启用 (#358) 2023-07-18 10:45:36 +08:00
tancong a26474a243
perf(设备接入网关): 设备接入网关文案(中文)修改 (#355) 2023-07-18 10:45:07 +08:00
tancong 333c95bdb3
refactor(基础模块): 优化excel导入数字类型格式错误提示 (#356) 2023-07-18 10:31:08 +08:00
tancong 998616fe37
fix(设备管理): 优化设备导入校验 (#354) 2023-07-18 10:29:56 +08:00
tancong 3b0871dab2
doc(基础模块): 修复文档说明错误 (#359) 2023-07-18 10:25:50 +08:00
tancong db16c2009f
fix(通知): 修复获取企业微信部门可能错误问题 (#351) 2023-07-18 10:25:19 +08:00
Zhang Ji a90d180fa4
feat(设备接入网关): 修改MQTT服务网关时,重新加载网络组件 (#336)
* feat(基础模块): 增加通用导入工具

* feat(设备): 导入设备数据,并提供日志下载

* feat(设备接入网关): 修改MQTT服务网关时,重新加载网络组件
2023-07-11 16:30:48 +08:00
bestfeng1020 5271799511
fix(场景联动):修复设备选择器条件会无限叠加问题 (#334) 2023-07-11 10:20:13 +08:00
bestfeng1020 98508e5a62
fix(文档):修复文案跳转链接错误 (#332) 2023-07-06 15:11:09 +08:00
dependabot[bot] e442009ce6
build(deps): bump grpc-protobuf (#331)
Bumps [grpc-protobuf](https://github.com/grpc/grpc-java) from 1.47.0 to 1.53.0.
- [Release notes](https://github.com/grpc/grpc-java/releases)
- [Commits](https://github.com/grpc/grpc-java/compare/v1.47.0...v1.53.0)

---
updated-dependencies:
- dependency-name: io.grpc:grpc-protobuf
  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-07-06 09:26:49 +08:00
bestfeng1020 7dafe5c0b8
fix(系统配置):解决base-path校验可能失效问题 (#330) 2023-07-05 18:23:21 +08:00
本宫在,尔等都是妃 4b5fa4a0dc
fix(通知管理): 修复邮件收件方不显示自定义的发件人昵称 (#327) 2023-07-03 13:47:18 +08:00
老周 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