Refactor system module dependencies with improved categorization

pom.xml

@@ -41,9 +41,7 @@
         <maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version>
         <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
         <flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
-        <!-- maven-surefire-plugin 暂时无法通过 bom 的依赖读取（兼容老版本 IDEA 2024 及以前版本） -->
-        <lombok.version>1.18.38</lombok.version>
-        <spring.boot.version>2.7.18</spring.boot.version>
+        <!-- 看看咋放到 bom 里 -->
         <mapstruct.version>1.6.3</mapstruct.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
@@ -81,12 +79,10 @@
                             <path>
                                 <groupId>org.springframework.boot</groupId>
                                 <artifactId>spring-boot-configuration-processor</artifactId>
-                                <version>${spring.boot.version}</version>
                             </path>
                             <path>
                                 <groupId>org.projectlombok</groupId>
                                 <artifactId>lombok</artifactId>
-                                <version>${lombok.version}</version>
                             </path>
                             <path>
                                 <groupId>org.mapstruct</groupId>

sql/dm/flowable-patch/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfiguration.java

@@ -1093,17 +1093,13 @@ public abstract class AbstractEngineConfiguration {
     }
 
     public void close() {
-        try {
-            // 关闭连接池
-            if (dataSource instanceof PooledDataSource) {
-                ((PooledDataSource) dataSource).forceCloseAll();
-            }
-            // 关闭其他资源
-            if (sqlSessionFactory != null) {
-                sqlSessionFactory.getConfiguration().getEnvironment().getDataSource().getConnection().close();
-            }
-        } catch (Exception e) {
-            logger.error("Error closing resources", e);
+        if (forceCloseMybatisConnectionPool && dataSource instanceof PooledDataSource) {
+            /*
+             * When the datasource is created by a Flowable engine (i.e. it's an instance of PooledDataSource),
+             * the connection pool needs to be closed when closing the engine.
+             * Note that calling forceCloseAll() multiple times (as is the case when running with multiple engine) is ok.
+             */
+            ((PooledDataSource) dataSource).forceCloseAll();
         }
     }
 

yudao-dependencies/pom.xml

@@ -53,7 +53,7 @@
         <!-- 工具类相关 -->
         <anji-plus-captcha.version>1.4.0</anji-plus-captcha.version>
         <jsoup.version>1.18.3</jsoup.version>
-        <lombok.version>1.18.38</lombok.version>
+        <lombok.version>1.18.36</lombok.version>
         <mapstruct.version>1.6.3</mapstruct.version>
         <hutool.version>5.8.35</hutool.version>
         <easyexcel.version>4.0.3</easyexcel.version>

yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/SecurityProperties.java

@@ -47,5 +47,5 @@ public class SecurityProperties {
     /**
      * PasswordEncoder 加密复杂度，越高开销越大
      */
-    private Integer passwordEncoderLength = 12;
+    private Integer passwordEncoderLength = 4;
 }

yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractServiceImpl.java

@@ -96,9 +96,6 @@ public class CrmContractServiceImpl implements CrmContractService {
     @Resource
     private BpmProcessInstanceApi bpmProcessInstanceApi;
 
-    @Resource
-    private CrmCommonService crmCommonService;
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     @LogRecord(type = CRM_CONTRACT_TYPE, subType = CRM_CONTRACT_CREATE_SUB_TYPE, bizNo = "{{#contract.id}}",
@@ -415,11 +412,4 @@ public class CrmContractServiceImpl implements CrmContractService {
         return contractMapper.selectListByCustomerIdOwnerUserId(customerId, ownerUserId);
     }
 
-    @Override
-    public void handleContractBusiness() {
-        // 使用通用服务处理业务逻辑
-        crmCommonService.handleContractCommon();
-        // 处理合同特有的业务逻辑
-    }
-
 }

yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/core/CrmCommonService.java

@@ -1,41 +0,0 @@
-package cn.iocoder.yudao.module.crm.service.core;
-
-import org.springframework.stereotype.Service;
-
-/**
- * CRM 通用业务 Service 实现类
- * 
- * 将公共的业务逻辑抽取到这里,避免循环依赖
- */
-@Service
-public class CrmCommonService {
-
-    /**
-     * 处理客户相关的通用逻辑
-     */
-    public void handleCustomerCommon() {
-        // TODO: 实现客户相关的通用逻辑
-    }
-
-    /**
-     * 处理联系人相关的通用逻辑  
-     */
-    public void handleContactCommon() {
-        // TODO: 实现联系人相关的通用逻辑
-    }
-
-    /**
-     * 处理商机相关的通用逻辑
-     */
-    public void handleBusinessCommon() {
-        // TODO: 实现商机相关的通用逻辑
-    }
-
-    /**
-     * 处理合同相关的通用逻辑
-     */
-    public void handleContractCommon() {
-        // TODO: 实现合同相关的通用逻辑
-    }
-
-}

yudao-module-system/pom.xml

@@ -18,13 +18,14 @@
     </description>
 
     <dependencies>
+        <!-- ========== 模块依赖 ========== -->
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-module-infra</artifactId>
             <version>${revision}</version>
         </dependency>
 
-        <!-- 业务组件 -->
+        <!-- ========== 业务组件 ========== -->
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-biz-data-permission</artifactId>
@@ -38,82 +39,80 @@
             <artifactId>yudao-spring-boot-starter-biz-ip</artifactId>
         </dependency>
 
-        <!-- Web 相关 -->
+        <!-- ========== Web 相关 ========== -->
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-security</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
 
-        <!-- DB 相关 -->
+        <!-- ========== 数据库相关 ========== -->
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-mybatis</artifactId>
         </dependency>
-
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-redis</artifactId>
         </dependency>
 
-        <!-- Job 定时任务相关 -->
+        <!-- ========== 任务调度相关 ========== -->
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-job</artifactId>
         </dependency>
 
-        <!-- 消息队列相关 -->
+        <!-- ========== 消息队列相关 ========== -->
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-mq</artifactId>
         </dependency>
 
-        <!-- Test 测试相关 -->
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- 工具类相关 -->
+        <!-- ========== 工具类相关 ========== -->
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
             <artifactId>yudao-spring-boot-starter-excel</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-mail</artifactId>
         </dependency>
 
-        <!-- 三方云服务相关 -->
+        <!-- ========== 第三方登录相关 ========== -->
         <dependency>
             <groupId>me.zhyd.oauth</groupId>
-            <artifactId>JustAuth</artifactId> <!-- 社交登陆（例如说，个人微信、企业微信等等） -->
+            <artifactId>JustAuth</artifactId>
         </dependency>
         <dependency>
             <groupId>com.xkcoding.justauth</groupId>
             <artifactId>justauth-spring-boot-starter</artifactId>
         </dependency>
 
+        <!-- ========== 微信相关 ========== -->
         <dependency>
             <groupId>com.github.binarywang</groupId>
-            <artifactId>wx-java-mp-spring-boot-starter</artifactId> <!-- 微信登录（公众号） -->
+            <artifactId>wx-java-mp-spring-boot-starter</artifactId>
         </dependency>
         <dependency>
             <groupId>com.github.binarywang</groupId>
-            <artifactId>wx-java-miniapp-spring-boot-starter</artifactId>  <!-- 微信登录（小程序） -->
+            <artifactId>wx-java-miniapp-spring-boot-starter</artifactId>
         </dependency>
 
+        <!-- ========== 验证码相关 ========== -->
         <dependency>
             <groupId>com.anji-plus</groupId>
-            <artifactId>captcha-spring-boot-starter</artifactId> <!-- 验证码，一般用于登录使用 -->
+            <artifactId>captcha-spring-boot-starter</artifactId>
         </dependency>
 
+        <!-- ========== 测试相关 ========== -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>

yudao-server/pom.xml

@@ -138,7 +138,6 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
                 <executions>
                     <execution>
                         <goals>