refactor(extension/crud): 优化项目结构

continew-starter-dependencies/pom.xml

@@ -312,13 +312,21 @@
             </dependency>
 
             <!-- ContiNew Starter 依赖 -->
-            <!-- 扩展模块 - CRUD -->
+            <!-- 扩展模块 - CRUD - 核心模块 -->
             <dependency>
                 <groupId>top.continew</groupId>
-                <artifactId>continew-starter-extension-crud</artifactId>
+                <artifactId>continew-starter-extension-crud-core</artifactId>
                 <version>${revision}</version>
             </dependency>
 
+            <!-- 扩展模块 - CRUD - MyBatis Plus ORM 模块 -->
+            <dependency>
+                <groupId>top.continew</groupId>
+                <artifactId>continew-starter-extension-crud-mp</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <!-- 扩展模块 - CRUD - MyBatis Flex ORM 模块 -->
             <dependency>
                 <groupId>top.continew</groupId>
                 <artifactId>continew-starter-extension-crud-mf</artifactId>

continew-starter-extension/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/model/query/SortQuery.java

@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
- * <p>
- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.gnu.org/licenses/lgpl.html
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package top.continew.starter.extension.crud.model.query;
-
-import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.text.CharSequenceUtil;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.springframework.data.domain.Sort;
-import top.continew.starter.core.constant.StringConstants;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 排序查询条件
- *
- * @author Charles7c
- * @since 1.0.0
- */
-@Schema(description = "排序查询条件")
-public class SortQuery implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 排序条件
-     */
-    @Schema(description = "排序条件", example = "createTime,desc")
-    private String[] sort;
-
-    /**
-     * 解析排序条件为 Spring 分页排序实体
-     *
-     * @return Spring 分页排序实体
-     */
-    public Sort getSort() {
-        if (ArrayUtil.isEmpty(sort)) {
-            return Sort.unsorted();
-        }
-
-        List<Sort.Order> orders = new ArrayList<>(sort.length);
-        if (CharSequenceUtil.contains(sort[0], StringConstants.COMMA)) {
-            // e.g "sort=createTime,desc&sort=name,asc"
-            for (String s : sort) {
-                List<String> sortList = CharSequenceUtil.splitTrim(s, StringConstants.COMMA);
-                Sort.Order order = new Sort.Order(Sort.Direction.valueOf(sortList.get(1).toUpperCase()), sortList
-                    .get(0));
-                orders.add(order);
-            }
-        } else {
-            // e.g "sort=createTime,desc"
-            Sort.Order order = new Sort.Order(Sort.Direction.valueOf(sort[1].toUpperCase()), sort[0]);
-            orders.add(order);
-        }
-        return Sort.by(orders);
-    }
-
-    public void setSort(String[] sort) {
-        this.sort = sort;
-    }
-}

continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/pom.xml

@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>top.continew</groupId>
-        <artifactId>continew-starter-extension</artifactId>
+        <artifactId>continew-starter-extension-crud</artifactId>
         <version>${revision}</version>
     </parent>
 
-    <artifactId>continew-starter-extension-crud-mf</artifactId>
-    <description>ContiNew Starter 扩展模块 - CRUD（增删改查）</description>
+    <artifactId>continew-starter-extension-crud-core</artifactId>
+    <description>ContiNew Starter 扩展模块 - CRUD（增删改查） - 核心模块</description>
 
     <dependencies>
         <!-- Crane4j（一个基于注解的，用于完成一切 “根据 A 的 key 值拿到 B，再把 B 的属性映射到 A” 这类需求的字段填充框架） -->
@@ -30,12 +30,6 @@
             <artifactId>continew-starter-auth-satoken</artifactId>
         </dependency>
 
-        <!-- 数据访问模块 - MyBatis Flex -->
-        <dependency>
-            <groupId>top.continew</groupId>
-            <artifactId>continew-starter-data-mybatis-flex</artifactId>
-        </dependency>
-
         <!-- 文件处理模块 - Excel -->
         <dependency>
             <groupId>top.continew</groupId>

continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/model/query/SortQuery.java

@@ -16,8 +16,8 @@
 
 package top.continew.starter.extension.crud.model.query;
 
-import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.text.CharSequenceUtil;
+import cn.hutool.core.util.ArrayUtil;
 import io.swagger.v3.oas.annotations.media.Schema;
 import org.springframework.data.domain.Sort;
 import top.continew.starter.core.constant.StringConstants;

continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/pom.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>top.continew</groupId>
+        <artifactId>continew-starter-extension-crud</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <artifactId>continew-starter-extension-crud-mf</artifactId>
+    <description>ContiNew Starter 扩展模块 - CRUD（增删改查） - MyBatis Flex ORM 模块</description>
+
+    <dependencies>
+        <!-- 核心模块 -->
+        <dependency>
+            <groupId>top.continew</groupId>
+            <artifactId>continew-starter-extension-crud-core</artifactId>
+        </dependency>
+
+        <!-- 数据访问模块 - MyBatis Flex -->
+        <dependency>
+            <groupId>top.continew</groupId>
+            <artifactId>continew-starter-data-mybatis-flex</artifactId>
+        </dependency>
+    </dependencies>
+</project>

continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/controller/BaseController.java

@@ -28,13 +28,13 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import top.continew.starter.core.constant.StringConstants;
 import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
-import top.continew.starter.extension.crud.util.ValidateGroup;
 import top.continew.starter.extension.crud.enums.Api;
-import top.continew.starter.extension.crud.model.query.PageQuery;
 import top.continew.starter.extension.crud.model.query.SortQuery;
 import top.continew.starter.extension.crud.model.req.BaseReq;
-import top.continew.starter.extension.crud.model.resp.PageResp;
 import top.continew.starter.extension.crud.service.BaseService;
+import top.continew.starter.extension.crud.util.ValidateGroup;
+import top.continew.starter.extension.crud.model.query.PageQuery;
+import top.continew.starter.extension.crud.model.resp.PageResp;
 import top.continew.starter.web.model.R;
 
 import java.util.List;

continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/BaseService.java

@@ -18,8 +18,8 @@ package top.continew.starter.extension.crud.service;
 
 import cn.hutool.core.lang.tree.Tree;
 import jakarta.servlet.http.HttpServletResponse;
-import top.continew.starter.extension.crud.model.query.PageQuery;
 import top.continew.starter.extension.crud.model.query.SortQuery;
+import top.continew.starter.extension.crud.model.query.PageQuery;
 import top.continew.starter.extension.crud.model.resp.PageResp;
 
 import java.util.List;

continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/impl/BaseServiceImpl.java

@@ -38,12 +38,12 @@ import top.continew.starter.data.mybatis.flex.base.BaseMapper;
 import top.continew.starter.data.mybatis.flex.query.QueryWrapperHelper;
 import top.continew.starter.data.mybatis.flex.service.impl.ServiceImpl;
 import top.continew.starter.extension.crud.annotation.TreeField;
-import top.continew.starter.extension.crud.model.entity.BaseIdDO;
 import top.continew.starter.extension.crud.model.query.PageQuery;
 import top.continew.starter.extension.crud.model.query.SortQuery;
 import top.continew.starter.extension.crud.model.resp.PageResp;
 import top.continew.starter.extension.crud.service.BaseService;
 import top.continew.starter.extension.crud.util.TreeUtils;
+import top.continew.starter.extension.crud.model.entity.BaseIdDO;
 import top.continew.starter.file.excel.util.ExcelUtils;
 
 import java.lang.reflect.Field;

continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/pom.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>top.continew</groupId>
+        <artifactId>continew-starter-extension-crud</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <artifactId>continew-starter-extension-crud-mp</artifactId>
+    <description>ContiNew Starter 扩展模块 - CRUD（增删改查） - MyBatis Plus ORM 模块</description>
+
+    <dependencies>
+        <!-- 核心模块 -->
+        <dependency>
+            <groupId>top.continew</groupId>
+            <artifactId>continew-starter-extension-crud-core</artifactId>
+        </dependency>
+
+        <!-- 数据访问模块 - MyBatis Plus -->
+        <dependency>
+            <groupId>top.continew</groupId>
+            <artifactId>continew-starter-data-mybatis-plus</artifactId>
+        </dependency>
+    </dependencies>
+</project>

continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/controller/BaseController.java

@@ -28,11 +28,11 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import top.continew.starter.core.constant.StringConstants;
 import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
-import top.continew.starter.extension.crud.util.ValidateGroup;
 import top.continew.starter.extension.crud.enums.Api;
-import top.continew.starter.extension.crud.model.query.PageQuery;
 import top.continew.starter.extension.crud.model.query.SortQuery;
 import top.continew.starter.extension.crud.model.req.BaseReq;
