build(deps): bump org.apache.logging.log4j:log4j-core (#730 )

Bumps org.apache.logging.log4j:log4j-core from 2.25.1 to 2.25.3. --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-core dependency-version: 2.25.3 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
feat: 适配新的网络组件查询接口
2025-12-21 18:43:31 +08:00 · 2025-12-17 09:33:51 +08:00 · 2025-12-09 17:37:23 +08:00 · 2025-12-01 09:58:00 +08:00 · 2025-11-25 15:17:53 +08:00 · 2025-11-19 19:00:13 +08:00
1557 changed files with 46403 additions and 10028 deletions
--- a/.github/workflows/maven_build_2.1x.yml
+++ b/.github/workflows/maven_build_2.1x.yml
@ -0,0 +1,45 @@
+name: Auto Deploy Docker
+
+on:
+    push:
+        branches: [ "2.10","2.11" ]
+jobs:
+    build:
+        runs-on: ubuntu-latest
+        steps:
+            -   uses: actions/checkout@v4
+            -   uses: docker/setup-qemu-action@v3
+            -   uses: docker/setup-buildx-action@v3
+            -   name: Set up JDK 17
+                uses: actions/setup-java@v4
+                with:
+                    java-version: '17'
+                    distribution: 'temurin'
+            -   name: Cache Maven Repository
+                uses: actions/cache@v3
+                with:
+                    path: ~/.m2
+                    key: ${{ runner.os }}-${{ hashFiles('**/pom.xml') }}
+            -   name: Build with Maven
+                run: ./mvnw clean install -Dmaven.build.timestamp="$(date "+%Y-%m-%d %H:%M:%S")" -Dmaven.test.skip=true -Pbuild
+            -   name: Get Maven project version
+                id: maven-version
+                run: |
+                    VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
+                    echo "version=$VERSION" >> $GITHUB_OUTPUT
+                    echo "Project version: $VERSION"
+            -   name: Log in to Aliyun ACR
+                uses: docker/login-action@v3
+                with:
+                    registry: registry.cn-shenzhen.aliyuncs.com
+                    username: ${{ secrets.ALIYUN_DOCKER_REPO_USERNAME }}
+                    password: ${{ secrets.ALIYUN_DOCKER_REPO_PWD }}
+            -   name: build and docker image
+                uses: docker/build-push-action@v6
+                with:
+                    context: ./jetlinks-standalone
+                    file: ./jetlinks-standalone/Dockerfile
+                    platforms: linux/amd64,linux/arm64/v8
+                    push: true
+                    tags: |
+                        registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-community:${{ steps.maven-version.outputs.version }}
--- a/.github/workflows/pull_request_2.1x.yml
+++ b/.github/workflows/pull_request_2.1x.yml
@ -0,0 +1,27 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Pull Request 2.10 with java17
+
+on:
+  pull_request:
+    branches: [ "2.10","2.11"  ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up JDK 17
+      uses: actions/setup-java@v1
+      with:
+        java-version: 17
+    - name: Cache Maven Repository
+      uses: actions/cache@v4.2.3
+      with:
+        path: ~/.m2
+        key: jetlinks-community-maven-repository
+    - name: Build with Maven
+      run: ./mvnw package -Dmaven.test.skip=true -Pbuild
--- a/.gitignore
+++ b/.gitignore
@ -29,4 +29,5 @@ docker/data
 !demo-protocol-1.0.jar
 application-local.yml
 dev/
-.DS_Store
+.DS_Store
+.java-version
--- a/.run/JetLinksApplication.run.xml
+++ b/.run/JetLinksApplication.run.xml
@ -0,0 +1,11 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="JetLinksApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="ACTIVE_PROFILES" value="default,dev,local" />
+    <module name="jetlinks-standalone" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="org.jetlinks.community.standalone.JetLinksApplication" />
+    <option name="VM_PARAMETERS" value="--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.base/java.math=ALL-UNNAMED --add-opens java.scripting/javax.script=ALL-UNNAMED --add-opens java.base/java.time=ALL-UNNAMED -XX:+EnableDynamicAgentLoading" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
--- a/README.md
+++ b/README.md
@ -1,7 +1,7 @@
 # JetLinks 物联网基础平台

 ![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/jetlinks/jetlinks-community/maven.yml?branch=master)
-![Version](https://img.shields.io/badge/version-2.3-brightgreen)
+![Version](https://img.shields.io/badge/version-2.11-brightgreen)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/e8d527d692c24633aba4f869c1c5d6ad)](https://app.codacy.com/gh/jetlinks/jetlinks-community?utm_source=github.com&utm_medium=referral&utm_content=jetlinks/jetlinks-community&utm_campaign=Badge_Grade_Settings)
 [![OSCS Status](https://www.oscs1024.com/platform/badge/jetlinks/jetlinks-community.svg?size=small)](https://www.oscs1024.com/project/jetlinks/jetlinks-community?ref=badge_small)
 [![star](https://img.shields.io/github/stars/jetlinks/jetlinks-community?style=social)](https://github.com/jetlinks/jetlinks-community)
@ -14,10 +14,9 @@
 [![QQ②群324606263](https://img.shields.io/badge/QQ②群-324606263-brightgreen)](https://qm.qq.com/cgi-bin/qm/qr?k=IMas2cH-TNsYxUcY8lRbsXqPnA2sGHYQ&jump_from=webapi)
 [![QQ①群2021514](https://img.shields.io/badge/QQ①群-2021514-brightgreen)](https://qm.qq.com/cgi-bin/qm/qr?k=LGf0OPQqvLGdJIZST3VTcypdVWhdfAOG&jump_from=webapi)

-JetLinks 基于Java8,Spring Boot 2.x,WebFlux,Netty,Vert.x,Reactor等开发, 
+JetLinks 2.1x 基于Java 17,Spring Boot 3.x,WebFlux,Netty,Vert.x,Reactor等开发,
 是一个开箱即用,可二次开发的企业级物联网基础平台。平台实现了物联网相关的众多基础功能,
 能帮助你快速建立物联网相关业务系统。
- 

 ## 核心特性

@ -25,25 +24,35 @@ JetLinks 基于Java8,Spring Boot 2.x,WebFlux,Netty,Vert.x,Reactor等开发,

 全部源代码开放,可自由拓展功能,不再受制于人.前后端分离,接口全开放。

+#### 部署简单
+
+最小化运行仅需要`java 17`,`redis`,`timescaledb`即可，无需部署大量中间件。
+
 #### 统一设备接入,海量设备管理
+
 TCP/UDP/MQTT/HTTP、TLS/DTLS、不同厂商、不同设备、不同报文、统一接入，统一管理。

 #### 规则引擎
+
 灵活的规则模型配置,支持多种规则模型以及自定义规则模型. 设备告警,场景联动,均由统一的规则引擎管理。

 #### 数据权限控制
+
 灵活的非侵入数据权限控制。可实现菜单、按钮、数据三维维度的数据权限控制。可控制单条数据的操作权限。

 ## 技术栈

-1. [Spring Boot 2.7.x](https://spring.io/projects/spring-boot)
+1. [Spring Boot 3.4.x](https://spring.io/projects/spring-boot)
 2. [Spring WebFlux](https://spring.io/) 响应式Web支持
 3. [R2DBC](https://r2dbc.io/) 响应式关系型数据库驱动
 4. [Project Reactor](https://projectreactor.io/) 响应式编程框架
-4. [Netty](https://netty.io/),[Vert.x](https://vertx.io/) 高性能网络编程框架
-5. [ElasticSearch](https://www.elastic.co/cn/products/enterprise-search) 全文检索，日志，时序数据存储
-6. [PostgreSQL](https://www.postgresql.org) 业务功能数据管理
-7. [hsweb framework 4](https://github.com/hs-web) 业务功能基础框架
+5. [Netty](https://netty.io/),[Vert.x](https://vertx.io/) 高性能网络编程框架
+6. [hsweb framework 4](https://github.com/hs-web) 业务功能基础框架
+7. [ElasticSearch](https://www.elastic.co/cn/products/enterprise-search) 全文检索，日志，时序数据存储 （可选）
+8. [TDengine](https://www.taosdata.com/) 设备时序数据存储（可选）
+9. [Redis](https://redis.io/) 缓存数据
+10. [TimescaleDB](https://www.timescale.com/) 时序数据存储（可选）
+11. [PostgreSQL](https://www.postgresql.org) 业务功能数据管理

 ## 架构

@ -59,7 +68,7 @@ TCP/UDP/MQTT/HTTP、TLS/DTLS、不同厂商、不同设备、不同报文、统
 --jetlinks-community
 ------|----docker
 ------|------|----dev-env       # 启动开发环境
------|------|----run-all       # 启动全部,通过http://localhost:9000 访问系统.
+------|------|----run-all       # 启动全部,通过http://localhost:8848 访问系统.
 ------|----jetlinks-components  # 公共组件模块
 ------|-------|----common-component # 通用组件.
 ------|-------|----configuration-component # 通用配置.
@ -90,22 +99,20 @@ TCP/UDP/MQTT/HTTP、TLS/DTLS、不同厂商、不同设备、不同报文、统
 ------|----simulator            # 设备模拟器
 ```

-
 ## 服务支持

 我们提供了各种服务方式帮助您深入了解物联网平台和代码，通过产品文档、技术交流群、付费教学等方式，你将获得如下服务：

-
-| 服务项       | 服务内容              | 服务收费   | 服务方式   |
-|-----------|-----------------|--------|-------------|
-| 基础问题答疑    | 问题答疑  | 免费     | 技术交流群支持 [![QQ⑤群554591908](https://img.shields.io/badge/QQ⑤群-554591908-brightgreen)](https://qm.qq.com/cgi-bin/qm/qr?k=jiirLiyFUecy_gsankzVQ-cl6SrZCnv9&&jump_from=webapi) [![QQ④群780133058](https://img.shields.io/badge/QQ④群-780133058-brightgreen)](https://qm.qq.com/cgi-bin/qm/qr?k=Gj47w9kg7TlV5ceD5Bqew_M_O0PIjh_l&jump_from=webapi) [![QQ③群647954464](https://img.shields.io/badge/QQ③群-647954464-brightgreen)](https://qm.qq.com/cgi-bin/qm/qr?k=K5m27CkhDn3B_Owr-g6rfiTBC5DKEY59&jump_from=webapi)  [![QQ②群324606263](https://img.shields.io/badge/QQ②群-324606263-brightgreen)](https://qm.qq.com/cgi-bin/qm/qr?k=IMas2cH-TNsYxUcY8lRbsXqPnA2sGHYQ&jump_from=webapi) [![QQ①群2021514](https://img.shields.io/badge/QQ①群-2021514-brightgreen)](https://qm.qq.com/cgi-bin/qm/qr?k=LGf0OPQqvLGdJIZST3VTcypdVWhdfAOG&jump_from=webapi) |
-| 系统部署      | 系统部署     | 免费     | 文档自助。[源码部署](https://hanta.yuque.com/px7kg1/yfac2l/vvoa3u2ztymtp4oh) [Docker部署](https://hanta.yuque.com/px7kg1/yfac2l/mzq23z4iey5ev1a5)  |
-| 产品使用      | 教学产品各功能使用   | 免费     | 文档自助。[产品文档](https://hanta.yuque.com/px7kg1/yfac2l) |
-| 二次开发      | 教学平台源码开发过程、工具使用等；| 免费     | 文档自助。[开发文档](https://hanta.yuque.com/px7kg1/dev)  |
-| 系统部署      | 在客户指定的网络和硬件环境中完成社区版服务部署；提供**模拟**设备接入到平台中，并能完成正常设备上线、数据上下行 | 199元   | 线上部署支持   |
-| 技术支持      | 提供各类部署、功能使用中遇到的问题答疑  | 100元    | 半小时内 线上远程支持|
-| 设备接入协议开发  | 根据提供的设备型号，编写并提供接入平台协议包的源码。| 3000+元 | 定制化开发  |
-| 其他服务 | 企业版源码购买；定制化开发；定制化时长、功能服务等 | 面议     | 面议 |
+| 服务项      | 服务内容                                                      | 服务收费   | 服务方式                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+|----------|-----------------------------------------------------------|--------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 基础问题答疑   | 问题答疑                                                      | 免费     | 技术交流群支持 [![QQ⑤群554591908](https://img.shields.io/badge/QQ⑤群-554591908-brightgreen)](https://qm.qq.com/cgi-bin/qm/qr?k=jiirLiyFUecy_gsankzVQ-cl6SrZCnv9&&jump_from=webapi) [![QQ④群780133058](https://img.shields.io/badge/QQ④群-780133058-brightgreen)](https://qm.qq.com/cgi-bin/qm/qr?k=Gj47w9kg7TlV5ceD5Bqew_M_O0PIjh_l&jump_from=webapi) [![QQ③群647954464](https://img.shields.io/badge/QQ③群-647954464-brightgreen)](https://qm.qq.com/cgi-bin/qm/qr?k=K5m27CkhDn3B_Owr-g6rfiTBC5DKEY59&jump_from=webapi)  [![QQ②群324606263](https://img.shields.io/badge/QQ②群-324606263-brightgreen)](https://qm.qq.com/cgi-bin/qm/qr?k=IMas2cH-TNsYxUcY8lRbsXqPnA2sGHYQ&jump_from=webapi) [![QQ①群2021514](https://img.shields.io/badge/QQ①群-2021514-brightgreen)](https://qm.qq.com/cgi-bin/qm/qr?k=LGf0OPQqvLGdJIZST3VTcypdVWhdfAOG&jump_from=webapi) |
+| 系统部署     | 系统部署                                                      | 免费     | 文档自助。[源码部署](https://hanta.yuque.com/px7kg1/yfac2l/vvoa3u2ztymtp4oh) [Docker部署](https://hanta.yuque.com/px7kg1/yfac2l/mzq23z4iey5ev1a5)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| 产品使用     | 教学产品各功能使用                                                 | 免费     | 文档自助。[产品文档](https://hanta.yuque.com/px7kg1/yfac2l)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
+| 二次开发     | 教学平台源码开发过程、工具使用等；                                         | 免费     | 文档自助。[开发文档](https://hanta.yuque.com/px7kg1/dev)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
+| 系统部署     | 在客户指定的网络和硬件环境中完成社区版服务部署；提供**模拟**设备接入到平台中，并能完成正常设备上线、数据上下行 | 199元   | 线上部署支持                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| 技术支持     | 提供各类部署、功能使用中遇到的问题答疑                                       | 100元   | 半小时内 线上远程支持                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
+| 设备接入协议开发 | 根据提供的设备型号，编写并提供接入平台协议包的源码。                                | 3000+元 | 定制化开发                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+| 其他服务     | 企业版源码购买；定制化开发；定制化时长、功能服务等                                 | 面议     | 面议                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |

 ### **付费**服务支持或商务合作请联系

@ -113,7 +120,6 @@ TCP/UDP/MQTT/HTTP、TLS/DTLS、不同厂商、不同设备、不同报文、统

 ## 文档

-
 [产品文档](https://hanta.yuque.com/px7kg1/yfac2l)
 [快速开始](https://hanta.yuque.com/px7kg1/yfac2l/raspyc4p1asfuxks)
 [开发文档](https://hanta.yuque.com/px7kg1/nn1gdr)
--- a/docker/dev-env/docker-compose.yml
+++ b/docker/dev-env/docker-compose.yml
@ -1,50 +1,24 @@
 version: '2'
 services:
-  redis:
-    image: redis:5.0.4
-    container_name: jetlinks-ce-redis
-    ports:
-      - "6379:6379"
-    volumes:
-      - "./data/redis:/data"
-    command: redis-server --appendonly yes
-    environment:
-      - TZ=Asia/Shanghai
-  elasticsearch:
-    image: elasticsearch:6.8.11
-    container_name: jetlinks-ce-elasticsearch
-    environment:
-      ES_JAVA_OPTS: -Djava.net.preferIPv4Stack=true -Xms1g -Xmx1g
-      transport.host: 0.0.0.0
-      discovery.type: single-node
-      bootstrap.memory_lock: "true"
-      discovery.zen.minimum_master_nodes: 1
-      discovery.zen.ping.unicast.hosts: elasticsearch
-    ports:
-      - "9200:9200"
-      - "9300:9300"
-  kibana:
-    image: kibana:6.8.11
-    container_name: jetlinks-ce-kibana
-    environment:
-      ELASTICSEARCH_URL: http://elasticsearch:9200
-    links:
-      - elasticsearch:elasticsearch
-    ports:
-      - "5601:5601"
-    depends_on:
-      - elasticsearch
-  postgres:
-    image: postgres:11-alpine
-    container_name: jetlinks-ce-postgres
-    ports:
-      - "5432:5432"
-    volumes:
-      - "./data/pg:/var/lib/postgresql/data"
-    environment:
-      POSTGRES_PASSWORD: jetlinks
-      POSTGRES_DB: jetlinks
-      TZ: Asia/Shanghai
-volumes:
-  postgres-volume:
-  redis-volume:
+    redis:
+        image: redis:6
+        container_name: jetlinks-ce-redis
+        ports:
+            - "6379:6379"
+        volumes:
+            - "./data/redis:/data"
+        command: redis-server --appendonly yes
+        environment:
+            - TZ=Asia/Shanghai
+    postgres:
+        image: timescale/timescaledb:latest-pg16
+        container_name: jetlinks-postgres-16
+        ports:
+            - "5432:5432"
+        volumes:
+            - "./data/postgres:/var/lib/postgresql/data"
+        environment:
+            POSTGRES_PASSWORD: jetlinks
+            POSTGRES_DB: jetlinks
+            POSTGRES_HOST_AUTH_METHOD: trust
+            TZ: Asia/Shanghai
--- a/docker/run-all/.gitignore
+++ b/docker/run-all/.gitignore
@ -0,0 +1 @@
+data
--- a/docker/run-all/docker-compose.yml
+++ b/docker/run-all/docker-compose.yml
@ -1,116 +1,92 @@
-version: '2'
+version: '3'
 services:
-  redis:
-    image: redis:5.0.4
-    container_name: jetlinks-ce-redis
-    #    ports:
-    #      - "6379:6379"
-    volumes:
-      - "./data/redis:/data"
-    command: redis-server --appendonly yes --requirepass "JetLinks@redis"
-    environment:
-      - TZ=Asia/Shanghai
-  elasticsearch:
-    image: elasticsearch:6.8.11
-    container_name: jetlinks-ce-elasticsearch
-    environment:
-      ES_JAVA_OPTS: -Djava.net.preferIPv4Stack=true -Xms1g -Xmx1g
-      transport.host: 0.0.0.0
-      discovery.type: single-node
-      bootstrap.memory_lock: "true"
-      discovery.zen.minimum_master_nodes: 1
-      discovery.zen.ping.unicast.hosts: elasticsearch
-  #  volumes:
-  #    - ./data/elasticsearch:/usr/share/elasticsearch/data
-  #    ports:
-  #      - "9200:9200"
-  #      - "9300:9300"
-  kibana:
-    image: kibana:6.8.11
-    container_name: jetlinks-ce-kibana
-    environment:
-      ELASTICSEARCH_URL: http://elasticsearch:9200
-    links:
-      - elasticsearch:elasticsearch
-    ports:
-      - "5601:5601"
-    depends_on:
-      - elasticsearch
-  postgres:
-    image: postgres:11-alpine
-    container_name: jetlinks-ce-postgres
-    volumes:
-      - "./data/postgres:/var/lib/postgresql/data"
-    ports:
-      - "5432:5432"
-    environment:
-      POSTGRES_PASSWORD: jetlinks
-      POSTGRES_DB: jetlinks
-      TZ: Asia/Shanghai
-  ui:
-    image: registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.3.0-SNAPSHOT
-    container_name: jetlinks-ce-ui
-    ports:
-      - 9000:80
-    environment:
-      - "API_BASE_PATH=http://jetlinks:8848/" #API根路径
-    volumes:
-      - "./data/jetlinks-ui:/usr/share/nginx/html/upload"
-    links:
-      - jetlinks:jetlinks
-  jetlinks:
-    image: registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-community:2.3.0-SNAPSHOT
-    container_name: jetlinks-ce
+    redis:
+        image: redis:6
+        container_name: jetlinks-ce-redis
+        #    ports:
+        #      - "6379:6379" # 仅供jetlinks-ce访问
+        volumes:
+            - "./data/redis:/data"
+        command: redis-server --appendonly yes --requirepass "JetLinks@redis"
+        environment:
+            - TZ=Asia/Shanghai
+        healthcheck:
+            test: [ "CMD", "redis-cli", "-h", "localhost", "-p", "6379", "-a", "JetLinks@redis", "ping" ]
+            interval: 10s
+            timeout: 5s
+            retries: 3
+    postgres:
+        image: timescale/timescaledb:latest-pg16
+        container_name: jetlinks-ce-postgres
+        #        ports:
+        #            - "5432:5432"  # 仅供jetlinks-ce访问
+        volumes:
+            - "./data/postgres:/var/lib/postgresql/data"
+        environment:
+            POSTGRES_PASSWORD: JetLinks@postgres
+            POSTGRES_DB: jetlinks
+            POSTGRES_HOST_AUTH_METHOD: trust
+            TZ: Asia/Shanghai
+        healthcheck:
+            test: [ "CMD", "pg_isready", "-U", "postgres" ]
+            interval: 10s
+            timeout: 5s
+            retries: 5
+    jetlinks:
+        image: registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-community:2.11.0-SNAPSHOT
+        container_name: jetlinks-ce
+        ports:
+            - "8848:8848" # 平台访问端口
+            - "1883-1890:1883-1890" # 预留
+            - "8800-8810:8800-8810" # 预留
+            - "5060-5061:5060-5061" # 预留
+        volumes:
+            - "./data/jetlinks:/application/data"
+        environment:
+            - "JAVA_OPTS=-Duser.language=zh"
+            - "TZ=Asia/Shanghai"
+            - "EXTERNAL_HOST=local-host.cn" # 对外提供访问的域名或者ip地址
+            - "EXTERNAL_PORT=8848" # 对外提供访问的端口,修改了端口映射同时也需要修改这里.
+            - "ADMIN_USER_PASSWORD=JetLinks.C0mmVn1ty" # admin用户的初始密码
+            - "spring.r2dbc.url=r2dbc:postgresql://postgres:5432/jetlinks" #数据库连接地址
+            - "spring.r2dbc.username=postgres"
+            - "spring.r2dbc.password=JetLinks@postgres"
+            - "spring.data.redis.host=redis"
+            - "spring.data.redis.port=6379"
+            - "file.manager.storage-base-path=/application/data/files"
+            - "spring.data.redis.password=JetLinks@redis"
+            - "logging.level.io.r2dbc=warn"
+            - "logging.level.org.springframework.data=warn"
+            - "logging.level.org.springframework=warn"
+            - "logging.level.org.jetlinks=warn"
+            - "logging.level.org.hswebframework=warn"
+            - "logging.level.org.springframework.data.r2dbc.connectionfactory=warn"
+            - "network.resources[0]=0.0.0.0:8800-8810/tcp"
+            - "network.resources[1]=0.0.0.0:1883-1890"
+            - "hsweb.cors.enable=true"
+            - "hsweb.cors.configs[0].path=/**"
+            - "hsweb.cors.configs[0].allowed-credentials=true"
+            - "hsweb.cors.configs[0].allowed-headers=*"
+            - "hsweb.cors.configs[0].allowed-origins=*"
+            - "hsweb.cors.configs[0].allowed-methods[0]=GET"
+            - "hsweb.cors.configs[0].allowed-methods[1]=POST"
+            - "hsweb.cors.configs[0].allowed-methods[2]=PUT"
+            - "hsweb.cors.configs[0].allowed-methods[3]=PATCH"
+            - "hsweb.cors.configs[0].allowed-methods[4]=DELETE"
+            - "hsweb.cors.configs[0].allowed-methods[5]=OPTIONS"
+        links:
+            - redis:redis
+            - postgres:postgres
+        depends_on:
+            postgres:
+                condition: service_healthy
+            redis:
+                condition: service_healthy
+#    ui:  # 如果通过访问内嵌的前端存在问题,可以使用这个镜像
+#        image: registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.11.0
+#        ports:
+#            - "9000:9000"
+#        environment:
+#            API_BASE_PATH: "http://jetlinks:8848/"
+#            TZ: Asia/Shanghai

-    ports:
-      - "8848:8848" # API端口
-      - "1883-1890:1883-1890" # 预留
-      - "8800-8810:8800-8810" # 预留
-      - "5060-5061:5060-5061" # 预留
-    volumes:
-      - "./data/jetlinks/upload:/application/static/upload"
-      - "./data/jetlinks:/application/data"
-    #entrypoint: /entrypoint.sh -d redis:5601,postgres:5432,elasticsearch:9200 'echo "start jetlinks service here"';
-    environment:
-     # - "SLEEP_SECOND=4"
-      - "JAVA_OPTS=-Duser.language=zh -XX:+UseG1GC"
-      - "TZ=Asia/Shanghai"
-      - "hsweb.file.upload.static-location=http://127.0.0.1:8848/upload"  #上传的静态文件访问根地址,为ui的地址.
-      - "spring.r2dbc.url=r2dbc:postgresql://postgres:5432/jetlinks" #数据库连接地址
-      - "spring.r2dbc.username=postgres"
-      - "spring.r2dbc.password=jetlinks"
-      - "spring.elasticsearch.uris=elasticsearch:9200"
-      #        - "spring.elasticsearch.username=admin"
-      #        - "spring.elasticsearch.password=admin"
-      #        - "spring.reactor.debug-agent.enabled=false" #设置为false能提升性能
-      - "spring.redis.host=redis"
-      - "spring.redis.port=6379"
-      - "file.manager.storage-base-path=/application/data/files"
-      - "spring.redis.password=JetLinks@redis"
-      - "logging.level.io.r2dbc=warn"
-      - "logging.level.org.springframework.data=warn"
-      - "logging.level.org.springframework=warn"
-      - "logging.level.org.jetlinks=warn"
-      - "logging.level.org.hswebframework=warn"
-      - "logging.level.org.springframework.data.r2dbc.connectionfactory=warn"
-      - "network.resources[0]=0.0.0.0:8800-8810/tcp"
-      - "network.resources[1]=0.0.0.0:1883-1890"
-      - "hsweb.cors.enable=true"
-      - "hsweb.cors.configs[0].path=/**"
-      - "hsweb.cors.configs[0].allowed-credentials=true"
-      - "hsweb.cors.configs[0].allowed-headers=*"
-      - "hsweb.cors.configs[0].allowed-origins=*"
-      - "hsweb.cors.configs[0].allowed-methods[0]=GET"
-      - "hsweb.cors.configs[0].allowed-methods[1]=POST"
-      - "hsweb.cors.configs[0].allowed-methods[2]=PUT"
-      - "hsweb.cors.configs[0].allowed-methods[3]=PATCH"
-      - "hsweb.cors.configs[0].allowed-methods[4]=DELETE"
-      - "hsweb.cors.configs[0].allowed-methods[5]=OPTIONS"
-    links:
-      - redis:redis
-      - postgres:postgres
-      - elasticsearch:elasticsearch
-    depends_on:
-      - postgres
-      - redis
-      - elasticsearch
--- a/jetlinks-components/common-component/pom.xml
+++ b/jetlinks-components/common-component/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>jetlinks-components</artifactId>
        <groupId>org.jetlinks.community</groupId>
-        <version>2.3.0-SNAPSHOT</version>
+        <version>2.11.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@ -80,9 +80,12 @@
        <dependency>
            <groupId>com.cronutils</groupId>
            <artifactId>cron-utils</artifactId>
-            <version>9.2.0</version>
            <scope>compile</scope>
            <exclusions>
+                <exclusion>
+                    <groupId>org.glassfish</groupId>
+                    <artifactId>jakarta.el</artifactId>
+                </exclusion>
                <exclusion>
                    <groupId>org.glassfish</groupId>
                    <artifactId>javax.el</artifactId>
@ -95,5 +98,11 @@
            <artifactId>spring-data-redis</artifactId>
            <optional>true</optional>
        </dependency>
+
+        <dependency>
+            <groupId>org.glassfish.expressly</groupId>
+            <artifactId>expressly</artifactId>
+        </dependency>
+
    </dependencies>
 </project>
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/ConfigMetadataConstants.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/ConfigMetadataConstants.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community;

 import org.jetlinks.core.config.ConfigKey;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/DynamicOperationType.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/DynamicOperationType.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community;

 import lombok.AllArgsConstructor;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/Interval.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/Interval.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community;

 import com.alibaba.fastjson.annotation.JSONType;
@ -37,6 +52,23 @@ public class Interval {

    private String expression;

+    public Interval(String expr) {
+        char[] chars = expr.toCharArray();
+        int numIndex = 0;
+        for (char c : expr.toCharArray()) {
+            if (c == '-' || c == '.' || (c >= '0' && c <= '9')) {
+                numIndex++;
+            } else {
+                BigDecimal val = new BigDecimal(chars, 0, numIndex);
+                this.expression = expr.substring(numIndex);
+                this.number = val;
+            }
+        }
+        if (this.expression == null) {
+            throw new IllegalArgumentException("can not parse interval expression:" + expr);
+        }
+    }
+
    @Override
    public String toString() {
        return (number) + expression;
@ -52,6 +84,11 @@ public class Interval {
        return of(days, Interval.days);
    }

+    @Generated
+    public static Interval ofWeeks(int weeks) {
+        return of(weeks, Interval.weeks);
+    }
+
    @Generated
    public static Interval ofHours(int hours) {
        return of(hours, Interval.hours);
@ -73,20 +110,7 @@ public class Interval {
    }

    public static Interval of(String expr) {
-
-        char[] chars = expr.toCharArray();
-        int numIndex = 0;
-        for (char c : expr.toCharArray()) {
-            if (c == '-' || c == '.' || (c >= '0' && c <= '9')) {
-                numIndex++;
-            } else {
-                BigDecimal val = new BigDecimal(chars, 0, numIndex);
-                return new Interval(val, expr.substring(numIndex));
-            }
-
-        }
-
-        throw new IllegalArgumentException("can not parse interval expression:" + expr);
+        return new Interval(expr);
    }

    public String getDefaultFormat() {
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/IntervalUnit.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/IntervalUnit.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community;

 import lombok.AllArgsConstructor;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/JvmErrorException.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/JvmErrorException.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community;

 import org.hswebframework.web.exception.I18nSupportException;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/Operation.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/Operation.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community;

 import lombok.AllArgsConstructor;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/OperationSource.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/OperationSource.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community;

 import lombok.AllArgsConstructor;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/OperationType.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/OperationType.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community;

 public interface OperationType {
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/PropertyConstants.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/PropertyConstants.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community;

 import lombok.Generated;
@ -38,13 +53,6 @@ public interface PropertyConstants {
     */
    Key<List<Map<String, Object>>> relations = Key.of("relations");

-    /**
-     * 租户ID
-     *
-     * @see org.jetlinks.pro.tenant.TenantMember
-     */
-    Key<List<String>> tenantId = Key.of("tenantId");
-
    //分组ID
    Key<List<String>> groupId = Key.of("groupId");

@ -71,7 +79,7 @@ public interface PropertyConstants {
    /**
     * 设备接入方式
     *
-     * @see org.jetlinks.pro.gateway.supports.DeviceGatewayProvider#getId
+     * @see org.jetlinks.community.gateway.supports.DeviceGatewayProvider#getId
     */
    Key<String> accessProvider = Key.of("accessProvider");

--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/PropertyMetadataConstants.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/PropertyMetadataConstants.java
@ -1,6 +1,22 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community;

 import org.jetlinks.community.utils.ConverterUtils;
+import org.jetlinks.core.config.ConfigKey;
 import org.jetlinks.core.message.DeviceMessage;
 import org.jetlinks.core.message.HeaderKey;
 import org.jetlinks.core.metadata.PropertyMetadata;
@ -56,38 +72,34 @@ public interface PropertyMetadataConstants {
     * 属性读写模式
     */
    interface AccessMode {
-        String id = "accessMode";
+        String id = "type";

        //读
-        String read = "r";
+        String read = "read";
        //写
-        String write = "w";
+        String write = "write";
        //上报
-        String report = "u";
+        String report = "report";

        static boolean isRead(PropertyMetadata property) {
            return property
                .getExpand(id)
                .map(val -> val.toString().contains(read))
-                .orElse(true);
+                .orElse(false);
        }

        static boolean isWrite(PropertyMetadata property) {
            return property
                .getExpand(id)
                .map(val -> val.toString().contains(write))
-                .orElseGet(() -> property
-                    .getExpand("readOnly")
-                    .map(readOnly -> !CastUtils.castBoolean(readOnly))
-                    .orElse(true)
-                );
+                .orElse(false);
        }

        static boolean isReport(PropertyMetadata property) {
            return property
                .getExpand(id)
                .map(val -> val.toString().contains(report))
-                .orElse(true);
+                .orElse(false);
        }
    }

@ -95,7 +107,7 @@ public interface PropertyMetadataConstants {
        String id = "metrics";


-        static Map<String,Object> metricsToExpands(List<PropertyMetric> metrics) {
+        static Map<String, Object> metricsToExpands(List<PropertyMetric> metrics) {
            return Collections.singletonMap(id, metrics);
        }

@ -111,7 +123,7 @@ public interface PropertyMetadataConstants {
                .getExpand(id)
                .map(obj -> {
                    for (PropertyMetric propertyMetric : ConverterUtils.convertToList(obj, PropertyMetric::of)) {
-                        if(Objects.equals(metric, propertyMetric.getId())){
+                        if (Objects.equals(metric, propertyMetric.getId())) {
                            return propertyMetric;
                        }
                    }
@ -120,4 +132,22 @@ public interface PropertyMetadataConstants {
        }

    }
+
+    interface Group {
+        ConfigKey<String> id = ConfigKey.of("groupId", "分组ID", String.class);
+        ConfigKey<String> name = ConfigKey.of("groupName", "分组名称", String.class);
+
+
+        static String getId(PropertyMetadata metadata) {
+            return metadata
+                .getExpand(id)
+                .orElse("");
+        }
+
+        static String getName(PropertyMetadata metadata) {
+            return metadata
+                .getExpand(name)
+                .orElse("");
+        }
+    }
 }
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/PropertyMetric.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/PropertyMetric.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community;

 import io.swagger.v3.oas.annotations.media.Schema;
@ -6,7 +21,7 @@ import org.hswebframework.web.bean.FastBeanCopier;
 import org.jetlinks.community.utils.ConverterUtils;
 import org.springframework.util.StringUtils;

-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import java.util.Map;
 import java.util.function.Function;

--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/TimerIterable.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/TimerIterable.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community;

 import java.time.ZonedDateTime;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/TimerSpec.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/TimerSpec.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community;

 import com.cronutils.builder.CronBuilder;
@ -28,8 +43,8 @@ import reactor.core.scheduler.Scheduler;
 import reactor.core.scheduler.Schedulers;

 import javax.annotation.Nonnull;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.time.*;
 import java.time.temporal.ChronoUnit;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/ValueObject.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/ValueObject.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community;

 import org.hswebframework.web.bean.FastBeanCopier;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/Version.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/Version.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community;

 import lombok.Getter;
@ -8,6 +23,6 @@ public class Version {

    private final String edition = "community";

-    private final String version = "2.2.0-SNAPSHOT";
+    private final String version = "2.11.0-SNAPSHOT";

 }
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/annotation/command/CommandService.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/annotation/command/CommandService.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.annotation.command;


--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/authorize/AuthenticationSpec.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/authorize/AuthenticationSpec.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.authorize;

 import lombok.Getter;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/authorize/FastSerializableAuthentication.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/authorize/FastSerializableAuthentication.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.authorize;

 import com.alibaba.fastjson.JSON;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/authorize/OrgDimensionType.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/authorize/OrgDimensionType.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.authorize;

 import lombok.AllArgsConstructor;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/AbstractBufferEviction.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/AbstractBufferEviction.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.buffer;

 import org.jetlinks.community.Operation;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/BufferEviction.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/BufferEviction.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.buffer;

 import org.springframework.util.unit.DataSize;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/BufferEvictionSpec.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/BufferEvictionSpec.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.buffer;

 import lombok.Getter;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/BufferProperties.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/BufferProperties.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.buffer;

 import lombok.Getter;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/BufferSettings.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/BufferSettings.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.buffer;

 import lombok.AllArgsConstructor;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/Buffered.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/Buffered.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.buffer;

 /**
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/ConsumeStrategy.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/ConsumeStrategy.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.buffer;

 public enum ConsumeStrategy {
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/DiskFreeEviction.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/DiskFreeEviction.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.buffer;


--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/DiskUsageEviction.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/DiskUsageEviction.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.buffer;


--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/EvictionContext.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/EvictionContext.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.buffer;

 /**
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/MemoryUsage.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/MemoryUsage.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.buffer;

 public interface MemoryUsage {
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/PersistenceBuffer.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/PersistenceBuffer.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.buffer;

 import com.google.common.collect.Collections2;
@ -370,6 +385,9 @@ public class PersistenceBuffer<T extends Serializable> implements EvictionContex
        return Mono
            .fromRunnable(() -> write(data))
            .subscribeOn(writer)
+            // 切换到parallel线程池,避免浪费writer线程性能。
+            // 但是线程切换本身也是消耗。
+            .publishOn(Schedulers.parallel())
            .then();
    }

@ -381,6 +399,7 @@ public class PersistenceBuffer<T extends Serializable> implements EvictionContex
        return Mono
            .fromRunnable(() -> data.forEach(this::write))
            .subscribeOn(writer)
+            .publishOn(Schedulers.parallel())
            .then();
    }

--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/SizeLimitEviction.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/SizeLimitEviction.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.buffer;

 import lombok.AllArgsConstructor;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/codec/ObjectSerializer.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/codec/ObjectSerializer.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.codec;

 import java.io.InputStream;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/codec/Serializers.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/codec/Serializers.java
@ -1,10 +1,31 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.codec;

+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufInputStream;
+import io.netty.buffer.Unpooled;
 import io.netty.util.concurrent.FastThreadLocal;
 import lombok.SneakyThrows;
+import org.jetlinks.core.utils.SerializeUtils;
 import org.nustaq.serialization.FSTConfiguration;

 import java.io.*;
+import java.util.Base64;
+import java.util.function.Supplier;

 public class Serializers {

@ -67,5 +88,72 @@ public class Serializers {
        return DEFAULT;
    }

+    public static String serializeToBase64(Object source) {
+        return Base64.getEncoder().encodeToString(serialize(source));
+    }
+
+    public static Object deserializeFromBase64(String base64) {
+        return deserialize(Base64.getDecoder().decode(base64));
+    }
+
+
+
+    @SuppressWarnings("all")
+    private static final FastThreadLocal<ByteArrayOutputStream>
+        SHARED_STREAM = new FastThreadLocal<ByteArrayOutputStream>() {
+        @Override
+        protected ByteArrayOutputStream initialValue() {
+            return new ByteArrayOutputStream();
+        }
+    };
+
+    @SneakyThrows
+    public static ByteBuf serializeExternal(Externalizable source) {
+        ByteArrayOutputStream outputStream = SHARED_STREAM.get();
+        if (outputStream.size() != 0) {
+            outputStream = new ByteArrayOutputStream();
+        }
+        try (ObjectOutput output = getDefault().createOutput(outputStream)) {
+            source.writeExternal(output);
+            output.flush();
+            return Unpooled.wrappedBuffer(outputStream.toByteArray());
+        } finally {
+            outputStream.reset();
+        }
+    }
+
+    @SneakyThrows
+    public static <T extends Externalizable> T deserializeExternal(ByteBuf buffer, Supplier<T> instance) {
+        try (ObjectInput input = getDefault().createInput(new ByteBufInputStream(buffer, true))) {
+            T data = instance.get();
+            data.readExternal(input);
+            return data;
+        }
+    }
+
+
+    @SneakyThrows
+    public static byte[] serialize(Object source) {
+        ByteArrayOutputStream outputStream = SHARED_STREAM.get();
+        if (outputStream.size() != 0) {
+            outputStream = new ByteArrayOutputStream();
+        }
+        try (ObjectOutput output = getDefault().createOutput(outputStream)) {
+            SerializeUtils.writeObject(source, output);
+            output.flush();
+            return outputStream.toByteArray();
+        } finally {
+            outputStream.reset();
+        }
+
+    }
+
+    @SneakyThrows
+    public static Object deserialize(byte[] data) {
+        ByteArrayInputStream stream = new ByteArrayInputStream(data);
+        try (ObjectInput input = getDefault().createInput(stream)) {
+            return SerializeUtils.readObject(input);
+        }
+    }

 }
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/CommandSupportManagerProvider.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/CommandSupportManagerProvider.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.command;

 import lombok.AllArgsConstructor;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/CommandSupportManagerProviders.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/CommandSupportManagerProviders.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.command;

 import org.jetlinks.core.command.CommandSupport;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/CompositeCommandSupportManagerProvider.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/CompositeCommandSupportManagerProvider.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.command;

 import lombok.AllArgsConstructor;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/CrudCommandSupport.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/CrudCommandSupport.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.command;

 import lombok.SneakyThrows;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/InternalSdkServices.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/InternalSdkServices.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.command;

 /**
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/StaticCommandSupportManagerProvider.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/StaticCommandSupportManagerProvider.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.command;

 import io.swagger.v3.oas.annotations.media.Schema;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/crud/CrudCommandHandler.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/crud/CrudCommandHandler.java
@ -0,0 +1,25 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetlinks.community.command.crud;
+
+import org.hswebframework.web.crud.service.ReactiveCrudService;
+
+public interface CrudCommandHandler<T, PK>
+    extends QueryCommandHandler<T, PK>, SaveCommandHandler<T, PK>, DeleteCommandHandler<T, PK> {
+
+    @Override
+    ReactiveCrudService<T, PK> getService();
+}
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/crud/DeleteCommandHandler.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/crud/DeleteCommandHandler.java
@ -0,0 +1,48 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetlinks.community.command.crud;
+
+import com.google.common.collect.Collections2;
+import org.hswebframework.web.authorization.annotation.SaveAction;
+import org.hswebframework.web.crud.service.ReactiveCrudService;
+import org.jetlinks.core.annotation.command.CommandHandler;
+import org.jetlinks.sdk.server.commons.cmd.DeleteByIdCommand;
+import org.jetlinks.sdk.server.commons.cmd.DeleteCommand;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+public interface DeleteCommandHandler<T, PK> {
+
+    ReactiveCrudService<T, PK> getService();
+
+    @CommandHandler
+    @SaveAction
+    default Mono<Integer> deleteById(DeleteByIdCommand<Integer> command) {
+        return getService()
+            .deleteById(Flux.fromIterable(
+                Collections2
+                    .transform(command.getIdList(),
+                               v -> (PK) v)));
+    }
+
+    @CommandHandler
+    @SaveAction
+    default Mono<Integer> delete(DeleteCommand command) {
+        return command
+            .applyDelete(getService().createDelete())
+            .execute();
+    }
+}
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/crud/QueryCommandHandler.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/crud/QueryCommandHandler.java
@ -0,0 +1,61 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetlinks.community.command.crud;
+
+import com.google.common.collect.Collections2;
+import org.hswebframework.web.api.crud.entity.PagerResult;
+import org.hswebframework.web.authorization.annotation.QueryAction;
+import org.hswebframework.web.crud.service.ReactiveCrudService;
+import org.jetlinks.core.annotation.command.CommandHandler;
+import org.jetlinks.sdk.server.commons.cmd.CountCommand;
+import org.jetlinks.sdk.server.commons.cmd.QueryByIdCommand;
+import org.jetlinks.sdk.server.commons.cmd.QueryListCommand;
+import org.jetlinks.sdk.server.commons.cmd.QueryPagerCommand;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+public interface QueryCommandHandler<T, PK> {
+
+    ReactiveCrudService<T, PK> getService();
+
+    @CommandHandler
+    @QueryAction
+    default Flux<T> queryById(QueryByIdCommand<T> command) {
+        return getService()
+            .findById(
+                Collections2.transform(command.getIdList(),
+                                       v -> (PK) v)
+            );
+    }
+
+    @CommandHandler
+    @QueryAction
+    default Flux<T> queryList(QueryListCommand<T> command) {
+        return getService().query(command.asQueryParam());
+    }
+
+    @CommandHandler
+    @QueryAction
+    default Mono<PagerResult<T>> queryPager(QueryPagerCommand<T> command) {
+        return getService().queryPager(command.asQueryParam());
+    }
+
+    @CommandHandler
+    @QueryAction
+    default Mono<Integer> count(CountCommand command) {
+        return getService().count(command.asQueryParam());
+    }
+}
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/crud/SaveCommandHandler.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/crud/SaveCommandHandler.java
@ -0,0 +1,64 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetlinks.community.command.crud;
+
+import org.hswebframework.web.authorization.annotation.SaveAction;
+import org.hswebframework.web.bean.FastBeanCopier;
+import org.hswebframework.web.crud.service.ReactiveCrudService;
+import org.jetlinks.core.annotation.command.CommandHandler;
+import org.jetlinks.sdk.server.commons.cmd.AddCommand;
+import org.jetlinks.sdk.server.commons.cmd.SaveCommand;
+import org.jetlinks.sdk.server.commons.cmd.UpdateCommand;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.util.List;
+
+public interface SaveCommandHandler<T, PK> {
+
+    ReactiveCrudService<T, PK> getService();
+
+    default T convertData(Object data) {
+        return FastBeanCopier.copy(data, getService().getRepository().newInstanceNow());
+    }
+
+    @CommandHandler
+    @SaveAction
+    default Flux<T> save(SaveCommand<T> command) {
+        List<T> data = command.dataList(this::convertData);
+        return getService()
+            .save(data)
+            .thenMany(Flux.fromIterable(data));
+    }
+
+    @CommandHandler
+    @SaveAction
+    default Flux<T> add(AddCommand<T> command) {
+        List<T> data = command.dataList(this::convertData);
+        return getService()
+            .save(data)
+            .thenMany(Flux.fromIterable(data));
+    }
+
+    @CommandHandler
+    @SaveAction
+    default Mono<Integer> update(UpdateCommand<T> command) {
+        return command
+            .applyUpdate(getService().createUpdate(),
+                         this::convertData)
+            .execute();
+    }
+}
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/register/CommandServiceEndpointRegister.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/register/CommandServiceEndpointRegister.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.command.register;

 import lombok.extern.slf4j.Slf4j;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/register/SpringBeanCommandSupportProvider.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/register/SpringBeanCommandSupportProvider.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.command.register;

 import com.google.common.collect.Lists;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/rule/RelievedAlarmCommand.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/rule/RelievedAlarmCommand.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.command.rule;

 import io.swagger.v3.oas.annotations.media.Schema;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/rule/RuleCommandServices.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/rule/RuleCommandServices.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.command.rule;

 public interface RuleCommandServices {
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/rule/TriggerAlarmCommand.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/rule/TriggerAlarmCommand.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.command.rule;

 import io.swagger.v3.oas.annotations.media.Schema;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/rule/data/AlarmInfo.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/rule/data/AlarmInfo.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.command.rule.data;


--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/rule/data/AlarmResult.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/rule/data/AlarmResult.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.command.rule.data;

 import io.swagger.v3.oas.annotations.media.Schema;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/rule/data/RelieveInfo.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/rule/data/RelieveInfo.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.command.rule.data;

 import io.swagger.v3.oas.annotations.media.Schema;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/rule/data/RelieveResult.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/rule/data/RelieveResult.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.command.rule.data;

 import io.swagger.v3.oas.annotations.media.Schema;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/ConfigManager.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/ConfigManager.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.config;

 import org.jetlinks.community.ValueObject;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/ConfigPropertyDef.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/ConfigPropertyDef.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.config;

 import io.swagger.v3.oas.annotations.media.Schema;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/ConfigScope.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/ConfigScope.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.config;

 import io.swagger.v3.oas.annotations.media.Schema;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/ConfigScopeCustomizer.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/ConfigScopeCustomizer.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.config;

 /**
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/ConfigScopeManager.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/ConfigScopeManager.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.config;

 import java.util.List;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/ConfigScopeProperties.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/ConfigScopeProperties.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.config;

 import lombok.Getter;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/SimpleConfigManager.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/SimpleConfigManager.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.config;

 import lombok.AllArgsConstructor;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/entity/ConfigEntity.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/entity/ConfigEntity.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.config.entity;

 import io.swagger.v3.oas.annotations.media.Schema;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/verification/ConfigVerificationService.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/verification/ConfigVerificationService.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.config.verification;

 import io.swagger.v3.oas.annotations.Operation;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/web/SystemConfigManagerController.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/web/SystemConfigManagerController.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.config.web;

 import io.swagger.v3.oas.annotations.Operation;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/configuration/CommonConfiguration.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/configuration/CommonConfiguration.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.configuration;

 import com.alibaba.fastjson.JSON;
@ -13,6 +28,8 @@ import org.hswebframework.web.dict.EnumDict;
 import org.hswebframework.web.dict.defaults.DefaultItemDefine;
 import org.jetlinks.community.Interval;
 import org.jetlinks.community.JvmErrorException;
+import org.jetlinks.community.command.CommandSupportManagerProvider;
+import org.jetlinks.community.command.CommandSupportManagerProviders;
 import org.jetlinks.community.command.register.CommandServiceEndpointRegister;
 import org.jetlinks.community.config.ConfigManager;
 import org.jetlinks.community.config.ConfigScopeCustomizer;
@ -20,8 +37,11 @@ import org.jetlinks.community.config.ConfigScopeProperties;
 import org.jetlinks.community.config.SimpleConfigManager;
 import org.jetlinks.community.config.entity.ConfigEntity;
 import org.jetlinks.community.dictionary.DictionaryJsonDeserializer;
+import org.jetlinks.community.form.type.FieldTypeProvider;
 import org.jetlinks.community.reactorql.aggregation.InternalAggregationSupports;
 import org.jetlinks.community.reactorql.function.InternalFunctionSupport;
+import org.jetlinks.community.reactorql.term.TermTypeSupport;
+import org.jetlinks.community.reactorql.term.TermTypes;
 import org.jetlinks.community.reference.DataReferenceManager;
 import org.jetlinks.community.reference.DataReferenceProvider;
 import org.jetlinks.community.reference.DefaultDataReferenceManager;
@ -45,6 +65,7 @@ import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.core.ReactiveRedisOperations;
@ -185,15 +206,20 @@ public class CommonConfiguration {
    }

    @Bean
-    public BeanPostProcessor globalReactorQlFeatureRegister() {
-        return new BeanPostProcessor() {
-            @Override
-            public Object postProcessAfterInitialization(@Nonnull Object bean, @Nonnull String beanName) throws BeansException {
-                if (bean instanceof Feature) {
-                    DefaultReactorQLMetadata.addGlobal(((Feature) bean));
-                }
-                return bean;
-            }
+    public ApplicationContextAware staticBeanRegister() {
+
+        return ctx -> {
+            ctx.getBeanProvider(Feature.class)
+               .forEach(DefaultReactorQLMetadata::addGlobal);
+
+            ctx.getBeanProvider(CommandSupportManagerProvider.class)
+               .forEach(CommandSupportManagerProviders::register);
+
+            ctx.getBeanProvider(TermTypeSupport.class)
+               .forEach(TermTypes::register);
+
+            ctx.getBeanProvider(FieldTypeProvider.class)
+               .forEach(provider -> FieldTypeProvider.supports.register(provider.getProvider(), provider));
        };
    }

--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/configuration/DataTypeJSONDeserializer.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/configuration/DataTypeJSONDeserializer.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.configuration;

 import com.fasterxml.jackson.core.JsonParser;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/configuration/SmartDateDeserializer.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/configuration/SmartDateDeserializer.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.configuration;

 import com.fasterxml.jackson.core.JsonParser;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/configuration/UiResourceConfiguration.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/configuration/UiResourceConfiguration.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.configuration;

 import org.jetlinks.community.resource.ui.UiMenuResourceProvider;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/DatabaseDictionaryManager.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/DatabaseDictionaryManager.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.dictionary;

 import lombok.AllArgsConstructor;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/Dictionaries.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/Dictionaries.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.dictionary;

 import org.hswebframework.web.dict.EnumDict;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/Dictionary.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/Dictionary.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.dictionary;

 import org.hswebframework.ezorm.rdb.mapping.annotation.Codec;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/DictionaryColumnCustomizer.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/DictionaryColumnCustomizer.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.dictionary;

 import org.hswebframework.ezorm.rdb.metadata.RDBColumnMetadata;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/DictionaryConfiguration.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/DictionaryConfiguration.java
@ -1,5 +1,23 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.dictionary;

+import org.hswebframework.web.crud.events.EntityEventListenerCustomizer;
+import org.hswebframework.web.dictionary.entity.DictionaryEntity;
+import org.hswebframework.web.dictionary.entity.DictionaryItemEntity;
 import org.hswebframework.web.dictionary.service.DefaultDictionaryItemService;
 import org.hswebframework.web.dictionary.service.DefaultDictionaryService;
 import org.springframework.beans.factory.ObjectProvider;
@ -9,15 +27,22 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

-@Configuration
+@AutoConfiguration
 public class DictionaryConfiguration {


-    @Configuration
+    @AutoConfiguration
    @ConditionalOnClass(DefaultDictionaryItemService.class)
    //@ConditionalOnBean(DefaultDictionaryItemService.class)
    public static class DictionaryManagerConfiguration {

+        @Bean
+        public EntityEventListenerCustomizer dictionaryEntityEventListenerCustomizer() {
+            return configure -> {
+                configure.enable(DictionaryItemEntity.class);
+                configure.enable(DictionaryEntity.class);
+            };
+        }

        @Bean
        public DictionaryEventHandler dictionaryEventHandler(DefaultDictionaryItemService service) {
@ -44,5 +69,6 @@ public class DictionaryConfiguration {
                                                           DefaultDictionaryItemService itemService) {
            return new DictionaryInitManager(initInfo, defaultDictionaryService, itemService);
        }
+
    }
 }
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/DictionaryConstants.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/DictionaryConstants.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.dictionary;

 public interface DictionaryConstants {
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/DictionaryEventHandler.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/DictionaryEventHandler.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.dictionary;

 import lombok.AllArgsConstructor;
@ -7,16 +22,21 @@ import org.hswebframework.web.crud.events.*;
 import org.hswebframework.web.dictionary.entity.DictionaryEntity;
 import org.hswebframework.web.dictionary.entity.DictionaryItemEntity;
 import org.hswebframework.web.dictionary.service.DefaultDictionaryItemService;
+import org.hswebframework.web.dictionary.service.DefaultDictionaryService;
 import org.hswebframework.web.exception.BusinessException;
 import org.springframework.context.event.EventListener;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;

+import java.util.Collections;
+import java.util.List;
+
 /**
 * @author bestfeng
 */
@AllArgsConstructor
-public class DictionaryEventHandler implements EntityEventListenerCustomizer {
+public class DictionaryEventHandler {
+

    private final DefaultDictionaryItemService itemService;

@ -68,28 +88,23 @@ public class DictionaryEventHandler implements EntityEventListenerCustomizer {
        );
    }

-    @Override
-    public void customize(EntityEventListenerConfigure configure) {
-        configure.enable(DictionaryItemEntity.class);
-        configure.enable(DictionaryEntity.class);
-    }
-
    /**
     * 监听字典删除前事件，阻止删除分类标识为系统的字典
+     *
     * @param event 字典删除前事件
     */
    @EventListener
    public void handleDictionaryBeforeDelete(EntityBeforeDeleteEvent<DictionaryEntity> event) {
        event.async(
-                Flux.fromIterable(event.getEntity())
-                        .any(dictionary ->
-                                StringUtils.equals(dictionary.getClassified(), DictionaryConstants.CLASSIFIED_SYSTEM))
-                        .flatMap(any -> {
-                            if (any) {
-                                return Mono.error(() -> new BusinessException("error.system_dictionary_can_not_delete"));
-                            }
-                            return Mono.empty();
-                        })
+            Flux.fromIterable(event.getEntity())
+                .any(dictionary ->
+                         StringUtils.equals(dictionary.getClassified(), DictionaryConstants.CLASSIFIED_SYSTEM))
+                .flatMap(any -> {
+                    if (any) {
+                        return Mono.error(() -> new BusinessException("error.system_dictionary_can_not_delete"));
+                    }
+                    return Mono.empty();
+                })
        );
    }
 }
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/DictionaryInitInfo.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/DictionaryInitInfo.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.dictionary;

 import org.apache.commons.collections4.CollectionUtils;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/DictionaryInitManager.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/DictionaryInitManager.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.dictionary;

 import lombok.Getter;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/DictionaryJsonDeserializer.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/DictionaryJsonDeserializer.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.dictionary;

 import com.fasterxml.jackson.core.JacksonException;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/DictionaryManager.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/DictionaryManager.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.dictionary;

 import org.hswebframework.web.dict.EnumDict;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/doc/QueryConditionOnly.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/doc/QueryConditionOnly.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.doc;

 import io.swagger.v3.oas.annotations.media.Schema;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/event/OperationAssetProvider.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/event/OperationAssetProvider.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.event;

 import org.jetlinks.community.Operation;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/event/OperationAssetProviders.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/event/OperationAssetProviders.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.event;

 import lombok.extern.slf4j.Slf4j;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/event/SystemEvent.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/event/SystemEvent.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.event;

 import lombok.Getter;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/event/SystemEventDispatcher.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/event/SystemEventDispatcher.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.event;

 import lombok.AllArgsConstructor;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/event/SystemEventHandler.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/event/SystemEventHandler.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.event;

 import org.jetlinks.core.utils.StringBuilderUtils;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/event/SystemEventHandlerRegister.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/event/SystemEventHandlerRegister.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.event;

 import org.springframework.beans.factory.ObjectProvider;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/event/SystemEventHolder.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/event/SystemEventHolder.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.event;

 import lombok.extern.slf4j.Slf4j;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/form/type/EnumFieldType.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/form/type/EnumFieldType.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.form.type;

 import lombok.Getter;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/form/type/FieldType.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/form/type/FieldType.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.form.type;

 import org.hswebframework.ezorm.core.ValueCodec;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/form/type/FieldTypeProvider.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/form/type/FieldTypeProvider.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.form.type;

 import org.jetlinks.community.spi.Provider;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/form/type/FieldTypeSpec.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/form/type/FieldTypeSpec.java
@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.form.type;

 import lombok.Getter;
--- a/jetlinks-components/common-component/src/main/java/org/jetlinks/community/lock/DefaultReactiveLock.java
+++ b/jetlinks-components/common-component/src/main/java/org/jetlinks/community/lock/DefaultReactiveLock.java
@ -1,5 +1,24 @@
+/*
+ * Copyright 2025 JetLinks https://www.jetlinks.cn
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jetlinks.community.lock;

+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscription;
 import reactor.core.CoreSubscriber;
@ -19,6 +38,7 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 import java.util.function.Consumer;

+@Slf4j
 class DefaultReactiveLock implements ReactiveLock {
    @SuppressWarnings("all")
    static final AtomicReferenceFieldUpdater<DefaultReactiveLock, LockingSubscriber>
@ -27,8 +47,22 @@ class DefaultReactiveLock implements ReactiveLock {

    final Deque<LockingSubscriber<?>> queue = new ConcurrentLinkedDeque<>();

+    protected final LockName lockName;
+
    volatile LockingSubscriber<?> pending;

+    static final AtomicIntegerFieldUpdater<DefaultReactiveLock> WIP =
+        AtomicIntegerFieldUpdater.newUpdater(DefaultReactiveLock.class, "wip");
+
+    volatile int wip;
+
+    DefaultReactiveLock(String lockName) {
+        this.lockName = new LockName(lockName);
+    }
+
+    public boolean isEmpty() {
+        return queue.isEmpty();
+    }

    @Override
    public <T> Flux<T> lock(Flux<T> job) {
@ -61,28 +95,34 @@ class DefaultReactiveLock implements ReactiveLock {
    }

    protected void drain() {
-        if (PENDING.get(this) != null) {
+        if (WIP.getAndIncrement(this) != 0) {
            return;
        }

        LockingSubscriber<?> locking;

-        for (; ; ) {
-            locking = queue.pollFirst();
-            if (locking == null) {
-                return;
+        do {
+            for (; ; ) {
+                locking = queue.pollFirst();
+                if (locking == null) {
+                    break;
+                }
+                if (locking.isDisposed()) {
+                    continue;
+                }
+                if (PENDING.compareAndSet(this, null, locking)) {
+                    try {
+                        locking.subscribe();
+                    } catch (Throwable e) {
+                        PENDING.compareAndSet(this, locking, null);
+                        queue.addLast(locking);
+                    }
+                } else {
+                    queue.addLast(locking);
+                }
+                break;
            }
-            if (locking.isDisposed()) {
-                continue;
-            }
-            if (PENDING.compareAndSet(this, null, locking)) {
-                //使用单独的线程池来调度,防止参与锁太多导致栈溢出.
-                Schedulers.parallel().schedule(locking::subscribe);
-            } else {
-                queue.addLast(locking);
-            }
-            break;
-        }
+        } while (WIP.decrementAndGet(this) != 0);

    }

@ -136,6 +176,12 @@ class DefaultReactiveLock implements ReactiveLock {

        @Override
        public void subscribe(@Nonnull CoreSubscriber<? super T> actual) {
+            if (actual.currentContext().hasKey(main.lockName)) {
+                log.debug("reactive lock {} already locked in current context, skip.", main.lockName);
+                //如果当前上下文已经有锁了,则不再重复注册订阅者
+                source.subscribe(actual);
+                return;
+            }
            Consumer<CoreSubscriber<? super T>> subscribeCallback = source::subscribe;
            main.registerSubscriber(actual, subscribeCallback, timeout, timeoutFallback);
        }
@ -168,6 +214,12 @@ class DefaultReactiveLock implements ReactiveLock {

        @Override
        public void subscribe(@Nonnull CoreSubscriber<? super T> actual) {
+            if (actual.currentContext().hasKey(main.lockName)) {
+                log.debug("reactive lock {} already locked in current context, skip.", main.lockName);
+                //如果当前上下文已经有锁了,则不再重复注册订阅者
+                source.subscribe(actual);
+                return;
+            }
            Consumer<CoreSubscriber<? super T>> subscribeCallback = source::subscribe;
            main.registerSubscriber(actual, subscribeCallback, timeout, fallback);
        }
@ -175,7 +227,7 @@ class DefaultReactiveLock implements ReactiveLock {

    }

-    static class LockingSubscriber<T> extends BaseSubscriber<T> {
+    static class LockingSubscriber<T> extends BaseSubscriber<T> implements Runnable {
        protected final DefaultReactiveLock main;
        protected final CoreSubscriber<? super T> actual;
        private final Consumer<CoreSubscriber<? super T>> subscriber;
@ -186,6 +238,7 @@ class DefaultReactiveLock implements ReactiveLock {
            AtomicIntegerFieldUpdater.newUpdater(LockingSubscriber.class, "status");

        private volatile int status;
+        private final Context context;

        //初始
        private static final int INIT = 0;
@ -208,6 +261,11 @@ class DefaultReactiveLock implements ReactiveLock {
            this.main = main;
            this.subscriber = subscriber;
            this.timeoutFallback = timeoutFallback;
+            this.context = actual
+                .currentContext()
+                .put(DefaultReactiveLock.class, main)
+                .put(main.lockName, true);
+
            if (timeout != null) {
                this.timeoutTask = Schedulers
                    .parallel()
@ -223,8 +281,12 @@ class DefaultReactiveLock implements ReactiveLock {
                if (timeoutFallback != null) {
                    timeoutFallback.subscribe(actual);
                } else {
-                    this.onError(new TimeoutException("Lock timed out"));
+                    Operators.error(
+                        actual, new TimeoutException("Lock [" + main.lockName + "] timeout")
+                    );
                }
+            } else {
+                main.drain();
            }
        }

@ -234,15 +296,21 @@ class DefaultReactiveLock implements ReactiveLock {
                    timeoutTask.dispose();
                }
                subscriber.accept(this);
+            } else {
+                main.drain();
            }
+
        }

        protected void complete() {
-            if (statusUpdater.compareAndSet(this, INIT, UN_SUB) || statusUpdater.compareAndSet(this, SUB_SOURCE, UN_SUB)) {
+            if (statusUpdater.compareAndSet(this, INIT, UN_SUB)
+                || statusUpdater.compareAndSet(this, SUB_SOURCE, UN_SUB)) {
                if (timeoutTask != null && !timeoutTask.isDisposed()) {
                    timeoutTask.dispose();
                }
                doComplete();
+            } else {
+                main.drain();
            }
        }

@ -251,9 +319,8 @@ class DefaultReactiveLock implements ReactiveLock {
            if (!this.isDisposed()) {
                this.cancel();
            }
-            if (PENDING.compareAndSet(main, this, null)) {
-                main.drain();
-            }
+            PENDING.compareAndSet(main, this, null);
+            main.drain();
        }

        @Override
@ -289,8 +356,25 @@ class DefaultReactiveLock implements ReactiveLock {
        @Override
        @Nonnull
        public Context currentContext() {
-            return actual.currentContext();
+            return context;
+        }
+
+        @Override
+        public void run() {
+            subscribe();
        }
    }

+
+    @Getter
+    @AllArgsConstructor
+    @EqualsAndHashCode
+    protected static class LockName {
+        final String name;
+
+        @Override
+        public String toString() {
+            return name;
+        }
+    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
dependabot[bot]	6abc815cdf	build(deps): bump org.apache.logging.log4j:log4j-core (#730 ) Bumps org.apache.logging.log4j:log4j-core from 2.25.1 to 2.25.3. --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-core dependency-version: 2.25.3 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-12-21 18:43:31 +08:00
zhouhao	c7a226bd4b	feat: 适配新的网络组件查询接口	2025-12-17 09:33:51 +08:00
zhouhao	d6eb169f32	fix: 修复设备日志时间错误	2025-12-09 17:37:23 +08:00
zhouhao	f2b99b501d	refactor: 优化内嵌UI	2025-12-01 09:58:00 +08:00
zhouhao	5b32a0f813	fix: NPE	2025-11-25 15:17:53 +08:00
zhouhao	51a600af70	build(CI): 构建多平台镜像	2025-11-19 19:00:13 +08:00
zhouhao	2ef1a7840a	build(CI): 构建多平台镜像	2025-11-19 17:55:26 +08:00
zhouhao	dbcf9c8f3a	Merge remote-tracking branch 'origin/2.11' into 2.11	2025-11-19 16:38:31 +08:00
zhouhao	fff6038c5c	refactor(基础模块): 优化es索引以及查询逻辑	2025-11-19 16:38:17 +08:00
PengyuDeng	7c46400585	perf(menu):Replace Guava Cache with Caffeine in DefaultMenuService (#722 )	2025-11-18 15:09:06 +08:00
zhouhao	b952f34719	refactor(基础模块): 优化条件比对	2025-11-13 15:22:54 +08:00
zhouhao	58e91a5097	refactor(基础模块): 优化设备会话持久化逻辑	2025-11-12 09:05:55 +08:00
PengyuDeng	deff207dd8	feat(timescaledb): 支持配置TimescaleDB函数所在的schema (#710 ) * feat(timescaledb): 支持配置TimescaleDB函数所在的schema - 在application.yml和application-default.yml中新增TIMESCALEDB_FUNCTION_SCHEMA配置项 - 修改TimescaleDBCreateTableSqlBuilder类，移除构造函数中的schema参数 - 更新创建超表和保留策略的SQL语句，使用functionSchema替代原有schema - 在TimescaleDBTimeSeriesManager中注入TimescaleDBProperties并设置FunctionSchema特性 - 调整时间分组列的创建逻辑，支持传入functionSchema参数 - 引入FunctionSchema类管理TimescaleDB相关的函数位置信息 * 把配置放进RDBDatabaseMetadata里 * 优化	2025-11-05 18:38:52 +08:00
zhouhao	4d7d40696d	refactor: 使用单独线程处理设备消息	2025-11-05 16:47:32 +08:00
PengyuDeng	00f9391534	refactor(common): 调整属性读写模式常量定义 (#712 )	2025-11-05 16:23:04 +08:00
zhouhao	70e42b11fc	refactor: 优化网关设备接口权限控制	2025-11-03 14:49:50 +08:00
PengyuDeng	bfb61547a3	feat(io-component): 添加布尔值转换器支持 (#707 ) * feat(io-component): 添加布尔值转换器支持 - 新增 BooleanConverter 类处理布尔值的读写转换 * 优化 * Update ExcelUtils.java * 优化	2025-10-31 19:31:39 +08:00
PengyuDeng	ccd7f8b806	feat(rule-engine): 添加字段分组名称支持 (#700 ) * feat(rule-engine): 添加字段分组名称支持 - 在TermColumn中新增groupName字段 - 更新with方法以支持从PropertyMetadata获取分组名称 * refactor(rule-engine):优化场景条件列配置 - 使用 ConfigKey 动态处理分组名称配置 * 优化 * 优化	2025-10-30 12:02:34 +08:00
zhouhao	fbc756f8b7	build: 2.11.0-SNAPSHOT	2025-10-28 14:37:06 +08:00
zhouhao	c03c318b85	doc: 优化说明	2025-10-27 13:42:56 +08:00
zhouhao	87d75c22a6	Merge branch '2.10' into 2.11	2025-10-27 11:52:35 +08:00
zhouhao	60ecc9f65d	refactor: 升级依赖	2025-10-27 11:45:17 +08:00
zhouhao	2fde2a25e3	build: 2.11	2025-10-27 11:44:40 +08:00
zhouhao	23ce017844	Merge remote-tracking branch 'origin/2.10' into 2.10	2025-10-27 11:38:59 +08:00
zhouhao	0515c78a88	refactor: 升级依赖版本	2025-10-27 11:38:25 +08:00
zhouhao	26e555f881	Merge remote-tracking branch 'origin/2.10' into 2.10	2025-10-26 19:11:55 +08:00
zhouhao	5dca15e76a	refactor: 优化条件匹配逻辑	2025-10-26 16:00:31 +08:00
zhouhao	bc758c2885	refactor: 启动失败退出进程	2025-10-23 15:19:29 +08:00
zhouhao	0429233c31	refactor: 优化透传解析api	2025-10-23 09:19:47 +08:00
zhouhao	e3aa51a3ab	Merge remote-tracking branch 'origin/2.10' into 2.10	2025-10-20 09:52:48 +08:00
zhouhao	a3edb86a49	refactor: 优化	2025-10-20 09:52:37 +08:00
zhouhao	6a0fff01b6	refactor: 优化延迟节点	2025-10-18 16:43:13 +08:00
zhouhao	fc7d09ce8b	refactor: 优化	2025-10-15 16:56:08 +08:00
zhouhao	89968c8e87	refactor: 优化条件匹配性能	2025-10-15 15:17:29 +08:00
zhouhao	069b7dace7	refactor: 优化配置	2025-10-15 14:40:25 +08:00
zhouhao	5879d8bbe5	refactor: 优化告警解除逻辑	2025-10-15 14:05:09 +08:00
zhouhao	67789af77d	refactor: 优化	2025-10-15 09:33:46 +08:00
zhouhao	fd196fbaf8	refactor: 优化心跳超时时间设置	2025-10-13 16:33:20 +08:00
dependabot[bot]	7c1617337c	build(deps): bump io.grpc:grpc-netty-shaded from 1.65.0 to 1.75.0 (#696 ) Bumps [io.grpc:grpc-netty-shaded](https://github.com/grpc/grpc-java) from 1.65.0 to 1.75.0. - [Release notes](https://github.com/grpc/grpc-java/releases) - [Commits](https://github.com/grpc/grpc-java/compare/v1.65.0...v1.75.0) --- updated-dependencies: - dependency-name: io.grpc:grpc-netty-shaded dependency-version: 1.75.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-10-07 14:33:18 +08:00
zhouhao	d99dac0041	refactor: 优化tcp报文打印	2025-09-27 17:03:14 +08:00
zhouhao	472e1dc89c	refactor: 优化权限初始化逻辑	2025-09-27 15:03:41 +08:00
zhouhao	3811266945	refactor: 优化菜单初始化逻辑	2025-09-27 12:14:26 +08:00
zhouhao	8e829817c5	refactor: 优化用户权限初始化逻辑	2025-09-27 10:00:58 +08:00
squlenhat	c28de1741c	fix: 修复阿里云语音通知Tts方式不能同时发送给多个关联用户的问题 (#683 )	2025-09-16 14:31:32 +08:00
squlenhat	fd3455f173	fix: 修复邮件通知类型中username未赋值导致的setFrom逻辑错误 (#681 )	2025-09-12 15:56:35 +08:00
zhouhao	766584426d	refactor: 优化	2025-09-12 15:06:29 +08:00
zhouhao	79b2257a8b	refactor: 升级依赖版本	2025-09-11 16:38:28 +08:00
zhouhao	cbe852e290	refactor: 优化	2025-09-11 09:43:39 +08:00
zhouhao	a7f5b03e6c	Merge remote-tracking branch 'origin/2.10' into 2.10	2025-09-11 09:31:13 +08:00
zhouhao	dcdba73994	refactor: 优化	2025-09-11 09:31:02 +08:00
wthee	960b940b5c	fix: 修复 TimescaleDB 方法调用问题 (#678 )	2025-09-05 14:12:01 +08:00
zhouhao	20f589999a	build(maven): 升级依赖版本	2025-08-06 16:07:22 +08:00
zhouhao	886d918739	refactor: 优化	2025-08-06 10:39:42 +08:00
zhouhao	b6510fe9c0	refactor: 优化	2025-08-04 15:11:26 +08:00
zhouhao	8e72147362	refactor: 优化lock	2025-08-01 16:38:21 +08:00
zhouhao	b9cf1b3db5	fix: 修复设备统计没有产品字段问题	2025-07-30 15:44:28 +08:00
zhouhao	773f9f4bb1	fix: 修复设备统计没有产品字段问题	2025-07-30 15:36:28 +08:00
zhouhao	488989d9a0	refactor: 优化excel导入导出	2025-07-24 10:26:43 +08:00
zhouhao	1ee2c16a48	refactor: 优化数据库兼容性	2025-07-18 13:43:38 +08:00
zhouhao	c711b0e627	refactor: 优化日志配置	2025-07-11 18:34:29 +08:00
zhouhao	0878f81361	refactor: 增加时序模块错误报告	2025-07-11 10:10:38 +08:00
zhouhao	c53e4522c1	fix: 修复配置错误	2025-07-10 14:10:08 +08:00
zhouhao	12ec7dfcb3	refactor: 优化redis序列化配置	2025-07-10 10:21:39 +08:00
zhouhao	4494701946	Merge remote-tracking branch 'origin/2.10' into 2.10	2025-07-10 09:48:05 +08:00
zhouhao	2621efa6ce	refactor: 优化jdbc	2025-07-10 09:47:53 +08:00
zhouhao	6392775e9a	refactor: 优化redis配置	2025-07-09 21:26:40 +08:00
zhouhao	2c891e5d20	refactor: 优化	2025-07-09 21:04:32 +08:00
zhouhao	6e3c92dc48	Merge remote-tracking branch 'origin/2.10' into 2.10	2025-07-09 20:19:11 +08:00
zhouhao	24899e1b1f	build: 升级依赖版本	2025-07-09 20:18:55 +08:00
zhouhao	916736c1ec	refactor: 优化并行度	2025-07-09 15:37:07 +08:00
zhouhao	705929a713	refactor: 优化配置	2025-07-08 09:25:19 +08:00
zhouhao	5497beff58	refactor: 优化子设备会话	2025-07-07 19:08:50 +08:00
zhouhao	99015efd8e	Merge branch '2.10' of github.com:jetlinks/jetlinks-community into 2.10	2025-07-07 09:35:06 +08:00
zhouhao	8af4d7eecc	build: 升级依赖版本	2025-07-05 21:21:33 +08:00
zhouhao	bfa8c8ea03	fix: 修复无法单独使用timescaledb问题	2025-07-05 21:03:32 +08:00
PengyuDeng	e5a68aab20	fix(基础模块): 修改国际化支持文件目录 (#653 )	2025-07-04 10:07:53 +08:00
zhouhao	edce20eeca	doc: 优化文档	2025-07-03 18:33:06 +08:00
zhouhao	1ffc0e6070	fix(网关管理): 修复插件网关禁用仍调用createPlugin()方法的问题	2025-07-03 18:32:53 +08:00
zhouhao	2c52227714	refactor: 优化状态同步消息订阅	2025-07-01 16:04:02 +08:00
zhouhao	b529059e69	Merge remote-tracking branch 'origin/2.10' into 2.10	2025-06-30 19:02:41 +08:00
zhouhao	7b2ea0913f	refactor: 优化插件设备指令下发	2025-06-30 19:01:24 +08:00
zhouhao	9a07c28499	build: 优化插件设备指令下发	2025-06-30 18:58:52 +08:00
dependabot[bot]	863466a518	build(deps): bump commons-beanutils:commons-beanutils (#652 ) Bumps commons-beanutils:commons-beanutils from 1.10.1 to 1.11.0. --- updated-dependencies: - dependency-name: commons-beanutils:commons-beanutils dependency-version: 1.11.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-06-30 18:39:18 +08:00
zhouhao	248e15ece1	build: 优化依赖	2025-06-30 17:18:21 +08:00
zhouhao	c22152ede9	build: 优化依赖	2025-06-30 16:48:32 +08:00
zhouhao	0b1b233fa2	build: 优化依赖	2025-06-30 13:53:24 +08:00
zhouhao	a7887857c9	fix: 修复表结构字段名称错误	2025-06-27 10:27:34 +08:00
PengyuDeng	cac929d71e	refactor: i18n support for DefaultNetworkType enum (#651 )	2025-06-26 19:46:18 +08:00
zhouhao	ee13e07799	Merge remote-tracking branch 'origin/2.10' into 2.10	2025-06-26 14:08:03 +08:00
zhouhao	b543c55b4a	build: 优化profile	2025-06-26 14:07:45 +08:00
zeje	38622f04ee	build: 整理plugin，解决install失败问题 (#649 )	2025-06-25 16:16:17 +08:00
zhouhao	084c55bd9a	Merge remote-tracking branch 'origin/2.10' into 2.10	2025-06-24 20:38:24 +08:00
zhouhao	dc6b1b118b	build: 移除无用依赖	2025-06-24 20:38:12 +08:00
zhouhao	bed9337550	Merge remote-tracking branch 'origin/2.10' into 2.10	2025-06-24 11:03:08 +08:00
zhouhao	9f15c5333b	doc: add license	2025-06-24 11:02:53 +08:00
zhouhao	317fc42c6b	fix: 修复告警记录统计错误	2025-06-24 11:02:22 +08:00
PengyuDeng	a8b211ad21	fix: 优化timescaledb多列存储建表语句 (#647 ) * fix: 优化timescaledb多列存储建表语句 * Update TimescaleDBColumnModeDDLOperations.java * Update TimescaleDBColumnModeDDLOperations.java	2025-06-23 09:26:35 +08:00
zhouhao	555d6ec5d7	refactor: 升级依赖	2025-06-20 19:10:46 +08:00
zhouhao	821a9ec736	refactor: 优化mqtt连接处理	2025-06-19 09:16:42 +08:00
zhouhao	780b14187b	refactor: 优化插件ID映射获取逻辑	2025-06-17 11:25:09 +08:00
zhouhao	ff336cdae0	refactor: 优化tdengine配置	2025-06-17 10:34:18 +08:00
zhouhao	f4af008ed1	Merge remote-tracking branch 'origin/2.10' into 2.10	2025-06-17 09:20:44 +08:00
zhouhao	dae843fe49	build: 升级spring依赖版本	2025-06-17 09:19:43 +08:00
zhouhao	d6628c52f5	refactor: 取消解析变量时的校验	2025-06-12 20:32:44 +08:00
zhouhao	7fe35252f3	refactor: 优化兼容性	2025-06-12 14:04:06 +08:00
zhouhao	da121cefee	refactor: 移除jakarta.mail-api	2025-06-12 11:11:43 +08:00
zhouhao	0782dac6b6	fix: 修复无法发送邮件问题	2025-06-12 09:26:28 +08:00
zhouhao	791ca8b2c8	refactor: 升级hsweb-utils依赖	2025-06-11 19:00:46 +08:00
zhouhao	1db6e43a25	Merge remote-tracking branch 'origin/2.10' into 2.10	2025-06-11 18:22:57 +08:00
zhouhao	0cb9988e20	refactor: 升级hsweb-utils依赖	2025-06-11 18:21:49 +08:00
PengyuDeng	2e1907b74d	refactor: 只保留一个OrgDimensionType (#643 )	2025-06-10 19:17:26 +08:00
zhouhao	50b2ca9b44	fix: 修复es聚合查询错误	2025-06-10 14:40:09 +08:00
zhouhao	2157880905	Merge remote-tracking branch 'origin/2.10' into 2.10	2025-06-09 14:47:22 +08:00
zhouhao	beaef36d91	refactor: 修复条件失效问题	2025-06-09 14:46:48 +08:00
zhouhao	2ffd0f3183	doc: add license	2025-06-07 22:21:49 +08:00
zhouhao	9fb37d826c	fix: 修复修改插件后不生效问题	2025-06-07 19:30:50 +08:00
zhouhao	75dea78c0a	refactor: 优化聚合查询逻辑	2025-06-05 18:23:07 +08:00
zhouhao	f27a8c8685	refactor: 优化物模型事件ddl	2025-06-03 09:33:55 +08:00
zhouhao	fc62dab895	refactor: 优化	2025-05-30 16:23:15 +08:00
zhouhao	ab95bb1d37	fix: license	2025-05-30 12:03:07 +08:00
zhouhao	22cdb6862a	fix: 修复保存协议不生效问题	2025-05-30 11:27:10 +08:00
zhouhao	a809a8c33d	refactor: 优化插件	2025-05-30 10:58:05 +08:00
zhouhao	0cf365e2b3	doc: add license	2025-05-29 16:48:07 +08:00
zhouhao	6e51235d49	refactor: 优化插件查询	2025-05-29 16:34:20 +08:00
zhouhao	bb687f9484	refactor: 增加设备命令支持	2025-05-29 16:23:40 +08:00
zhouhao	5cfd92cd2f	refactor: 增加profile	2025-05-29 09:07:12 +08:00
zhouhao	8ee188c13c	refactor: 优化协议管理	2025-05-28 15:08:24 +08:00
zhouhao	8b30ab68e4	refactor: 优化buffer写入逻辑	2025-05-28 11:20:31 +08:00
zhouhao	0440a9f964	fix: 修复无法上传协议问题	2025-05-27 16:23:29 +08:00
zhouhao	f052b01f07	fix: 修复索引不存在聚合查询报错问题	2025-05-27 13:53:03 +08:00
zhouhao	4d7285a3d5	Merge remote-tracking branch 'origin/2.10' into 2.10	2025-05-27 10:45:45 +08:00
zhouhao	02962158b7	refactor: 移除es配置类	2025-05-27 10:45:30 +08:00
zhouhao	ff2e36e77a	fix: license 缺失	2025-05-26 20:03:17 +08:00
zhouhao	94342f13dc	Merge remote-tracking branch 'origin/master' into 2.10 # Conflicts: # jetlinks-components/common-component/src/main/java/org/jetlinks/community/configuration/UiResourceConfiguration.java # jetlinks-components/common-component/src/main/java/org/jetlinks/community/resource/ui/UiMenuResourceProvider.java # jetlinks-components/common-component/src/main/java/org/jetlinks/community/resource/ui/UiResourceProvider.java # jetlinks-components/common-component/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports	2025-05-26 19:05:20 +08:00
zhouhao	54143df3e1	doc: add license header	2025-05-23 12:37:38 +08:00
zhouhao	2667b3d8a0	Merge branch '2.10' of github.com:jetlinks/jetlinks-community into 2.10	2025-05-23 10:45:47 +08:00
老周	54763c8cbd	feat: 增加插件功能支持 (#635 ) * refactor: 升级版本 * feat: 增加插件功能支持	2025-05-23 09:04:20 +08:00
zhouhao	3d7515ad24	fix: 修复监控无数据问题	2025-05-22 20:06:25 +08:00
zhouhao	20b70771e4	refactor: 升级版本	2025-05-22 10:32:48 +08:00
zhouhao	4f6c622e4c	refactor: 增加认证模块前端依赖	2025-05-22 10:12:12 +08:00
zhouhao	20bc184a9f	refactor: 优化配置	2025-05-21 20:20:47 +08:00
zhouhao	b962f822c5	refactor: 优化配置	2025-05-21 20:05:43 +08:00
zhouhao	b7adcf0a0e	refactor: 优化	2025-05-15 17:25:14 +08:00
zhouhao	06b9c3e1e3	refactor: 优化	2025-05-15 16:56:13 +08:00
zhouhao	f194946492	refactor: 优化配置	2025-05-15 15:00:34 +08:00
zhouhao	3be58dce1e	refactor: 优化构建逻辑	2025-05-15 13:38:58 +08:00
zhouhao	545e66e130	refactor: 优化配置	2025-05-15 11:56:47 +08:00
zhouhao	dab9244249	refactor: 优化配置	2025-05-13 14:03:57 +08:00
PengyuDeng	c57dbda68a	build(doc):升级springdoc (#631 ) * build(doc):升级springdoc * Update pom.xml * Update SpringDocCustomizerConfiguration.java * 增加单独的类处理 * Update ResponseWrapperConverter.java * 增加普通类型的处理 * Update ResponseWrapperConverter.java * Update ResponseWrapperConverter.java * Update SpringDocCustomizerConfiguration.java * 增加泛型转换 * Update ResponseWrapperConverter.java * Update ResponseWrapperConverter.java * Update pom.xml * openai参数配置化 --------- Co-authored-by: 老周 <zh.sqy@qq.com>	2025-05-12 16:23:54 +08:00
zhouhao	3ae7e668c2	refactor: 优化构建脚本	2025-05-09 16:15:54 +08:00
zhouhao	93b973a56d	fix: 移除无用类	2025-05-08 17:58:21 +08:00
zhouhao	f57165e320	refactor: 优化端口	2025-05-08 10:27:03 +08:00
zhouhao	09a786b2b6	refactor: 增加内嵌UI支持	2025-05-08 09:50:49 +08:00
zhouhao	bcdc66c68a	Merge branch 'master' into 2.10	2025-04-28 11:42:18 +08:00
zhouhao	7d4ade0b37	refactor: 调整docker脚本	2025-04-27 17:35:56 +08:00
zhouhao	587c4f4d48	refactor: spring-boot3 适配	2025-04-27 17:28:32 +08:00
zhouhao	79e8f22cd5	Merge branch 'master' into 2.10 # Conflicts: # pom.xml	2025-04-27 10:43:26 +08:00
zhouhao	757f3f6f77	feat: 升级依赖	2025-03-07 11:01:33 +08:00