设备模块单元测试

.editorconfig

@@ -3,318 +3,10 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
-indent_size = tab
-indent_style = space
-insert_final_newline = false
-max_line_length = 120
-tab_width = 4
-trim_trailing_whitespace = true
-ij_continuation_indent_size = 4
-ij_formatter_off_tag = @formatter:off
-ij_formatter_on_tag = @formatter:on
-ij_formatter_tags_enabled = true
-ij_smart_tabs = false
-ij_visual_guides =
-ij_wrap_on_typing = true
 
 [*.java]
-ij_wrap_on_typing = false
-ij_java_align_consecutive_assignments = false
-ij_java_align_consecutive_variable_declarations = false
-ij_java_align_group_field_declarations = false
-ij_java_align_multiline_annotation_parameters = false
-ij_java_align_multiline_array_initializer_expression = false
-ij_java_align_multiline_assignment = false
-ij_java_align_multiline_binary_operation = false
-ij_java_align_multiline_chained_methods = true
-ij_java_align_multiline_deconstruction_list_components = true
-ij_java_align_multiline_extends_list = false
-ij_java_align_multiline_for = true
-ij_java_align_multiline_method_parentheses = false
-ij_java_align_multiline_parameters = true
-ij_java_align_multiline_parameters_in_calls = true
-ij_java_align_multiline_parenthesized_expression = false
-ij_java_align_multiline_records = true
-ij_java_align_multiline_resources = true
-ij_java_align_multiline_ternary_operation = false
-ij_java_align_multiline_text_blocks = false
-ij_java_align_multiline_throws_list = false
-ij_java_align_subsequent_simple_methods = false
-ij_java_align_throws_keyword = false
-ij_java_align_types_in_multi_catch = true
-ij_java_annotation_parameter_wrap = off
-ij_java_array_initializer_new_line_after_left_brace = false
-ij_java_array_initializer_right_brace_on_new_line = false
-ij_java_array_initializer_wrap = off
-ij_java_assert_statement_colon_on_next_line = false
-ij_java_assert_statement_wrap = off
-ij_java_assignment_wrap = off
-ij_java_binary_operation_sign_on_next_line = false
-ij_java_binary_operation_wrap = off
-ij_java_blank_lines_after_anonymous_class_header = 0
-ij_java_blank_lines_after_class_header = 0
-ij_java_blank_lines_after_imports = 1
-ij_java_blank_lines_after_package = 1
-ij_java_blank_lines_around_class = 1
-ij_java_blank_lines_around_field = 0
-ij_java_blank_lines_around_field_in_interface = 0
-ij_java_blank_lines_around_initializer = 1
-ij_java_blank_lines_around_method = 1
-ij_java_blank_lines_around_method_in_interface = 1
-ij_java_blank_lines_before_class_end = 0
-ij_java_blank_lines_before_imports = 1
-ij_java_blank_lines_before_method_body = 0
-ij_java_blank_lines_before_package = 0
-ij_java_block_brace_style = end_of_line
-ij_java_block_comment_add_space = false
-ij_java_block_comment_at_first_column = true
-ij_java_builder_methods =
-ij_java_call_parameters_new_line_after_left_paren = false
-ij_java_call_parameters_right_paren_on_new_line = false
-ij_java_call_parameters_wrap = off
-ij_java_case_statement_on_separate_line = true
-ij_java_catch_on_new_line = false
-ij_java_class_annotation_wrap = split_into_lines
-ij_java_class_brace_style = end_of_line
-ij_java_class_count_to_use_import_on_demand = 5
-ij_java_class_names_in_javadoc = 1
-ij_java_deconstruction_list_wrap = normal
-ij_java_do_not_indent_top_level_class_members = false
-ij_java_do_not_wrap_after_single_annotation = false
-ij_java_do_not_wrap_after_single_annotation_in_parameter = false
-ij_java_do_while_brace_force = never
-ij_java_doc_add_blank_line_after_description = true
-ij_java_doc_add_blank_line_after_param_comments = false
-ij_java_doc_add_blank_line_after_return = false
-ij_java_doc_add_p_tag_on_empty_lines = true
-ij_java_doc_align_exception_comments = true
-ij_java_doc_align_param_comments = true
-ij_java_doc_do_not_wrap_if_one_line = false
-ij_java_doc_enable_formatting = true
-ij_java_doc_enable_leading_asterisks = true
-ij_java_doc_indent_on_continuation = false
-ij_java_doc_keep_empty_lines = true
-ij_java_doc_keep_empty_parameter_tag = true
-ij_java_doc_keep_empty_return_tag = true
-ij_java_doc_keep_empty_throws_tag = true
-ij_java_doc_keep_invalid_tags = true
-ij_java_doc_param_description_on_new_line = false
-ij_java_doc_preserve_line_breaks = false
-ij_java_doc_use_throws_not_exception_tag = true
-ij_java_else_on_new_line = false
-ij_java_entity_dd_prefix =
-ij_java_entity_dd_suffix = EJB
-ij_java_entity_eb_prefix =
-ij_java_entity_eb_suffix = Bean
-ij_java_entity_hi_prefix =
-ij_java_entity_hi_suffix = Home
-ij_java_entity_lhi_prefix = Local
-ij_java_entity_lhi_suffix = Home
-ij_java_entity_li_prefix = Local
-ij_java_entity_li_suffix =
-ij_java_entity_pk_class = java.lang.String
-ij_java_entity_ri_prefix =
-ij_java_entity_ri_suffix =
-ij_java_entity_vo_prefix =
-ij_java_entity_vo_suffix = VO
-ij_java_enum_constants_wrap = off
-ij_java_extends_keyword_wrap = off
-ij_java_extends_list_wrap = off
-ij_java_field_annotation_wrap = split_into_lines
-ij_java_field_name_prefix =
-ij_java_field_name_suffix =
-ij_java_filter_class_prefix =
-ij_java_filter_class_suffix =
-ij_java_filter_dd_prefix =
-ij_java_filter_dd_suffix =
-ij_java_finally_on_new_line = false
-ij_java_for_brace_force = never
-ij_java_for_statement_new_line_after_left_paren = false
-ij_java_for_statement_right_paren_on_new_line = false
-ij_java_for_statement_wrap = off
-ij_java_generate_final_locals = false
-ij_java_generate_final_parameters = false
-ij_java_if_brace_force = never
-ij_java_imports_layout = *, |, javax.**, java.**, |, $*
-ij_java_indent_case_from_switch = true
-ij_java_insert_inner_class_imports = false
-ij_java_insert_override_annotation = true
-ij_java_keep_blank_lines_before_right_brace = 2
-ij_java_keep_blank_lines_between_package_declaration_and_header = 2
-ij_java_keep_blank_lines_in_code = 2
-ij_java_keep_blank_lines_in_declarations = 2
-ij_java_keep_builder_methods_indents = false
-ij_java_keep_control_statement_in_one_line = true
-ij_java_keep_first_column_comment = true
-ij_java_keep_indents_on_empty_lines = false
-ij_java_keep_line_breaks = true
-ij_java_keep_multiple_expressions_in_one_line = false
-ij_java_keep_simple_blocks_in_one_line = false
-ij_java_keep_simple_classes_in_one_line = false
-ij_java_keep_simple_lambdas_in_one_line = false
-ij_java_keep_simple_methods_in_one_line = false
-ij_java_label_indent_absolute = false
-ij_java_label_indent_size = 0
-ij_java_lambda_brace_style = end_of_line
-ij_java_layout_static_imports_separately = true
-ij_java_line_comment_add_space = false
-ij_java_line_comment_add_space_on_reformat = false
-ij_java_line_comment_at_first_column = true
-ij_java_listener_class_prefix =
-ij_java_listener_class_suffix =
-ij_java_local_variable_name_prefix =
-ij_java_local_variable_name_suffix =
-ij_java_message_dd_prefix =
-ij_java_message_dd_suffix = EJB
-ij_java_message_eb_prefix =
-ij_java_message_eb_suffix = Bean
-ij_java_method_annotation_wrap = split_into_lines
-ij_java_method_brace_style = end_of_line
-ij_java_method_call_chain_wrap = on_every_item
-ij_java_method_parameters_new_line_after_left_paren = false
-ij_java_method_parameters_right_paren_on_new_line = false
-ij_java_method_parameters_wrap = off
-ij_java_modifier_list_wrap = false
-ij_java_multi_catch_types_wrap = normal
-ij_java_names_count_to_use_import_on_demand = 3
-ij_java_new_line_after_lparen_in_annotation = false
-ij_java_new_line_after_lparen_in_deconstruction_pattern = true
-ij_java_new_line_after_lparen_in_record_header = false
-ij_java_packages_to_use_import_on_demand = java.awt.*, javax.swing.*
-ij_java_parameter_annotation_wrap = off
-ij_java_parameter_name_prefix =
-ij_java_parameter_name_suffix =
-ij_java_parentheses_expression_new_line_after_left_paren = false
-ij_java_parentheses_expression_right_paren_on_new_line = false
-ij_java_place_assignment_sign_on_next_line = false
-ij_java_prefer_longer_names = true
-ij_java_prefer_parameters_wrap = false
-ij_java_record_components_wrap = normal
-ij_java_repeat_synchronized = true
-ij_java_replace_instanceof_and_cast = false
-ij_java_replace_null_check = true
-ij_java_replace_sum_lambda_with_method_ref = true
-ij_java_resource_list_new_line_after_left_paren = false
-ij_java_resource_list_right_paren_on_new_line = false
-ij_java_resource_list_wrap = off
-ij_java_rparen_on_new_line_in_annotation = false
-ij_java_rparen_on_new_line_in_deconstruction_pattern = true
-ij_java_rparen_on_new_line_in_record_header = false
-ij_java_servlet_class_prefix =
-ij_java_servlet_class_suffix =
-ij_java_servlet_dd_prefix =
-ij_java_servlet_dd_suffix =
-ij_java_session_dd_prefix =
-ij_java_session_dd_suffix = EJB
-ij_java_session_eb_prefix =
-ij_java_session_eb_suffix = Bean
-ij_java_session_hi_prefix =
-ij_java_session_hi_suffix = Home
-ij_java_session_lhi_prefix = Local
-ij_java_session_lhi_suffix = Home
-ij_java_session_li_prefix = Local
-ij_java_session_li_suffix =
-ij_java_session_ri_prefix =
-ij_java_session_ri_suffix =
-ij_java_session_si_prefix =
-ij_java_session_si_suffix = Service
-ij_java_space_after_closing_angle_bracket_in_type_argument = false
-ij_java_space_after_colon = true
-ij_java_space_after_comma = true
-ij_java_space_after_comma_in_type_arguments = true
-ij_java_space_after_for_semicolon = true
-ij_java_space_after_quest = true
-ij_java_space_after_type_cast = true
-ij_java_space_before_annotation_array_initializer_left_brace = false
-ij_java_space_before_annotation_parameter_list = false
-ij_java_space_before_array_initializer_left_brace = false
-ij_java_space_before_catch_keyword = true
-ij_java_space_before_catch_left_brace = true
-ij_java_space_before_catch_parentheses = true
-ij_java_space_before_class_left_brace = true
-ij_java_space_before_colon = true
-ij_java_space_before_colon_in_foreach = true
-ij_java_space_before_comma = false
-ij_java_space_before_deconstruction_list = false
-ij_java_space_before_do_left_brace = true
-ij_java_space_before_else_keyword = true
-ij_java_space_before_else_left_brace = true
-ij_java_space_before_finally_keyword = true
-ij_java_space_before_finally_left_brace = true
-ij_java_space_before_for_left_brace = true
-ij_java_space_before_for_parentheses = true
-ij_java_space_before_for_semicolon = false
-ij_java_space_before_if_left_brace = true
-ij_java_space_before_if_parentheses = true
-ij_java_space_before_method_call_parentheses = false
-ij_java_space_before_method_left_brace = true
-ij_java_space_before_method_parentheses = false
-ij_java_space_before_opening_angle_bracket_in_type_parameter = false
-ij_java_space_before_quest = true
-ij_java_space_before_switch_left_brace = true
-ij_java_space_before_switch_parentheses = true
-ij_java_space_before_synchronized_left_brace = true
-ij_java_space_before_synchronized_parentheses = true
-ij_java_space_before_try_left_brace = true
-ij_java_space_before_try_parentheses = true
-ij_java_space_before_type_parameter_list = false
-ij_java_space_before_while_keyword = true
-ij_java_space_before_while_left_brace = true
-ij_java_space_before_while_parentheses = true
-ij_java_space_inside_one_line_enum_braces = false
-ij_java_space_within_empty_array_initializer_braces = false
-ij_java_space_within_empty_method_call_parentheses = false
-ij_java_space_within_empty_method_parentheses = false
-ij_java_spaces_around_additive_operators = true
-ij_java_spaces_around_annotation_eq = true
-ij_java_spaces_around_assignment_operators = true
-ij_java_spaces_around_bitwise_operators = true
-ij_java_spaces_around_equality_operators = true
-ij_java_spaces_around_lambda_arrow = true
-ij_java_spaces_around_logical_operators = true
-ij_java_spaces_around_method_ref_dbl_colon = false
-ij_java_spaces_around_multiplicative_operators = true
-ij_java_spaces_around_relational_operators = true
-ij_java_spaces_around_shift_operators = true
-ij_java_spaces_around_type_bounds_in_type_parameters = true
-ij_java_spaces_around_unary_operator = false
-ij_java_spaces_within_angle_brackets = false
-ij_java_spaces_within_annotation_parentheses = false
-ij_java_spaces_within_array_initializer_braces = false
-ij_java_spaces_within_braces = false
-ij_java_spaces_within_brackets = false
-ij_java_spaces_within_cast_parentheses = false
-ij_java_spaces_within_catch_parentheses = false
-ij_java_spaces_within_deconstruction_list = false
-ij_java_spaces_within_for_parentheses = false
-ij_java_spaces_within_if_parentheses = false
-ij_java_spaces_within_method_call_parentheses = false
-ij_java_spaces_within_method_parentheses = false
-ij_java_spaces_within_parentheses = false
-ij_java_spaces_within_record_header = false
-ij_java_spaces_within_switch_parentheses = false
-ij_java_spaces_within_synchronized_parentheses = false
-ij_java_spaces_within_try_parentheses = false
-ij_java_spaces_within_while_parentheses = false
-ij_java_special_else_if_treatment = true
-ij_java_static_field_name_prefix =
-ij_java_static_field_name_suffix =
-ij_java_subclass_name_prefix =
-ij_java_subclass_name_suffix = Impl
-ij_java_ternary_operation_signs_on_next_line = false
-ij_java_ternary_operation_wrap = off
-ij_java_test_name_prefix =
-ij_java_test_name_suffix = Test
-ij_java_throws_keyword_wrap = off
-ij_java_throws_list_wrap = off
-ij_java_use_external_annotations = false
-ij_java_use_fq_class_names = false
-ij_java_use_relative_indents = false
-ij_java_use_single_class_imports = true
-ij_java_variable_annotation_wrap = off
-ij_java_visibility = public
-ij_java_while_brace_force = never
-ij_java_while_on_new_line = false
-ij_java_wrap_comments = false
-ij_java_wrap_first_method_in_call_chain = true
-ij_java_wrap_long_lines = false
+indent_style = space
+indent_size = tab
+tab_width = 4
+trim_trailing_whitespace = true
+insert_final_newline = false

.github/workflows/maven.yml

@@ -1,27 +1,27 @@
 name: Auto Deploy Docker
 
-on:
+on: 
   push:
-    branches: [ "master","2.0","2.1","2.2" ]
+    branches: [ "master","2.0" ]
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v1
     - name: Set up JDK 1.8
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
     - name: Cache Maven Repository
-      uses: actions/cache@v3
+      uses: actions/cache@v1
       with:
         path: ~/.m2
-        key: ${{ runner.os }}-${{ hashFiles('**/pom.xml') }}
+        key: jetlinks-community-maven-repository
     - 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) .