+import top.continew.starter.extension.crud.util.ValidateGroup;
+import top.continew.starter.extension.crud.model.query.PageQuery;
 import top.continew.starter.extension.crud.model.resp.PageResp;
 import top.continew.starter.extension.crud.service.BaseService;
 import top.continew.starter.web.model.R;

continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/BaseService.java

@@ -18,9 +18,9 @@ package top.continew.starter.extension.crud.service;
 
 import cn.hutool.core.lang.tree.Tree;
 import jakarta.servlet.http.HttpServletResponse;
-import top.continew.starter.extension.crud.model.query.PageQuery;
 import top.continew.starter.extension.crud.model.query.SortQuery;
 import top.continew.starter.extension.crud.model.resp.PageResp;
+import top.continew.starter.extension.crud.model.query.PageQuery;
 
 import java.util.List;
 

continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/impl/BaseServiceImpl.java

@@ -40,11 +40,11 @@ import top.continew.starter.data.mybatis.plus.query.QueryWrapperHelper;
 import top.continew.starter.data.mybatis.plus.service.impl.ServiceImpl;
 import top.continew.starter.extension.crud.annotation.TreeField;
 import top.continew.starter.extension.crud.model.entity.BaseIdDO;
-import top.continew.starter.extension.crud.model.query.PageQuery;
 import top.continew.starter.extension.crud.model.query.SortQuery;
 import top.continew.starter.extension.crud.model.resp.PageResp;
 import top.continew.starter.extension.crud.service.BaseService;
 import top.continew.starter.extension.crud.util.TreeUtils;
+import top.continew.starter.extension.crud.model.query.PageQuery;
 import top.continew.starter.file.excel.util.ExcelUtils;
 
 import java.lang.reflect.Field;

continew-starter-extension/continew-starter-extension-crud/pom.xml

@@ -10,42 +10,12 @@
     </parent>
 
     <artifactId>continew-starter-extension-crud</artifactId>
+    <packaging>pom</packaging>
     <description>ContiNew Starter 扩展模块 - CRUD（增删改查）</description>
 
-    <dependencies>
-        <!-- Crane4j（一个基于注解的，用于完成一切 “根据 A 的 key 值拿到 B，再把 B 的属性映射到 A” 这类需求的字段填充框架） -->
-        <dependency>
-            <groupId>cn.crane4j</groupId>
-            <artifactId>crane4j-spring-boot-starter</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-commons</artifactId>
-        </dependency>
-
-        <!-- 认证模块 - SaToken -->
-        <dependency>
-            <groupId>top.continew</groupId>
-            <artifactId>continew-starter-auth-satoken</artifactId>
-        </dependency>
-
-        <!-- 数据访问模块 - MyBatis Plus -->
-        <dependency>
-            <groupId>top.continew</groupId>
-            <artifactId>continew-starter-data-mybatis-plus</artifactId>
-        </dependency>
-
-        <!-- 文件处理模块 - Excel -->
-        <dependency>
-            <groupId>top.continew</groupId>
-            <artifactId>continew-starter-file-excel</artifactId>
-        </dependency>
-
-        <!-- Web 模块 -->
-        <dependency>
-            <groupId>top.continew</groupId>
-            <artifactId>continew-starter-web</artifactId>
-        </dependency>
-    </dependencies>
+    <modules>
+        <module>continew-starter-extension-crud-core</module>
+        <module>continew-starter-extension-crud-mp</module>
+        <module>continew-starter-extension-crud-mf</module>
+    </modules>
 </project>

continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/annotation/CrudRequestMapping.java

@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
- * <p>
- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.gnu.org/licenses/lgpl.html
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package top.continew.starter.extension.crud.annotation;
-
-import top.continew.starter.extension.crud.enums.Api;
-
-import java.lang.annotation.*;
-
-/**
- * CRUD（增删改查）请求映射器注解
- *
- * @author Charles7c
- * @since 1.0.0
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface CrudRequestMapping {
-
-    /**
-     * 路径映射 URI（等同于：@RequestMapping("/foo1")）
-     */
-    String value() default "";
-
-    /**
-     * API 列表
-     */
-    Api[] api() default {Api.PAGE, Api.GET, Api.ADD, Api.UPDATE, Api.DELETE, Api.EXPORT};
-}

continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/annotation/EnableCrudRestController.java

