Merge branch 'master' of https://gitee.com/youlaiorg/youlai-boot

src/main/java/com/youlai/boot/config/MybatisConfig.java

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.config.GlobalConfig;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.DataPermissionInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
-import com.youlai.boot.framework.mybatis.handler.AutoFillMetaObjectHandler;
-import com.youlai.boot.framework.mybatis.interceptor.MyDataPermissionHandler;
+import com.youlai.boot.framework.mybatis.MetaFieldFillHandler;
+import com.youlai.boot.framework.mybatis.MyDataPermissionHandler;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -43,7 +43,7 @@ public class MybatisConfig {
     @Bean
     public GlobalConfig globalConfig() {
         GlobalConfig globalConfig = new GlobalConfig();
-        globalConfig.setMetaObjectHandler(new AutoFillMetaObjectHandler());
+        globalConfig.setMetaObjectHandler(new MetaFieldFillHandler());
         return globalConfig;
     }
 

src/main/java/com/youlai/boot/config/OpenApiConfig.java

@@ -14,7 +14,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springdoc.core.customizers.GlobalOpenApiCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
+
 import org.springframework.http.HttpHeaders;
 import org.springframework.util.AntPathMatcher;
 
@@ -32,8 +32,6 @@ import java.util.stream.Stream;
 @Slf4j
 public class OpenApiConfig {
 
-    private final Environment environment;
-
     private final SecurityProperties securityProperties;
 
     /**
@@ -42,13 +40,10 @@ public class OpenApiConfig {
     @Bean
     public OpenAPI openApi() {
 
-        String appVersion = environment.getProperty("project.version", "1.0.0");
-
         return new OpenAPI()
                 .info(new Info()
                         .title("管理系统 API 文档")
                         .description("本文档涵盖管理系统的所有API接口，包括登录认证、用户管理、角色管理、部门管理等功能模块，提供详细的接口说明和使用指南。")
-                        .version(appVersion)
                         .license(new License()
                                 .name("Apache License 2.0")
                                 .url("http://www.apache.org/licenses/LICENSE-2.0")

src/main/java/com/youlai/boot/framework/mybatis/MetaFieldFillHandler.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.framework.mybatis.handler;
+package com.youlai.boot.framework.mybatis;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.youlai.boot.framework.security.util.SecurityUtils;
@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
  * @since 3.0.0
  */
 @Component
-public class AutoFillMetaObjectHandler implements MetaObjectHandler {
+public class MetaFieldFillHandler implements MetaObjectHandler {
 
     @Override
     public void insertFill(MetaObject metaObject) {

src/main/java/com/youlai/boot/framework/mybatis/MyDataPermissionHandler.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.framework.mybatis.interceptor;
+package com.youlai.boot.framework.mybatis;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
@@ -23,7 +23,7 @@ import java.lang.reflect.Method;
 import java.util.List;
 
 /**
- * 数据权限控制器
+ * 数据权限处理器
  * <p>
  * 支持多角色数据权限合并（并集策略）：
  * - 如果任一角色是 ALL，则跳过数据权限过滤