+      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-standalone:$(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)
+      run: docker push registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-standalone:$(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.yml

@@ -19,7 +19,7 @@ jobs:
       with:
         java-version: 1.8
     - name: Cache Maven Repository
-      uses: actions/cache@v4.2.3
+      uses: actions/cache@v1
       with:
         path: ~/.m2
         key: jetlinks-community-maven-repository

.github/workflows/pull_request_2.1x.yml

@@ -1,27 +0,0 @@
-# This workflow will build a Java project with Maven
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-
-name: Pull Request 2.10 with java17
-
-on:
-  pull_request:
-    branches: [ "2.10","2.11"  ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Set up JDK 17
-      uses: actions/setup-java@v1
-      with:
-        java-version: 17
-    - name: Cache Maven Repository
-      uses: actions/cache@v4.2.3
-      with:
-        path: ~/.m2
-        key: jetlinks-community-maven-repository
-    - name: Build with Maven
-      run: ./mvnw package -Dmaven.test.skip=true -Pbuild

.gitignore

@@ -28,6 +28,4 @@ docker/data
 !device-simulator.jar
 !demo-protocol-1.0.jar
 application-local.yml
-dev/
-.DS_Store
-.java-version
+dev/

.mvn/wrapper/maven-wrapper.properties

@@ -1 +1 @@
-distributionUrl=https://archive.apache.org/dist/maven/maven-3/3.9.3/binaries/apache-maven-3.9.3-bin.zip
+distributionUrl=https://downloads.apache.org/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.zip

.run/JetLinksApplication.run.xml

@@ -1,11 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="JetLinksApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-    <option name="ACTIVE_PROFILES" value="default,dev,local" />
-    <module name="jetlinks-standalone" />
-    <option name="SPRING_BOOT_MAIN_CLASS" value="org.jetlinks.community.standalone.JetLinksApplication" />
-    <option name="VM_PARAMETERS" value="--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.base/java.math=ALL-UNNAMED --add-opens java.scripting/javax.script=ALL-UNNAMED --add-opens java.base/java.time=ALL-UNNAMED -XX:+EnableDynamicAgentLoading" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>

README.md

@@ -1,66 +1,51 @@
 # 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)
+![GitHub Workflow Status](https://img.shields.io/github/workflow/status/jetlinks/jetlinks-community/Auto%20Deploy%20Docker?label=docker)
+![Version](https://img.shields.io/badge/version-1.13--RELEASE-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)
-[![star](https://gitee.com/jetlinks/jetlinks-community/badge/star.svg?theme=gvp)](https://gitee.com/jetlinks/jetlinks-community/stargazers)
+![jetlinks](https://visitor-badge.glitch.me/badge?page_id=jetlinks)
 
-[![QQ⑥群572077464](https://img.shields.io/badge/QQ⑥群-572077464-brightgreen)](https://qm.qq.com/q/kLT3trlXuE)
-[![QQ⑤群554591908](https://img.shields.io/badge/QQ⑤群-554591908-brightgreen)](https://qm.qq.com/cgi-bin/qm/qr?k=jiirLiyFUecy_gsankzVQ-cl6SrZCnv9&&jump_from=webapi)
-[![QQ④群780133058](https://img.shields.io/badge/QQ④群-780133058-brightgreen)](https://qm.qq.com/cgi-bin/qm/qr?k=Gj47w9kg7TlV5ceD5Bqew_M_O0PIjh_l&jump_from=webapi)
-[![QQ③群647954464](https://img.shields.io/badge/QQ③群-647954464-brightgreen)](https://qm.qq.com/cgi-bin/qm/qr?k=K5m27CkhDn3B_Owr-g6rfiTBC5DKEY59&jump_from=webapi)
-[![QQ②群324606263](https://img.shields.io/badge/QQ②群-324606263-brightgreen)](https://qm.qq.com/cgi-bin/qm/qr?k=IMas2cH-TNsYxUcY8lRbsXqPnA2sGHYQ&jump_from=webapi)
 [![QQ①群2021514](https://img.shields.io/badge/QQ①群-2021514-brightgreen)](https://qm.qq.com/cgi-bin/qm/qr?k=LGf0OPQqvLGdJIZST3VTcypdVWhdfAOG&jump_from=webapi)
+[![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③群647954464](https://img.shields.io/badge/QQ③群-647954464-brightgreen)](https://qm.qq.com/cgi-bin/qm/qr?k=K5m27CkhDn3B_Owr-g6rfiTBC5DKEY59&jump_from=webapi)
+[![QQ④群780133058](https://img.shields.io/badge/QQ④群-780133058-brightgreen)](https://qm.qq.com/cgi-bin/qm/qr?k=Gj47w9kg7TlV5ceD5Bqew_M_O0PIjh_l&jump_from=webapi)
 
-JetLinks 2.1x 基于Java 17,Spring Boot 3.x,WebFlux,Netty,Vert.x,Reactor等开发,
+JetLinks 基于Java8,Spring Boot 2.x,WebFlux,Netty,Vert.x,Reactor等开发, 
 是一个开箱即用,可二次开发的企业级物联网基础平台。平台实现了物联网相关的众多基础功能,
 能帮助你快速建立物联网相关业务系统。
+ 
 
 ## 核心特性
 
-#### 开放源代码
+支持统一物模型管理,多种设备,多种厂家,统一管理。
 
-全部源代码开放,可自由拓展功能,不再受制于人.前后端分离,接口全开放。
+统一设备连接管理,多协议适配(TCP,MQTT,UDP,CoAP,HTTP等),屏蔽网络编程复杂性,灵活接入不同厂家不同协议的设备。
 
-#### 部署简单
+灵活的规则引擎,设备告警,消息通知,数据转发.
 
-最小化运行仅需要`java 17`,`redis`,`timescaledb`即可，无需部署大量中间件。
+强大的ReactorQL引擎,使用SQL来处理实时数据.
 
-#### 统一设备接入,海量设备管理
-
-TCP/UDP/MQTT/HTTP、TLS/DTLS、不同厂商、不同设备、不同报文、统一接入，统一管理。
-
-#### 规则引擎
-
-灵活的规则模型配置,支持多种规则模型以及自定义规则模型. 设备告警,场景联动,均由统一的规则引擎管理。
-
-#### 数据权限控制
-
-灵活的非侵入数据权限控制。可实现菜单、按钮、数据三维维度的数据权限控制。可控制单条数据的操作权限。
+地理位置:统一管理地理位置信息,支持区域搜索. 
 
 ## 技术栈
 
-1. [Spring Boot 3.4.x](https://spring.io/projects/spring-boot)
+1. [Spring Boot 2.3.x](https://spring.io/projects/spring-boot)
 2. [Spring WebFlux](https://spring.io/) 响应式Web支持
 3. [R2DBC](https://r2dbc.io/) 响应式关系型数据库驱动
 4. [Project Reactor](https://projectreactor.io/) 响应式编程框架
-5. [Netty](https://netty.io/),[Vert.x](https://vertx.io/) 高性能网络编程框架
-6. [hsweb framework 4](https://github.com/hs-web) 业务功能基础框架
-7. [ElasticSearch](https://www.elastic.co/cn/products/enterprise-search) 全文检索，日志，时序数据存储 （可选）
-8. [TDengine](https://www.taosdata.com/) 设备时序数据存储（可选）
-9. [Redis](https://redis.io/) 缓存数据
-10. [TimescaleDB](https://www.timescale.com/) 时序数据存储（可选）
-11. [PostgreSQL](https://www.postgresql.org) 业务功能数据管理
+4. [Netty](https://netty.io/) ,[Vert.x](https://vertx.io/) 高性能网络编程框架
+5. [ElasticSearch](https://www.elastic.co/cn/products/enterprise-search) 全文检索，日志，时序数据存储
+6. [PostgreSQL](https://www.postgresql.org) 业务功能数据管理
+7. [hsweb framework 4](https://github.com/hs-web) 业务功能基础框架
 
 ## 架构
 
-![platform](./platform.png)
+![platform](./platform.svg)
 
 ## 设备接入流程
 
-![device-flow](./device-flow.png)
+![flow](./flow.svg)
 
 ## 模块
 
@@ -68,61 +53,15 @@ TCP/UDP/MQTT/HTTP、TLS/DTLS、不同厂商、不同设备、不同报文、统
 --jetlinks-community
 ------|----docker
 ------|------|----dev-env       # 启动开发环境
-------|------|----run-all       # 启动全部,通过http://localhost:8848 访问系统.
+------|------|----run-all       # 启动全部,通过http://localhost:9000 访问系统.
 ------|----jetlinks-components  # 公共组件模块
-------|-------|----common-component # 通用组件.
-------|-------|----configuration-component # 通用配置.
-------|-------|----dashboard-component # 仪表盘.
-------|-------|----datasource-component # 数据源.
-------|-------|----elasticsearch-component # elasticsearch集成.
-------|-------|----gateway-component # 网关组件,消息网关,设备接入.
-------|-------|----io-component # IO 组件,Excel导入导出等.
-------|-------|----logging-component # 日志组件
-------|-------|----network-component # 网络组件,MQTT,TCP,CoAP,UDP等
-------|-------|----notify-component # 通知组件,短信,右键等通知
-------|-------|----protocol-component # 协议组件
-------|-------|----relation-component # 关系组件
-------|-------|----rule-engine-component # 规则引擎
-------|-------|----script-component # 脚本组件
-------|-------|----timeseries-component # 时序数据组件
-------|-------|----tdengine-component # TDengine集成
-------|-------|----things-component # 物组件
 ------|----jetlinks-manager     # 业务管理模块
-------|-------|----authentication-manager   # 用户,权限管理
-------|-------|----device-manager   # 设备管理
-------|-------|----logging-manager   # 日志管理
-------|-------|----network-manager   # 网络组件管理
-------|-------|----notify-manager   # 通知管理
-------|-------|----visualization-manager   # 数据可视化管理
-------|-------|----rule-engine-manager   # 规则引擎管理
 ------|----jetlinks-standalone  # 服务启动模块
 ------|----simulator            # 设备模拟器
 ```
 
-## 服务支持
-
-我们提供了各种服务方式帮助您深入了解物联网平台和代码，通过产品文档、技术交流群、付费教学等方式，你将获得如下服务：
-
-| 服务项      | 服务内容                                                      | 服务收费   | 服务方式                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
-|----------|-----------------------------------------------------------|--------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| 基础问题答疑   | 问题答疑                                                      | 免费     | 技术交流群支持 [![QQ⑤群554591908](https://img.shields.io/badge/QQ⑤群-554591908-brightgreen)](https://qm.qq.com/cgi-bin/qm/qr?k=jiirLiyFUecy_gsankzVQ-cl6SrZCnv9&&jump_from=webapi) [![QQ④群780133058](https://img.shields.io/badge/QQ④群-780133058-brightgreen)](https://qm.qq.com/cgi-bin/qm/qr?k=Gj47w9kg7TlV5ceD5Bqew_M_O0PIjh_l&jump_from=webapi) [![QQ③群647954464](https://img.shields.io/badge/QQ③群-647954464-brightgreen)](https://qm.qq.com/cgi-bin/qm/qr?k=K5m27CkhDn3B_Owr-g6rfiTBC5DKEY59&jump_from=webapi)  [![QQ②群324606263](https://img.shields.io/badge/QQ②群-324606263-brightgreen)](https://qm.qq.com/cgi-bin/qm/qr?k=IMas2cH-TNsYxUcY8lRbsXqPnA2sGHYQ&jump_from=webapi) [![QQ①群2021514](https://img.shields.io/badge/QQ①群-2021514-brightgreen)](https://qm.qq.com/cgi-bin/qm/qr?k=LGf0OPQqvLGdJIZST3VTcypdVWhdfAOG&jump_from=webapi) |
-| 系统部署     | 系统部署                                                      | 免费     | 文档自助。[源码部署](https://hanta.yuque.com/px7kg1/yfac2l/vvoa3u2ztymtp4oh) [Docker部署](https://hanta.yuque.com/px7kg1/yfac2l/mzq23z4iey5ev1a5)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| 产品使用     | 教学产品各功能使用                                                 | 免费     | 文档自助。[产品文档](https://hanta.yuque.com/px7kg1/yfac2l)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
-| 二次开发     | 教学平台源码开发过程、工具使用等；                                         | 免费     | 文档自助。[开发文档](https://hanta.yuque.com/px7kg1/dev)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
-| 系统部署     | 在客户指定的网络和硬件环境中完成社区版服务部署；提供**模拟**设备接入到平台中，并能完成正常设备上线、数据上下行 | 199元   | 线上部署支持                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| 技术支持     | 提供各类部署、功能使用中遇到的问题答疑                                       | 100元   | 半小时内 线上远程支持                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
-| 设备接入协议开发 | 根据提供的设备型号，编写并提供接入平台协议包的源码。                                | 3000+元 | 定制化开发                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| 其他服务     | 企业版源码购买；定制化开发；定制化时长、功能服务等                                 | 面议     | 面议                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
-
-### **付费**服务支持或商务合作请联系
-
-![qrCode.jpg](./qrCode.png)
-
 ## 文档
 
-[产品文档](https://hanta.yuque.com/px7kg1/yfac2l)
-[快速开始](https://hanta.yuque.com/px7kg1/yfac2l/raspyc4p1asfuxks)
-[开发文档](https://hanta.yuque.com/px7kg1/nn1gdr)
-
-[![Stargazers over time](https://starchart.cc/jetlinks/jetlinks-community.svg?variant=adaptive)](https://starchart.cc/jetlinks/jetlinks-community)
-
+[快速开始](http://doc.jetlinks.cn/basics-guide/quick-start.html) 
+[开发文档](http://doc.jetlinks.cn/dev-guide/start.html) 
+[常见问题](http://doc.jetlinks.cn/common-problems/network-components.html) 

build-and-push-docker.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-dockerImage=registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-community:$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+dockerImage=registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-standalone:$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
 ./mvnw clean package -Dmaven.test.skip=true -Dmaven.build.timestamp="$(date "+%Y-%m-%d %H:%M:%S")"
 if [ $? -ne 0 ];then
     echo "构建失败!"

docker/dev-env/docker-compose.yml

@@ -1,24 +1,50 @@
 version: '2'
 services:
-    redis:
-        image: redis:6
-        container_name: jetlinks-ce-redis
-        ports:
-            - "6379:6379"
-        volumes:
-            - "./data/redis:/data"
-        command: redis-server --appendonly yes
-        environment:
-            - TZ=Asia/Shanghai
-    postgres:
-        image: timescale/timescaledb:latest-pg16
-        container_name: jetlinks-postgres-16
-        ports:
-            - "5432:5432"
-        volumes:
-            - "./data/postgres:/var/lib/postgresql/data"
-        environment:
-            POSTGRES_PASSWORD: jetlinks
-            POSTGRES_DB: jetlinks
-            POSTGRES_HOST_AUTH_METHOD: trust
-            TZ: Asia/Shanghai
+  redis:
+    image: redis:5.0.4
+    container_name: jetlinks-ce-redis
+    ports:
+      - "6379:6379"
+    volumes:
+      - "redis-volume:/data"
+    command: redis-server --appendonly yes
+    environment:
+      - TZ=Asia/Shanghai
+  elasticsearch:
+    image: elasticsearch:6.8.11
+    container_name: jetlinks-ce-elasticsearch
+    environment:
+      ES_JAVA_OPTS: -Djava.net.preferIPv4Stack=true -Xms1g -Xmx1g
+      transport.host: 0.0.0.0
+      discovery.type: single-node
+      bootstrap.memory_lock: "true"
+      discovery.zen.minimum_master_nodes: 1
+      discovery.zen.ping.unicast.hosts: elasticsearch
+    ports:
+      - "9200:9200"
+      - "9300:9300"
+  kibana:
+    image: kibana:6.8.11
+    container_name: jetlinks-ce-kibana
+    environment:
+      ELASTICSEARCH_URL: http://elasticsearch:9200
+    links:
+      - elasticsearch:elasticsearch
+    ports:
+      - "5601:5601"
+    depends_on:
+      - elasticsearch
+  postgres:
+    image: postgres:11-alpine
+    container_name: jetlinks-ce-postgres
+    ports:
+      - "5432:5432"
+    volumes:
+      - "postgres-volume:/var/lib/postgresql/data"
+    environment:
+      POSTGRES_PASSWORD: jetlinks
+      POSTGRES_DB: jetlinks
+      TZ: Asia/Shanghai
+volumes:
+  postgres-volume:
+  redis-volume:

docker/run-all/.gitignore

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

docker/run-all/docker-compose.yml

@@ -1,92 +1,118 @@
-version: '3'
+version: '2'
 services:
-    redis:
-        image: redis:6
-        container_name: jetlinks-ce-redis
-        #    ports:
-        #      - "6379:6379" # 仅供jetlinks-ce访问
-        volumes:
-            - "./data/redis:/data"
-        command: redis-server --appendonly yes --requirepass "JetLinks@redis"
-        environment:
-            - TZ=Asia/Shanghai
-        healthcheck:
-            test: [ "CMD", "redis-cli", "-h", "localhost", "-p", "6379", "-a", "JetLinks@redis", "ping" ]
-            interval: 10s
-            timeout: 5s
-            retries: 3
-    postgres:
-        image: timescale/timescaledb:latest-pg16
-        container_name: jetlinks-ce-postgres
-        #        ports:
-        #            - "5432:5432"  # 仅供jetlinks-ce访问
-        volumes:
-            - "./data/postgres:/var/lib/postgresql/data"
-        environment:
-            POSTGRES_PASSWORD: JetLinks@postgres
-            POSTGRES_DB: jetlinks
-            POSTGRES_HOST_AUTH_METHOD: trust
-            TZ: Asia/Shanghai
-        healthcheck:
-            test: [ "CMD", "pg_isready", "-U", "postgres" ]
-            interval: 10s
-            timeout: 5s
-            retries: 5
-    jetlinks:
-        image: registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-community:2.11.0-SNAPSHOT
-        container_name: jetlinks-ce
-        ports:
-            - "8848:8848" # 平台访问端口
-            - "1883-1890:1883-1890" # 预留
-            - "8800-8810:8800-8810" # 预留
-            - "5060-5061:5060-5061" # 预留
-        volumes:
-            - "./data/jetlinks:/application/data"
-        environment:
-            - "JAVA_OPTS=-Duser.language=zh"
-            - "TZ=Asia/Shanghai"
-            - "EXTERNAL_HOST=local-host.cn" # 对外提供访问的域名或者ip地址
-            - "EXTERNAL_PORT=8848" # 对外提供访问的端口,修改了端口映射同时也需要修改这里.
-            - "ADMIN_USER_PASSWORD=JetLinks.C0mmVn1ty" # admin用户的初始密码
-            - "spring.r2dbc.url=r2dbc:postgresql://postgres:5432/jetlinks" #数据库连接地址
-            - "spring.r2dbc.username=postgres"
-            - "spring.r2dbc.password=JetLinks@postgres"
-            - "spring.data.redis.host=redis"
-            - "spring.data.redis.port=6379"
-            - "file.manager.storage-base-path=/application/data/files"
-            - "spring.data.redis.password=JetLinks@redis"
-            - "logging.level.io.r2dbc=warn"
-            - "logging.level.org.springframework.data=warn"
-            - "logging.level.org.springframework=warn"
-            - "logging.level.org.jetlinks=warn"
-            - "logging.level.org.hswebframework=warn"
-            - "logging.level.org.springframework.data.r2dbc.connectionfactory=warn"
-            - "network.resources[0]=0.0.0.0:8800-8810/tcp"
-            - "network.resources[1]=0.0.0.0:1883-1890"
-            - "hsweb.cors.enable=true"
-            - "hsweb.cors.configs[0].path=/**"
-            - "hsweb.cors.configs[0].allowed-credentials=true"
-            - "hsweb.cors.configs[0].allowed-headers=*"
-            - "hsweb.cors.configs[0].allowed-origins=*"
-            - "hsweb.cors.configs[0].allowed-methods[0]=GET"
-            - "hsweb.cors.configs[0].allowed-methods[1]=POST"
-            - "hsweb.cors.configs[0].allowed-methods[2]=PUT"
-            - "hsweb.cors.configs[0].allowed-methods[3]=PATCH"
-            - "hsweb.cors.configs[0].allowed-methods[4]=DELETE"
-            - "hsweb.cors.configs[0].allowed-methods[5]=OPTIONS"
-        links:
-            - redis:redis
-            - postgres:postgres
-        depends_on:
-            postgres:
-                condition: service_healthy
-            redis:
-                condition: service_healthy
-#    ui:  # 如果通过访问内嵌的前端存在问题,可以使用这个镜像
-#        image: registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.11.0
-#        ports:
-#            - "9000:9000"
-#        environment:
-#            API_BASE_PATH: "http://jetlinks:8848/"
-#            TZ: Asia/Shanghai
+  redis:
+    image: redis:5.0.4
+    container_name: jetlinks-ce-redis
+    #    ports:
+    #      - "6379:6379"
+    volumes:
+      - "./data/redis:/data"
+    command: redis-server --appendonly yes --requirepass "JetLinks@redis"
+    environment:
+      - TZ=Asia/Shanghai
+  elasticsearch:
+    image: elasticsearch:6.8.11
+    container_name: jetlinks-ce-elasticsearch
+    environment:
+      ES_JAVA_OPTS: -Djava.net.preferIPv4Stack=true -Xms1g -Xmx1g
+      transport.host: 0.0.0.0
+      discovery.type: single-node
+      bootstrap.memory_lock: "true"
+      discovery.zen.minimum_master_nodes: 1
+      discovery.zen.ping.unicast.hosts: elasticsearch
+  #  volumes:
+  #    - ./data/elasticsearch:/usr/share/elasticsearch/data
+  #    ports:
+  #      - "9200:9200"
+  #      - "9300:9300"
+  kibana:
+    image: kibana:6.8.11
+    container_name: jetlinks-ce-kibana
+    environment:
+      ELASTICSEARCH_URL: http://elasticsearch:9200
+    links:
+      - elasticsearch:elasticsearch
+    ports:
+      - "5601:5601"
+    depends_on:
+      - elasticsearch
+  postgres:
+    image: postgres:11-alpine
+    container_name: jetlinks-ce-postgres
+    volumes:
+      - "./data/postgres:/var/lib/postgresql/data"
+    ports:
+      - "5432:5432"
+    environment:
+      POSTGRES_PASSWORD: jetlinks
+      POSTGRES_DB: jetlinks
+      TZ: Asia/Shanghai
+  ui:
+    image: registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-pro:2.0.0
+    container_name: jetlinks-ce-ui
+    ports:
+      - 9000:80
+    environment:
+      - "API_BASE_PATH=http://jetlinks:8848/" #API根路径
+    volumes:
+      - "./data/jetlinks-ui:/usr/share/nginx/html/upload"
+    links:
+      - jetlinks:jetlinks
+  jetlinks:
+    image: registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-standalone:2.0.0-SNAPSHOT
+    container_name: jetlinks-ce
 
+    ports:
+      - "8848:8848" # API端口
+      - "1883-1890:1883-1890" # 预留
+      - "8800-8810:8800-8810" # 预留
+      - "5060-5061:5060-5061" # 预留
+    volumes:
+      - "./data/jetlinks:/application/static/upload"  # 持久化上传的文件
+      - "./data/jetlinks/:/application/data/files"
+      - "./data/jetlinks/:/application/data/protocols"
+      - "./entrypoint.sh:/entrypoint.sh"
+    #entrypoint: /entrypoint.sh -d redis:5601,postgres:5432,elasticsearch:9200 'echo "start jetlinks service here"';
+    environment:
+     # - "SLEEP_SECOND=4"
+      - "JAVA_OPTS=-Duser.language=zh -XX:+UseG1GC"
+      - "TZ=Asia/Shanghai"
+      - "hsweb.file.upload.static-location=http://127.0.0.1:8848/upload"  #上传的静态文件访问根地址,为ui的地址.
+      - "spring.r2dbc.url=r2dbc:postgresql://postgres:5432/jetlinks" #数据库连接地址
+      - "spring.r2dbc.username=postgres"
+      - "spring.r2dbc.password=jetlinks"
+      - "spring.data.elasticsearch.client.reactive.endpoints=elasticsearch:9200"
+      #        - "spring.data.elasticsearch.client.reactive.username=admin"
+      #        - "spring.data.elasticsearch.client.reactive.password=admin"
+      #        - "spring.reactor.debug-agent.enabled=false" #设置为false能提升性能
+      - "spring.redis.host=redis"
+      - "spring.redis.port=6379"
+      - "file.manager.storage-base-path=/application/data/files"
+      - "spring.redis.password=JetLinks@redis"
+      - "logging.level.io.r2dbc=warn"
+      - "logging.level.org.springframework.data=warn"
+      - "logging.level.org.springframework=warn"
+      - "logging.level.org.jetlinks=warn"
+      - "logging.level.org.hswebframework=warn"
+      - "logging.level.org.springframework.data.r2dbc.connectionfactory=warn"
+      - "network.resources[0]=0.0.0.0:8800-8810/tcp"
+      - "network.resources[1]=0.0.0.0:1883-1890"
+      - "hsweb.cors.enable=true"
+      - "hsweb.cors.configs[0].path=/**"
+      - "hsweb.cors.configs[0].allowed-credentials=true"
+      - "hsweb.cors.configs[0].allowed-headers=*"
+      - "hsweb.cors.configs[0].allowed-origins=*"
+      - "hsweb.cors.configs[0].allowed-methods[0]=GET"
+      - "hsweb.cors.configs[0].allowed-methods[1]=POST"
+      - "hsweb.cors.configs[0].allowed-methods[2]=PUT"
+      - "hsweb.cors.configs[0].allowed-methods[3]=PATCH"
+      - "hsweb.cors.configs[0].allowed-methods[4]=DELETE"
+      - "hsweb.cors.configs[0].allowed-methods[5]=OPTIONS"
+    links:
+      - redis:redis
+      - postgres:postgres
+      - elasticsearch:elasticsearch
+    depends_on:
+      - postgres
+      - redis
+      - elasticsearch

docker/run-all/entrypoint.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+#set -x
+#******************************************************************************
+# @file    : entrypoint.sh
+# @author  : wangyubin
+# @date    : 2018-08- 1 10:18:43
+#
+# @brief   : entry point for manage service start order
+# history  : init
+#******************************************************************************
+
+: ${SLEEP_SECOND:=2}
+
+wait_for() {
+    echo Waiting for $1 to listen on $2...
+    while ! nc -z $1 $2; do echo waiting...; sleep $SLEEP_SECOND; done
+}
+
+declare DEPENDS
+declare CMD
+
+while getopts "d:c:" arg
+do
+    case $arg in
+        d)
+            DEPENDS=$OPTARG
+            ;;
+        c)
+            CMD=$OPTARG
+            ;;
+        ?)
+            echo "unkonw argument"
+            exit 1
+            ;;
+    esac
+done
+
+for var in ${DEPENDS//,/ }
+do
+    host=${var%:*}
+    port=${var#*:}
+    wait_for $host $port
+done
+
+eval $CMD

jetlinks-components/common-component/pom.xml

@@ -5,8 +5,7 @@
     <parent>
         <artifactId>jetlinks-components</artifactId>
         <groupId>org.jetlinks.community</groupId>
-        <version>2.11.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -19,11 +18,6 @@
             <version>${jetlinks.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.jetlinks</groupId>
-            <artifactId>jetlinks-supports</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.hswebframework.web</groupId>
             <artifactId>hsweb-authorization-api</artifactId>
@@ -54,22 +48,12 @@
         <dependency>
             <groupId>de.ruedigermoeller</groupId>
             <artifactId>fst</artifactId>
+            <version>2.57</version>
         </dependency>
 
         <dependency>
             <groupId>com.h2database</groupId>
-            <artifactId>h2-mvstore</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jetlinks.sdk</groupId>
-            <artifactId>jetlinks-sdk-api</artifactId>
-            <version>${jetlinks.sdk.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-system-dictionary</artifactId>
+            <artifactId>h2</artifactId>
         </dependency>
 
         <dependency>
@@ -80,29 +64,14 @@
         <dependency>
             <groupId>com.cronutils</groupId>
             <artifactId>cron-utils</artifactId>
+            <version>9.2.0</version>
             <scope>compile</scope>
             <exclusions>
-                <exclusion>
-                    <groupId>org.glassfish</groupId>
-                    <artifactId>jakarta.el</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.glassfish</groupId>
                     <artifactId>javax.el</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
-
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-redis</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.glassfish.expressly</groupId>
-            <artifactId>expressly</artifactId>
-        </dependency>
-
     </dependencies>
-</project>
+</project>

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

@@ -1,24 +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.core.config.ConfigKey;
-import org.jetlinks.core.metadata.MergeOption;
-
-import java.util.Map;
 
 /**
  * 数据验证配置常量类
@@ -38,8 +20,4 @@ public interface ConfigMetadataConstants {
 
     ConfigKey<String> format = ConfigKey.of("format", "格式", String.class);
 
-    ConfigKey<String> defaultValue = ConfigKey.of("defaultValue", "默认值", String.class);
-
-    ConfigKey<Boolean> indexEnabled = ConfigKey.of("indexEnabled", "开启索引", Boolean.TYPE);
-
 }

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

@@ -1,31 +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;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-@Getter
-@Setter
-@AllArgsConstructor
-@NoArgsConstructor
-public class DynamicOperationType implements OperationType {
-    private String id;
-    private String name;
-
-}

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

@@ -1,35 +1,17 @@
-/*
- * 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;
-import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import lombok.*;
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import reactor.core.publisher.Flux;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.SneakyThrows;
 
-import java.io.IOException;
 import java.math.BigDecimal;
-import java.util.function.BiFunction;
-import java.util.function.Function;
 
 @Getter
 @AllArgsConstructor
@@ -46,27 +28,21 @@ public class Interval {
     public static final String hours = "h";
     public static final String minutes = "m";
     public static final String seconds = "s";
-    public static final String millis = "S";
 
     private BigDecimal number;
 
     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);
-        }
+    public boolean isFixed() {
+        return expression.equalsIgnoreCase(hours) ||
+            expression.equals(minutes) ||
+            expression.equals(seconds);
+    }
+
+    public boolean isCalendar() {
+        return expression.equals(days) ||
+            expression.equals(month) ||
+            expression.equals(year);
     }
 
     @Override
@@ -74,43 +50,41 @@ public class Interval {
         return (number) + expression;
     }
 
-    @Generated
     public static Interval ofSeconds(int seconds) {
         return of(seconds, Interval.seconds);
     }
 
-    @Generated
     public static Interval ofDays(int days) {
         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);
     }
 
-    @Generated
     public static Interval ofMonth(int month) {
         return of(month, Interval.month);
     }
 
-    @Generated
-    public static Interval ofMinutes(int month) {
-        return of(month, Interval.minutes);
-    }
-
-    @Generated
     public static Interval of(int month, String expression) {
         return new Interval(new BigDecimal(month), expression);
     }
 
     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() {
@@ -133,31 +107,6 @@ public class Interval {
         }
     }
 
-    public IntervalUnit getUnit() {
-        switch (expression) {
-            case year:
-                return IntervalUnit.YEARS;
-            case quarter:
-                return IntervalUnit.QUARTER;
-            case month:
-                return IntervalUnit.MONTHS;
-            case weeks:
-                return IntervalUnit.WEEKS;
-            case days:
-                return IntervalUnit.DAYS;
-            case hours:
-                return IntervalUnit.HOURS;
-            case minutes:
-                return IntervalUnit.MINUTES;
-            case seconds:
-                return IntervalUnit.SECONDS;
-            case millis:
-                return IntervalUnit.MILLIS;
-        }
-
-        throw new UnsupportedOperationException("unsupported interval express:" + expression);
-    }
-
     public static class IntervalJSONDeserializer extends JsonDeserializer<Interval> {
 
         @Override
@@ -172,54 +121,6 @@ public class Interval {
             }
             return of(node.textValue());
         }
-
-    }
-
-    public static class IntervalJSONSerializer extends JsonSerializer<Interval> {
-
-        @Override
-        public void serialize(Interval value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
-            gen.writeString(value.toString());
-        }
-    }
-
-    public long toMillis() {
-        return getUnit().toMillis(number.intValue());
-    }
-
-    /**
-     * 对指定的时间戳按周期取整
-     *
-     * @param timestamp 时间戳
-     * @return 取整后的值
-     */
-    public long round(long timestamp) {
-        return getUnit().truncatedTo(timestamp, number.intValue());
-    }
-
-    /**
-     * 按当前周期对指定的时间范围进行迭代,每次迭代一个周期的时间戳
-     *
-     * @param from 时间从
-     * @param to   时间止
-     * @return 迭代器
-     */
-    public Iterable<Long> iterate(long from, long to) {
-        return getUnit().iterate(from, to, number.intValue());
-    }
-
-    public <T> Flux<T> generate(long from, long to, Function<Long, T> converter) {
-        return Flux
-            .fromIterable(iterate(from, to))
-            .map(converter);
-    }
-
-    public <T> Flux<T> generateWithFormat(long from,
-                                          long to,
-                                          String pattern,
-                                          BiFunction<Long, String, T> converter) {
-        DateTimeFormatter formatter = DateTimeFormat.forPattern(pattern);
-        return generate(from, to, t -> converter.apply(t, new DateTime(t).toString(formatter)));
     }
 
 }

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

@@ -1,174 +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;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-import java.time.temporal.ChronoUnit;
-import java.util.Iterator;
-
-/**
- * 时间间隔单位，可用于计算时间范围的间隔周期
- *
- * @author zhouhao
- * @since 1.12
- */
-@AllArgsConstructor
-public enum IntervalUnit {
-    MILLIS(1, ChronoUnit.MILLIS),
-    SECONDS(1, ChronoUnit.SECONDS),
-    MINUTES(1, ChronoUnit.MINUTES),
-    HOURS(1, ChronoUnit.HOURS),
-    DAYS(1, ChronoUnit.DAYS),
-    WEEKS(1, ChronoUnit.WEEKS) {
-        @Override
-        protected LocalDateTime doTruncateTo(LocalDateTime time) {
-            return time.truncatedTo(ChronoUnit.DAYS)
-                       .minusDays(time.getDayOfWeek().getValue() - 1);
-        }
-    },
-    MONTHS(1, ChronoUnit.MONTHS) {
-        @Override
-        protected LocalDateTime doTruncateTo(LocalDateTime time) {
-            return time.truncatedTo(ChronoUnit.DAYS)
-                       .withDayOfMonth(1);
-        }
-    },
-    //季度
-    QUARTER(3, ChronoUnit.MONTHS) {
-        @Override
-        protected LocalDateTime doTruncateTo(LocalDateTime time) {
-            return time
-                .withMonth(time.getMonth().firstMonthOfQuarter().getValue())
-                .truncatedTo(ChronoUnit.DAYS)
-                .withDayOfMonth(1);
-
-        }
-    },
-    YEARS(1, ChronoUnit.YEARS) {
-        @Override
-        protected LocalDateTime doTruncateTo(LocalDateTime time) {
-            return time.truncatedTo(ChronoUnit.DAYS)
-                       .withDayOfYear(1);
-        }
-    },
-    //不分区,永远返回0
-    FOREVER(1, ChronoUnit.FOREVER) {
-        @Override
-        public long truncatedTo(long timestamp) {
-            return 0;
-        }
-
-        @Override
-        public Iterable<Long> iterate(long from, long to, int duration) {
-            return () -> new Iterator<Long>() {
-                private boolean nexted;
-
-                @Override
-                public boolean hasNext() {
-                    return !nexted;
-                }
-
-                @Override
-                public Long next() {
-                    nexted = true;
-                    return 0L;
-                }
-            };
-        }
-    };
-
-    @Getter
-    private final int durationOfUnit;
-
-    @Getter
-    private final ChronoUnit unit;
-
-    protected LocalDateTime doTruncateTo(LocalDateTime time) {
-        return time.truncatedTo(unit);
-    }
-
-    protected LocalDateTime next(LocalDateTime time, int duration) {
-        return time.plus((long) durationOfUnit * duration, unit);
-    }
-
-    protected long next(long timestamp) {
-        return next(timestamp, 1);
-    }
-
-    protected long next(long timestamp, int duration) {
-        return this
-            .next(LocalDateTime.ofInstant(Instant.ofEpochMilli(timestamp), ZoneOffset.UTC), duration)
-            .toInstant(ZoneOffset.UTC)
-            .toEpochMilli();
-    }
-
-    public long truncatedTo(long timestamp) {
-        return this
-            .doTruncateTo(LocalDateTime.ofInstant(Instant.ofEpochMilli(timestamp), ZoneOffset.UTC))
-            .toInstant(ZoneOffset.UTC)
-            .toEpochMilli();
-    }
-
-    public final long truncatedTo(long timestamp, int duration) {
-        long ts = truncatedTo(timestamp);
-        //指定了多个周期
-        if (Math.abs(duration) > 1) {
-            ts = next(ts, duration);
-        }
-        return ts;
-    }
-
-    public long toMillis(int duration) {
-        return duration * durationOfUnit * unit.getDuration().toMillis();
-    }
-
-    public final Iterable<Long> iterate(long from, long to) {
-        return iterate(from, to, 1);
-    }
-
-    /**
-     * 迭代时间区间的每一个周期时间
-     *
-     * @param from     时间从
-     * @param to       时间止
-     * @param duration 间隔数量,比如 2天为一个间隔
-     * @return 每个间隔的时间戳迭代器
-     */
-    public Iterable<Long> iterate(long from, long to, int duration) {
-        return () -> new Iterator<Long>() {
-            long _from = truncatedTo(Math.min(from, to));
-            final long _to = truncatedTo(Math.max(from, to));
-
-            @Override
-            public boolean hasNext() {
-                return _from <= _to;
-            }
-
-            @Override
-            public Long next() {
-                long that = truncatedTo(_from, duration);
-                _from = IntervalUnit.this.next(_from, duration);
-                return that;
-            }
-        };
-    }
-
-}

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

@@ -1,27 +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;
-
-import org.hswebframework.web.exception.I18nSupportException;
-
-public class JvmErrorException extends I18nSupportException {
-
-    public JvmErrorException(Throwable cause) {
-        super("error.jvm_error",cause);
-    }
-
-
-}

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

@@ -1,68 +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;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import org.jetlinks.core.utils.SerializeUtils;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-/**
- * 描述,用于对某些操作的通用描述.
- *
- * @author zhouhao
- * @since 2.0
- */
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor(staticName = "of")
-public class Operation implements Externalizable {
-    /**
-     * 操作来源
-     */
-    private OperationSource source;
-
-    /**
-     * 操作类型，比如: transparent-codec等
-     */
-    private OperationType type;
-
-    @Override
-    public String toString() {
-        return type.getId() + "(" + type.getName() + "):[" + source.getId() + "]";
-    }
-
-    @Override
-    public void writeExternal(ObjectOutput out) throws IOException {
-        source.writeExternal(out);
-        SerializeUtils.writeObject(type.getId(), out);
-        SerializeUtils.writeObject(type.getName(), out);
-    }
-
-    @Override
-    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        source = new OperationSource();
-        source.readExternal(in);
-        type = new DynamicOperationType((String) SerializeUtils.readObject(in), (String) SerializeUtils.readObject(in));
-    }
-}

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

@@ -1,80 +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;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import org.jetlinks.core.utils.SerializeUtils;
-import reactor.util.context.Context;
-import reactor.util.context.ContextView;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.Optional;
-
-@AllArgsConstructor(staticName = "of")
-@NoArgsConstructor
-@Getter
-@Setter
-public class OperationSource implements Externalizable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID,type对应操作的唯一标识
-     */
-    private String id;
-
-    /**
-     * 操作源名称
-     */
-    private String name;
-
-    /**
-     * 操作目标,通常为ID对应的详情数据
-     */
-    private Object data;
-
-    public static OperationSource of(String id, Object data) {
-        return of(id, id, data);
-    }
-
-    public static Context ofContext(String id, String name, Object data) {
-        return Context.of(OperationSource.class, of(id, name, data));
-    }
-
-    public static Optional<OperationSource> fromContext(ContextView ctx) {
-        return ctx.getOrEmpty(OperationSource.class);
-    }
-
-    @Override
-    public void writeExternal(ObjectOutput out) throws IOException {
-        out.writeUTF(id);
-        SerializeUtils.writeObject(name, out);
-        SerializeUtils.writeObject(data, out);
-    }
-
-    @Override
-    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        id = in.readUTF();
-        name = (String) SerializeUtils.readObject(in);
-        data = SerializeUtils.readObject(in);
-    }
-}

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

@@ -1,26 +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;
-
-public interface OperationType {
-    String getId();
-
-    String getName();
-
-    static OperationType of(String id,String name){
-        return new DynamicOperationType(id,name);
-    }
-}

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

@@ -1,28 +1,10 @@
-/*
- * 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;
-import org.hswebframework.web.id.IDGenerator;
 import org.jetlinks.core.config.ConfigKey;
 import org.jetlinks.core.message.HeaderKey;
-import org.springframework.core.ResolvableType;
 
 import java.lang.reflect.Type;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Supplier;
@@ -31,75 +13,32 @@ import java.util.function.Supplier;
  * @author wangzheng
  * @since 1.0
  */
-@Generated
 public interface PropertyConstants {
-    //机构ID
     Key<String> orgId = Key.of("orgId");
 
-    //设备名称
     Key<String> deviceName = Key.of("deviceName");
-
     //产品名称
     Key<String> productName = Key.of("productName");
 
-    //产品ID
     Key<String> productId = Key.of("productId");
-
-    /**
-     * 关系信息.值格式:
-     * <pre>{@code
-     * [{"type":"user","id":"userId","rel":"manager"}]
-     * }</pre>
-     */
-    Key<List<Map<String, Object>>> relations = Key.of("relations");
-
-    //分组ID
-    Key<List<String>> groupId = Key.of("groupId");
-
-    //是否记录task记录
-    Key<Boolean> useTask = Key.of("useTask", false);
-
-    //taskId
-    Key<String> taskId = Key.of("taskId");
-
-    //最大重试次数
-    Key<Long> maxRetryTimes = Key.of("maxRetryTimes", () -> Long.getLong("device.message.task.retryTimes", 1), Long.class);
-    //当前重试次数
-    Key<Long> retryTimes = Key.of("retryTimes", () -> 0L, Long.class);
-
-    //服务ID
-    Key<String> serverId = Key.of("serverId");
-
-    //全局唯一ID
-    Key<String> uid = Key.of("_uid", IDGenerator.RANDOM::generate);
+    Key<String> uid = Key.of("_uid");
+    //设备创建者
+    Key<String> creatorId = Key.of("creatorId");
 
     //设备接入网关ID
     Key<String> accessId = Key.of("accessId");
 
     /**
      * 设备接入方式
-     *
      * @see org.jetlinks.community.gateway.supports.DeviceGatewayProvider#getId
      */
     Key<String> accessProvider = Key.of("accessProvider");
 
-    //设备创建者
-    Key<String> creatorId = Key.of("creatorId");
-
     @SuppressWarnings("all")
     static <T> Optional<T> getFromMap(ConfigKey<T> key, Map<String, Object> map) {
         return Optional.ofNullable((T) map.get(key.getKey()));
     }
 
-    @SuppressWarnings("all")
-    static <T> T getFromMapOrElse(ConfigKey<T> key, Map<String, Object> map, Supplier<T> defaultIfEmpty) {
-        Object value = map.get(key.getKey());
-        if (value == null) {
-            return defaultIfEmpty.get();
-        }
-        return (T) value;
-    }
-
     @Generated
     interface Key<V> extends ConfigKey<V>, HeaderKey<V> {
 
@@ -150,14 +89,13 @@ public interface PropertyConstants {
 
                 @Override
                 public T getDefaultValue() {
-                    return defaultValue == null ? null : defaultValue.get();
+                    return defaultValue.get();
                 }
             };
         }
 
         static <T> Key<T> of(String key, Supplier<T> defaultValue, Type type) {
             return new Key<T>() {
-
                 @Override
                 public Type getValueType() {
                     return type;
@@ -170,11 +108,10 @@ public interface PropertyConstants {
 
                 @Override
                 public T getDefaultValue() {
-                    return defaultValue == null ? null : defaultValue.get();
+                    return defaultValue.get();
                 }
             };
         }
 
-
     }
 }

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;
@@ -45,8 +29,8 @@ public interface PropertyMetadataConstants {
 
         static boolean isManual(DeviceMessage message) {
             return message
-                .getHeader(Source.headerKey)
-                .map(Source.manual::equals)
+                .getHeader(PropertyMetadataConstants.Source.headerKey)
+                .map(PropertyMetadataConstants.Source.manual::equals)
                 .orElse(false);
         }
 
@@ -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;
@@ -21,7 +6,7 @@ import org.hswebframework.web.bean.FastBeanCopier;
 import org.jetlinks.community.utils.ConverterUtils;
 import org.springframework.util.StringUtils;
 
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
 import java.util.Map;
 import java.util.function.Function;
 

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;
@@ -30,30 +15,21 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.apache.commons.collections4.CollectionUtils;
-import org.hswebframework.ezorm.core.param.Term;
-import org.hswebframework.web.exception.ValidationException;
-import org.hswebframework.web.i18n.LocaleUtils;
-import org.jetlinks.community.terms.I18nSpec;
-import org.reactivestreams.Subscription;
 import org.springframework.util.Assert;
-import reactor.core.CoreSubscriber;
-import reactor.core.Disposable;
-import reactor.core.publisher.Flux;
-import reactor.core.scheduler.Scheduler;
-import reactor.core.scheduler.Schedulers;
 
-import javax.annotation.Nonnull;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.ValidationException;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.time.*;
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
 import java.time.temporal.TemporalUnit;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 @Getter
 @Setter
@@ -64,9 +40,6 @@ public class TimerSpec implements Serializable {
     @NotNull
     private Trigger trigger;
 
-    @Schema(description = "使用日程标签进行触发")
-    private Set<String> scheduleTags;
-
     //Cron表达式
     @Schema(description = "触发方式为[cron]时不能为空")
     private String cron;
@@ -80,15 +53,9 @@ public class TimerSpec implements Serializable {
     @Schema(description = "执行模式为[period]时不能为空")
     private Period period;
 
-    @Schema(description = "执行模式为[period]时不能与period同时为空")
-    private List<Period> periods;
-
     @Schema(description = "执行模式为[once]时不能为空")
     private Once once;
 
-    @Schema(description = "组合触发配置列表")
-    private Multi multi;
-
     public static TimerSpec cron(String cron) {
         TimerSpec spec = new TimerSpec();
         spec.cron = cron;
@@ -96,17 +63,6 @@ public class TimerSpec implements Serializable {
         return spec;
     }
 
-    public List<Period> periods() {
-        List<Period> list = new ArrayList<>(1);
-        if (periods != null) {
-            list.addAll(periods);
-        }
-        if (period != null) {
-            list.add(period);
-        }
-        return list;
-    }
-
     public Predicate<LocalDateTime> createRangeFilter() {
         if (CollectionUtils.isEmpty(when)) {
             return ignore -> true;
@@ -121,49 +77,20 @@ public class TimerSpec implements Serializable {
 
     public Predicate<LocalDateTime> createTimeFilter() {
         Predicate<LocalDateTime> range = createRangeFilter();
+        //周期执行指定了to,表示只在时间范围段内执行
         if (mod == ExecuteMod.period) {
-            Predicate<LocalDateTime> predicate = null;
-            //可能多个周期
-            for (Period period : periods()) {
-                //周期执行指定了to,表示只在时间范围段内执行
-                LocalTime to = period.toLocalTime();
-                LocalTime from = period.fromLocalTime();
-                Predicate<LocalDateTime> _predicate = time -> !time.toLocalTime().isBefore(from);
-                if (to != null) {
-                    _predicate = _predicate.and(time -> !time.toLocalTime().isAfter(to));
-                }
-                if (predicate == null) {
-                    predicate = _predicate;
-                } else {
-                    predicate = _predicate.or(predicate);
-                }
-            }
-            if (predicate == null) {
-                return range;
-            }
-            return predicate.and(range);
-        }
-        if (mod == ExecuteMod.once) {
-            LocalTime onceTime = once.localTime();
+            LocalTime to = period.toLocalTime();
+            LocalTime from = period.fromLocalTime();
             Predicate<LocalDateTime> predicate
-                = time -> compareOnceTime(time.toLocalTime(), onceTime) == 0;
+                = time -> time.toLocalTime().compareTo(from) >= 0;
+            if (to != null) {
+                predicate = predicate.and(time -> time.toLocalTime().compareTo(to) <= 0);
+            }
             return predicate.and(range);
         }
         return range;
     }
 
-    public int compareOnceTime(LocalTime time1, LocalTime time2) {
-        int cmp = Integer.compare(time1.getHour(), time2.getHour());
-        if (cmp == 0) {
-            cmp = Integer.compare(time1.getMinute(), time2.getMinute());
-            if (cmp == 0) {
-                cmp = Integer.compare(time1.getSecond(), time2.getSecond());
-                //不比较纳秒
-            }
-        }
-        return cmp;
-    }
-
     public String toCronExpression() {
         return toCron().asString();
     }
@@ -274,23 +201,10 @@ public class TimerSpec implements Serializable {
         if (trigger == null) {
             Assert.hasText(cron, "error.scene_rule_timer_cron_cannot_be_empty");
         }
-        if (trigger == Trigger.cron) {
-            try {
-                toCronExpression();
-            } catch (Throwable e) {
-                ValidationException exception = new ValidationException("cron", "error.cron_format_error", cron);
-                exception.addSuppressed(e);
-                throw exception;
-            }
-        } else if (trigger == Trigger.multi) {
-            List<TimerSpec> multiSpec = multi.getSpec();
-            if (CollectionUtils.isNotEmpty(multiSpec)) {
-                for (TimerSpec spec : multiSpec) {
-                    spec.validate();
-                }
-            }
-        } else {
-            nextDurationBuilder().apply(ZonedDateTime.now());
+        try {
+            toCronExpression();
+        } catch (Throwable e) {
+            throw new ValidationException("error.cron_format_error");
         }
 
     }
@@ -299,8 +213,7 @@ public class TimerSpec implements Serializable {
     @Setter
     @AllArgsConstructor(staticName = "of")
     @NoArgsConstructor
-    public static class Once implements Serializable {
-        private static final long serialVersionUID = 1L;
+    public static class Once {
         //时间点
         @Schema(description = "时间点.格式:[hh:mm],或者[hh:mm:ss]")
         @NotBlank
@@ -313,8 +226,7 @@ public class TimerSpec implements Serializable {
 
     @Getter
     @Setter
-    public static class Period implements Serializable {
-        private static final long serialVersionUID = 1L;
+    public static class Period {
         //周期执行的时间区间
         @Schema(description = "执行时间范围从.格式:[hh:mm],或者[hh:mm:ss]")
         private String from;
@@ -337,21 +249,6 @@ public class TimerSpec implements Serializable {
 
     }
 
-    @Getter
-    @Setter
-    public static class Multi implements Serializable {
-        private static final long serialVersionUID = 1L;
-
-        @Schema(description = "组合触发配置列表")
-        private List<TimerSpec> spec;
-
-        @Schema(description = "多个触发的关系。and、or")
-        private Term.Type type = Term.Type.or;
-
-        @Schema(description = "组合触发时，只触发一次的最小时间间隔")
-        private int timeSpanSecond = 2;
-    }
-
     private static LocalTime parsTime(String time) {
         return LocalTime.parse(time);
     }
@@ -369,23 +266,10 @@ public class TimerSpec implements Serializable {
      * @return 构造器
      */
     public Function<ZonedDateTime, Duration> nextDurationBuilder() {
-        return nextDurationBuilder(ZonedDateTime.now());
+        Function<ZonedDateTime, ZonedDateTime> nextTime = nextTimeBuilder();
+        return time -> Duration.between(time, nextTime.apply(time));
     }
 
-
-    public Function<ZonedDateTime, Duration> nextDurationBuilder(ZonedDateTime baseTime) {
-        Iterator<ZonedDateTime> it = iterable().iterator(baseTime);
-        return (time) -> {
-            Duration duration;
-            do {
-                duration = Duration.between(time, time = it.next());
-            }
-            while (duration.toMillis() < 0);
-            return duration;
-        };
-    }
-
-
     /**
      * 创建一个时间构造器,通过构造器来获取下一次时间
      * <pre>{@code
@@ -442,40 +326,11 @@ public class TimerSpec implements Serializable {
     }
 
     private TimerIterable periodIterable() {
-        List<Period> periods = periods();
-        Assert.notEmpty(periods, "period or periods can not be null");
+        Assert.notNull(period, "period can not be null");
         Predicate<LocalDateTime> filter = createTimeFilter();
 
-        Duration _Duration = null;
-        LocalTime earliestFrom = LocalTime.MAX;
-        LocalTime latestTo = LocalTime.MIN;
-
-        //使用最小的执行周期进行判断?
-        for (Period period : periods) {
-            Duration duration = Duration.of(period.every, period.unit.temporal);
-            LocalTime from = period.fromLocalTime();
-            LocalTime to = period.toLocalTime();
-
-            // 更新最小的duration
-            if (_Duration == null || duration.compareTo(_Duration) < 0) {
-                _Duration = duration;
-            }
-
-            // 更新最早的起始时间
-            if (from != null && from.isBefore(earliestFrom)) {
-                earliestFrom = from;
-            }
-
-            // 更新最晚的结束时间
-            if (to != null && to.isAfter(latestTo)) {
-                latestTo = to;
-            }
-        }
-
-        Duration duration = _Duration;
-        LocalTime firstFrom = earliestFrom.equals(LocalTime.MAX) ? LocalTime.MIDNIGHT : earliestFrom;
-        LocalTime endTo = latestTo.equals(LocalTime.MIN) ? null : latestTo;
-
+        Duration duration = Duration.of(period.every, period.unit.temporal);
+        LocalTime time = period.fromLocalTime();
         return baseTime -> new Iterator<ZonedDateTime>() {
             ZonedDateTime current = baseTime;
 
@@ -490,21 +345,6 @@ public class TimerSpec implements Serializable {
                 int max = MAX_IT_TIMES;
                 do {
                     dateTime = dateTime.plus(duration);
-                    // 检查时间是否在 firstFrom 和 endTo 之间
-                    LocalTime time = dateTime.toLocalTime();
-                    if (time.isBefore(firstFrom) || time.isAfter(endTo)) {
-                        // 获取第二天的 firstFrom
-                        ZonedDateTime nextDayFromTime = dateTime.toLocalDate().plusDays(1).atTime(firstFrom).atZone(dateTime.getZone());
-
-                        // 计算当前时间到 nextDayFromTime 的差值
-                        Duration timeDifference = Duration.between(dateTime, nextDayFromTime);
-
-                        // 计算可以整除的 duration 数量
-                        long n = timeDifference.toMillis() / duration.toMillis();
-
-                        // 跳转到下一个 n * duration 的时间点
-                        dateTime = dateTime.plus(n * duration.toMillis(), ChronoUnit.MILLIS);
-                    }
                     if (filter.test(dateTime.toLocalDateTime())) {
                         break;
                     }
@@ -516,146 +356,8 @@ public class TimerSpec implements Serializable {
         };
     }
 
-    private TimerIterable onceIterable() {
-        Assert.notNull(once, "once can not be null");
-        Predicate<LocalDateTime> filter = createTimeFilter();
-        LocalTime onceTime = once.localTime();
-        return baseTime -> new Iterator<ZonedDateTime>() {
-            ZonedDateTime current = baseTime;
-
-            @Override
-            public boolean hasNext() {
-                return true;
-            }
-
-            @Override
-            public ZonedDateTime next() {
-                ZonedDateTime dateTime = current;
-                int max = MAX_IT_TIMES;
-                if (!dateTime.toLocalTime().equals(onceTime)) {
-                    dateTime = onceTime.atDate(dateTime.toLocalDate()).atZone(dateTime.getZone());
-                }
-                do {
-                    if (filter.test(dateTime.toLocalDateTime()) && current.compareTo(dateTime) <= 0) {
-                        current = dateTime.plusDays(1);
-                        break;
-                    }
-                    dateTime = dateTime.plusDays(1);
-                    max--;
-                } while (max > 0);
-                return dateTime;
-            }
-        };
-    }
-
-    private TimerIterable multiSpecIterable() {
-        List<TimerSpec> multiSpec = multi.getSpec();
-        Assert.notEmpty(multiSpec, "multiSpec can not be empty");
-        return baseTime -> new Iterator<ZonedDateTime>() {
-            final List<ZonedDateTime> timeList = new ArrayList<>(multiSpec.size());
-
-            final List<Iterator<ZonedDateTime>> iterators = multiSpec
-                .stream()
-                .map(spec -> spec.iterable().iterator(baseTime))
-                .collect(Collectors.toList());
-
-            @Override
-            public boolean hasNext() {
-                switch (multi.getType()) {
-                    case and:
-                        return iterators.stream().allMatch(Iterator::hasNext);
-                    case or:
-                        return iterators.stream().anyMatch(Iterator::hasNext);
-                    default:
-                        return false;
-                }
-            }
-
-            @Override
-            public ZonedDateTime next() {
-                switch (multi.getType()) {
-                    case and:
-                        return handleNextAnd();
-                    case or:
-                        return handleNextOr();
-                    default:
-                        return baseTime;
-                }
-            }
-
-            private ZonedDateTime handleNextAnd() {
-                ZonedDateTime dateTime = null;
-                int max = MAX_IT_TIMES;
-                int match = 0;
-                do {
-                    for (Iterator<ZonedDateTime> iterator : iterators) {
-                        ZonedDateTime next = iterator.next();
-                        if (dateTime == null) {
-                            dateTime = next;
-                        }
-                        // 若生成的时间比当前选中的时间早，则继续生成
-                        while (next.isBefore(dateTime)) {
-                            next = iterator.next();
-                        }
-                        if (next.isEqual(dateTime)) {
-                            // 所有定时器的next时间一致时，返回时间
-                            if (++match == iterators.size()) {
-                                return dateTime;
-                            }
-                        } else {
-                            dateTime = next;
-                        }
-                    }
-                    max--;
-                } while (
-                    max > 0
-                );
-                return dateTime;
-            }
-
-            private ZonedDateTime handleNextOr() {
-                ZonedDateTime earliest = null;
-                // 每个定时器生成next
-                fillTimeList();
-
-                // 获取最早的一个时间
-                for (ZonedDateTime zonedDateTime : timeList) {
-                    if (earliest == null || earliest.isAfter(zonedDateTime) || earliest.isEqual(zonedDateTime)) {
-                        earliest = zonedDateTime;
-                    }
-                }
-                // 清空被选中的最早时间
-                for (int i = 0; i < timeList.size(); i++) {
-                    if (timeList.get(i).isEqual(earliest)) {
-                        timeList.set(i, null);
-                    }
-                }
-                return earliest;
-            }
-
-            /**
-             * 遍历所有定时器，若有next为空的则生成新的
-             */
-            private void fillTimeList() {
-                for (int i = 0; i < iterators.size(); i++) {
-                    if (timeList.size() <= i) {
-                        timeList.add(iterators.get(i).next());
-                    } else if (timeList.get(i) == null) {
-                        timeList.set(i, iterators.get(i).next());
-                    }
-                }
-            }
-        };
-    }
-
     public TimerIterable iterable() {
-        if (trigger == Trigger.multi) {
-            return multiSpecIterable();
-        }
-        if ((trigger == Trigger.cron || trigger == null) && cron != null) {
-            return cronIterable();
-        }
-        return mod == ExecuteMod.period ? periodIterable() : onceIterable();
+        return mod == ExecuteMod.period ? periodIterable() : cronIterable();
     }
 
     public List<ZonedDateTime> getNextExecuteTimes(ZonedDateTime from, long times) {
@@ -667,197 +369,10 @@ public class TimerSpec implements Serializable {
         return timeList;
     }
 
-    public Flux<Long> flux() {
-        return flux(Schedulers.parallel());
-    }
-
-    public Flux<Long> flux(Scheduler scheduler) {
-        return new TimerFlux(nextDurationBuilder(), scheduler);
-    }
-
-    @Override
-    public String toString() {
-        if (getTrigger() == null) {
-            return null;
-        }
-        switch (getTrigger()) {
-            case week: {
-                return weekDesc();
-            }
-            case month: {
-                return monthDesc();
-            }
-            case cron: {
-               return getCron();
-            }
-        }
-        return null;
-    }
-
-    private String weekDesc() {
-        I18nSpec spec = new I18nSpec();
-        spec.setCode("message.timer_spec_desc");
-        List<I18nSpec> args = new ArrayList<>();
-        if (when == null || when.isEmpty()) {
-            args.add(I18nSpec.of("message.timer_spec_desc_everyday", "每天"));
-        } else {
-            String week = when
-                .stream()
-                .map(weekNum -> LocaleUtils.resolveMessage("message.timer_spec_desc_week_" + weekNum))
-                .collect(Collectors.joining(LocaleUtils.resolveMessage("message.timer_spec_desc_seperator")));
-            args.add(I18nSpec.of(
-                "message.timer_spec_desc_everyweek",
-                "每周" + week,
-                week));
-        }
-        args.add(timerModDesc());
-        spec.setArgs(args);
-        return spec.resolveI18nMessage();
-    }
-
-    private String monthDesc() {
-        I18nSpec spec = new I18nSpec();
-        spec.setCode("message.timer_spec_desc");
-        List<I18nSpec> args = new ArrayList<>();
-        if (when == null || when.isEmpty()) {
-            args.add(I18nSpec.of("message.timer_spec_desc_everyday", "每天"));
-        } else {
-            String month = when
-                .stream()
-                .map(monthNum -> {
-                    switch (monthNum) {
-                        case 1:
-                            return LocaleUtils.resolveMessage("message.timer_spec_desc_month_1", monthNum);
-                        case 2:
-                            return LocaleUtils.resolveMessage("message.timer_spec_desc_month_2", monthNum);
-                        case 3:
-                            return LocaleUtils.resolveMessage("message.timer_spec_desc_month_3", monthNum);
-                        default:
-                            return LocaleUtils.resolveMessage("message.timer_spec_desc_month", monthNum);
-                    }
-                })
-                .collect(Collectors.joining(LocaleUtils.resolveMessage("message.timer_spec_desc_seperator")));
-            args.add(I18nSpec.of(
-                "message.timer_spec_desc_everymonth",
-                "每月" + month,
-                month));
-        }
-        args.add(timerModDesc());
-        spec.setArgs(args);
-        return spec.resolveI18nMessage();
-    }
-
-    private I18nSpec timerModDesc() {
-        switch (getMod()) {
-            case period: {
-                if (getPeriod() == null) {
-                    break;
-                }
-                return I18nSpec.of(
-                    "message.timer_spec_desc_period",
-                    getPeriod().getFrom() + "-" + getPeriod().getTo() +
-                        " 每" + getPeriod().getEvery() + getPeriod().getUnit().name(),
-                    I18nSpec.of("message.timer_spec_desc_period_duration",
-                                getPeriod().getFrom() + "-" + getPeriod().getTo(),
-                                getPeriod().getFrom(),
-                                getPeriod().getTo()),
-                    getPeriod().getEvery(),
-                    I18nSpec.of("message.timer_spec_desc_period_" + getPeriod().getUnit().name(),
-                                getPeriod().getUnit().name())
-                );
-            }
-            case once: {
-                // [time]，执行1次
-                if (getOnce() == null) {
-                    break;
-                }
-                return I18nSpec.of("message.timer_spec_desc_period_once", getOnce().getTime(), getOnce().getTime());
-            }
-        }
-        return I18nSpec.of("", "");
-    }
-
-    @AllArgsConstructor
-    static class TimerFlux extends Flux<Long> {
-        final Function<ZonedDateTime, Duration> spec;
-        final Scheduler scheduler;
-
-        @Override
-        public void subscribe(@Nonnull CoreSubscriber<? super Long> coreSubscriber) {
-
-            TimerSubscriber subscriber = new TimerSubscriber(spec, scheduler, coreSubscriber);
-            coreSubscriber.onSubscribe(subscriber);
-        }
-    }
-
-    static class TimerSubscriber implements Subscription {
-        final Function<ZonedDateTime, Duration> spec;
-        final CoreSubscriber<? super Long> subscriber;
-        final Scheduler scheduler;
-        long count;
-        Disposable scheduling;
-
-        public TimerSubscriber(Function<ZonedDateTime, Duration> spec,
-                               Scheduler scheduler,
-                               CoreSubscriber<? super Long> subscriber) {
-            this.scheduler = scheduler;
-            this.spec = spec;
-            this.subscriber = subscriber;
-        }
-
-
-        @Override
-        public void request(long l) {
-            trySchedule();
-        }
-
-        @Override
-        public void cancel() {
-            if (scheduling != null) {
-                scheduling.dispose();
-            }
-        }
-
-        public void onNext() {
-
-            if (canSchedule()) {
-                subscriber.onNext(count++);
-            }
-            trySchedule();
-        }
-
-        void trySchedule() {
-            if (scheduling != null) {
-                scheduling.dispose();
-            }
-
-            ZonedDateTime now = ZonedDateTime.ofInstant(Instant.ofEpochMilli(scheduler.now(TimeUnit.MILLISECONDS)), ZoneId.systemDefault());
-            Duration delay = spec.apply(now);
-
-            scheduling = scheduler
-                .schedule(
-                    this::onNext,
-                    delay.toMillis(),
-                    TimeUnit.MILLISECONDS
-                );
-        }
-
-        protected boolean canSchedule() {
-            return true;
-        }
-
-
-    }
-
     public enum Trigger {
-        //按周
         week,
-        //按月
         month,
-        //cron表达式
-        cron,
-        // 多个触发组合
-        multi
+        cron
     }
 
     public enum ExecuteMod {

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

@@ -1,23 +1,7 @@
-/*
- * 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;
 import org.jetlinks.community.utils.TimeUtils;
-import org.jetlinks.reactor.ql.utils.CastUtils;
 import org.springframework.util.StringUtils;
 
 import java.time.Duration;
@@ -31,7 +15,7 @@ public interface ValueObject {
 
     default Optional<Object> get(String name) {
         return Optional.ofNullable(values())
-                       .map(map -> map.get(name));
+            .map(map -> map.get(name));
     }
 
     default Optional<Integer> getInt(String name) {
@@ -60,8 +44,9 @@ public interface ValueObject {
             .map(Interval::of);
     }
 
-    default Interval getInterval(String name, Interval defaultValue) {
-        return getInterval(name)
+    default Interval getInterval(String name,Interval defaultValue) {
+        return getString(name)
+            .map(Interval::of)
             .orElse(defaultValue);
     }
 
@@ -71,14 +56,9 @@ public interface ValueObject {
     }
 
     default Optional<Date> getDate(String name) {
-        return this
-            .get(name)
-            .map(d -> {
-                if (d instanceof Date) {
-                    return (Date) d;
-                }
-                return TimeUtils.parseDate(String.valueOf(d));
-            });
+        return get(name)
+            .map(String::valueOf)
+            .map(TimeUtils::parseDate);
     }
 
     default Date getDate(String name, Date defaultValue) {
@@ -103,8 +83,7 @@ public interface ValueObject {
     }
 
     default Optional<Boolean> getBoolean(String name) {
-        return get(name)
-            .map(CastUtils::castBoolean);
+        return get(name, Boolean.class);
     }
 
     default boolean getBoolean(String name, boolean defaultValue) {
@@ -116,9 +95,8 @@ public interface ValueObject {
             .map(obj -> FastBeanCopier.DEFAULT_CONVERT.convert(obj, type, FastBeanCopier.EMPTY_CLASS_ARRAY));
     }
 
-    @SuppressWarnings("unchecked")
-    static ValueObject of(Map<String, ?> mapVal) {
-        return () -> (Map<String, Object>) mapVal;
+    static ValueObject of(Map<String, Object> mapVal) {
+        return () -> mapVal;
     }
 
     default <T> T as(Class<T> type) {

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.0.0-SNAPSHOT";
 
 }

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

@@ -1,79 +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.annotation.command;
-
-
-import org.jetlinks.core.annotation.command.CommandHandler;
-import org.springframework.stereotype.Indexed;
-
-import java.lang.annotation.*;
-
-/**
- * 标记一个类为命令服务支持端点,用于对外提供命令支持
- * <pre>{@code
- *
- *  @CommandService("myService")
- *  public class MyCommandService{
- *
- *  }
- *
- * }</pre>
- *
- * @author zhouhao
- * @since 1.2.3
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Inherited
-@Indexed
-public @interface CommandService {
-
-    /**
-     * 服务标识
-     *
-     * @return 服务标识
-     */
-    String id();
-
-    /**
-     * 服务名称
-     *
-     * @return 服务名称
-     */
-    String name();
-
-    /**
-     * 服务描述
-     *
-     * @return 服务描述
-     */
-    String[] description() default {};
-
-
-    /**
-     * 是否根据注解扫描注册服务
-     *
-     * @return 是否注册服务
-     */
-    boolean autoRegistered() default true;
-
-    /**
-     * 命令定义,用于声明支持的命令
-     *
-     * @return 命令定义
-     */
-    CommandHandler[] commands() default {};
-}

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

@@ -1,81 +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.authorize;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.hswebframework.web.authorization.Authentication;
-import org.hswebframework.web.authorization.DefaultDimensionType;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Predicate;
-
-@Getter
-@Setter
-public class AuthenticationSpec implements Serializable {
-
-    private static final long serialVersionUID = 3512105446265694264L;
-
-    private RoleSpec role;
-
-    private List<PermissionSpec> permissions;
-
-    @Getter
-    @Setter
-    public static class RoleSpec {
-        private List<String> idList;
-    }
-
-    @Getter
-    @Setter
-    public static class PermissionSpec implements Serializable {
-        private static final long serialVersionUID = 7188197046015343251L;
-        private String id;
-        private List<String> actions;
-    }
-
-    public boolean isGranted(Authentication auth) {
-        return createFilter().test(auth);
-    }
-
-    public Predicate<Authentication> createFilter() {
-        RoleSpec role = this.role;
-        List<PermissionSpec> permissions = this.permissions;
-        List<Predicate<Authentication>> all = new ArrayList<>();
-
-        if (null != role && role.getIdList() != null) {
-            all.add(auth -> auth.hasDimension(DefaultDimensionType.role.getId(), role.getIdList()));
-        }
-
-        if (null != permissions) {
-            for (PermissionSpec permission : permissions) {
-                all.add(auth -> auth.hasPermission(permission.getId(), permission.getActions()));
-            }
-        }
-
-        Predicate<Authentication> temp = null;
-        for (Predicate<Authentication> predicate : all) {
-            if (temp == null) {
-                temp = predicate;
-            } else {
-                temp = temp.and(predicate);
-            }
-        }
-        return temp == null ? auth -> true : temp;
-    }
-}

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

@@ -1,448 +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.authorize;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import lombok.AllArgsConstructor;
-import lombok.Setter;
-import lombok.SneakyThrows;
-import org.apache.commons.lang3.StringUtils;
-import org.hswebframework.web.authorization.*;
-import org.hswebframework.web.authorization.simple.*;
-import org.hswebframework.web.bean.FastBeanCopier;
-import org.jetlinks.core.metadata.Jsonable;
-import org.jetlinks.core.utils.RecyclerUtils;
-import org.jetlinks.core.utils.SerializeUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.*;
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-@Setter
-public class FastSerializableAuthentication extends SimpleAuthentication
-    implements Externalizable, Jsonable {
-
-    private static final Logger log = LoggerFactory.getLogger(FastSerializableAuthentication.class);
-
-    static {
-        SerializeUtils.registerSerializer(
-            0x90,
-            FastSerializableAuthentication.class,
-            (ignore) -> new FastSerializableAuthentication());
-    }
-
-    public static void load() {
-
-    }
-
-    @SuppressWarnings("all")
-    public static Authentication of(Object jsonOrObject, boolean share) {
-        if (jsonOrObject == null) {
-            return null;
-        }
-        //json
-        if (jsonOrObject instanceof String) {
-            return of((String) jsonOrObject, share);
-        }
-        // map
-        if (jsonOrObject instanceof Map) {
-            FastSerializableAuthentication fast = new FastSerializableAuthentication();
-            fast.shared = share;
-            fast.fromJson(new JSONObject((Map) jsonOrObject));
-            return fast;
-        }
-        //auth
-        if (jsonOrObject instanceof Authentication) {
-            return of(((Authentication) jsonOrObject));
-        }
-        throw new UnsupportedOperationException();
-    }
-
-    public static Authentication of(String json, boolean share) {
-        if (StringUtils.isEmpty(json)) {
-            return null;
-        }
-        FastSerializableAuthentication fast = new FastSerializableAuthentication();
-        fast.shared = share;
-        fast.fromJson(JSON.parseObject(json));
-        return fast;
-    }
-
-
-    public static Authentication of(Authentication auth) {
-        return of(auth, false);
-    }
-
-    public static Authentication of(Authentication auth, boolean simplify) {
-        if (auth instanceof FastSerializableAuthentication) {
-            ((FastSerializableAuthentication) auth).simplify = simplify;
-            return auth;
-        }
-        FastSerializableAuthentication fast = new FastSerializableAuthentication();
-        fast.setUser(auth.getUser());
-        fast.setSimplify(simplify);
-        fast.getPermissions().addAll(auth.getPermissions());
-        fast.getDimensions().addAll(auth.getDimensions());
-        fast.getAttributes().putAll(auth.getAttributes());
-        return fast;
-    }
-
-    @Override
-    protected FastSerializableAuthentication newInstance() {
-        return new FastSerializableAuthentication();
-    }
-
-    /**
-     * 是否简化,为true时,不序列化权限名称
-     *
-     * @see Permission#getName()
-     */
-    private boolean simplify = false;
-
-    private transient boolean shared;
-
-    public void makeShared() {
-        shared = true;
-        List<Dimension> dimensions = getDimensions()
-            .stream()
-            .map(RecyclerUtils::intern)
-            .collect(Collectors.toList());
-        setDimensions(dimensions);
-    }
-
-    @Override
-    public void writeExternal(ObjectOutput out) throws IOException {
-        String userId = null;
-        try {
-            out.writeByte(0x01);
-            //是否简化模式
-            out.writeBoolean(simplify);
-
-            //user
-            User user = getUser();
-            out.writeUTF(user.getId() == null ? "" : (userId = user.getId()));
-            SerializeUtils.writeNullableUTF(user.getName(), out);
-            out.writeUTF(user.getUsername() == null ? "" : user.getUsername());
-            SerializeUtils.writeNullableUTF(user.getUserType(), out);
-            SerializeUtils.writeKeyValue(user.getOptions(), out);
-
-            //permission
-            {
-                List<Permission> permissions = getPermissions();
-                if (permissions == null) {
-                    permissions = Collections.emptyList();
-                }
-                out.writeInt(permissions.size());
-                for (Permission permission : permissions) {
-                    write(permission, out);
-                }
-            }
-            //dimension
-            {
-                List<Dimension> dimensions = getDimensions();
-                if (dimensions == null) {
-                    dimensions = Collections.emptyList();
-                }
-                out.writeInt(dimensions.size());
-                for (Dimension permission : dimensions) {
-                    write(permission, out);
-                }
-            }
-
-            SerializeUtils.writeKeyValue(getAttributes(), out);
-
-        } catch (Throwable e) {
-            log.warn("write FastSerializableAuthentication [{}] error", userId, e);
-            throw e;
-        }
-    }
-
-    @Override
-    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        byte version = in.readByte();
-        simplify = in.readBoolean();
-
-        //user
-        SimpleUser user = new SimpleUser();
-        user.setId(in.readUTF());
-        user.setName(SerializeUtils.readNullableUTF(in));
-        user.setUsername(in.readUTF());
-        user.setUserType(SerializeUtils.readNullableUTF(in));
-        user.setOptions(SerializeUtils.readMap(in, Maps::newHashMapWithExpectedSize));
-
-        setUser0(user);
-
-        //permission
-        {
-            int size = in.readInt();
-            List<Permission> permissions = new ArrayList<>(size);
-            for (int i = 0; i < size; i++) {
-                Permission permission = readPermission(in);
-                permissions.add(permission);
-            }
-            setPermissions(permissions);
-        }
-        //dimension
-        {
-            int size = in.readInt();
-            Set<Dimension> dimensions = new HashSet<>(size);
-            for (int i = 0; i < size; i++) {
-                Dimension dimension = readDimension(in);
-                dimensions.add(dimension);
-            }
-            setDimensions(dimensions);
-        }
-
-        setAttributes(SerializeUtils.readMap(in, Maps::newHashMapWithExpectedSize));
-    }
-
-    @SneakyThrows
-    private Dimension readDimension(ObjectInput in) {
-        SimpleDimension dimension = new SimpleDimension();
-        dimension.setId(in.readUTF());
-        dimension.setName(in.readUTF());
-
-        dimension.setOptions(SerializeUtils.readMap(
-            in,
-            k -> RecyclerUtils.intern(String.valueOf(k)),
-            Function.identity(),
-            Maps::newHashMapWithExpectedSize));
-
-        boolean known = in.readBoolean();
-        if (known) {
-            KnownDimension knownDimension = KnownDimension.ALL[in.readByte()];
-            dimension.setType(knownDimension.type);
-        } else {
-            SimpleDimensionType type = new SimpleDimensionType();
-            type.setId(in.readUTF());
-            type.setName(in.readUTF());
-            dimension.setType(RecyclerUtils.intern(type));
-        }
-        return dimension;
-    }
-
-
-    @SneakyThrows
-    private void write(Dimension dimension, ObjectOutput out) {
-        out.writeUTF(dimension.getId());
-        out.writeUTF(dimension.getName() == null ? "" : dimension.getName());
-
-        SerializeUtils.writeKeyValue(dimension.getOptions(), out);
-
-        KnownDimension knownDimension = KnownDimension.MAPPING.get(dimension.getType().getId());
-
-        out.writeBoolean(knownDimension != null);
-        if (knownDimension != null) {
-            out.writeByte(knownDimension.ordinal());
-        } else {
-            out.writeUTF(dimension.getType().getId());
-            out.writeUTF(dimension.getType().getName());
-        }
-
-    }
-
-
-    @SneakyThrows
-    private Permission readPermission(ObjectInput in) {
-        SimplePermission permission = new SimplePermission();
-        permission.setId(in.readUTF());
-        if (!simplify) {
-            permission.setName(in.readUTF());
-        } else {
-            permission.setName(permission.getId());
-        }
-        permission.setOptions(SerializeUtils.readMap(in, Maps::newHashMapWithExpectedSize));
-
-        int actionSize = in.readUnsignedShort();
-        Set<String> actions = Sets.newHashSetWithExpectedSize(actionSize);
-        for (int i = 0; i < actionSize; i++) {
-            if (in.readBoolean()) {
-                actions.add(KnownAction.ALL[in.readByte()].action);
-            } else {
-                actions.add(in.readUTF());
-            }
-        }
-        permission.setActions(actions);
-        return permission;
-    }
-
-    @SneakyThrows
-    private void write(Permission permission, ObjectOutput out) {
-        out.writeUTF(permission.getId());
-        if (!simplify) {
-            out.writeUTF(permission.getName() == null ? "" : permission.getName());
-        }
-
-        SerializeUtils.writeKeyValue(permission.getOptions(), out);
-        Set<String> actions = permission.getActions();
-        out.writeShort(actions.size());
-
-        for (String action : actions) {
-            KnownAction knownAction = KnownAction.ACTION_MAP.get(action);
-            out.writeBoolean(knownAction != null);
-            if (null != knownAction) {
-                out.writeByte(knownAction.ordinal());
-            } else {
-                out.writeUTF(action);
-            }
-        }
-    }
-
-    @AllArgsConstructor
-    enum KnownDimension {
-        user(DefaultDimensionType.user),
-        role(DefaultDimensionType.role),
-        org(OrgDimensionType.org),
-        parentOrg(OrgDimensionType.parentOrg);
-        private final DimensionType type;
-        static final KnownDimension[] ALL = values();
-        static final Map<Object, KnownDimension> MAPPING = new HashMap<>();
-
-        static {
-            for (KnownDimension value : ALL) {
-                MAPPING.put(value, value);
-                MAPPING.put(value.ordinal(), value);
-                MAPPING.put(value.name(), value);
-            }
-        }
-    }
-
-    enum KnownAction {
-        query,
-        get,
-        update,
-        save,
-        delete,
-        export,
-        _import(Permission.ACTION_IMPORT),
-        enable,
-        disable;
-        static final KnownAction[] ALL = values();
-        static final Map<Object, KnownAction> ACTION_MAP = new HashMap<>();
-
-        static {
-            for (KnownAction value : ALL) {
-                ACTION_MAP.put(value, value);
-                ACTION_MAP.put(value.ordinal(), value);
-                ACTION_MAP.put(value.action, value);
-            }
-        }
-
-        private final String action;
-
-        KnownAction() {
-            this.action = name();
-        }
-
-        KnownAction(String action) {
-            this.action = action;
-        }
-    }
-
-    @Override
-    public JSONObject toJson() {
-        JSONObject obj = new JSONObject();
-        obj.put("user", SerializeUtils.convertToSafelySerializable(getUser()));
-        obj.put("permissions", SerializeUtils.convertToSafelySerializable(getPermissions()));
-        //忽略user
-        obj.put("dimensions", SerializeUtils.convertToSafelySerializable(
-            Collections2.filter(getDimensions(), i -> !(i instanceof User))
-        ));
-        obj.put("attributes", new HashMap<>(getAttributes()));
-
-        return obj;
-    }
-
-    @Override
-    public void fromJson(JSONObject json) {
-        JSONObject user = json.getJSONObject("user");
-        if (user != null) {
-            setUser(user.toJavaObject(SimpleUser.class));
-        }
-        JSONArray permissions = json.getJSONArray("permissions");
-        if (permissions != null) {
-            for (int i = 0, size = permissions.size(); i < size; i++) {
-                JSONObject permission = permissions.getJSONObject(i);
-                //不再支持
-                permission.remove("dataAccesses");
-
-                Object actions = permission.remove("actions");
-                SimplePermission perm = permission.toJavaObject(SimplePermission.class);
-
-                if (actions instanceof Collection) {
-                    @SuppressWarnings("all")
-                    Collection<Object> _actions = (Collection<Object>) actions;
-                    Set<String> acts = Sets.newHashSetWithExpectedSize(_actions.size());
-                    for (Object action : _actions) {
-                        KnownAction act = KnownAction.ACTION_MAP.get(action);
-                        if (act == null) {
-                            acts.add(String.valueOf(action));
-                        } else {
-                            acts.add(act.action);
-                        }
-                    }
-                    perm.setActions(acts);
-                }
-
-                getPermissions().add(shared ? RecyclerUtils.intern(perm) : perm);
-            }
-        }
-        JSONArray dimensions = json.getJSONArray("dimensions");
-
-        if (dimensions != null) {
-            for (int i = 0, size = dimensions.size(); i < size; i++) {
-                JSONObject dimension = dimensions.getJSONObject(i);
-                Object type = dimension.remove("type");
-                if (type == null) {
-                    continue;
-                }
-                SimpleDimension simpleDimension = dimension.toJavaObject(SimpleDimension.class);
-                if (type instanceof DimensionType) {
-                    simpleDimension.setType((DimensionType) type);
-                } else {
-                    KnownDimension knownDimension = KnownDimension.MAPPING.get(type);
-                    if (knownDimension != null) {
-                        simpleDimension.setType(knownDimension.type);
-                    } else {
-                        SimpleDimensionType dimensionType;
-                        if (type instanceof String) {
-                            dimensionType = SimpleDimensionType.of(String.valueOf(type));
-                        } else {
-                            dimensionType = FastBeanCopier.copy(type, new SimpleDimensionType());
-                        }
-                        if (StringUtils.isNoneEmpty(dimensionType.getId())) {
-                            simpleDimension.setType(shared ? RecyclerUtils.intern(dimensionType) : dimensionType);
-                        }
-                    }
-                }
-                getDimensions().add(shared ? RecyclerUtils.intern(simpleDimension) : simpleDimension);
-            }
-        }
-        JSONObject attr = json.getJSONObject("attributes");
-        if (attr != null) {
-            getAttributes().putAll(Maps.transformValues(attr, Serializable.class::cast));
-        }
-
-    }
-}

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

@@ -1,37 +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.authorize;
-
-import lombok.AllArgsConstructor;
-import lombok.Generated;
-import lombok.Getter;
-import org.hswebframework.web.authorization.DimensionType;
-
-/**
- * @author wangzheng
- * @since 1.0
- */
-@AllArgsConstructor
-@Getter
-@Generated
-public enum OrgDimensionType implements DimensionType {
-    org("org","组织"),
-    parentOrg("parentOrg","上级组织");
-
-    private final String id;
-    private final String name;
-
-}

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

@@ -1,96 +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.buffer;
-
-import org.jetlinks.community.Operation;
-import org.jetlinks.community.OperationSource;
-import org.jetlinks.community.OperationType;
-import org.jetlinks.community.event.SystemEventHolder;
-import org.jetlinks.community.utils.TimeUtils;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
-import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-
-public abstract class AbstractBufferEviction implements BufferEviction {
-
-    public static final OperationType OPERATION_TYPE = OperationType.of("buffer-eviction", "缓冲区数据丢弃");
-
-    private static final AtomicLongFieldUpdater<AbstractBufferEviction>
-        LAST_EVENT_TIME = AtomicLongFieldUpdater.newUpdater(AbstractBufferEviction.class, "lastEventTime");
-    private static final AtomicIntegerFieldUpdater<AbstractBufferEviction>
-        LAST_TIMES = AtomicIntegerFieldUpdater.newUpdater(AbstractBufferEviction.class, "lastTimes");
-
-    //最大事件推送频率
-    //可通过java -Djetlinks.buffer.eviction.event.max-interval=10m修改配置
-    private static final long MAX_EVENT_INTERVAL =
-        TimeUtils.parse(System.getProperty("jetlinks.buffer.eviction.event.max-interval", "10m")).toMillis();
-
-    private volatile long lastEventTime;
-    private volatile int lastTimes;
-
-    abstract boolean doEviction(EvictionContext context);
-
-    @Override
-    public boolean tryEviction(EvictionContext context) {
-        if (doEviction(context)) {
-            sendEvent(context);
-            return true;
-        }
-        return false;
-    }
-
-    private String operationCode() {
-        return getClass().getSimpleName();
-    }
-
-    private void sendEvent(EvictionContext context) {
-        long now = System.currentTimeMillis();
-        long time = LAST_EVENT_TIME.get(this);
-        //记录事件推送周期内总共触发了多少次
-        LAST_TIMES.incrementAndGet(this);
-
-        //超过间隔事件则推送事件,防止推送太多错误事件
-        if (now - time > MAX_EVENT_INTERVAL) {
-            LAST_EVENT_TIME.set(this, now);
-            Map<String, Object> info = new HashMap<>();
-
-            //缓冲区数量
-            info.put("bufferSize", context.size(EvictionContext.BufferType.buffer));
-            //死数据数量
-            info.put("deadSize", context.size(EvictionContext.BufferType.dead));
-            //总计触发次数
-            info.put("times", LAST_TIMES.getAndSet(this, 0));
-
-            //应用自定义的数据,比如磁盘剩余空间等信息
-            applyEventData(info);
-
-            //推送系统事件
-            SystemEventHolder.warn(
-                Operation.of(
-                    OperationSource.of(context.getName(), "eviction"),
-                    OPERATION_TYPE),
-                operationCode(),
-                info
-            );
-        }
-    }
-
-    protected void applyEventData(Map<String, Object> data) {
-
-    }
-}

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

@@ -1,148 +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.buffer;
-
-import org.springframework.util.unit.DataSize;
-
-import java.io.File;
-
-/**
- * 缓存淘汰策略
- *
- * @author zhouhao
- * @since 2.0
- */
-public interface BufferEviction {
-
-    BufferEviction NONE = new BufferEviction() {
-        @Override
-        public boolean tryEviction(EvictionContext context) {
-            return false;
-        }
-
-        @Override
-        public String toString() {
-            return "None";
-        }
-    };
-
-    /**
-     * 根据磁盘使用率来进行淘汰,磁盘使用率超过阈值时则淘汰旧数据
-     *
-     * @param path      文件路径
-     * @param threshold 使用率阈值 范围为0-1 .如: 0.8 表示磁盘使用率超过80%则丢弃数据
-     * @return 淘汰策略
-     */
-    static BufferEviction disk(String path, float threshold) {
-        return new DiskUsageEviction(new File(path), threshold);
-    }
-
-    /**
-     * 根据磁盘可用空间来进行淘汰,磁盘剩余空间低于阈值时则淘汰旧数据
-     *
-     * @param path              文件路径
-     * @param minUsableDataSize 磁盘最小可用空间阈值,当磁盘可用空间低于此值时则则淘汰旧数据
-     * @return 淘汰策略
-     */
-    static BufferEviction disk(String path, DataSize minUsableDataSize) {
-        return new DiskFreeEviction(new File(path), minUsableDataSize.toBytes());
-    }
-
-    /**
-     * 根据缓冲区数量来淘汰数据,当数量超过指定阈值后则淘汰旧数据
-     *
-     * @param bufferLimit 数量阈值
-     * @return 淘汰策略
-     */
-    static BufferEviction limit(long bufferLimit) {
-        return limit(bufferLimit, bufferLimit);
-    }
-
-    /**
-     * 根据缓冲区数量来淘汰数据,当数量超过指定阈值后则淘汰旧数据
-     *
-     * @param bufferLimit 缓冲数量阈值
-     * @param deadLimit   死数据数量阈值
-     * @return 淘汰策略
-     */
-    static BufferEviction limit(long bufferLimit, long deadLimit) {
-        return new SizeLimitEviction(bufferLimit, deadLimit);
-    }
-
-    /**
-     * 根据缓冲区数量来淘汰死数据
-     *
-     * @param deadLimit 死数据数量阈值
-     * @return 淘汰策略
-     */
-    static BufferEviction deadLimit(long deadLimit) {
-        return new SizeLimitEviction(-1, deadLimit);
-    }
-
-    /**
-     * 尝试执行淘汰
-     *
-     * @param context 上下文
-     * @return 是否有数据被淘汰
-     */
-    boolean tryEviction(EvictionContext context);
-
-    /**
-     * 组合另外一个淘汰策略,2个策略同时执行.
-     *
-     * @param after 后续策略
-     * @return 淘汰策略
-     */
-    default BufferEviction and(BufferEviction after) {
-        BufferEviction self = this;
-        return new BufferEviction() {
-            @Override
-            public boolean tryEviction(EvictionContext context) {
-               return self.tryEviction(context) & after.tryEviction(context);
-            }
-
-            @Override
-            public String toString() {
-                return self + " and " + after;
-            }
-        };
-    }
-
-    /**
-     * 组合另外一个淘汰策略,当前策略淘汰了数据才执行另外一个策略
-     *
-     * @param after 后续策略
-     * @return 淘汰策略
-     */
-    default BufferEviction then(BufferEviction after) {
-        BufferEviction self = this;
-        return new BufferEviction() {
-            @Override
-            public boolean tryEviction(EvictionContext context) {
-                if (self.tryEviction(context)) {
-                    after.tryEviction(context);
-                    return true;
-                }
-                return false;
-            }
-
-            @Override
-            public String toString() {
-                return self + " then " + after;
-            }
-        };
-    }
-}

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

@@ -1,70 +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.buffer;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.util.unit.DataSize;
-
-@Getter
-@Setter
-public class BufferEvictionSpec {
-
-    public static final BufferEviction DEFAULT = new BufferEvictionSpec().build();
-
-    //最大队列数量,超过则淘汰最旧的数据
-    private int maxSize = -1;
-
-    //最大死信数量,超过则淘汰dead数据
-    private int maxDeadSize = Integer.getInteger("jetlinks.buffer.dead.limit", 100_0000);
-
-    //根据磁盘空间淘汰数据
-    private DataSize diskFree = DataSize.parse(System.getProperty("jetlinks.buffer.disk.free.threshold", "4GB"));
-
-    //磁盘最大使用率
-    private float diskThreshold;
-
-    //判断磁盘空间大小的目录
-    private String diskPath = System.getProperty("jetlinks.buffer.disk.free.path", "./");
-
-    public BufferEviction build() {
-
-        BufferEviction
-            eviction = null,
-            size = BufferEviction.limit(maxSize, maxDeadSize),
-            disk = null;
-
-        if (diskThreshold > 0) {
-            disk = BufferEviction.disk(diskPath, diskThreshold);
-        } else if (diskFree != null) {
-            disk = BufferEviction.disk(diskPath, diskFree);
-        }
-
-        if (disk != null) {
-            eviction = disk;
-        }
-
-        if (eviction == null) {
-            eviction = size;
-        } else {
-            eviction = eviction.then(size);
-        }
-
-        return eviction;
-    }
-
-
-}

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;
@@ -37,17 +22,4 @@ public class BufferProperties {
 
     //最大重试次数,超过此次数的数据将会放入死队列.
     private long maxRetryTimes = 64;
-
-    //文件操作的最大并行度,默认为1,不建议设置超过4.
-    private int fileConcurrency = 1;
-
-    //消费策略 默认先进先出
-    private ConsumeStrategy strategy = ConsumeStrategy.FIFO;
-
-    //淘汰策略
-    private BufferEvictionSpec eviction = new BufferEvictionSpec();
-
-    public boolean isExceededRetryCount(int count) {
-        return maxRetryTimes > 0 && count >= maxRetryTimes;
-    }
 }

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;
@@ -25,18 +10,19 @@ import org.springframework.transaction.CannotCreateTransactionException;
 import java.io.IOException;
 import java.time.Duration;
 import java.util.Objects;
-import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Predicate;
 
+/**
+ * @author zhouhao
+ * @since 2.0
+ */
 @Getter
 @AllArgsConstructor
 public class BufferSettings {
 
     private static final Predicate<Throwable> DEFAULT_RETRY_WHEN_ERROR =
         e -> ErrorUtils.hasException(e, IOException.class,
-                                     IllegalStateException.class,
-                                     RejectedExecutionException.class,
                                      TimeoutException.class,
                                      DataAccessResourceFailureException.class,
                                      CannotCreateTransactionException.class,
@@ -46,17 +32,10 @@ public class BufferSettings {
         return DEFAULT_RETRY_WHEN_ERROR;
     }
 
-    public static BufferEviction defaultEviction(){
-        return BufferEvictionSpec.DEFAULT;
-    }
-
     private final String filePath;
 
     private final String fileName;
 
-    //缓存淘汰策略
-    private final BufferEviction eviction;
-
     private final Predicate<Throwable> retryWhenError;
 
     //缓冲区大小,超过此大小将执行 handler 处理逻辑
@@ -71,23 +50,16 @@ public class BufferSettings {
     //最大重试次数,超过此次数的数据将会放入死队列.
     private final long maxRetryTimes;
 
-    private final int fileConcurrency;
-
-    private final ConsumeStrategy strategy;
 
     public static BufferSettings create(String filePath, String fileName) {
         return new BufferSettings(
             filePath,
             fileName,
-            defaultEviction(),
-            //默认重试逻辑
             defaultRetryWhenError(),
             1000,
             Duration.ofSeconds(1),
             Math.max(1, Runtime.getRuntime().availableProcessors() / 2),
-            5,
-            1,
-            ConsumeStrategy.FIFO);
+            5);
     }
 
     public static BufferSettings create(BufferProperties properties) {
@@ -98,122 +70,64 @@ public class BufferSettings {
         return create(properties.getFilePath(), fileName).properties(properties);
     }
 
-    public BufferSettings eviction(BufferEviction eviction) {
-        return new BufferSettings(filePath,
-                                  fileName,
-                                  eviction,
-                                  retryWhenError,
-                                  bufferSize,
-                                  bufferTimeout,
-                                  parallelism,
-                                  maxRetryTimes,
-                                  fileConcurrency,
-                                  strategy);
-    }
-
     public BufferSettings bufferSize(int bufferSize) {
         return new BufferSettings(filePath,
                                   fileName,
-                                  eviction,
                                   retryWhenError,
                                   bufferSize,
                                   bufferTimeout,
                                   parallelism,
-                                  maxRetryTimes,
-                                  fileConcurrency,
-                                  strategy);
+                                  maxRetryTimes);
     }
 
     public BufferSettings bufferTimeout(Duration bufferTimeout) {
         return new BufferSettings(filePath,
                                   fileName,
-                                  eviction,
                                   retryWhenError,
                                   bufferSize,
                                   bufferTimeout,
                                   parallelism,
-                                  maxRetryTimes,
-                                  fileConcurrency,
-                                  strategy);
+                                  maxRetryTimes);
     }
 
     public BufferSettings parallelism(int parallelism) {
         return new BufferSettings(filePath,
                                   fileName,
-                                  eviction,
                                   retryWhenError,
                                   bufferSize,
                                   bufferTimeout,
                                   parallelism,
-                                  maxRetryTimes,
-                                  fileConcurrency,
-                                  strategy);
+                                  maxRetryTimes);
     }
 
     public BufferSettings maxRetry(int maxRetryTimes) {
         return new BufferSettings(filePath,
                                   fileName,
-                                  eviction,
                                   retryWhenError,
                                   bufferSize,
                                   bufferTimeout,
                                   parallelism,
-                                  maxRetryTimes,
-                                  fileConcurrency,
-                                  strategy);
+                                  maxRetryTimes);
     }
 
     public BufferSettings retryWhenError(Predicate<Throwable> retryWhenError) {
         return new BufferSettings(filePath,
                                   fileName,
-                                  eviction,
                                   Objects.requireNonNull(retryWhenError),
                                   bufferSize,
                                   bufferTimeout,
                                   parallelism,
-                                  maxRetryTimes,
-                                  fileConcurrency,
-                                  strategy);
-    }
-
-    public BufferSettings fileConcurrency(int fileConcurrency) {
-        return new BufferSettings(filePath,
-                                  fileName,
-                                  eviction,
-                                  retryWhenError,
-                                  bufferSize,
-                                  bufferTimeout,
-                                  parallelism,
-                                  maxRetryTimes,
-                                  fileConcurrency,
-                                  strategy);
-    }
-
-    public BufferSettings strategy(ConsumeStrategy strategy) {
-        return new BufferSettings(filePath,
-                                  fileName,
-                                  eviction,
-                                  retryWhenError,
-                                  bufferSize,
-                                  bufferTimeout,
-                                  parallelism,
-                                  maxRetryTimes,
-                                  fileConcurrency,
-                                  strategy);
+                                  maxRetryTimes);
     }
 
     public BufferSettings properties(BufferProperties properties) {
         return new BufferSettings(filePath,
                                   fileName,
-                                  properties.getEviction().build(),
                                   Objects.requireNonNull(retryWhenError),
                                   properties.getSize(),
                                   properties.getTimeout(),
                                   properties.getParallelism(),
-                                  properties.getMaxRetryTimes(),
-                                  properties.getFileConcurrency(),
-                                  properties.getStrategy()
-                                  );
+                                  properties.getMaxRetryTimes());
     }
 
 

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

@@ -1,46 +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.buffer;
-
-/**
- * 已缓冲的数据
- *
- * @param <T> 数据类型
- * @author zhouhao
- * @since 2.2
- */
-public interface Buffered<T> {
-
-    /**
-     * @return 数据
-     */
-    T getData();
-
-    /**
-     * @return 当前重试次数
-     */
-    int getRetryTimes();
-
-    /**
-     * 标记是否重试此数据
-     */
-    void retry(boolean retry);
-
-    /**
-     * 标记此数据为死信
-     */
-    void dead();
-}

jetlinks-components/common-component/src/main/java/org/jetlinks/community/buffer/ConsumeStrategy.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.buffer;
-
-public enum ConsumeStrategy {
-
-    // 先进先出
-    FIFO,
-
-    // 后进先出
-    LIFO
-}

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

@@ -1,74 +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.buffer;
-
-
-import org.jetlinks.community.utils.FormatUtils;
-import org.springframework.util.unit.DataSize;
-
-import java.io.File;
-import java.util.Map;
-
-class DiskFreeEviction extends AbstractBufferEviction {
-
-    private final File path;
-    private final long minUsableBytes;
-
-    public DiskFreeEviction(File path, long minUsableBytes) {
-        this.path = path;
-        this.minUsableBytes = minUsableBytes;
-    }
-
-    private volatile long usableSpace = -1;
-    private volatile long lastUpdateTime;
-
-    @Override
-    public boolean doEviction(EvictionContext context) {
-        tryUpdate();
-
-        if (freeOutOfThreshold()) {
-            context.removeOldest(EvictionContext.BufferType.buffer);
-            return true;
-        }
-        return false;
-    }
-
-    protected boolean freeOutOfThreshold() {
-        return usableSpace != -1 && usableSpace <= minUsableBytes;
-    }
-
-    private void tryUpdate() {
-        long now = System.currentTimeMillis();
-        //1秒更新一次
-        if (now - lastUpdateTime <= 1000) {
-            return;
-        }
-        usableSpace = path.getUsableSpace();
-        lastUpdateTime = now;
-    }
-
-    @Override
-    protected void applyEventData(Map<String, Object> data) {
-        data.put("usableSpace", DataSize.ofBytes(usableSpace).toMegabytes());
-        data.put("minUsableBytes", DataSize.ofBytes(minUsableBytes).toMegabytes());
-    }
-
-    @Override
-    public String toString() {
-        return "DiskFree(path=" + path
-            + ",space=" + FormatUtils.formatDataSize(usableSpace) + "/" + FormatUtils.formatDataSize(minUsableBytes) + ")";
-    }
-}

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

@@ -1,74 +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.buffer;
-
-
-import java.io.File;
-import java.util.Map;
-
-class DiskUsageEviction extends AbstractBufferEviction {
-
-    private final File path;
-    private final float threshold;
-
-    public DiskUsageEviction(File path, float threshold) {
-        this.path = path;
-        this.threshold = threshold;
-    }
-
-    private volatile float usage;
-    private volatile long lastUpdateTime;
-
-    @Override
-    public boolean doEviction(EvictionContext context) {
-        tryUpdate();
-
-        if (freeOutOfThreshold()) {
-            context.removeOldest(EvictionContext.BufferType.buffer);
-            return true;
-        }
-        return false;
-    }
-
-    protected boolean freeOutOfThreshold() {
-        return usage >= threshold;
-    }
-
-    private void tryUpdate() {
-        long now = System.currentTimeMillis();
-        //1秒更新一次
-        if (now - lastUpdateTime <= 1000) {
-            return;
-        }
-        long total = path.getTotalSpace();
-        long usable = path.getUsableSpace();
-
-        usage = (float) ((total - usable) / (double) total);
-        lastUpdateTime = now;
-    }
-
-    @Override
-    protected void applyEventData(Map<String, Object> data) {
-        data.put("usage", String.format("%.2f%%", usage * 100));
-    }
-
-    @Override
-    public String toString() {
-        return "DiskUsage(path=" + path
-            + ", threshold=" + String.format("%.2f%%", threshold * 100)
-            + ", usage=" + String.format("%.2f%%", usage * 100) + ")";
-    }
-}

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

@@ -1,59 +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.buffer;
-
-/**
- * 缓冲淘汰上下文
- *
- * @author zhouhao
- * @since 2.0
- */
-public interface EvictionContext {
-
-    /**
-     * 获取指定类型的数据量
-     *
-     * @param type 类型
-     * @return 数据量
-     */
-    long size(BufferType type);
-
-    /**
-     * 删除最新的数据
-     *
-     * @param type 类型
-     */
-    void removeLatest(BufferType type);
-
-    /**
-     * 删除最旧的数据
-     *
-     * @param type 类型
-     */
-    void removeOldest(BufferType type);
-
-    /**
-     * @return 缓冲区名称, 用于区分多个不同的缓冲区
-     */
-    String getName();
-
-    enum BufferType {
-        //缓冲区
-        buffer,
-        //死数据
-        dead
-    }
-}

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/SizeLimitEviction.java

@@ -1,52 +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.buffer;
-
-import lombok.AllArgsConstructor;
-
-import java.util.Map;
-
-@AllArgsConstructor
-class SizeLimitEviction extends AbstractBufferEviction {
-
-    private final long bufferLimit;
-    private final long deadLimit;
-
-    @Override
-    public boolean doEviction(EvictionContext context) {
-        boolean anyEviction = false;
-        if (bufferLimit > 0 && context.size(EvictionContext.BufferType.buffer) >= bufferLimit) {
-            context.removeOldest(EvictionContext.BufferType.buffer);
-            anyEviction = true;
-        }
-        if (deadLimit > 0 && context.size(EvictionContext.BufferType.dead) >= deadLimit) {
-            context.removeOldest(EvictionContext.BufferType.dead);
-            anyEviction = true;
-        }
-        return anyEviction;
-    }
-
-    @Override
-    protected void applyEventData(Map<String, Object> data) {
-        data.put("bufferLimit", bufferLimit);
-        data.put("deadLimit", deadLimit);
-    }
-
-    @Override
-    public String toString() {
-        return "SizeLimit(buffer=" + bufferLimit + ", dead=" + deadLimit + ")";
-    }
-}

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,31 +1,10 @@
-/*
- * Copyright 2025 JetLinks https://www.jetlinks.cn
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.jetlinks.community.codec;
 
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufInputStream;
-import io.netty.buffer.Unpooled;
 import io.netty.util.concurrent.FastThreadLocal;
 import lombok.SneakyThrows;
-import org.jetlinks.core.utils.SerializeUtils;
 import org.nustaq.serialization.FSTConfiguration;
 
 import java.io.*;
-import java.util.Base64;
-import java.util.function.Supplier;
 
 public class Serializers {
 
@@ -88,72 +67,5 @@ public class Serializers {
         return DEFAULT;
     }
 
-    public static String serializeToBase64(Object source) {
-        return Base64.getEncoder().encodeToString(serialize(source));
-    }
-
-    public static Object deserializeFromBase64(String base64) {
-        return deserialize(Base64.getDecoder().decode(base64));
-    }
-
-
-
-    @SuppressWarnings("all")
-    private static final FastThreadLocal<ByteArrayOutputStream>
-        SHARED_STREAM = new FastThreadLocal<ByteArrayOutputStream>() {
-        @Override
-        protected ByteArrayOutputStream initialValue() {
-            return new ByteArrayOutputStream();
-        }
-    };
-
-    @SneakyThrows
-    public static ByteBuf serializeExternal(Externalizable source) {
-        ByteArrayOutputStream outputStream = SHARED_STREAM.get();
-        if (outputStream.size() != 0) {
-            outputStream = new ByteArrayOutputStream();
-        }
-        try (ObjectOutput output = getDefault().createOutput(outputStream)) {
-            source.writeExternal(output);
-            output.flush();
-            return Unpooled.wrappedBuffer(outputStream.toByteArray());
-        } finally {
-            outputStream.reset();
-        }
-    }
-
-    @SneakyThrows
-    public static <T extends Externalizable> T deserializeExternal(ByteBuf buffer, Supplier<T> instance) {
-        try (ObjectInput input = getDefault().createInput(new ByteBufInputStream(buffer, true))) {
-            T data = instance.get();
-            data.readExternal(input);
-            return data;
-        }
-    }
-
-
-    @SneakyThrows
-    public static byte[] serialize(Object source) {
-        ByteArrayOutputStream outputStream = SHARED_STREAM.get();
-        if (outputStream.size() != 0) {
-            outputStream = new ByteArrayOutputStream();
-        }
-        try (ObjectOutput output = getDefault().createOutput(outputStream)) {
-            SerializeUtils.writeObject(source, output);
-            output.flush();
-            return outputStream.toByteArray();
-        } finally {
-            outputStream.reset();
-        }
-
-    }
-
-    @SneakyThrows
-    public static Object deserialize(byte[] data) {
-        ByteArrayInputStream stream = new ByteArrayInputStream(data);
-        try (ObjectInput input = getDefault().createInput(stream)) {
-            return SerializeUtils.readObject(input);
-        }
-    }
 
 }

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

@@ -1,117 +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;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import org.hswebframework.web.bean.FastBeanCopier;
-import org.jetlinks.core.command.CommandSupport;
-import org.jetlinks.core.utils.SerializeUtils;
-import org.jetlinks.community.spi.Provider;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.Map;
-
-/**
- * 命令支持提供者,用于针对多个基于命令模式的可选模块依赖时的解耦.
- * <p>
- *
- * @author zhouhao
- * @see org.jetlinks.sdk.server.SdkServices
- * @see InternalSdkServices
- * @since 2.1
- */
-public interface CommandSupportManagerProvider {
-    /**
-     * 所有支持的提供商
-     */
-    Provider<CommandSupportManagerProvider> supports = Provider.create(CommandSupportManagerProvider.class);
-
-    /**
-     * 命令服务提供商标识
-     *
-     * @return 唯一标识
-     */
-    String getProvider();
-
-    /**
-     * 获取命令支持,不同的命令管理支持多种命令支持,可能通过id进行区分,具体规则由对应服务实 现
-     *
-     * @param id      命令ID标识
-     * @param options 拓展配置
-     * @return CommandSupport
-     * @see CommandSupportManagerProviders#getCommandSupport(String, Map)
-     */
-    Mono<? extends CommandSupport> getCommandSupport(String id, Map<String, Object> options);
-
-    /**
-     * 获取所有支持的信息
-     *
-     * @return id
-     */
-    default Flux<CommandSupportInfo> getSupportInfo() {
-        return Flux.empty();
-    }
-
-    @Getter
-    @NoArgsConstructor
-    @AllArgsConstructor(staticName = "of")
-    @Setter
-    class CommandSupportInfo implements Externalizable {
-        private String id;
-        private String name;
-        private String description;
-
-        public CommandSupportInfo copy() {
-            return FastBeanCopier.copy(this, new CommandSupportInfo());
-        }
-
-        /**
-         * @param serviceId serviceId
-         * @return this
-         * @see CommandSupportManagerProviders#getCommandSupport(String)
-         */
-        public CommandSupportInfo appendService(String serviceId) {
-            if (this.id == null) {
-                this.id = serviceId;
-            } else {
-                this.id = serviceId + ":" + id;
-            }
-            return this;
-        }
-
-        @Override
-        public void writeExternal(ObjectOutput out) throws IOException {
-            SerializeUtils.writeNullableUTF(id, out);
-            SerializeUtils.writeNullableUTF(name, out);
-            SerializeUtils.writeNullableUTF(description, out);
-        }
-
-        @Override
-        public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-            id = SerializeUtils.readNullableUTF(in);
-            name = SerializeUtils.readNullableUTF(in);
-            description = SerializeUtils.readNullableUTF(in);
-        }
-    }
-}

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

@@ -1,136 +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;
-
-import org.jetlinks.core.command.CommandSupport;
-import reactor.core.publisher.Mono;
-
-import java.util.Collections;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * 命令支持管理提供商工具类,用于提供对{@link CommandSupportManagerProvider}相关通用操作.
- *
- * @author zhouhao
- * @see CommandSupportManagerProvider
- * @see CommandSupportManagerProviders#getCommandSupport(String, Map)
- * @since 2.2
- */
-public class CommandSupportManagerProviders {
-
-
-    /**
-     * 根据服务ID获取CommandSupport.
-     * <pre>{@code
-     *
-     *  CommandSupportManagerProviders
-     *      .getCommandSupport("deviceService:device",Collections.emptyMap())
-     *
-     * }</pre>
-     *
-     * @param serviceId serviceId 服务名
-     * @return CommandSupport
-     * @see InternalSdkServices
-     * @see org.jetlinks.sdk.server.SdkServices
-     */
-    public static Mono<CommandSupport> getCommandSupport(String serviceId) {
-        return getCommandSupport(serviceId, Collections.emptyMap());
-    }
-
-    /**
-     * 根据服务ID和支持ID获取CommandSupport.
-     *
-     * @param serviceId 服务ID
-     * @param supportId 支持ID
-     * @return CommandSupport
-     */
-    public static Mono<CommandSupport> getCommandSupport(String serviceId, String supportId) {
-        return getProviderNow(serviceId)
-            .getCommandSupport(supportId, Collections.emptyMap())
-            .cast(CommandSupport.class);
-    }
-
-    /**
-     * 根据服务ID获取CommandSupport.
-     * <pre>{@code
-     *
-     *  CommandSupportManagerProviders
-     *      .getCommandSupport("deviceService:device",Collections.emptyMap())
-     *
-     * }</pre>
-     *
-     * @param serviceId serviceId 服务名
-     * @param options   options
-     * @return CommandSupport
-     * @see InternalSdkServices
-     * @see org.jetlinks.sdk.server.SdkServices
-     */
-    public static Mono<CommandSupport> getCommandSupport(String serviceId,
-                                                         Map<String, Object> options) {
-        //fast path
-        CommandSupportManagerProvider provider = CommandSupportManagerProvider
-            .supports
-            .get(serviceId)
-            .orElse(null);
-        if (provider != null) {
-            return provider
-                .getCommandSupport(serviceId, options)
-                .cast(CommandSupport.class);
-        }
-        String supportId = serviceId;
-        // deviceService:product
-        if (serviceId.contains(":")) {
-            String[] arr = serviceId.split(":", 2);
-            serviceId = arr[0];
-            supportId = arr[1];
-        }
-        String finalServiceId = serviceId;
-        String finalSupportId = supportId;
-        return Mono.defer(() -> getProviderNow(finalServiceId).getCommandSupport(finalSupportId, options));
-    }
-
-    /**
-     * 注册命令支持
-     *
-     * @param provider {@link CommandSupportManagerProvider#getProvider()}
-     */
-    public static void register(CommandSupportManagerProvider provider) {
-        CommandSupportManagerProvider.supports.register(provider.getProvider(), provider);
-    }
-
-    /**
-     * 获取命令支持
-     *
-     * @param provider {@link CommandSupportManagerProvider#getProvider()}
-     * @return Optional
-     */
-    public static Optional<CommandSupportManagerProvider> getProvider(String provider) {
-        return CommandSupportManagerProvider.supports.get(provider);
-    }
-
-    /**
-     * 获取命令支持,如果不存在则抛出异常{@link UnsupportedOperationException}
-     *
-     * @param provider provider {@link CommandSupportManagerProvider#getProvider()}
-     * @return CommandSupportManagerProvider
-     */
-    public static CommandSupportManagerProvider getProviderNow(String provider) {
-        return CommandSupportManagerProvider.supports.getNow(provider);
-    }
-
-
-}

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

@@ -1,52 +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;
-
-import lombok.AllArgsConstructor;
-import org.jetlinks.core.command.CommandSupport;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.util.List;
-import java.util.Map;
-
-@AllArgsConstructor
-public class CompositeCommandSupportManagerProvider implements CommandSupportManagerProvider {
-    private final List<CommandSupportManagerProvider> providers;
-
-    @Override
-    public String getProvider() {
-        return providers.get(0).getProvider();
-    }
-
-    @Override
-    public Mono<? extends CommandSupport> getCommandSupport(String id, Map<String, Object> options) {
-
-        return Flux
-            .fromIterable(providers)
-            .flatMap(provider -> provider.getCommandSupport(id, options))
-            .take(1)
-            .singleOrEmpty();
-    }
-
-    @Override
-    public Flux<CommandSupportInfo> getSupportInfo() {
-        return Flux
-            .fromIterable(providers)
-            .flatMap(CommandSupportManagerProvider::getSupportInfo)
-            .distinct(CommandSupportInfo::getId);
-    }
-}

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

@@ -1,322 +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;
-
-import lombok.SneakyThrows;
-import org.hswebframework.web.api.crud.entity.EntityFactoryHolder;
-import org.hswebframework.web.authorization.Authentication;
-import org.hswebframework.web.authorization.Permission;
-import org.hswebframework.web.authorization.exception.AccessDenyException;
-import org.hswebframework.web.bean.FastBeanCopier;
-import org.hswebframework.web.crud.service.ReactiveCrudService;
-import org.jetlinks.core.command.AbstractCommandSupport;
-import org.jetlinks.core.command.Command;
-import org.jetlinks.core.metadata.FunctionMetadata;
-import org.jetlinks.core.metadata.SimplePropertyMetadata;
-import org.jetlinks.core.metadata.types.ArrayType;
-import org.jetlinks.core.metadata.types.IntType;
-import org.jetlinks.core.metadata.types.ObjectType;
-import org.jetlinks.core.metadata.types.StringType;
-import org.jetlinks.core.utils.Reactors;
-import org.jetlinks.sdk.server.commons.cmd.*;
-import org.jetlinks.supports.official.DeviceMetadataParser;
-import org.springframework.core.ResolvableType;
-import reactor.bool.BooleanUtils;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 通用增删改查命令支持,基于{@link ReactiveCrudService}来实现增删改查相关命令
- *
- * @param <T> 实体类型
- * @author zhouhao
- * @see QueryByIdCommand
- * @see QueryPagerCommand
- * @see QueryListCommand
- * @see CountCommand
- * @see SaveCommand
- * @see AddCommand
- * @see UpdateCommand
- * @see DeleteCommand
- * @see DeleteByIdCommand
- * @since 2.2
- */
-public class CrudCommandSupport<T> extends AbstractCommandSupport {
-
-    final ReactiveCrudService<T, String> service;
-    final ResolvableType _entityType;
-
-    public CrudCommandSupport(ReactiveCrudService<T, String> service) {
-        this(service, ResolvableType
-            .forClass(ReactiveCrudService.class, service.getClass())
-            .getGeneric(0));
-    }
-
-    public CrudCommandSupport(ReactiveCrudService<T, String> service, ResolvableType _entityType) {
-        this.service = service;
-        this._entityType = _entityType;
-
-        registerQueries();
-        registerSaves();
-        registerDelete();
-    }
-
-    @Override
-    public Flux<FunctionMetadata> getCommandMetadata() {
-        return super
-            .getCommandMetadata()
-            .filterWhen(func -> commandIsSupported(func.getId()));
-    }
-
-    @Override
-    public Mono<Boolean> commandIsSupported(String commandId) {
-
-        return BooleanUtils.and(
-            super.commandIsSupported(commandId),
-            hasPermission(getPermissionId(), getAction(commandId))
-        );
-    }
-
-    @Override
-    public Mono<FunctionMetadata> getCommandMetadata(String commandId) {
-        return super
-            .getCommandMetadata(commandId)
-            .filterWhen(func -> commandIsSupported(func.getId()));
-    }
-
-    @Override
-    public Mono<FunctionMetadata> getCommandMetadata(Command<?> command) {
-        return super
-            .getCommandMetadata(command)
-            .filterWhen(func -> commandIsSupported(func.getId()));
-    }
-
-    @Override
-    public Mono<FunctionMetadata> getCommandMetadata(@Nonnull String commandId,
-                                                     @Nullable Map<String, Object> parameters) {
-        return super
-            .getCommandMetadata(commandId, parameters)
-            .filterWhen(func -> commandIsSupported(func.getId()));
-    }
-
-    @SneakyThrows
-    @SuppressWarnings("all")
-    private T newInstance0() {
-        return (T) _entityType.toClass().getConstructor().newInstance();
-    }
-
-    protected T newInstance() {
-        @SuppressWarnings("all")
-        Class<T> clazz = (Class<T>) _entityType.toClass();
-        return EntityFactoryHolder
-            .newInstance(clazz,
-                         this::newInstance0);
-    }
-
-    protected ResolvableType getResolvableType() {
-        return _entityType;
-    }
-
-    protected ObjectType createEntityType() {
-        return (ObjectType) DeviceMetadataParser.withType(_entityType);
-    }
-
-    protected String getPermissionId() {
-        return null;
-    }
-
-    protected Mono<Void> assetPermission(String action) {
-        return assetPermission(getPermissionId(), action);
-    }
-
-    protected Mono<Boolean> hasPermission(String permissionId, String action) {
-        if (permissionId == null) {
-            return Reactors.ALWAYS_TRUE;
-        }
-        return Authentication
-            .currentReactive()
-            .map(auth -> auth.hasPermission(permissionId, action))
-            .defaultIfEmpty(true);
-    }
-
-    protected Mono<Void> assetPermission(String permissionId, String action) {
-        if (permissionId == null) {
-            return Mono.empty();
-        }
-        return Authentication
-            .currentReactive()
-            .flatMap(
-                auth -> auth.hasPermission(permissionId, action)
-                    ? Mono.empty()
-                    : Mono.error(new AccessDenyException.NoStackTrace(permissionId, Collections.singleton(action))));
-    }
-
-    protected String getAction(String commandId) {
-        if (commandId.startsWith("Delete")) {
-            return Permission.ACTION_DELETE;
-        }
-        if (commandId.startsWith("Update") ||
-            commandId.startsWith("Save") ||
-            commandId.startsWith("Add") ||
-            commandId.startsWith("Disable") ||
-            commandId.startsWith("Enable")) {
-            return Permission.ACTION_SAVE;
-        }
-        return Permission.ACTION_QUERY;
-    }
-
-    protected void registerQueries() {
-        //根据id查询
-        registerHandler(
-            QueryByIdCommand
-                .<T>createHandler(
-                    metadata -> {
-                        metadata
-                            .setInputs(Collections.singletonList(
-                                SimplePropertyMetadata
-                                    .of("id", "id", new ArrayType()
-                                        .elementType(StringType.GLOBAL))
-                            ));
-                        metadata.setOutput(createEntityType());
-                    },
-                    cmd -> assetPermission(Permission.ACTION_QUERY)
-                        .then(service.findById(cmd.getId())),
-                    _entityType)
-        );
-
-        //分页查询
-        registerHandler(
-            QueryPagerCommand
-                .<T>createHandler(
-                    metadata -> metadata.setOutput(
-                        QueryPagerCommand
-                            .createOutputType(createEntityType().getProperties())),
-                    cmd -> assetPermission(Permission.ACTION_QUERY)
-                        .then(service.queryPager(cmd.asQueryParam())),
-                    _entityType)
-        );
-        //查询列表
-        registerHandler(
-            QueryListCommand
-                .<T>createHandler(
-                    metadata -> metadata.setOutput(createEntityType()),
-                    cmd -> assetPermission(Permission.ACTION_QUERY)
-                        .thenMany(service.query(cmd.asQueryParam())),
-                    _entityType)
-        );
-        //查询数量
-        registerHandler(
-            CountCommand
-                .createHandler(
-                    metadata -> metadata.setOutput(new ObjectType()
-                                                       .addProperty("total", "总数", IntType.GLOBAL)),
-                    cmd -> assetPermission(Permission.ACTION_QUERY)
-                        .then(service.count(cmd.asQueryParam())))
-        );
-        //todo 聚合查询?
-
-    }
-
-    protected void registerSaves() {
-        //批量保存
-        registerHandler(
-            SaveCommand.createHandler(
-                metadata -> {
-                    metadata
-                        .setInputs(Collections.singletonList(
-                            SimplePropertyMetadata.of("data", "数据列表", new ArrayType().elementType(createEntityType()))
-                        ));
-                    metadata.setOutput(createEntityType());
-                },
-                cmd -> {
-                    List<T> list = cmd.dataList((data) -> FastBeanCopier.copy(data, newInstance()));
-                    return assetPermission(Permission.ACTION_SAVE)
-                        .then(service.save(list))
-                        .thenMany(Flux.fromIterable(list));
-                },
-                _entityType)
-        );
-        //新增
-        registerHandler(
-            AddCommand
-                .<T>createHandler(
-                    metadata -> {
-                        metadata
-                            .setInputs(Collections.singletonList(
-                                SimplePropertyMetadata.of("data", "数据列表", new ArrayType().elementType(createEntityType()))
-                            ));
-                        metadata.setOutput(createEntityType());
-                    },
-                    cmd -> Flux
-                        .fromIterable(cmd.dataList((data) -> FastBeanCopier.copy(data, newInstance())))
-                        .as(flux -> assetPermission(Permission.ACTION_SAVE)
-                            .then(service.insert(flux))
-                            .thenMany(flux)))
-        );
-        //修改
-        registerHandler(
-            UpdateCommand
-                .<T>createHandler(
-                    metadata -> {
-                        metadata.setInputs(
-                            Arrays.asList(
-                                SimplePropertyMetadata.of("data", "数据", createEntityType()),
-                                QueryCommand.getTermsMetadata()
-                            ));
-                        metadata.setOutput(IntType.GLOBAL);
-                    },
-                    cmd -> this
-                        .assetPermission(Permission.ACTION_SAVE)
-                        .then(cmd
-                                  .applyUpdate(service.createUpdate(), map -> FastBeanCopier.copy(map, newInstance()))
-                                  .execute()))
-        );
-    }
-
-    protected void registerDelete() {
-
-        //删除
-        registerHandler(
-            DeleteCommand.createHandler(
-                metadata -> {
-                    metadata.setInputs(Collections.singletonList(
-                        SimplePropertyMetadata.of("terms", "删除条件", QueryCommand.getTermsDataType())));
-                    metadata.setOutput(IntType.GLOBAL);
-                },
-                cmd -> this
-                    .assetPermission(Permission.ACTION_DELETE)
-                    .then(cmd.applyDelete(service.createDelete()).execute()))
-        );
-        //根据id移除
-        registerHandler(
-            DeleteByIdCommand
-                .<Mono<Void>>createHandler(
-                    metadata -> {
-                    },
-                    cmd -> this
-                        .assetPermission(Permission.ACTION_DELETE)
-                        .then(service.deleteById(cmd.getId()).then()))
-        );
-    }
-
-}

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

@@ -1,58 +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;
-
-/**
- * 平台内部的一些服务定义
- *
- * @author zhouhao
- * @see org.jetlinks.sdk.server.SdkServices
- * @since 2.2
- */
-public interface InternalSdkServices {
-
-    /**
-     * 网络组件服务
-     */
-    String networkService = "networkService";
-
-    /**
-     * 设备接入网关服务
-     */
-    String deviceGatewayService = "deviceGatewayService";
-
-
-    /**
-     * 采集器服务
-     */
-    String collectorService = "collectorService";
-
-    /**
-     * 规则服务
-     */
-    String ruleService = "ruleService";
-
-
-    /**
-     * 插件服务
-     */
-    String pluginService = "pluginService";
-
-    /**
-     * 基础服务
-     */
-    String commonService = "commonService";
-}

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

@@ -1,90 +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;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import org.hswebframework.web.i18n.LocaleUtils;
-import org.jetlinks.core.command.AbstractCommandSupport;
-import org.jetlinks.core.command.CommandSupport;
-import org.jetlinks.community.annotation.command.CommandService;
-import org.springframework.core.annotation.AnnotationUtils;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 通用静态命令管理.
- *
- * @author zhangji 2024/2/2
- * @since 2.2.0
- */
-@AllArgsConstructor
-public class StaticCommandSupportManagerProvider extends AbstractCommandSupport implements CommandSupportManagerProvider {
-
-    @Getter
-    public String provider;
-
-    private final Map<String, CommandSupport> commandSupports = new HashMap<>();
-
-    public void register(String id, CommandSupport commandSupport) {
-        commandSupports.put(id, commandSupport);
-    }
-
-    @Override
-    public final Mono<? extends CommandSupport> getCommandSupport(String id, Map<String, Object> options) {
-        CommandSupport cmd = commandSupports.get(id);
-        if (cmd == null) {
-            return getUndefined(id, options);
-        }
-        return Mono.just(cmd);
-    }
-
-    protected Mono<? extends CommandSupport> getUndefined(String id, Map<String, Object> options) {
-        return Mono.just(this);
-    }
-
-    @Override
-    public Flux<CommandSupportInfo> getSupportInfo() {
-        Flux<CommandSupportInfo> another = Flux
-            .fromIterable(commandSupports.entrySet())
-            .map(entry -> createCommandSupport(entry.getKey(), entry.getValue().getClass()));
-
-        if (!this.handlers.isEmpty()) {
-            return Flux.concat(another, Flux.just(createCommandSupport(null, this.getClass())));
-        }
-        return another;
-    }
-
-    protected final CommandSupportInfo createCommandSupport(String id, Class<?> clazz) {
-        String name = id;
-        String description = null;
-        Schema schema = AnnotationUtils.findAnnotation(clazz, Schema.class);
-        if (null != schema) {
-            name = schema.title();
-            description = schema.description();
-        }
-        CommandService service = AnnotationUtils.findAnnotation(clazz, CommandService.class);
-        if (null != service) {
-            name = LocaleUtils.resolveMessage(service.name(), service.name());
-            description = String.join("", service.description());
-        }
-        return CommandSupportInfo.of(id, name, description);
-    }
-}

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,98 +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.register;
-
-import lombok.extern.slf4j.Slf4j;
-import org.jetlinks.community.command.CommandSupportManagerProvider;
-import org.jetlinks.community.command.CommandSupportManagerProviders;
-import org.jetlinks.community.command.CompositeCommandSupportManagerProvider;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.SmartInitializingSingleton;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.core.annotation.AnnotatedElementUtils;
-import org.springframework.util.ClassUtils;
-import org.jetlinks.community.annotation.command.CommandService;
-
-import javax.annotation.Nonnull;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-@Slf4j
-public class CommandServiceEndpointRegister implements ApplicationContextAware, SmartInitializingSingleton {
-
-    private ApplicationContext context;
-
-    @Override
-    public void setApplicationContext(@Nonnull ApplicationContext applicationContext) throws BeansException {
-        this.context = applicationContext;
-    }
-
-    @Override
-    public void afterSingletonsInstantiated() {
-        Map<String, Object> beans = context.getBeansWithAnnotation(CommandService.class);
-
-        //静态Provider
-        Map<String, List<CommandSupportManagerProvider>> statics = context
-            .getBeanProvider(CommandSupportManagerProvider.class)
-            .stream()
-            .collect(Collectors.groupingBy(CommandSupportManagerProvider::getProvider));
-
-        Map<String, SpringBeanCommandSupportProvider> providers = new HashMap<>();
-
-        for (Object value : beans.values()) {
-            CommandService endpoint =
-                AnnotatedElementUtils.findMergedAnnotation(ClassUtils.getUserClass(value), CommandService.class);
-            if (endpoint == null || !endpoint.autoRegistered()) {
-                continue;
-            }
-            String id = endpoint.id();
-            String support = id;
-            if (id.contains(":")) {
-                support = id.substring(id.indexOf(":") + 1);
-                id = id.substring(0, id.indexOf(":"));
-            }
-
-            SpringBeanCommandSupportProvider provider = providers
-                .computeIfAbsent(id, SpringBeanCommandSupportProvider::new);
-            log.debug("register command support:{} -> {}", endpoint.id(), value);
-            provider.register(support, endpoint, value);
-        }
-
-        for (SpringBeanCommandSupportProvider value : providers.values()) {
-            if (value.isEmpty()) {
-                continue;
-            }
-            //合并静态Provider
-            List<CommandSupportManagerProvider> provider = statics.remove(value.getProvider());
-            if (provider != null) {
-                provider.forEach(value::register);
-            }
-
-            CommandSupportManagerProviders.register(value);
-        }
-        for (List<CommandSupportManagerProvider> value : statics.values()) {
-            if (value.size() == 1) {
-                CommandSupportManagerProviders.register(value.get(0));
-            } else {
-                CommandSupportManagerProviders.register(new CompositeCommandSupportManagerProvider(value));
-            }
-        }
-    }
-
-}

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

@@ -1,153 +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.register;
-
-import com.google.common.collect.Lists;
-import lombok.Getter;
-import org.hswebframework.web.i18n.LocaleUtils;
-import org.jetlinks.core.command.CommandSupport;
-import org.jetlinks.core.command.CompositeCommandSupport;
-import org.jetlinks.community.annotation.command.CommandService;
-import org.jetlinks.community.command.CommandSupportManagerProvider;
-import org.jetlinks.supports.command.JavaBeanCommandSupport;
-import org.springframework.util.StringUtils;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.util.*;
-
-class SpringBeanCommandSupportProvider implements CommandSupportManagerProvider {
-
-    private final String provider;
-    private final Map<String, CompositeSpringBeanCommandSupport> commandSupports = new HashMap<>();
-
-    private final List<CommandSupportManagerProvider> statics = new ArrayList<>();
-
-    public SpringBeanCommandSupportProvider(String provider) {
-        this.provider = provider;
-    }
-
-    void register(CommandSupportManagerProvider provider) {
-        statics.add(provider);
-    }
-
-    void register(String support, CommandService annotation, Object bean) {
-        Objects.requireNonNull(annotation, "endpoint");
-        Objects.requireNonNull(bean, "bean");
-
-        SpringBeanCommandSupport commandSupport = new SpringBeanCommandSupport(annotation, bean);
-        if (commandSupport.isEmpty()) {
-            return;
-        }
-        //相同support合并成一个
-        commandSupports
-            .computeIfAbsent(support, id -> new CompositeSpringBeanCommandSupport(id,provider))
-            .register(commandSupport);
-    }
-
-    boolean isEmpty() {
-        return commandSupports.isEmpty();
-    }
-
-    @Override
-    public String getProvider() {
-        return provider;
-    }
-
-    @Override
-    public Mono<? extends CommandSupport> getCommandSupport(String id, Map<String, Object> options) {
-        CommandSupport support = commandSupports.get(StringUtils.hasText(id) ? id : provider);
-        if (support != null) {
-            return Mono.just(support);
-        }
-        if (statics.isEmpty()) {
-            return Mono.empty();
-        }
-        return Flux
-            .fromIterable(statics)
-            .flatMap(provider -> provider.getCommandSupport(id, options))
-            .take(1)
-            .singleOrEmpty();
-    }
-
-    @Override
-    public Flux<CommandSupportInfo> getSupportInfo() {
-        if (statics.isEmpty()) {
-            return Flux
-                .fromIterable(commandSupports.values())
-                .flatMapIterable(CompositeSpringBeanCommandSupport::getInfo);
-        }
-        return Flux
-            .concat(
-                Flux
-                    .fromIterable(commandSupports.values())
-                    .flatMapIterable(CompositeSpringBeanCommandSupport::getInfo),
-                Flux.fromIterable(statics)
-                    .flatMap(CommandSupportManagerProvider::getSupportInfo)
-            )
-            .distinct(info -> {
-                String id = info.getId();
-                return String.valueOf(id);
-            });
-    }
-
-    static class CompositeSpringBeanCommandSupport extends CompositeCommandSupport {
-        private final String id;
-        private final String provider;
-
-        public CompositeSpringBeanCommandSupport(String id,String provider) {
-            super();
-            this.id = id;
-            this.provider = provider;
-        }
-
-        public List<CommandSupportInfo> getInfo() {
-            return Lists
-                .transform(
-                    getSupports(),
-                    support -> {
-                        SpringBeanCommandSupport commandSupport = support.unwrap(SpringBeanCommandSupport.class);
-                        //兼容为null
-                        String _id = id.equals(provider) ? null : id;
-                        return CommandSupportInfo.of(
-                            _id,
-                            LocaleUtils.resolveMessage(commandSupport.annotation.name(), commandSupport.annotation.name()),
-                            String.join("", commandSupport.annotation.description())
-                        );
-                    });
-        }
-
-        @Override
-        public String toString() {
-            return getSupports().toString();
-        }
-    }
-
-    @Getter
-    static class SpringBeanCommandSupport extends JavaBeanCommandSupport {
-        private final CommandService annotation;
-
-        boolean isEmpty() {
-            return handlers.isEmpty();
-        }
-
-        public SpringBeanCommandSupport(CommandService annotation, Object target) {
-            super(target);
-            this.annotation = annotation;
-        }
-
-    }
-}

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

@@ -1,50 +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.rule;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.hswebframework.web.bean.FastBeanCopier;
-import org.jetlinks.core.command.AbstractCommand;
-import org.jetlinks.core.command.CommandMetadataResolver;
-import org.jetlinks.core.command.CommandUtils;
-import org.jetlinks.core.metadata.FunctionMetadata;
-import org.jetlinks.core.metadata.SimpleFunctionMetadata;
-import org.jetlinks.community.command.rule.data.RelieveInfo;
-import org.jetlinks.community.command.rule.data.RelieveResult;
-import org.springframework.core.ResolvableType;
-import reactor.core.publisher.Mono;
-
-@Schema(title = "解除告警命令")
-public class RelievedAlarmCommand extends AbstractCommand<Mono<RelieveResult>,RelievedAlarmCommand> {
-
-    @Schema(description = "解除告警传参信息")
-    public RelieveInfo getRelieveInfo() {
-        return FastBeanCopier.copy(readable(),  new RelieveInfo());
-    }
-
-    public RelievedAlarmCommand setRelieveInfo(RelieveInfo relieveInfo) {
-        return with(FastBeanCopier.copy(relieveInfo, writable()));
-    }
-
-    public static FunctionMetadata metadata() {
-        SimpleFunctionMetadata metadata = new SimpleFunctionMetadata();
-        metadata.setId(CommandUtils.getCommandIdByType(RelievedAlarmCommand.class));
-        metadata.setName("解除告警命令");
-        metadata.setInputs(CommandMetadataResolver.resolveInputs(ResolvableType.forClass(RelieveInfo.class)));
-        metadata.setOutput(CommandMetadataResolver.resolveOutput(ResolvableType.forClass(RelievedAlarmCommand.class)));
-        return metadata;
-    }
-}

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

@@ -1,49 +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.rule;
-
-public interface RuleCommandServices {
-    /**
-     * 场景
-     */
-    String sceneService = "sceneService";
-
-    /**
-     * 告警配置
-     */
-    String alarmConfigService = "alarmConfigService";
-
-    /**
-     * 告警记录
-     */
-    String alarmRecordService = "alarmRecordService";
-
-    /**
-     * 告警历史
-     */
-    String alarmHistoryService = "alarmHistoryService";
-
-    /**
-     * 告警规则绑定
-     */
-    String alarmRuleBindService = "alarmRuleBindService";
-
-    /**
-     * 告警相关
-     */
-    String alarm = "alarm";
-
-}

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

@@ -1,53 +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.rule;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.hswebframework.web.bean.FastBeanCopier;
-import org.jetlinks.core.command.AbstractCommand;
-import org.jetlinks.core.command.CommandMetadataResolver;
-import org.jetlinks.core.command.CommandUtils;
-import org.jetlinks.core.metadata.FunctionMetadata;
-import org.jetlinks.core.metadata.SimpleFunctionMetadata;
-import org.jetlinks.community.command.rule.data.AlarmInfo;
-import org.jetlinks.community.command.rule.data.AlarmResult;
-import org.springframework.core.ResolvableType;
-import reactor.core.publisher.Mono;
-
-
-@Schema(title = "触发告警命令")
-public class TriggerAlarmCommand extends AbstractCommand<Mono<AlarmResult>,TriggerAlarmCommand> {
-    private static final long serialVersionUID = 7056867872399432831L;
-
-
-    @Schema(description = "告警传参信息")
-    public AlarmInfo getAlarmInfo() {
-        return FastBeanCopier.copy(readable(), new AlarmInfo());
-    }
-
-    public TriggerAlarmCommand setAlarmInfo(AlarmInfo alarmInfo) {
-        return with(FastBeanCopier.copy(alarmInfo, writable()));
-    }
-
-    public static FunctionMetadata metadata() {
-        SimpleFunctionMetadata metadata = new SimpleFunctionMetadata();
-        metadata.setId(CommandUtils.getCommandIdByType(TriggerAlarmCommand.class));
-        metadata.setName("触发告警命令");
-        metadata.setInputs(CommandMetadataResolver.resolveInputs(ResolvableType.forClass(AlarmInfo.class)));
-        metadata.setOutput(CommandMetadataResolver.resolveOutput(ResolvableType.forClass(TriggerAlarmCommand.class)));
-        return metadata;
-    }
-}

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

@@ -1,89 +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.rule.data;
-
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import org.jetlinks.community.terms.TermSpec;
-
-import java.io.Serializable;
-import java.util.Map;
-
-/**
- * 触发告警参数
- */
-@Getter
-@Setter
-@AllArgsConstructor
-@NoArgsConstructor
-public class AlarmInfo implements Serializable {
-    private static final long serialVersionUID = -2316376361116648370L;
-
-    @Schema(description = "告警配置ID")
-    private String alarmConfigId;
-
-    @Schema(description = "告警名称")
-    private String alarmName;
-
-    @Schema(description = "告警说明")
-    private String description;
-
-    @Schema(description = "告警级别")
-    private int level;
-
-    @Schema(description = "告警目标类型")
-    private String targetType;
-
-    @Schema(description = "告警目标ID")
-    private String targetId;
-
-    @Schema(description = "告警目标名称")
-    private String targetName;
-
-    @Schema(description = "告警来源类型")
-    private String sourceType;
-
-    @Schema(description = "告警来源ID")
-    private String sourceId;
-
-    @Schema(description = "告警来源的创建人ID")
-    private String sourceCreatorId;
-
-    @Schema(description = "告警来源名称")
-    private String sourceName;
-
-    /**
-     * 标识告警触发的配置来自什么业务功能
-     */
-    @Schema(description = "告警配置源")
-    private String alarmConfigSource;
-
-    @Schema(description = "告警数据")
-    private Map<String, Object> data;
-
-    /**
-     * 告警触发条件
-     */
-    private TermSpec termSpec;
-
-    @Schema(description = "告警时间")
-    private Long alarmTime;
-
-}

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

@@ -1,51 +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.rule.data;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-import java.io.Serializable;
-
-/**
- * 告警结果
- */
-@AllArgsConstructor
-@NoArgsConstructor
-@Getter
-@Setter
-public class AlarmResult implements Serializable {
-
-    private static final long serialVersionUID = -1752497262936740164L;
-
-    @Schema(description = "告警ID")
-    private String recordId;
-
-    @Schema(description = "是否重复告警")
-    private boolean alarming;
-
-    @Schema(description = "当前首次触发")
-    private boolean firstAlarm;
-
-    @Schema(description = "上一次告警时间")
-    private long lastAlarmTime;
-
-    @Schema(description = "首次告警或者解除告警后的再一次告警时间")
-    private long alarmTime;
-}

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

@@ -1,47 +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.rule.data;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-/**
- * 解除告警参数
- */
-@Getter
-@Setter
-@AllArgsConstructor
-@NoArgsConstructor
-public class RelieveInfo extends AlarmInfo{
-
-    @Schema(description = "解除原因")
-    private String relieveReason;
-
-    @Schema(description = "解除时间")
-    private Long relieveTime;
-
-    @Schema(description = "解除说明")
-    private String describe;
-
-    /**
-     * 告警解除类型，人工（user）、系统（system）等
-     */
-    @Schema(description = "告警解除类型")
-    private String alarmRelieveType;
-}

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

@@ -1,47 +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.rule.data;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-/**
- * 解除警告结果
- */
-@Getter
-@Setter
-@AllArgsConstructor
-@NoArgsConstructor
-public class RelieveResult extends AlarmResult{
-
-    @Schema(description = "告警级别")
-    private int level;
-
-    @Schema(description = "告警原因描述")
-    private String actualDesc;
-
-    @Schema(description = "解除原因")
-    private String relieveReason;
-
-    @Schema(description = "解除时间")
-    private long relieveTime;
-
-    @Schema(description = "解除说明")
-    private String describe;
-}

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,25 +1,8 @@
-/*
- * 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;
 import org.apache.commons.collections4.MapUtils;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveRepository;
-import org.hswebframework.web.cache.ReactiveCache;
-import org.hswebframework.web.cache.ReactiveCacheManager;
 import org.jetlinks.community.ValueObject;
 import org.jetlinks.community.config.entity.ConfigEntity;
 import reactor.core.publisher.Flux;
@@ -35,13 +18,6 @@ public class SimpleConfigManager implements ConfigManager, ConfigScopeManager {
 
     private final ReactiveRepository<ConfigEntity, String> repository;
 
-    private final ReactiveCache<Map<String, Object>> cache;
-
-    public SimpleConfigManager(ReactiveRepository<ConfigEntity, String> repository, ReactiveCacheManager cacheManager) {
-        this.repository = repository;
-        this.cache = cacheManager.getCache("system-config");
-    }
-
     @Override
     public void addScope(ConfigScope scope,
                          List<ConfigPropertyDef> properties) {
@@ -79,38 +55,35 @@ public class SimpleConfigManager implements ConfigManager, ConfigScopeManager {
                     .filter(def -> null != def.getDefaultValue())
                     .collectMap(ConfigPropertyDef::getKey, ConfigPropertyDef::getDefaultValue),
                 //数据库配置的值
-                cache
-                    .getMono(scope, () -> getPropertiesNow(scope)),
+                repository
+                    .createQuery()
+                    .where(ConfigEntity::getScope, scope)
+                    .fetch()
+                    .filter(val -> MapUtils.isNotEmpty(val.getProperties()))
+                    .<Map<String, Object>>reduce(new LinkedHashMap<>(), (l, r) -> {
+                        l.putAll(r.getProperties());
+                        return l;
+                    }),
                 (defaults, values) -> {
-                    Map<String, Object> properties = new HashMap<>(values);
-                    defaults.forEach(properties::putIfAbsent);
-                    return properties;
+                    defaults.forEach(values::putIfAbsent);
+                    return values;
                 }
-            )
-            .map(ValueObject::of);
-    }
-
-    private Mono<Map<String, Object>> getPropertiesNow(String scope) {
-        return repository
-            .createQuery()
-            .where(ConfigEntity::getScope, scope)
-            .fetch()
-            .filter(val -> MapUtils.isNotEmpty(val.getProperties()))
-            .reduce(new LinkedHashMap<>(), (l, r) -> {
-                l.putAll(r.getProperties());
-                return l;
-            });
+            ).map(ValueObject::of);
     }
 
     @Override
     public Mono<Void> setProperties(String scope, Map<String, Object> values) {
-        ConfigEntity entity = new ConfigEntity();
-        entity.setProperties(values);
-        entity.setScope(scope);
-        entity.getId();
-        return repository
-            .save(entity)
-            .then(cache.evict(scope));
+        return Flux
+            .fromIterable(values.entrySet())
+            .map(e -> {
+                ConfigEntity entity = new ConfigEntity();
+                entity.setProperties(values);
+                entity.setScope(scope);
+                entity.getId();
+                return entity;
+            })
+            .as(repository::save)
+            .then();
     }
 
 }

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;
@@ -21,7 +6,6 @@ import lombok.Setter;
 import org.hswebframework.ezorm.rdb.mapping.annotation.ColumnType;
 import org.hswebframework.ezorm.rdb.mapping.annotation.JsonCodec;
 import org.hswebframework.web.api.crud.entity.GenericEntity;
-import org.hswebframework.web.crud.annotation.EnableEntityEvent;
 import org.hswebframework.web.utils.DigestUtils;
 import org.springframework.util.StringUtils;
 
@@ -36,7 +20,6 @@ import java.util.Map;
 })
 @Getter
 @Setter
-@EnableEntityEvent
 public class ConfigEntity extends GenericEntity<String> {
 
     @Column(length = 64, nullable = false, updatable = false)

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

@@ -1,110 +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.config.verification;
-
-import io.swagger.v3.oas.annotations.Operation;
-import org.hswebframework.web.crud.events.EntitySavedEvent;
-import org.hswebframework.web.exception.BusinessException;
-import org.jetlinks.community.config.entity.ConfigEntity;
-import org.jetlinks.reactor.ql.utils.CastUtils;
-import org.springframework.context.event.EventListener;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.reactive.function.client.WebClient;
-import org.springframework.web.server.ServerWebExchange;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.net.URI;
-import java.net.UnknownHostException;
-import java.time.Duration;
-import java.util.Objects;
-import java.util.concurrent.TimeoutException;
-
-/**
- * @author bestfeng
- */
-@RestController
-public class ConfigVerificationService {
-
-
-    private final WebClient webClient;
-
-    private static final String PATH_VERIFICATION_URI = "/system/config/base-path/verification";
-
-    public ConfigVerificationService() {
-        this.webClient = WebClient
-            .builder()
-            .build();
-    }
-
-    @GetMapping(value = PATH_VERIFICATION_URI)
-    @Operation(description = "basePath配置验证接口")
-    public Mono<String> basePathValidate() {
-        return Mono.just("auth:"+PATH_VERIFICATION_URI);
-    }
-
-
-    @EventListener
-    public void handleConfigSavedEvent(EntitySavedEvent<ConfigEntity> event){
-        //base-path校验
-        event.async(
-            Flux.fromIterable(event.getEntity())
-                .filter(config -> Objects.equals(config.getScope(), "paths"))
-                .flatMap(config-> doBasePathValidate(config.getProperties().get("base-path")))
-        );
-    }
-
-
-    public Mono<Void> doBasePathValidate(Object basePath) {
-        if (basePath == null) {
-            return Mono.empty();
-        }
-
-        URI uri = URI.create(CastUtils.castString(CastUtils.castString(basePath).concat(PATH_VERIFICATION_URI)));
-        if (Objects.equals(uri.getHost(), "127.0.0.1")){
-            return Mono.error(new BusinessException("error.base_path_host_error", 500, "127.0.0.1"));
-        }
-        if (Objects.equals(uri.getHost(), "localhost")){
-            return Mono.error(new BusinessException("error.base_path_host_error", 500, "localhost"));
-        }
-
-        return webClient
-            .get()
-            .uri(uri)
-            .exchangeToMono(cr -> {
-                if (cr.statusCode().is2xxSuccessful()) {
-                    return cr.bodyToMono(String.class)
-                             .filter(r-> r.contains("auth:"+PATH_VERIFICATION_URI))
-                             .switchIfEmpty(Mono.error(()-> new BusinessException("error.base_path_error")));
-                }
-                return Mono.defer(() -> Mono.error(new BusinessException("error.base_path_error")));
-            })
-            .timeout(Duration.ofSeconds(3), Mono.error(TimeoutException::new))
-            .onErrorResume(err -> {
-                while (err != null) {
-                    if (err instanceof TimeoutException) {
-                        return Mono.error(() -> new BusinessException("error.base_path_validate_request_timeout"));
-                    } else if (err instanceof UnknownHostException) {
-                        return Mono.error(() -> new BusinessException("error.base_path_DNS_resolution_failed"));
-                    }
-                    err = err.getCause();
-                }
-                return Mono.error(() -> new BusinessException("error.base_path_error"));
-            })
-            .then();
-    }
-}

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;
@@ -52,14 +37,14 @@ public class SystemConfigManagerController {
 
     @GetMapping("/scopes")
     @QueryAction
-    @Operation(summary = "获取配置作用域")
+    @Operation(description = "获取配置作用域")
     public Flux<ConfigScope> getConfigScopes() {
         return configManager.getScopes();
     }
 
     @GetMapping("/{scope}")
     @Authorize(ignore = true)
-    @Operation(summary = "获取作用域下的全部配置信息")
+    @Operation(description = "获取作用域下的全部配置信息")
     public Mono<Map<String, Object>> getConfigs(@PathVariable String scope) {
         return Authentication
             .currentReactive()
@@ -78,7 +63,7 @@ public class SystemConfigManagerController {
 
     @GetMapping("/{scope}/_detail")
     @QueryAction
-    @Operation(summary = "获取作用域下的配置信息")
+    @Operation(description = "获取作用域下的配置信息")
     public Flux<ConfigPropertyValue> getConfigDetail(@PathVariable String scope) {
         return configManager
             .getProperties(scope)
@@ -90,7 +75,7 @@ public class SystemConfigManagerController {
 
     @PostMapping("/scopes")
     @QueryAction
-    @Operation(summary = "获取作用域下的配置详情")
+    @Operation(description = "获取作用域下的配置详情")
     public Flux<Scope> getConfigDetail(@RequestBody Mono<List<String>> scopeMono) {
         return scopeMono
             .flatMapMany(scopes -> Flux
@@ -101,7 +86,7 @@ public class SystemConfigManagerController {
 
     @PostMapping("/{scope}")
     @SaveAction
-    @Operation(summary = "保存配置")
+    @Operation(description = "保存配置")
     public Mono<Void> saveConfig(@PathVariable String scope,
                                  @RequestBody Mono<Map<String, Object>> properties) {
         return properties.flatMap(props -> configManager.setProperties(scope, props));
@@ -110,12 +95,11 @@ public class SystemConfigManagerController {
 
     @PostMapping("/scope/_save")
     @SaveAction
-    @Operation(summary = "批量保存配置")
+    @Operation(description = "批量保存配置")
     @Transactional
     public Mono<Void> saveConfig(@RequestBody Flux<Scope> scope) {
-
         return scope
-            .concatMap(scopeConfig -> configManager.setProperties(scopeConfig.getScope(), scopeConfig.getProperties()))
+            .flatMap(scopeConfig -> configManager.setProperties(scopeConfig.getScope(), scopeConfig.getProperties()))
             .then();
     }
 

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

@@ -1,95 +1,50 @@
-/*
- * 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;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
-import lombok.Generated;
 import org.apache.commons.beanutils.BeanUtilsBean;
 import org.apache.commons.beanutils.Converter;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveRepository;
-import org.hswebframework.web.bean.FastBeanCopier;
-import org.hswebframework.web.cache.ReactiveCacheManager;
-import org.hswebframework.web.dict.EnumDict;
-import org.hswebframework.web.dict.defaults.DefaultItemDefine;
 import org.jetlinks.community.Interval;
-import org.jetlinks.community.JvmErrorException;
-import org.jetlinks.community.command.CommandSupportManagerProvider;
-import org.jetlinks.community.command.CommandSupportManagerProviders;
-import org.jetlinks.community.command.register.CommandServiceEndpointRegister;
 import org.jetlinks.community.config.ConfigManager;
 import org.jetlinks.community.config.ConfigScopeCustomizer;
 import org.jetlinks.community.config.ConfigScopeProperties;
 import org.jetlinks.community.config.SimpleConfigManager;
 import org.jetlinks.community.config.entity.ConfigEntity;
-import org.jetlinks.community.dictionary.DictionaryJsonDeserializer;
-import org.jetlinks.community.form.type.FieldTypeProvider;
-import org.jetlinks.community.reactorql.aggregation.InternalAggregationSupports;
-import org.jetlinks.community.reactorql.function.InternalFunctionSupport;
-import org.jetlinks.community.reactorql.term.TermTypeSupport;
-import org.jetlinks.community.reactorql.term.TermTypes;
 import org.jetlinks.community.reference.DataReferenceManager;
 import org.jetlinks.community.reference.DataReferenceProvider;
 import org.jetlinks.community.reference.DefaultDataReferenceManager;
 import org.jetlinks.community.resource.DefaultResourceManager;
 import org.jetlinks.community.resource.ResourceManager;
 import org.jetlinks.community.resource.ResourceProvider;
-import org.jetlinks.community.resource.TypeScriptDeclareResourceProvider;
 import org.jetlinks.community.resource.initialize.PermissionResourceProvider;
-import org.jetlinks.community.service.DefaultUserBindService;
 import org.jetlinks.community.utils.TimeUtils;
-import org.jetlinks.core.metadata.DataType;
-import org.jetlinks.core.metadata.types.DataTypes;
+import org.jetlinks.core.rpc.RpcManager;
 import org.jetlinks.reactor.ql.feature.Feature;
 import org.jetlinks.reactor.ql.supports.DefaultReactorQLMetadata;
 import org.jetlinks.reactor.ql.utils.CastUtils;
-import org.jetlinks.supports.official.JetLinksDataTypeCodecs;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.core.ReactiveRedisOperations;
 import org.springframework.http.MediaType;
-import org.springframework.util.StringUtils;
 import org.springframework.util.unit.DataSize;
-import reactor.core.Exceptions;
-import reactor.core.publisher.Hooks;
 
 import javax.annotation.Nonnull;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 import java.util.Date;
-import java.util.Map;
 
-@AutoConfiguration
+@Configuration
 @SuppressWarnings("all")
 @EnableConfigurationProperties({ConfigScopeProperties.class})
 public class CommonConfiguration {
 
     static {
-        InternalAggregationSupports.register();
-        InternalFunctionSupport.register();
-
         BeanUtilsBean.getInstance().getConvertUtils().register(new Converter() {
             @Override
             public <T> T convert(Class<T> aClass, Object o) {
@@ -156,88 +111,33 @@ public class CommonConfiguration {
                 return (T)((Long) CastUtils.castNumber(value).longValue());
             }
         }, Long.class);
-
-        BeanUtilsBean.getInstance().getConvertUtils().register(new Converter() {
-            @Override
-            @Generated
-            public <T> T convert(Class<T> type, Object value) {
-
-                if (value instanceof String) {
-                    return (T) DefaultItemDefine.builder()
-                                                .value(String.valueOf(value))
-                                                .build();
-                }
-
-                return (T) FastBeanCopier.copy(value, new DefaultItemDefine());
-
-            }
-        }, EnumDict.class);
-
-        BeanUtilsBean.getInstance().getConvertUtils().register(new Converter() {
-            @Override
-            @Generated
-            public <T> T convert(Class<T> type, Object value) {
-                if (value instanceof Map) {
-                    Map<String, Object> map = ((Map) value);
-                    String typeId = (String) map.get("type");
-                    if (StringUtils.isEmpty(typeId)) {
-                        return null;
-                    }
-                    return (T) JetLinksDataTypeCodecs.decode(DataTypes.lookup(typeId).get(), map);
-                }
-                return null;
-
-            }
-        }, DataType.class);
-
-        //捕获jvm错误,防止Flux被挂起
-        Hooks.onOperatorError((err, val) -> {
-            if (Exceptions.isJvmFatal(err)) {
-                return new JvmErrorException(err);
-            }
-            return err;
-        });
-        Hooks.onNextError((err, val) -> {
-            if (Exceptions.isJvmFatal(err)) {
-                return new JvmErrorException(err);
-            }
-            return err;
-        });
     }
 
     @Bean
-    public ApplicationContextAware staticBeanRegister() {
-
-        return ctx -> {
-            ctx.getBeanProvider(Feature.class)
-               .forEach(DefaultReactorQLMetadata::addGlobal);
-
-            ctx.getBeanProvider(CommandSupportManagerProvider.class)
-               .forEach(CommandSupportManagerProviders::register);
-
-            ctx.getBeanProvider(TermTypeSupport.class)
-               .forEach(TermTypes::register);
-
-            ctx.getBeanProvider(FieldTypeProvider.class)
-               .forEach(provider -> FieldTypeProvider.supports.register(provider.getProvider(), provider));
+    public BeanPostProcessor globalReactorQlFeatureRegister() {
+        return new BeanPostProcessor() {
+            @Override
+            public Object postProcessAfterInitialization(@Nonnull Object bean, @Nonnull String beanName) throws BeansException {
+                if (bean instanceof Feature) {
+                    DefaultReactorQLMetadata.addGlobal(((Feature) bean));
+                }
+                return bean;
+            }
         };
     }
 
     @Bean
     public Jackson2ObjectMapperBuilderCustomizer jackson2ObjectMapperBuilderCustomizer(){
         return builder->{
-            builder.deserializerByType(DataType.class, new DataTypeJSONDeserializer());
             builder.deserializerByType(Date.class,new SmartDateDeserializer());
-            builder.deserializerByType(EnumDict.class, new DictionaryJsonDeserializer());
         };
     }
 
     @Bean
     public ConfigManager configManager(ObjectProvider<ConfigScopeCustomizer> configScopeCustomizers,
-                                       ReactiveRepository<ConfigEntity, String> repository,
-                                       ReactiveCacheManager cacheManager) {
+                                       ReactiveRepository<ConfigEntity, String> repository) {
 
-        SimpleConfigManager configManager = new SimpleConfigManager(repository,cacheManager);
+        SimpleConfigManager configManager = new SimpleConfigManager(repository);
         for (ConfigScopeCustomizer customizer : configScopeCustomizers) {
             customizer.custom(configManager);
         }
@@ -249,11 +149,6 @@ public class CommonConfiguration {
         return new PermissionResourceProvider();
     }
 
-    @Bean
-    public TypeScriptDeclareResourceProvider typeScriptDeclareResourceProvider() {
-        return new TypeScriptDeclareResourceProvider();
-    }
-
     @Bean
     public ResourceManager resourceManager(ObjectProvider<ResourceProvider> providers) {
         DefaultResourceManager manager = new DefaultResourceManager();
@@ -269,19 +164,4 @@ public class CommonConfiguration {
 
         return referenceManager;
     }
-
-    @Bean
-    public CommandServiceEndpointRegister commandServiceEndpointRegister() {
-        return new CommandServiceEndpointRegister();
-    }
-
-
-    @Configuration
-    @ConditionalOnClass(ReactiveRedisOperations.class)
-    static class DefaultUserBindServiceConfiguration {
-        @Bean
-        public DefaultUserBindService defaultUserBindService(ReactiveRedisOperations<Object, Object> redis) {
-            return new DefaultUserBindService(redis);
-        }
-    }
 }

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

@@ -1,41 +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.configuration;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import org.apache.commons.beanutils.BeanUtilsBean;
-import org.jetlinks.core.metadata.DataType;
-
-import java.io.IOException;
-import java.util.Map;
-
-/**
- *
- * @author zhangji 2025/1/23
- * @since 2.3
- */
-public class DataTypeJSONDeserializer extends JsonDeserializer<DataType> {
-    @Override
-    public DataType deserialize(JsonParser parser, DeserializationContext ctxt) throws IOException, JsonProcessingException {
-
-        Map<String,Object> map= ctxt.readValue(parser, Map.class);
-
-        return (DataType) BeanUtilsBean.getInstance().getConvertUtils().convert(map, DataType.class);
-    }
-}

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,39 +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.configuration;
-
-import org.jetlinks.community.resource.ui.UiMenuResourceProvider;
-import org.jetlinks.community.resource.ui.UiResourceProvider;
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Bean;
-
-@AutoConfiguration
-@ConditionalOnProperty(prefix = "jetlinks.ui", name = "enabled", havingValue = "true", matchIfMissing = true)
-public class UiResourceConfiguration {
-
-
-    @Bean
-    public UiResourceProvider uiResourceProvider() {
-        return new UiResourceProvider();
-    }
-
-    @Bean
-    public UiMenuResourceProvider uiMenuResourceProvider() {
-        return new UiMenuResourceProvider();
-    }
-
-}

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

@@ -1,103 +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.dictionary;
-
-import lombok.AllArgsConstructor;
-import org.apache.commons.collections4.MapUtils;
-import org.hswebframework.web.dict.EnumDict;
-import org.hswebframework.web.dictionary.entity.DictionaryItemEntity;
-import org.hswebframework.web.dictionary.service.DefaultDictionaryItemService;
-import org.springframework.boot.CommandLineRunner;
-
-import javax.annotation.Nonnull;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * @author bestfeng
- */
-@AllArgsConstructor
-public class DatabaseDictionaryManager implements DictionaryManager, CommandLineRunner{
-
-    private final DefaultDictionaryItemService dictionaryItemService;
-
-    private final Map<String, Map<String, DictionaryItemEntity>> itemStore = new ConcurrentHashMap<>();
-
-    @Nonnull
-    @Override
-    public List<EnumDict<?>> getItems(@Nonnull String dictId) {
-        Map<String, DictionaryItemEntity> itemEntityMap = itemStore.get(dictId);
-        if (MapUtils.isEmpty(itemEntityMap)) {
-            return Collections.emptyList();
-        }
-        return new ArrayList<>(itemEntityMap.values());
-    }
-
-    @Nonnull
-    @Override
-    public Optional<EnumDict<?>> getItem(@Nonnull String dictId, @Nonnull String itemId) {
-        Map<String, DictionaryItemEntity> itemEntityMap = itemStore.get(dictId);
-        if (itemEntityMap == null) {
-            return Optional.empty();
-        }
-        return Optional.ofNullable(itemEntityMap.get(itemId));
-    }
-
-
-    public void registerItems(List<DictionaryItemEntity> items) {
-        items.forEach(this::registerItem);
-    }
-
-
-    public void removeItems(List<DictionaryItemEntity> items) {
-        items.forEach(this::removeItem);
-    }
-
-
-    public void removeItem(DictionaryItemEntity item) {
-        if (item == null || item.getDictId() == null || item.getId() == null) {
-            return;
-        }
-        itemStore.compute(item.getDictId(), (k, v) -> {
-            if (v != null) {
-                v.remove(item.getId());
-                if (!v.isEmpty()) {
-                    return v;
-                }
-            }
-            return null;
-        });
-    }
-
-
-    public void registerItem(DictionaryItemEntity item) {
-        if (item == null || item.getDictId() == null) {
-            return;
-        }
-        itemStore
-            .computeIfAbsent(item.getDictId(), k -> new ConcurrentHashMap<>())
-            .put(item.getId(), item);
-    }
-
-    @Override
-    public void run(String... args) throws Exception {
-        dictionaryItemService
-            .createQuery()
-            .fetch()
-            .doOnNext(this::registerItem)
-            .subscribe();
-    }
-}

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

@@ -1,109 +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.dictionary;
-
-import org.hswebframework.web.dict.EnumDict;
-
-import javax.annotation.Nonnull;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-/**
- * 动态数据字典工具类
- *
- * @author zhouhao
- * @since 2.1
- */
-public class Dictionaries {
-
-    static DictionaryManager HOLDER = null;
-
-    static void setup(DictionaryManager manager) {
-        HOLDER = manager;
-    }
-
-    /**
-     * 获取字典的所有选型
-     *
-     * @param dictId 字典ID
-     * @return 字典值
-     */
-    @Nonnull
-    public static List<EnumDict<?>> getItems(@Nonnull String dictId) {
-        return HOLDER == null ? Collections.emptyList() : HOLDER.getItems(dictId);
-    }
-
-    /**
-     * 根据掩码获取枚举选项,通常用于多选时获取选项.
-     *
-     * @param dictId 枚举ID
-     * @param mask   掩码
-     * @return 选项
-     * @see Dictionaries#toMask(Collection)
-     */
-    @Nonnull
-    public static List<EnumDict<?>> getItems(@Nonnull String dictId, long mask) {
-        if (HOLDER == null) {
-            return Collections.emptyList();
-        }
-        return HOLDER
-            .getItems(dictId)
-            .stream()
-            .filter(item -> item.in(mask))
-            .collect(Collectors.toList());
-    }
-
-    /**
-     * 查找枚举选项
-     *
-     * @param dictId 枚举ID
-     * @param value  选项值
-     * @return 选项
-     */
-    public static Optional<EnumDict<?>> findItem(@Nonnull String dictId, Object value) {
-        return getItems(dictId)
-            .stream()
-            .filter(item -> item.eq(value))
-            .findFirst();
-    }
-
-    /**
-     * 获取字段选型
-     *
-     * @param dictId 字典ID
-     * @param itemId 选项ID
-     * @return 选项值
-     */
-    @Nonnull
-    public static Optional<EnumDict<?>> getItem(@Nonnull String dictId,
-                                                @Nonnull String itemId) {
-        return HOLDER == null ? Optional.empty() : HOLDER.getItem(dictId, itemId);
-    }
-
-
-    public static long toMask(Collection<EnumDict<?>> items) {
-        long value = 0L;
-        for (EnumDict<?> t1 : items) {
-            value |= t1.getMask();
-        }
-        return value;
-    }
-
-
-}

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

@@ -1,86 +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.dictionary;
-
-import org.hswebframework.ezorm.rdb.mapping.annotation.Codec;
-import org.hswebframework.web.dict.EnumDict;
-
-import java.lang.annotation.*;
-import java.util.Collection;
-
-/**
- * 定义字段是一个数据字典,和枚举的使用方式类似.
- * <p>
- * 区别是数据的值通过{@link Dictionaries}进行获取.
- *
- * <pre>{@code
- *   public class MyEntity{
- *
- *      //数据库存储的是枚举的值
- *       @Column(length=32)
- *       @Dictionary("my_status")
- *       @ColumnType(javaType=String.class)
- *       private EnumDict<String> status;
- *
- *       @Column
- *       @Dictionary("my_types")
- *       //使用long来存储数据,表示使用字段的序号来进行mask运算进行存储.
- *       @ColumnType(javaType=Long.class,jdbcType=JDBCType.BIGINT)
- *       private EnumDict<String>[] types;
- *   }
- * }</pre>
- * <b>⚠️注意</b>
- * <ul>
- *     <li>
- *         字段类型只支持{@code EnumDict<String>},{@code EnumDict<String>[]},{@code List<EnumDict<String>>}
- *     </li>
- *     <li>
- *         多选时建议使用位掩码来存储: {@code @ColumnType(javaType=Long.class,jdbcType=JDBCType.BIGINT) },便于查询.
- *     </li>
- *     <li>使用位掩码存储字典值时,基于{@link EnumDict#ordinal()}进行计算,因此字段选项数量不能超过64个,修改字典时,请注意序号值变化。</li>
- *     <li>模块需要引入依赖:<pre>{@code
- *   <dependency>
- *      <groupId>org.hswebframework.web</groupId>
- *      <artifactId>hsweb-system-dictionary</artifactId>
- *   </dependency>
- *     }</pre></li>
- * </ul>
- *
- *
- * @author zhouhao
- * @see EnumDict#getValue()
- * @see EnumDict#getMask()
- * @see Dictionaries
- * @see Dictionaries#toMask(Collection)
- * @see DictionaryManager
- * @since 2.2
- */
-@Target({ElementType.FIELD, ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-@Inherited
-@Documented
-@Codec
-public @interface Dictionary {
-
-    /**
-     * 数据字典ID
-     *
-     * @return 数据字典ID
-     * @see Dictionaries#getItem(String, String)
-     */
-    String value();
-
-}

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

@@ -1,72 +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.dictionary;
-
-import org.hswebframework.ezorm.rdb.metadata.RDBColumnMetadata;
-import org.hswebframework.ezorm.rdb.metadata.RDBTableMetadata;
-import org.hswebframework.ezorm.rdb.operator.builder.fragments.term.EnumFragmentBuilder;
-import org.hswebframework.ezorm.rdb.operator.builder.fragments.term.EnumInFragmentBuilder;
-import org.hswebframework.web.crud.configuration.TableMetadataCustomizer;
-import org.jetlinks.community.form.type.EnumFieldType;
-
-import java.beans.PropertyDescriptor;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-import java.sql.JDBCType;
-import java.util.List;
-import java.util.Set;
-
-public class DictionaryColumnCustomizer implements TableMetadataCustomizer {
-    @Override
-    public void customColumn(Class<?> entityType,
-                             PropertyDescriptor descriptor,
-                             Field field,
-                             Set<Annotation> annotations,
-                             RDBColumnMetadata column) {
-        Dictionary dictionary = annotations
-            .stream()
-            .filter(Dictionary.class::isInstance)
-            .findFirst()
-            .map(Dictionary.class::cast)
-            .orElse(null);
-        if (dictionary != null) {
-            Class<?> type = field.getType();
-
-            JDBCType jdbcType = (JDBCType) column.getType().getSqlType();
-            EnumFieldType codec = new EnumFieldType(
-                type.isArray() || List.class.isAssignableFrom(type),
-                dictionary.value(),
-                jdbcType)
-                .withArray(type.isArray())
-                .withFieldValueConverter(e -> e);
-
-            column.setValueCodec(codec);
-            if (codec.isToMask()) {
-                column.addFeature(EnumFragmentBuilder.eq);
-                column.addFeature(EnumFragmentBuilder.not);
-
-                column.addFeature(EnumInFragmentBuilder.of(column.getDialect()));
-                column.addFeature(EnumInFragmentBuilder.ofNot(column.getDialect()));
-
-            }
-        }
-    }
-
-    @Override
-    public void customTable(Class<?> entityType, RDBTableMetadata table) {
-
-    }
-}

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

@@ -1,74 +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.dictionary;
-
-import org.hswebframework.web.crud.events.EntityEventListenerCustomizer;
-import org.hswebframework.web.dictionary.entity.DictionaryEntity;
-import org.hswebframework.web.dictionary.entity.DictionaryItemEntity;
-import org.hswebframework.web.dictionary.service.DefaultDictionaryItemService;
-import org.hswebframework.web.dictionary.service.DefaultDictionaryService;
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@AutoConfiguration
-public class DictionaryConfiguration {
-
-
-    @AutoConfiguration
-    @ConditionalOnClass(DefaultDictionaryItemService.class)
-    //@ConditionalOnBean(DefaultDictionaryItemService.class)
-    public static class DictionaryManagerConfiguration {
-
-        @Bean
-        public EntityEventListenerCustomizer dictionaryEntityEventListenerCustomizer() {
-            return configure -> {
-                configure.enable(DictionaryItemEntity.class);
-                configure.enable(DictionaryEntity.class);
-            };
-        }
-
-        @Bean
-        public DictionaryEventHandler dictionaryEventHandler(DefaultDictionaryItemService service) {
-            return new DictionaryEventHandler(service);
-        }
-
-        @Bean
-        public DatabaseDictionaryManager defaultDictionaryManager(DefaultDictionaryItemService service) {
-            DatabaseDictionaryManager dictionaryManager = new DatabaseDictionaryManager(service);
-            Dictionaries.setup(dictionaryManager);
-            return dictionaryManager;
-        }
-
-        @Bean
-        public DictionaryColumnCustomizer dictionaryColumnCustomizer() {
-            return new DictionaryColumnCustomizer();
-        }
-
-
-        @Bean
-        @ConfigurationProperties(prefix = "jetlinks.dict")
-        public DictionaryInitManager dictionaryInitManager(ObjectProvider<DictionaryInitInfo> initInfo,
-                                                           DefaultDictionaryService defaultDictionaryService,
-                                                           DefaultDictionaryItemService itemService) {
-            return new DictionaryInitManager(initInfo, defaultDictionaryService, itemService);
-        }
-
-    }
-}

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

@@ -1,24 +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.dictionary;
-
-public interface DictionaryConstants {
-
-    /**
-     * 系统分类标识
-     */
-    String CLASSIFIED_SYSTEM = "system";
-}

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

@@ -1,110 +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.dictionary;
-
-import lombok.AllArgsConstructor;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.hswebframework.web.crud.events.*;
-import org.hswebframework.web.dictionary.entity.DictionaryEntity;
-import org.hswebframework.web.dictionary.entity.DictionaryItemEntity;
-import org.hswebframework.web.dictionary.service.DefaultDictionaryItemService;
-import org.hswebframework.web.dictionary.service.DefaultDictionaryService;
-import org.hswebframework.web.exception.BusinessException;
-import org.springframework.context.event.EventListener;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author bestfeng
- */
-@AllArgsConstructor
-public class DictionaryEventHandler {
-
-
-    private final DefaultDictionaryItemService itemService;
-
-    @EventListener
-    public void handleDictionaryCreated(EntityCreatedEvent<DictionaryEntity> event) {
-        event.async(
-            Flux.fromIterable(event.getEntity())
-                .flatMap(dictionary -> {
-                    if (!CollectionUtils.isEmpty(dictionary.getItems())) {
-                        return Flux
-                            .fromIterable(dictionary.getItems())
-                            .doOnNext(item -> item.setDictId(dictionary.getId()))
-                            .as(itemService::save);
-                    }
-                    return Mono.empty();
-                })
-        );
-
-    }
-
-    @EventListener
-    public void handleDictionarySaved(EntitySavedEvent<DictionaryEntity> event) {
-        event.async(
-            Flux.fromIterable(event.getEntity())
-                .flatMap(dictionary -> {
-                    if (!CollectionUtils.isEmpty(dictionary.getItems())) {
-                        return Flux
-                            .fromIterable(dictionary.getItems())
-                            .doOnNext(item -> item.setDictId(dictionary.getId()))
-                            .as(itemService::save);
-                    }
-                    return Mono.empty();
-                })
-        );
-    }
-
-    @EventListener
-    public void handleDictionaryDeleted(EntityDeletedEvent<DictionaryEntity> event) {
-        event.async(
-            Flux.fromIterable(event.getEntity())
-                .map(DictionaryEntity::getId)
-                .collectList()
-                .flatMap(dictionary -> itemService
-                    .createDelete()
-                    .where()
-                    .in(DictionaryItemEntity::getDictId, dictionary)
-                    .execute()
-                    .then())
-        );
-    }
-
-    /**
-     * 监听字典删除前事件，阻止删除分类标识为系统的字典
-     *
-     * @param event 字典删除前事件
-     */
-    @EventListener
-    public void handleDictionaryBeforeDelete(EntityBeforeDeleteEvent<DictionaryEntity> event) {
-        event.async(
-            Flux.fromIterable(event.getEntity())
-                .any(dictionary ->
-                         StringUtils.equals(dictionary.getClassified(), DictionaryConstants.CLASSIFIED_SYSTEM))
-                .flatMap(any -> {
-                    if (any) {
-                        return Mono.error(() -> new BusinessException("error.system_dictionary_can_not_delete"));
-                    }
-                    return Mono.empty();
-                })
-        );
-    }
-}

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

@@ -1,38 +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.dictionary;
-
-import org.apache.commons.collections4.CollectionUtils;
-import org.hswebframework.web.dictionary.entity.DictionaryEntity;
-import reactor.core.publisher.Flux;
-
-import java.util.Collection;
-
-/**
- * @author gyl
- * @since 2.2
- */
-public interface DictionaryInitInfo {
-    Collection<DictionaryEntity> getDict();
-
-    default Flux<DictionaryEntity> getDictAsync() {
-        if (CollectionUtils.isEmpty(getDict())) {
-            return Flux.empty();
-        }
-        return Flux.fromIterable(getDict());
-    }
-
-}

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

@@ -1,96 +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.dictionary;
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
-import org.hswebframework.web.crud.events.EntityEventHelper;
-import org.hswebframework.web.dictionary.entity.DictionaryEntity;
-import org.hswebframework.web.dictionary.entity.DictionaryItemEntity;
-import org.hswebframework.web.dictionary.service.DefaultDictionaryItemService;
-import org.hswebframework.web.dictionary.service.DefaultDictionaryService;
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.boot.CommandLineRunner;
-import reactor.core.publisher.Flux;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author gyl
- * @since 2.2
- */
-@Slf4j
-public class DictionaryInitManager implements CommandLineRunner {
-
-    @Getter
-    @Setter
-    private List<DictionaryEntity> inits = new ArrayList<>();
-
-    public final ObjectProvider<DictionaryInitInfo> initInfo;
-
-    private final DefaultDictionaryService defaultDictionaryService;
-
-    private final DefaultDictionaryItemService itemService;
-
-    public DictionaryInitManager(ObjectProvider<DictionaryInitInfo> initInfo, DefaultDictionaryService defaultDictionaryService, DefaultDictionaryItemService itemService) {
-        this.initInfo = initInfo;
-        this.defaultDictionaryService = defaultDictionaryService;
-        this.itemService = itemService;
-    }
-
-    @Override
-    public void run(String... args) {
-        Flux
-            .merge(
-                Flux.fromIterable(inits),
-                Flux
-                    .fromIterable(initInfo)
-                    .flatMap(DictionaryInitInfo::getDictAsync)
-            )
-            .buffer(200)
-            .filter(CollectionUtils::isNotEmpty)
-            .flatMap(collection -> {
-                List<DictionaryItemEntity> items = generateItems(collection);
-                return defaultDictionaryService
-                    .save(collection)
-                    .mergeWith(itemService.save(items));
-            })
-            .as(EntityEventHelper::setDoNotFireEvent)
-            .subscribe(ignore -> {
-                       },
-                       err -> log.error("init dict error", err));
-
-    }
-
-
-    public List<DictionaryItemEntity> generateItems(List<DictionaryEntity> dictionaryList) {
-        List<DictionaryItemEntity> items = new ArrayList<>();
-        for (DictionaryEntity dictionary : dictionaryList) {
-            if (!CollectionUtils.isEmpty(dictionary.getItems())) {
-                for (DictionaryItemEntity item : dictionary.getItems()) {
-                    item.setDictId(dictionary.getId());
-                    items.add(item);
-                }
-            }
-        }
-        return items;
-    }
-
-
-}

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

@@ -1,55 +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.dictionary;
-
-import com.fasterxml.jackson.core.JacksonException;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import org.hswebframework.web.bean.FastBeanCopier;
-import org.hswebframework.web.dict.EnumDict;
-import org.hswebframework.web.dict.defaults.DefaultItemDefine;
-
-import java.io.IOException;
-import java.util.Map;
-
-public class DictionaryJsonDeserializer extends JsonDeserializer<EnumDict<?>> {
-    @Override
-    public EnumDict<?> deserialize(JsonParser jsonParser, DeserializationContext ctxt) throws IOException, JacksonException {
-        if (jsonParser.hasToken(JsonToken.VALUE_NUMBER_INT)) {
-            DefaultItemDefine defaultItemDefine = new DefaultItemDefine();
-            defaultItemDefine.setOrdinal(jsonParser.getIntValue());
-            return defaultItemDefine;
-        }
-        if (jsonParser.hasToken(JsonToken.VALUE_STRING)) {
-            String str = jsonParser.getText().trim();
-            if (!str.isEmpty()) {
-                DefaultItemDefine defaultItemDefine = new DefaultItemDefine();
-                defaultItemDefine.setValue(str);
-                return defaultItemDefine;
-            }
-        }
-
-        if (jsonParser.hasToken(JsonToken.START_OBJECT)) {
-            Map<?, ?> map = ctxt.readValue(jsonParser, Map.class);
-            if (map != null) {
-                return FastBeanCopier.copy(map, new DefaultItemDefine());
-            }
-        }
-        return null;
-    }
-}

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

@@ -1,56 +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.dictionary;
-
-import org.hswebframework.web.dict.EnumDict;
-
-import javax.annotation.Nonnull;
-import java.util.List;
-import java.util.Optional;
-
-/**
- * 数据字典管理器,用于获取数据字典的枚举值
- *
- * @author zhouhao
- * @since 2.1
- */
-public interface DictionaryManager {
-
-    /**
-     * 获取字典的所有选项
-     *
-     * @param dictId 字典ID
-     * @return 字典值
-     */
-    @Nonnull
-    List<EnumDict<?>> getItems(@Nonnull String dictId);
-
-    /**
-     * 获取字段选项
-     *
-     * @param dictId 字典ID
-     * @param itemId 选项ID
-     * @return 选项值
-     */
-    @Nonnull
-    Optional<EnumDict<?>> getItem(@Nonnull String dictId,
-                                  @Nonnull String itemId);
-
-
-
-
-
-}

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,30 +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.event;
-
-import org.jetlinks.community.Operation;
-import org.jetlinks.community.OperationType;
-import reactor.core.publisher.Flux;
-
-public interface OperationAssetProvider {
-
-    OperationType[] getSupportTypes();
-
-    Flux<String> createTopics(Operation operation, String original);
-
-    Flux<String> getAssetTypes(String operationType);
-
-}

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

@@ -1,50 +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.event;
-
-import lombok.extern.slf4j.Slf4j;
-import org.jetlinks.community.Operation;
-import org.jetlinks.community.OperationType;
-
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-
-@Slf4j
-public class OperationAssetProviders {
-
-    private static final Map<String, OperationAssetProvider> providers = new ConcurrentHashMap<>();
-
-    public static void register(OperationAssetProvider provider) {
-        for (OperationType supportType : provider.getSupportTypes()) {
-            OperationAssetProvider old = providers.put(supportType.getId(), provider);
-
-            if (old != null && old != provider) {
-                log.warn("operation asset provider [{}] already exists,will be replaced by [{}]", old, provider);
-            }
-
-        }
-    }
-
-    public static Optional<OperationAssetProvider> lookup(Operation operation) {
-        return lookup(operation.getType().getId());
-    }
-
-    public static Optional<OperationAssetProvider> lookup(String operationType) {
-        return Optional.ofNullable(providers.get(operationType));
-    }
-
-}

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

@@ -1,92 +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.event;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.jetlinks.core.utils.SerializeUtils;
-import org.jetlinks.community.Operation;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-@Getter
-@Setter
-public class SystemEvent implements Externalizable {
-    private static final long serialVersionUID = 1L;
-
-    private Level level;
-
-    private String code;
-
-    private Operation operation;
-
-    /**
-     * 描述详情，不同的类型详情内容不同
-     *
-     * @see org.jetlinks.community.monitor.ExecutionMonitorInfo
-     */
-    private Object detail;
-
-    private long timestamp;
-
-    public SystemEvent(Level level, String code, Operation operation, Object detail) {
-        this.level = level;
-        this.code = code;
-        this.operation = operation;
-        this.detail = detail;
-        this.timestamp = System.currentTimeMillis();
-    }
-
-    public SystemEvent() {
-    }
-
-
-    @Override
-    public void writeExternal(ObjectOutput out) throws IOException {
-        out.writeByte(level.ordinal());
-
-        out.writeUTF(code);
-
-        operation.writeExternal(out);
-
-        SerializeUtils.writeObject(detail, out);
-
-        out.writeLong(timestamp);
-    }
-
-    @Override
-    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        level = Level.values()[in.readByte()];
-
-        code = in.readUTF();
-
-        operation = new Operation();
-        operation.readExternal(in);
-
-        detail = SerializeUtils.readObject(in);
-        timestamp = in.readLong();
-    }
-
-    public enum Level {
-        info,
-        warn,
-        error
-    }
-
-}

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

@@ -1,63 +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.event;
-
-import lombok.AllArgsConstructor;
-import org.jetlinks.core.event.EventBus;
-import org.springframework.context.ApplicationEventPublisher;
-
-/**
- * 推送系统事件到事件总线，topic: /sys-event/{operationType}/{operationId}/{level}
- *
- * @author zhouhao
- * @since 2.0
- */
-@AllArgsConstructor
-public class SystemEventDispatcher implements SystemEventHandler {
-
-    private final EventBus eventBus;
-
-    private final ApplicationEventPublisher eventPublisher;
-
-
-    @Override
-    public final void handle(SystemEvent event) {
-
-        String topic = SystemEventHandler
-            .topic(event.getOperation().getType().getId(),
-                   event.getOperation().getSource().getId(),
-                   event.getLevel().name());
-
-        eventPublisher.publishEvent(event);
-
-        OperationAssetProvider provider = OperationAssetProviders
-            .lookup(event.getOperation())
-            .orElse(null);
-
-        //对数据权限控制的支持
-        if (provider != null) {
-            provider
-                .createTopics(event.getOperation(), topic)
-                .flatMap(_topic -> eventBus.publish(_topic, event))
-                .subscribe();
-        } else {
-            eventBus.publish(topic, event)
-                    .subscribe();
-        }
-
-
-    }
-}