@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
- * <p>
- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.gnu.org/licenses/lgpl.html
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package top.continew.starter.extension.crud.annotation;
-
-import org.springframework.context.annotation.Import;
-import top.continew.starter.extension.crud.autoconfigure.CrudRestControllerAutoConfiguration;
-
-import java.lang.annotation.*;
-
-/**
- * CRUD REST Controller 启用注解
- *
- * @author Charles7c
- * @since 1.2.0
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Import({CrudRestControllerAutoConfiguration.class})
-public @interface EnableCrudRestController {
-}

continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/annotation/TreeField.java

@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
- * <p>
- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.gnu.org/licenses/lgpl.html
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package top.continew.starter.extension.crud.annotation;
-
-import java.lang.annotation.*;
-
-/**
- * 树结构字段
- *
- * @author Charles7c
- * @see cn.hutool.core.lang.tree.TreeNodeConfig
- * @since 1.0.0
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface TreeField {
-
-    /**
-     * ID 字段名
-     *
-     * @return ID 字段名
-     */
-    String value() default "key";
-
-    /**
-     * 父 ID 字段名
-     *
-     * @return 父 ID 字段名
-     */
-    String parentIdKey() default "parentId";
-
-    /**
-     * 名称字段名
-     *
-     * @return 名称字段名
-     */
-    String nameKey() default "title";
-
-    /**
-     * 排序字段名
-     *
-     * @return 排序字段名
-     */
-    String weightKey() default "sort";
-
-    /**
-     * 子列表字段名
-     *
-     * @return 子列表字段名
-     */
-    String childrenKey() default "children";
-
-    /**
-     * 递归深度（< 0 不限制）
-     *
-     * @return 递归深度
-     */
-    int deep() default -1;
-}

continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/autoconfigure/CrudRequestMappingHandlerMapping.java

@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
- * <p>
- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.gnu.org/licenses/lgpl.html
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package top.continew.starter.extension.crud.autoconfigure;
-
-import cn.hutool.core.util.ArrayUtil;
-import org.springframework.core.annotation.AnnotatedElementUtils;
-import org.springframework.lang.NonNull;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.mvc.condition.RequestCondition;
-import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
-import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
-import org.springframework.web.util.pattern.PathPatternParser;
-import top.continew.starter.core.util.ExceptionUtils;
-import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
-import top.continew.starter.extension.crud.enums.Api;
-
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Method;
-
-/**
- * CRUD 请求映射器处理器映射器
- *
- * @author Charles7c
- * @since 1.0.0
- */
-public class CrudRequestMappingHandlerMapping extends RequestMappingHandlerMapping {
-
-    @Override
-    protected RequestMappingInfo getMappingForMethod(@NonNull Method method, @NonNull Class<?> handlerType) {
-        RequestMappingInfo requestMappingInfo = super.getMappingForMethod(method, handlerType);
-        if (null == requestMappingInfo) {
-            return null;
-        }
-        // 如果没有声明 @CrudRequestMapping 注解，直接返回
-        if (!handlerType.isAnnotationPresent(CrudRequestMapping.class)) {
-            return requestMappingInfo;
-        }
-        CrudRequestMapping crudRequestMapping = handlerType.getDeclaredAnnotation(CrudRequestMapping.class);
-        // 过滤 API，如果非本类中定义，且 API 列表中不包含，则忽略
-        Api[] apiArr = crudRequestMapping.api();
-        Api api = ExceptionUtils.exToNull(() -> Api.valueOf(method.getName().toUpperCase()));
-        if (method.getDeclaringClass() != handlerType && !ArrayUtil.containsAny(apiArr, Api.ALL, api)) {
-            return null;
-        }
-        // 拼接路径（合并了 @RequestMapping 的部分能力）
-        return this.getMappingForMethodWrapper(method, handlerType, crudRequestMapping);
-    }
-
-    private RequestMappingInfo getMappingForMethodWrapper(@NonNull Method method,
-                                                          @NonNull Class<?> handlerType,
-                                                          CrudRequestMapping crudRequestMapping) {
-        RequestMappingInfo info = this.buildRequestMappingInfo(method);
-        if (null != info) {
-            RequestMappingInfo typeInfo = this.buildRequestMappingInfo(handlerType);
-            if (null != typeInfo) {
-                info = typeInfo.combine(info);
-            }
-            String prefix = crudRequestMapping.value();
-            if (null != prefix) {
-                RequestMappingInfo.BuilderConfiguration options = new RequestMappingInfo.BuilderConfiguration();
-                options.setPatternParser(PathPatternParser.defaultInstance);
-                info = RequestMappingInfo.paths(prefix).options(options).build().combine(info);
-            }
-        }
-        return info;
-    }
-
-    private RequestMappingInfo buildRequestMappingInfo(AnnotatedElement element) {
-        RequestMapping requestMapping = AnnotatedElementUtils.findMergedAnnotation(element, RequestMapping.class);
-        RequestCondition<?> condition = (element instanceof Class<?> clazz
-            ? getCustomTypeCondition(clazz)
-            : getCustomMethodCondition((Method)element));
-        return (requestMapping != null ? super.createRequestMappingInfo(requestMapping, condition) : null);
-    }
-}

continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/autoconfigure/CrudRestControllerAutoConfiguration.java

@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
- * <p>
- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.gnu.org/licenses/lgpl.html
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package top.continew.starter.extension.crud.autoconfigure;
-
-import jakarta.annotation.PostConstruct;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.format.support.FormattingConversionService;
-import org.springframework.web.accept.ContentNegotiationManager;
-import org.springframework.web.servlet.config.annotation.DelegatingWebMvcConfiguration;
-import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
-import org.springframework.web.servlet.resource.ResourceUrlProvider;
-
-/**
- * CRUD REST Controller 自动配置
- *
- * @author Charles7c
- * @since 1.0.0
- */
-@Configuration
-public class CrudRestControllerAutoConfiguration extends DelegatingWebMvcConfiguration {
-
-    private static final Logger log = LoggerFactory.getLogger(CrudRestControllerAutoConfiguration.class);
-
-    /**
-     * CRUD 请求映射器处理器映射器（覆盖默认 RequestMappingHandlerMapping）
-     */
-    @Override
-    public RequestMappingHandlerMapping createRequestMappingHandlerMapping() {
-        return new CrudRequestMappingHandlerMapping();
-    }
-
-    @Bean
-    @Primary
-    @Override
-    public RequestMappingHandlerMapping requestMappingHandlerMapping(@Qualifier("mvcContentNegotiationManager") ContentNegotiationManager contentNegotiationManager,
-                                                                     @Qualifier("mvcConversionService") FormattingConversionService conversionService,
-                                                                     @Qualifier("mvcResourceUrlProvider") ResourceUrlProvider resourceUrlProvider) {
-        return super.requestMappingHandlerMapping(contentNegotiationManager, conversionService, resourceUrlProvider);
-    }
-
-    @PostConstruct
-    public void postConstruct() {
-        log.debug("[ContiNew Starter] - Auto Configuration 'Extension-CRUD REST Controller' completed initialization.");
-    }
-}

continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/constant/ContainerPool.java

@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
- * <p>
- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.gnu.org/licenses/lgpl.html
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package top.continew.starter.extension.crud.constant;
-
-/**
- * 数据源容器相关常量（Crane4j 数据填充组件使用）
- *
- * @author Charles7c
- * @since 1.2.0
- */
-public class ContainerPool {
-
-    /**
-     * 用户昵称
-     */
-    public static final String USER_NICKNAME = "UserNickname";
-
-    protected ContainerPool() {
-    }
-}

continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/enums/Api.java

@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
- * <p>
- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.gnu.org/licenses/lgpl.html
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package top.continew.starter.extension.crud.enums;
-
-/**
- * API 类型枚举
- *
- * @author Charles7c
- * @since 1.0.0
- */
-public enum Api {
-
-    /**
-     * 所有 API
-     */
-    ALL,
-    /**
-     * 分页
-     */
-    PAGE,
-    /**
-     * 树列表
-     */
-    TREE,
-    /**
-     * 列表
-     */
-    LIST,
-    /**
-     * 详情
-     */
-    GET,
-    /**
-     * 新增
-     */
-    ADD,
-    /**
-     * 修改
-     */
-    UPDATE,
-    /**
-     * 删除
-     */
-    DELETE,
-    /**
-     * 导出
-     */
-    EXPORT,
-}

continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/model/req/BaseReq.java

@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
- * <p>
- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.gnu.org/licenses/lgpl.html
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package top.continew.starter.extension.crud.model.req;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-/**
- * 请求基类
- *
- * @author Charles7c
- * @since 1.0.0
- */
-public class BaseReq implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-}

continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/model/resp/BaseDetailResp.java

@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
- * <p>
- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.gnu.org/licenses/lgpl.html
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package top.continew.starter.extension.crud.model.resp;
-
-import cn.crane4j.annotation.Assemble;
-import cn.crane4j.annotation.Mapping;
-import cn.crane4j.annotation.condition.ConditionOnPropertyNotNull;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.swagger.v3.oas.annotations.media.Schema;
-import top.continew.starter.extension.crud.constant.ContainerPool;
-
-import java.io.Serial;
-import java.time.LocalDateTime;
-
-/**
- * 详情响应基类
- *
- * @author Charles7c
- * @since 1.0.0
- */
-public class BaseDetailResp extends BaseResp {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 修改人
-     */
-    @JsonIgnore
-    @ConditionOnPropertyNotNull
-    @Assemble(container = ContainerPool.USER_NICKNAME, props = @Mapping(ref = "updateUserString"))
-    private Long updateUser;
-
-    /**
-     * 修改人
-     */
-    @Schema(description = "修改人", example = "李四")
-    @ExcelProperty(value = "修改人", order = Integer.MAX_VALUE - 2)
-    private String updateUserString;
-
-    /**
-     * 修改时间
-     */
-    @Schema(description = "修改时间", example = "2023-08-08 08:08:08", type = "string")
-    @ExcelProperty(value = "修改时间", order = Integer.MAX_VALUE - 1)
-    private LocalDateTime updateTime;
-
-    public Long getUpdateUser() {
-        return updateUser;
-    }
-
-    public void setUpdateUser(Long updateUser) {
-        this.updateUser = updateUser;
-    }
-
-    public String getUpdateUserString() {
-        return updateUserString;
-    }
-
-    public void setUpdateUserString(String updateUserString) {
-        this.updateUserString = updateUserString;
-    }
-
-    public LocalDateTime getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(LocalDateTime updateTime) {
-        this.updateTime = updateTime;
-    }
-}

continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/model/resp/BaseResp.java

@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
- * <p>
- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.gnu.org/licenses/lgpl.html
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package top.continew.starter.extension.crud.model.resp;
-
-import cn.crane4j.annotation.Assemble;
-import cn.crane4j.annotation.Mapping;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.v3.oas.annotations.media.Schema;
-import top.continew.starter.extension.crud.constant.ContainerPool;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * 响应基类
- *
- * @author Charles7c
- * @since 1.0.0
- */
-public class BaseResp implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    @Schema(description = "ID", example = "1")
-    @ExcelProperty(value = "ID", order = 1)
-    private Long id;
-
-    /**
-     * 创建人
-     */
-    @JsonIgnore
-    @Assemble(container = ContainerPool.USER_NICKNAME, props = @Mapping(ref = "createUserString"))
-    private Long createUser;
-
-    /**
-     * 创建人
-     */
-    @Schema(description = "创建人", example = "超级管理员")
-    @ExcelProperty(value = "创建人", order = Integer.MAX_VALUE - 4)
-    private String createUserString;
-
-    /**
-     * 创建时间
-     */
-    @Schema(description = "创建时间", example = "2023-08-08 08:08:08", type = "string")
-    @ExcelProperty(value = "创建时间", order = Integer.MAX_VALUE - 3)
-    private LocalDateTime createTime;
-
-    /**
-     * 是否禁用修改
-     */
-    @Schema(description = "是否禁用修改", example = "true")
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    private Boolean disabled;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getCreateUser() {
-        return createUser;
-    }
-
-    public void setCreateUser(Long createUser) {
-        this.createUser = createUser;
-    }
-
-    public String getCreateUserString() {
-        return createUserString;
-    }
-
-    public void setCreateUserString(String createUserString) {
-        this.createUserString = createUserString;
-    }
-
-    public LocalDateTime getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(LocalDateTime createTime) {
-        this.createTime = createTime;
-    }
-
-    public Boolean getDisabled() {
-        return disabled;
-    }
-
-    public void setDisabled(Boolean disabled) {
-        this.disabled = disabled;
-    }
-}

continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/service/CommonUserService.java

