refactor: 优化提示

.github/workflows/maven_build_2.10.yml

@@ -0,0 +1,27 @@
+name: Auto Deploy Docker
+
+on:
+  push:
+    branches: [ "2.10" ]
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 17
+      uses: actions/setup-java@v1
+      with:
+        java-version: 17
+    - 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 && cd jetlinks-standalone && docker build -t registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-community:$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) .
+    - name: Login Docker Repo
+      run: echo "${{ secrets.ALIYUN_DOCKER_REPO_PWD }}" | docker login registry.cn-shenzhen.aliyuncs.com -u ${{ secrets.ALIYUN_DOCKER_REPO_USERNAME }} --password-stdin
+    - name: Push Docker
+      run: docker push registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-community:$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)

.github/workflows/maven_build_2.1x.yml

@@ -1,45 +0,0 @@
-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 }}

.github/workflows/pull_request_2.10.yml

@@ -5,7 +5,7 @@ name: Pull Request 2.10 with java17
 
 on:
   pull_request:
-    branches: [ "2.10","2.11"  ]
+    branches: [ "2.10" ]
 
 jobs:
   build:

.run/JetLinksApplication.run.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="JetLinksApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-    <option name="ACTIVE_PROFILES" value="default,dev,local" />
+    <option name="ACTIVE_PROFILES" value="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" />

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.11-brightgreen)
+![Version](https://img.shields.io/badge/version-2.3-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,7 +14,7 @@
 [![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 2.1x 基于Java 17,Spring Boot 3.x,WebFlux,Netty,Vert.x,Reactor等开发,
+JetLinks 2.10 基于Java 17,Spring Boot 3.x,WebFlux,Netty,Vert.x,Reactor等开发,
 是一个开箱即用,可二次开发的企业级物联网基础平台。平台实现了物联网相关的众多基础功能,
 能帮助你快速建立物联网相关业务系统。
 

docker/run-all/.gitignore

@@ -1 +0,0 @@
-data

docker/run-all/docker-compose.yml

@@ -11,15 +11,15 @@ services:
         environment:
             - TZ=Asia/Shanghai
         healthcheck:
-            test: [ "CMD", "redis-cli", "-h", "localhost", "-p", "6379", "-a", "JetLinks@redis", "ping" ]
+            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访问
+#        ports:
+#            - "5432:5432"  # 仅供jetlinks-ce访问
         volumes:
             - "./data/postgres:/var/lib/postgresql/data"
         environment:
@@ -28,12 +28,12 @@ services:
             POSTGRES_HOST_AUTH_METHOD: trust
             TZ: Asia/Shanghai
         healthcheck:
-            test: [ "CMD", "pg_isready", "-U", "postgres" ]
+            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
+        image: registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-community:2.10.0-SNAPSHOT
         container_name: jetlinks-ce
         ports:
             - "8848:8848" # 平台访问端口
@@ -78,15 +78,7 @@ services:
             - 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
-
+             postgres:
+                 condition: service_healthy
+             redis:
+                 condition: service_healthy

jetlinks-components/common-component/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jetlinks-components</artifactId>
         <groupId>org.jetlinks.community</groupId>
-        <version>2.11.0-SNAPSHOT</version>
+        <version>2.10.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

jetlinks-components/common-component/src/main/java/org/jetlinks/community/ConfigMetadataConstants.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/DynamicOperationType.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/Interval.java

@@ -1,18 +1,3 @@
-/*
- * 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;
@@ -52,23 +37,6 @@ 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;
@@ -84,11 +52,6 @@ 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);
@@ -110,7 +73,20 @@ public class Interval {
     }
 
     public static Interval of(String expr) {
-        return new Interval(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);
     }
 
     public String getDefaultFormat() {

jetlinks-components/common-component/src/main/java/org/jetlinks/community/IntervalUnit.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/JvmErrorException.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/Operation.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/OperationSource.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/OperationType.java

@@ -1,18 +1,3 @@
-/*
- * 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 {

jetlinks-components/common-component/src/main/java/org/jetlinks/community/PropertyConstants.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/PropertyMetadataConstants.java

@@ -1,22 +1,6 @@
-/*
- * 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;
@@ -72,34 +56,38 @@ public interface PropertyMetadataConstants {
      * 属性读写模式
      */
     interface AccessMode {
-        String id = "type";
+        String id = "accessMode";
 
         //读
-        String read = "read";
+        String read = "r";
         //写
-        String write = "write";
+        String write = "w";
         //上报
-        String report = "report";
+        String report = "u";
 
         static boolean isRead(PropertyMetadata property) {
             return property
                 .getExpand(id)
                 .map(val -> val.toString().contains(read))
-                .orElse(false);
+                .orElse(true);
         }
 
         static boolean isWrite(PropertyMetadata property) {
             return property
                 .getExpand(id)
                 .map(val -> val.toString().contains(write))
-                .orElse(false);
+                .orElseGet(() -> property
+                    .getExpand("readOnly")
+                    .map(readOnly -> !CastUtils.castBoolean(readOnly))
+                    .orElse(true)
+                );
         }
 
         static boolean isReport(PropertyMetadata property) {
             return property
                 .getExpand(id)
                 .map(val -> val.toString().contains(report))
-                .orElse(false);
+                .orElse(true);
         }
     }
 
@@ -107,7 +95,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);
         }
 
@@ -123,7 +111,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;
                         }
                     }
