Commit Graph

842 Commits

Author SHA1 Message Date
zhouhao cabc095367 优化 2022-06-14 17:51:43 +08:00
zhouhao 5f871ebd13 优化 2022-06-14 17:09:41 +08:00
zhouhao ede32aa7fc Merge branch 'master' into 1.20
# Conflicts:
#	jetlinks-components/io-component/pom.xml
#	jetlinks-components/io-component/src/main/java/org/jetlinks/community/io/file/FileManagerConfiguration.java
#	jetlinks-components/io-component/src/main/java/org/jetlinks/community/io/file/FileProperties.java
#	jetlinks-components/io-component/src/main/java/org/jetlinks/community/io/file/web/FileManagerController.java
#	jetlinks-components/network-component/tcp-component/src/main/java/org/jetlinks/community/network/tcp/parser/strateies/DelimitedPayloadParserBuilder.java
#	jetlinks-components/notify-component/notify-email/src/main/java/org/jetlinks/community/notify/email/embedded/DefaultEmailNotifier.java
#	pom.xml
2022-06-14 17:07:28 +08:00
老周 f4dc74b1d3
Merge pull request #170 from jetlinks/file-auth-support
静态文件授权支持
2022-06-13 17:02:54 +08:00
ayan 812749393d 静态文件授权支持 2022-06-13 15:38:37 +08:00
zhouhao 0996f140a9 Merge remote-tracking branch 'origin/master' 2022-06-13 14:52:59 +08:00
zhouhao 44241548f4 增加文件管理 2022-06-13 14:52:22 +08:00
zhouhao 6760b7e817 增加文件管理 2022-06-13 14:45:37 +08:00
zhouhao 79e3db9266 增加文件管理 2022-06-13 14:45:34 +08:00
老周 bf04b7f908
Merge pull request #168 from wujun8/master
ProtocolSupport.onChildBind onChildUnbind
2022-06-08 17:29:59 +08:00
Winston 189756ebfd ProtocolSupport.onChildBind onChildUnbind 2022-06-08 17:18:46 +08:00
zhouhao aab9215293 优化 2022-05-24 17:22:40 +08:00
zhouhao 72e3011946 优化 2022-05-24 17:20:40 +08:00
zhouhao 87a922687f 优化 2022-05-24 16:58:47 +08:00
zhouhao b688e55cd2 fastjson 1.2.83 2022-05-24 15:08:26 +08:00
zhouhao e41ce546dd fastjson 1.2.83 2022-05-24 15:04:30 +08:00
zhouhao 34cb265917 优化 2022-05-17 18:01:08 +08:00
zhouhao 890fe14b31 优化集群 2022-05-17 17:51:39 +08:00
zhouhao 33864d544c 协议包以数据库为准 2022-05-17 17:51:28 +08:00
zhouhao e29672b66f 优化滚动查询 2022-05-11 15:10:08 +08:00
zhouhao 47c14686c1 优化滚动查询 2022-05-11 15:09:33 +08:00
zhouhao fc412d652e Merge remote-tracking branch 'origin/1.20' into 1.20 2022-05-10 16:53:22 +08:00
zhouhao e35ee69588 优化在线数量统计 2022-05-10 16:53:08 +08:00
zhouhao cf8d1285eb 修复状态错误 2022-05-08 13:32:15 +08:00
zhouhao 30a996070b remove ReactiveHashCommands.java 2022-05-07 19:29:37 +08:00
zhouhao de9bd5b570 修改跨域 2022-05-07 14:16:07 +08:00
zhouhao 024c3d9649 1.20.0-SNAPSHOT 2022-05-07 14:15:09 +08:00
zhouhao 68e4acdfb0 优化es查询 2022-04-21 09:22:40 +08:00
zhouhao c987a5bb85 修复依赖冲突 2022-04-19 20:57:02 +08:00
zhouhao 44ba268306 Merge remote-tracking branch 'origin/master' 2022-04-11 10:49:16 +08:00
zhouhao 0c9b286558 优化会话管理 2022-04-11 10:48:42 +08:00
zhouhao 3621ef1ea8 Merge remote-tracking branch 'origin/master' 2022-04-06 18:23:00 +08:00
zhouhao 759176ec4a 修复设备告警定时触发可能不生效问题 2022-04-06 18:22:42 +08:00
zhouhao 4a8489fcb0 upgrade jsoup version 2022-02-09 15:23:06 +08:00
zhouhao c7e0676071 upgrade easy-orm version 2022-02-09 15:04:38 +08:00
zhouhao 13f7e87a5c 优化代码格式 2022-02-09 15:04:11 +08:00
zhouhao 7eb0a320d8 优化ElasticSearchService 2022-02-08 14:44:06 +08:00
zhouhao 0d62f1c9eb 1.13.0 2022-01-25 15:36:29 +08:00
zhouhao 393bff113c 升级依赖 2022-01-25 15:36:01 +08:00
zhouhao 5b103aaca7 1.13.0-SNAPSHOT 2022-01-17 16:17:38 +08:00
zhouhao 263701be8b 升级netty以及vertx版本 2022-01-17 16:17:21 +08:00
zhouhao 803b7af565 1.13.0-SNAPSHOT 2022-01-17 16:16:52 +08:00
zhouhao 888f776124 修复未激活设备无法获取标签信息 2022-01-13 11:09:43 +08:00
zhouhao 1794e3d33a 1.12.0 2022-01-07 14:15:22 +08:00
zhouhao 20a72c5caf 优化mqtt重复deviceId会话注销逻辑 2022-01-05 16:29:20 +08:00
zhouhao 0a6869fa44 设备注册时,如果设备已经注册则更新配置等信息。 2022-01-05 15:00:13 +08:00
老周 884ecd8000
Merge pull request #133 from jetlinks/dependabot/maven/org.apache.logging.log4j-log4j-api-2.17.1
Bump log4j-api from 2.17.0 to 2.17.1
2022-01-05 09:03:49 +08:00
老周 be85d229c8
Merge pull request #134 from jetlinks/dependabot/maven/org.apache.logging.log4j-log4j-core-2.17.1
Bump log4j-core from 2.17.0 to 2.17.1
2022-01-05 09:03:24 +08:00
dependabot[bot] 20431fb2f5
Bump log4j-core from 2.17.0 to 2.17.1
Bumps log4j-core from 2.17.0 to 2.17.1.

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-core
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-04 16:56:48 +00:00
dependabot[bot] 262535221e
Bump log4j-api from 2.17.0 to 2.17.1
Bumps log4j-api from 2.17.0 to 2.17.1.

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-api
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-04 16:51:58 +00:00