@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
- * <p>
- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.gnu.org/licenses/lgpl.html
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package top.continew.starter.extension.crud.service;
-
-import cn.crane4j.annotation.ContainerMethod;
-import cn.crane4j.annotation.MappingType;
-import top.continew.starter.extension.crud.constant.ContainerPool;
-
-/**
- * 公共用户业务接口
- *
- * @author Charles7c
- * @since 1.0.0
- */
-public interface CommonUserService {
-
-    /**
-     * 根据 ID 查询昵称
-     *
-     * @param id ID
-     * @return 昵称
-     */
-    @ContainerMethod(namespace = ContainerPool.USER_NICKNAME, type = MappingType.ORDER_OF_KEYS)
-    String getNicknameById(Long id);
-}

continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/util/TreeUtils.java

@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
- * <p>
- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.gnu.org/licenses/lgpl.html
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package top.continew.starter.extension.crud.util;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.lang.tree.Tree;
-import cn.hutool.core.lang.tree.TreeNodeConfig;
-import cn.hutool.core.lang.tree.TreeUtil;
-import cn.hutool.core.lang.tree.parser.NodeParser;
-import cn.hutool.core.util.ReflectUtil;
-import top.continew.starter.core.util.validate.CheckUtils;
-import top.continew.starter.extension.crud.annotation.TreeField;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 树工具类
- *
- * @author Charles7c
- * @since 1.0.0
- */
-public class TreeUtils {
-
-    /**
-     * 默认字段配置对象（根据前端树结构灵活调整名称）
-     */
-    public static final TreeNodeConfig DEFAULT_CONFIG = TreeNodeConfig.DEFAULT_CONFIG.setNameKey("title")
-        .setIdKey("key")
-        .setWeightKey("sort");
-
-    private TreeUtils() {
-    }
-
-    /**
-     * 树构建
-     *
-     * @param <T>        转换的实体 为数据源里的对象类型
-     * @param <E>        ID类型
-     * @param list       源数据集合
-     * @param nodeParser 转换器
-     * @return List 树列表
-     */
-    public static <T, E> List<Tree<E>> build(List<T> list, NodeParser<T, E> nodeParser) {
-        return build(list, DEFAULT_CONFIG, nodeParser);
-    }
-
-    /**
-     * 树构建
-     *
-     * @param <T>            转换的实体 为数据源里的对象类型
-     * @param <E>            ID类型
-     * @param list           源数据集合
-     * @param treeNodeConfig 配置
-     * @param nodeParser     转换器
-     * @return List 树列表
-     */
-    public static <T, E> List<Tree<E>> build(List<T> list, TreeNodeConfig treeNodeConfig, NodeParser<T, E> nodeParser) {
-        if (CollUtil.isEmpty(list)) {
-            return new ArrayList<>(0);
-        }
-        E parentId = (E)ReflectUtil.getFieldValue(list.get(0), treeNodeConfig.getParentIdKey());
-        return TreeUtil.build(list, parentId, treeNodeConfig, nodeParser);
-    }
-
-    /**
-     * 根据 @TreeField 配置生成树结构配置
-     *
-     * @param treeField 树结构字段注解
-     * @return 树结构配置
-     */
-    public static TreeNodeConfig genTreeNodeConfig(TreeField treeField) {
-        CheckUtils.throwIfNull(treeField, "请添加并配置 @TreeField 树结构信息");
-        return new TreeNodeConfig().setIdKey(treeField.value())
-            .setParentIdKey(treeField.parentIdKey())
-            .setNameKey(treeField.nameKey())
-            .setWeightKey(treeField.weightKey())
-            .setChildrenKey(treeField.childrenKey())
-            .setDeep(treeField.deep() < 0 ? null : treeField.deep());
-    }
-}

continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/util/ValidateGroup.java

@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
- * <p>
- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.gnu.org/licenses/lgpl.html
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package top.continew.starter.extension.crud.util;
-
-import jakarta.validation.groups.Default;
-
-/**
- * 分组校验
- *
- * @author Charles7c
- * @since 1.0.0
- */
-public interface ValidateGroup extends Default {
-
-    /**
-     * 分组校验-增删改查
-     */
-    interface Crud extends ValidateGroup {
-        /**
-         * 分组校验-创建
-         */
-        interface Add extends Crud {
-        }
-
-        /**
-         * 分组校验-修改
-         */
-        interface Update extends Crud {
-        }
-    }
-}

continew-starter-extension/pom.xml

@@ -15,7 +15,6 @@
 
     <modules>
         <module>continew-starter-extension-crud</module>
-        <module>continew-starter-extension-crud-mf</module>
     </modules>
 
     <dependencies>