@@ -132,22 +120,4 @@ 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("");
-        }
-    }
 }

jetlinks-components/common-component/src/main/java/org/jetlinks/community/PropertyMetric.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/TimerIterable.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/TimerSpec.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/ValueObject.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/Version.java

@@ -1,18 +1,3 @@
-/*
- * 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;
@@ -23,6 +8,6 @@ public class Version {
 
     private final String edition = "community";
 
-    private final String version = "2.11.0-SNAPSHOT";
+    private final String version = "2.10.0-SNAPSHOT";
 
 }

jetlinks-components/common-component/src/main/java/org/jetlinks/community/annotation/command/CommandService.java

@@ -1,18 +1,3 @@
-/*
- * 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;
 
 

jetlinks-components/common-component/src/main/java/org/jetlinks/community/authorize/AuthenticationSpec.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/authorize/FastSerializableAuthentication.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/authorize/OrgDimensionType.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/AbstractBufferEviction.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/BufferEviction.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/BufferEvictionSpec.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/BufferProperties.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/BufferSettings.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/Buffered.java

@@ -1,18 +1,3 @@
-/*
- * 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;
 
 /**

jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/ConsumeStrategy.java

@@ -1,18 +1,3 @@
-/*
- * 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 {

jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/DiskFreeEviction.java

@@ -1,18 +1,3 @@
-/*
- * 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;
 
 

jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/DiskUsageEviction.java

@@ -1,18 +1,3 @@
-/*
- * 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;
 
 

jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/EvictionContext.java

@@ -1,18 +1,3 @@
-/*
- * 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;
 
 /**

jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/MemoryUsage.java

@@ -1,18 +1,3 @@
-/*
- * 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 {

jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/PersistenceBuffer.java

@@ -1,18 +1,3 @@
-/*
- * 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;
@@ -385,9 +370,6 @@ public class PersistenceBuffer<T extends Serializable> implements EvictionContex
         return Mono
             .fromRunnable(() -> write(data))
             .subscribeOn(writer)
-            // 切换到parallel线程池,避免浪费writer线程性能。
-            // 但是线程切换本身也是消耗。
-            .publishOn(Schedulers.parallel())
             .then();
     }
 
@@ -399,7 +381,6 @@ public class PersistenceBuffer<T extends Serializable> implements EvictionContex
         return Mono
             .fromRunnable(() -> data.forEach(this::write))
             .subscribeOn(writer)
-            .publishOn(Schedulers.parallel())
             .then();
     }
 

jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/SizeLimitEviction.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/codec/ObjectSerializer.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/codec/Serializers.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/CommandSupportManagerProvider.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/CommandSupportManagerProviders.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/CompositeCommandSupportManagerProvider.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/CrudCommandSupport.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/InternalSdkServices.java

@@ -1,18 +1,3 @@
-/*
- * 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;
 
 /**

jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/StaticCommandSupportManagerProvider.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/crud/CrudCommandHandler.java

@@ -1,25 +0,0 @@
-/*
- * 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();
-}

jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/crud/DeleteCommandHandler.java

@@ -1,48 +0,0 @@
-/*
- * 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();
-    }
-}

jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/crud/QueryCommandHandler.java

@@ -1,61 +0,0 @@
-/*
- * 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());
-    }
-}

jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/crud/SaveCommandHandler.java

@@ -1,64 +0,0 @@
-/*
- * 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();
-    }
-}

jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/register/CommandServiceEndpointRegister.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/register/SpringBeanCommandSupportProvider.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/rule/RelievedAlarmCommand.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/rule/RuleCommandServices.java

@@ -1,18 +1,3 @@
-/*
- * 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 {

jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/rule/TriggerAlarmCommand.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/rule/data/AlarmInfo.java

@@ -1,18 +1,3 @@
-/*
- * 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;
 
 

jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/rule/data/AlarmResult.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/rule/data/RelieveInfo.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/command/rule/data/RelieveResult.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/ConfigManager.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/ConfigPropertyDef.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/ConfigScope.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/ConfigScopeCustomizer.java

@@ -1,18 +1,3 @@
-/*
- * 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;
 
 /**

jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/ConfigScopeManager.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/ConfigScopeProperties.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/SimpleConfigManager.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/entity/ConfigEntity.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/verification/ConfigVerificationService.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/config/web/SystemConfigManagerController.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/configuration/CommonConfiguration.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/configuration/DataTypeJSONDeserializer.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/configuration/SmartDateDeserializer.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/configuration/UiResourceConfiguration.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/DatabaseDictionaryManager.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/Dictionaries.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/Dictionary.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/DictionaryColumnCustomizer.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/DictionaryConfiguration.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/DictionaryConstants.java

@@ -1,18 +1,3 @@
-/*
- * 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 {

jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/DictionaryEventHandler.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/DictionaryInitInfo.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/DictionaryInitManager.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/DictionaryJsonDeserializer.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/dictionary/DictionaryManager.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/doc/QueryConditionOnly.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/event/OperationAssetProvider.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/event/OperationAssetProviders.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/event/SystemEvent.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/event/SystemEventDispatcher.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/event/SystemEventHandler.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/event/SystemEventHandlerRegister.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/event/SystemEventHolder.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/form/type/EnumFieldType.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/form/type/FieldType.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/form/type/FieldTypeProvider.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/form/type/FieldTypeSpec.java

@@ -1,18 +1,3 @@
-/*
- * 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;

jetlinks-components/common-component/src/main/java/org/jetlinks/community/lock/DefaultReactiveLock.java

@@ -1,24 +1,5 @@
-/*
- * 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;
@@ -38,7 +19,6 @@ 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>
@@ -47,22 +27,8 @@ 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) {
@@ -95,34 +61,28 @@ class DefaultReactiveLock implements ReactiveLock {
     }
 
     protected void drain() {
-        if (WIP.getAndIncrement(this) != 0) {
+        if (PENDING.get(this) != null) {
             return;
         }
 
         LockingSubscriber<?> locking;
 
-        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;
+        for (; ; ) {
+            locking = queue.pollFirst();
+            if (locking == null) {
+                return;
             }
-        } while (WIP.decrementAndGet(this) != 0);
+            if (locking.isDisposed()) {
+                continue;
+            }
+            if (PENDING.compareAndSet(this, null, locking)) {
+                //使用单独的线程池来调度,防止参与锁太多导致栈溢出.
+                Schedulers.parallel().schedule(locking::subscribe);
+            } else {
+                queue.addLast(locking);
+            }
+            break;
+        }
 
     }
 
@@ -176,12 +136,6 @@ 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);
         }
@@ -214,12 +168,6 @@ 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);
         }
@@ -227,7 +175,7 @@ class DefaultReactiveLock implements ReactiveLock {
 
     }
 
-    static class LockingSubscriber<T> extends BaseSubscriber<T> implements Runnable {
+    static class LockingSubscriber<T> extends BaseSubscriber<T> {
         protected final DefaultReactiveLock main;
         protected final CoreSubscriber<? super T> actual;
         private final Consumer<CoreSubscriber<? super T>> subscriber;
@@ -238,7 +186,6 @@ class DefaultReactiveLock implements ReactiveLock {
             AtomicIntegerFieldUpdater.newUpdater(LockingSubscriber.class, "status");
 
         private volatile int status;
-        private final Context context;
 
         //初始
         private static final int INIT = 0;
@@ -261,11 +208,6 @@ 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()
@@ -281,12 +223,8 @@ class DefaultReactiveLock implements ReactiveLock {
                 if (timeoutFallback != null) {
                     timeoutFallback.subscribe(actual);
                 } else {
-                    Operators.error(
-                        actual, new TimeoutException("Lock [" + main.lockName + "] timeout")
-                    );
+                    this.onError(new TimeoutException("Lock timed out"));
                 }
-            } else {
-                main.drain();
             }
         }
 
@@ -296,21 +234,15 @@ 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();
             }
         }
 
@@ -319,8 +251,9 @@ class DefaultReactiveLock implements ReactiveLock {
             if (!this.isDisposed()) {
                 this.cancel();
             }
-            PENDING.compareAndSet(main, this, null);
-            main.drain();
+            if (PENDING.compareAndSet(main, this, null)) {
+                main.drain();
+            }
         }
 
         @Override
@@ -356,25 +289,8 @@ class DefaultReactiveLock implements ReactiveLock {
         @Override
         @Nonnull
         public Context currentContext() {
-            return context;
-        }
-
-        @Override
-        public void run() {
-            subscribe();
+            return actual.currentContext();
         }
     }
 
-
-    @Getter
-    @AllArgsConstructor
-    @EqualsAndHashCode
-    protected static class LockName {
-        final String name;
-
-        @Override
-        public String toString() {
-            return name;
-        }
-    }
 }

jetlinks-components/common-component/src/main/java/org/jetlinks/community/lock/DefaultReactiveLockManager.java

@@ -1,18 +1,3 @@
-/*
- * 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 com.github.benmanes.caffeine.cache.Caffeine;
@@ -30,6 +15,6 @@ class DefaultReactiveLockManager implements ReactiveLockManager {
 
     @Override
     public ReactiveLock getLock(String name) {
-        return cache.computeIfAbsent(name, DefaultReactiveLock::new);
+        return cache.computeIfAbsent(name, ignore -> new DefaultReactiveLock());
     }
 }