项目结构调整 x 14 : 将 yudao-spring-boot-starter-mybatis 拆分

yudao-framework/pom.xml

@@ -12,6 +12,7 @@
     <modules>
         <module>yudao-common</module>
         <module>yudao-framework-all</module>
+        <module>yudao-spring-boot-starter-mybatis</module>
     </modules>
 
     <artifactId>yudao-framework</artifactId>

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/core/IntArrayValuable.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.common.core;
+package cn.iocoder.yudao.framework.common.core;
 
 /**
  * 可生成 Int 数组的接口

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/core/KeyValue.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.common.core;
+package cn.iocoder.yudao.framework.common.core;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/CommonStatusEnum.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.common.enums;
+package cn.iocoder.yudao.framework.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/UserTypeEnum.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.common.enums;
+package cn.iocoder.yudao.framework.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/ErrorCode.java

@@ -1,7 +1,7 @@
-package cn.iocoder.yudao.common.exception;
+package cn.iocoder.yudao.framework.common.exception;
 
-import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants;
-import cn.iocoder.yudao.common.exception.enums.ServiceErrorCodeRange;
+import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
+import cn.iocoder.yudao.framework.common.exception.enums.ServiceErrorCodeRange;
 import lombok.Data;
 
 /**

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/ServiceException.java

@@ -1,6 +1,6 @@
-package cn.iocoder.yudao.common.exception;
+package cn.iocoder.yudao.framework.common.exception;
 
-import cn.iocoder.yudao.common.exception.enums.ServiceErrorCodeRange;
+import cn.iocoder.yudao.framework.common.exception.enums.ServiceErrorCodeRange;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/enums/GlobalErrorCodeConstants.java

@@ -1,6 +1,6 @@
-package cn.iocoder.yudao.common.exception.enums;
+package cn.iocoder.yudao.framework.common.exception.enums;
 
-import cn.iocoder.yudao.common.exception.ErrorCode;
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
 
 /**
  * 全局错误码枚举

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/enums/ServiceErrorCodeRange.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.common.exception.enums;
+package cn.iocoder.yudao.framework.common.exception.enums;
 
 /**
  * 业务异常的错误码区间，解决：解决各模块错误码定义，避免重复，在此只声明不做实际使用

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/exception/util/ServiceExceptionUtil.java

@@ -1,11 +1,9 @@
-package cn.iocoder.yudao.common.exception.util;
+package cn.iocoder.yudao.framework.common.exception.util;
 
-import cn.iocoder.yudao.common.exception.ErrorCode;
-import cn.iocoder.yudao.common.exception.ServiceException;
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
 import com.google.common.annotations.VisibleForTesting;
 import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/package-info.java

@@ -3,4 +3,4 @@
  *
  * 例如说，CommonResult 为通用返回
  */
-package cn.iocoder.yudao.common;
+package cn.iocoder.yudao.framework.common;

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/CommonResult.java

@@ -1,8 +1,8 @@
-package cn.iocoder.yudao.common.pojo;
+package cn.iocoder.yudao.framework.common.pojo;
 
-import cn.iocoder.yudao.common.exception.ErrorCode;
-import cn.iocoder.yudao.common.exception.ServiceException;
-import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants;
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import org.springframework.util.Assert;

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageParam.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.common.pojo;
+package cn.iocoder.yudao.framework.common.pojo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageResult.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.common.pojo;
+package cn.iocoder.yudao.framework.common.pojo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/SortingField.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.common.pojo;
+package cn.iocoder.yudao.framework.common.pojo;
 
 import java.io.Serializable;
 

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/collection/ArrayUtils.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.util.collection;
+package cn.iocoder.yudao.framework.util.collection;
 
 import cn.hutool.core.util.ArrayUtil;
 

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/collection/CollectionUtils.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.util.collection;
+package cn.iocoder.yudao.framework.util.collection;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/collection/MapUtils.java

@@ -1,8 +1,8 @@
-package cn.iocoder.yudao.util.collection;
+package cn.iocoder.yudao.framework.util.collection;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import cn.iocoder.yudao.common.core.KeyValue;
+import cn.iocoder.yudao.framework.common.core.KeyValue;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/collection/SetUtils.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.util.collection;
+package cn.iocoder.yudao.framework.util.collection;
 
 import java.util.Arrays;
 import java.util.HashSet;

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/date/DateUtils.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.util.date;
+package cn.iocoder.yudao.framework.util.date;
 
 import java.time.Duration;
 import java.util.Calendar;

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/json/JsonUtils.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.util.json;
+package cn.iocoder.yudao.framework.util.json;
 
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/object/ObjectUtils.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.util.object;
+package cn.iocoder.yudao.framework.util.object;
 
 import cn.hutool.core.util.ObjectUtil;
 

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/package-info.java

@@ -4,4 +4,4 @@
  *
  * ps：如果担心 Hutool 存在坑的问题，可以阅读 Hutool 的实现源码，以确保可靠性。并且，可以补充相关的单元测试。
  */
-package cn.iocoder.yudao.util;
+package cn.iocoder.yudao.framework.util;

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/servlet/ServletUtils.java

@@ -1,9 +1,9 @@
-package cn.iocoder.yudao.util.servlet;
+package cn.iocoder.yudao.framework.util.servlet;
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.servlet.ServletUtil;
-import cn.iocoder.yudao.util.json.JsonUtils;
+import cn.iocoder.yudao.framework.util.json.JsonUtils;
 import org.springframework.http.MediaType;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/sping/SpringAopUtils.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.util.sping;
+package cn.iocoder.yudao.framework.util.sping;
 
 import cn.hutool.core.bean.BeanUtil;
 import org.springframework.aop.framework.AdvisedSupport;

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/sping/SpringExpressionUtils.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.util.sping;
+package cn.iocoder.yudao.framework.util.sping;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.map.MapUtil;

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/util/string/StrUtils.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.util.string;
+package cn.iocoder.yudao.framework.util.string;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;

yudao-framework/yudao-framework-all/pom.xml

@@ -55,24 +55,6 @@
         </dependency>
 
         <!-- DB 相关 -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.46</version> <!-- TODO 强制版本 -->
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot-starter</artifactId> <!-- 多数据源 -->
-        </dependency>
-
         <dependency>
             <groupId>org.redisson</groupId>
             <artifactId>redisson-spring-boot-starter</artifactId>

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java

@@ -5,7 +5,6 @@ import cn.hutool.core.util.ClassUtil;
 import cn.hutool.core.util.ReflectUtil;
 import cn.iocoder.dashboard.framework.apollo.core.ConfigConsts;
 import cn.iocoder.dashboard.framework.apollo.internals.dto.ConfigRespDTO;
-import cn.iocoder.yudao.util.object.ObjectUtils;
 import com.ctrip.framework.apollo.Apollo;
 import com.ctrip.framework.apollo.build.ApolloInjector;
 import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/dict/core/dto/DictDataRespDTO.java

@@ -1,6 +1,6 @@
 package cn.iocoder.dashboard.framework.dict.core.dto;
 
-import cn.iocoder.yudao.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import lombok.Data;
 
 /**

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java

@@ -3,7 +3,7 @@ package cn.iocoder.dashboard.framework.errorcode.core.generator;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ClassUtil;
 import cn.hutool.core.util.ReflectUtil;
-import cn.iocoder.yudao.common.exception.ErrorCode;
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
 import cn.iocoder.dashboard.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO;
 import cn.iocoder.dashboard.framework.errorcode.core.service.ErrorCodeFrameworkService;
 import lombok.RequiredArgsConstructor;

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoader.java

@@ -1,11 +1,11 @@
 package cn.iocoder.dashboard.framework.errorcode.core.loader;
 
-import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil;
+import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
 
 /**
  * 错误码加载器
  *
- * 注意，错误码最终加载到 {@link cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil} 的 MESSAGES 变量中！
+ * 注意，错误码最终加载到 {@link ServiceExceptionUtil} 的 MESSAGES 变量中！
  *
  * @author dlyan
  */

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/errorcode/core/loader/ErrorCodeLoaderImpl.java

@@ -3,7 +3,7 @@ package cn.iocoder.dashboard.framework.errorcode.core.loader;
 import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.dashboard.framework.errorcode.core.dto.ErrorCodeRespDTO;
 import cn.iocoder.dashboard.framework.errorcode.core.service.ErrorCodeFrameworkService;
-import cn.iocoder.yudao.util.date.DateUtils;
+import cn.iocoder.yudao.framework.util.date.DateUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.context.event.ApplicationReadyEvent;

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/JsonConvert.java

@@ -1,6 +1,6 @@
 package cn.iocoder.dashboard.framework.excel.core.convert;
 
-import cn.iocoder.yudao.util.json.JsonUtils;
+import cn.iocoder.yudao.framework.util.json.JsonUtils;
 import com.alibaba.excel.converters.Converter;
 import com.alibaba.excel.enums.CellDataTypeEnum;
 import com.alibaba.excel.metadata.CellData;

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/idempotent/core/aop/IdempotentAspect.java

@@ -1,11 +1,11 @@
 package cn.iocoder.dashboard.framework.idempotent.core.aop;
 
-import cn.iocoder.yudao.common.exception.ServiceException;
-import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
 import cn.iocoder.dashboard.framework.idempotent.core.annotation.Idempotent;
 import cn.iocoder.dashboard.framework.idempotent.core.keyresolver.IdempotentKeyResolver;
 import cn.iocoder.dashboard.framework.idempotent.core.redis.IdempotentRedisDAO;
-import cn.iocoder.yudao.util.collection.CollectionUtils;
+import cn.iocoder.yudao.framework.util.collection.CollectionUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/jackson/config/JacksonConfig.java

@@ -2,7 +2,7 @@ package cn.iocoder.dashboard.framework.jackson.config;
 
 import cn.iocoder.dashboard.framework.jackson.deser.LocalDateTimeDeserializer;
 import cn.iocoder.dashboard.framework.jackson.ser.LocalDateTimeSerializer;
-import cn.iocoder.yudao.util.json.JsonUtils;
+import cn.iocoder.yudao.framework.util.json.JsonUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import org.springframework.context.annotation.Bean;

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/lock4j/core/DefaultLockFailureStrategy.java

@@ -1,12 +1,12 @@
 package cn.iocoder.dashboard.framework.lock4j.core;
 
-import cn.iocoder.yudao.common.exception.ServiceException;
-import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
 import com.baomidou.lock.LockFailureStrategy;
 import lombok.extern.slf4j.Slf4j;
 
 /**
- * 自定义获取锁失败策略，抛出 {@link cn.iocoder.yudao.common.exception.ServiceException} 异常
+ * 自定义获取锁失败策略，抛出 {@link ServiceException} 异常
  */
 @Slf4j
 public class DefaultLockFailureStrategy implements LockFailureStrategy {

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/apilog/core/filter/ApiAccessLogFilter.java

@@ -3,16 +3,16 @@ package cn.iocoder.dashboard.framework.logger.apilog.core.filter;
 import cn.hutool.core.exceptions.ExceptionUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.extra.servlet.ServletUtil;
-import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants;
-import cn.iocoder.yudao.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.dashboard.framework.logger.apilog.core.service.ApiAccessLogFrameworkService;
 import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiAccessLogCreateDTO;
 import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils;
 import cn.iocoder.dashboard.framework.web.config.WebProperties;
 import cn.iocoder.dashboard.framework.web.core.util.WebFrameworkUtils;
-import cn.iocoder.yudao.util.date.DateUtils;
-import cn.iocoder.yudao.util.json.JsonUtils;
-import cn.iocoder.yudao.util.servlet.ServletUtils;
+import cn.iocoder.yudao.framework.util.date.DateUtils;
+import cn.iocoder.yudao.framework.util.json.JsonUtils;
+import cn.iocoder.yudao.framework.util.servlet.ServletUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.filter.OncePerRequestFilter;

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/logger/operatelog/core/aop/OperateLogAspect.java

@@ -4,15 +4,15 @@ import cn.hutool.core.exceptions.ExceptionUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.servlet.ServletUtil;
-import cn.iocoder.yudao.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog;
 import cn.iocoder.dashboard.framework.logger.operatelog.core.dto.OperateLogCreateReqDTO;
 import cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum;
 import cn.iocoder.dashboard.framework.logger.operatelog.core.service.OperateLogFrameworkService;
 import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils;
-import cn.iocoder.yudao.util.json.JsonUtils;
-import cn.iocoder.yudao.util.servlet.ServletUtils;
+import cn.iocoder.yudao.framework.util.json.JsonUtils;
+import cn.iocoder.yudao.framework.util.servlet.ServletUtils;
 import com.google.common.collect.Maps;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -35,8 +35,8 @@ import java.util.*;
 import java.util.function.Predicate;
 import java.util.stream.IntStream;
 
-import static cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR;
-import static cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants.SUCCESS;
+import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR;
+import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.SUCCESS;
 
 /**
  * 拦截使用 @OperateLog 注解，如果满足条件，则生成操作日志。

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/quartz/core/handler/JobHandlerInvoker.java

@@ -15,7 +15,7 @@ import org.springframework.scheduling.quartz.QuartzJobBean;
 import javax.annotation.Resource;
 import java.util.Date;
 
-import static cn.iocoder.yudao.util.date.DateUtils.diff;
+import static cn.iocoder.yudao.framework.util.date.DateUtils.diff;
 import static org.apache.commons.lang3.exception.ExceptionUtils.getRootCauseMessage;
 
 /**

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/pubsub/AbstractChannelMessageListener.java

@@ -1,7 +1,7 @@
 package cn.iocoder.dashboard.framework.redis.core.pubsub;
 
 import cn.hutool.core.util.TypeUtil;
-import cn.iocoder.yudao.util.json.JsonUtils;
+import cn.iocoder.yudao.framework.util.json.JsonUtils;
 import lombok.SneakyThrows;
 import org.springframework.data.redis.connection.Message;
 import org.springframework.data.redis.connection.MessageListener;

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/stream/AbstractStreamMessageListener.java

@@ -1,7 +1,7 @@
 package cn.iocoder.dashboard.framework.redis.core.stream;
 
 import cn.hutool.core.util.TypeUtil;
-import cn.iocoder.yudao.util.json.JsonUtils;
+import cn.iocoder.yudao.framework.util.json.JsonUtils;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.SneakyThrows;

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/redis/core/util/RedisMessageUtils.java

@@ -2,7 +2,7 @@ package cn.iocoder.dashboard.framework.redis.core.util;
 
 import cn.iocoder.dashboard.framework.redis.core.pubsub.ChannelMessage;
 import cn.iocoder.dashboard.framework.redis.core.stream.StreamMessage;
-import cn.iocoder.yudao.util.json.JsonUtils;
+import cn.iocoder.yudao.framework.util.json.JsonUtils;
 import org.springframework.data.redis.connection.stream.RecordId;
 import org.springframework.data.redis.connection.stream.StreamRecords;
 import org.springframework.data.redis.core.RedisTemplate;

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityConfiguration.java

@@ -26,7 +26,7 @@ import javax.annotation.Resource;
 /**
  * spring security配置
  *
- * @author ruoyi
+ * @author 芋道源码
  */
 @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
 @EnableConfigurationProperties(SecurityProperties.class)

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/LoginUser.java

@@ -1,6 +1,6 @@
 package cn.iocoder.dashboard.framework.security.core;
 
-import cn.iocoder.yudao.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import org.springframework.security.core.GrantedAuthority;

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/filter/JwtAuthenticationTokenFilter.java

@@ -1,13 +1,13 @@
 package cn.iocoder.dashboard.framework.security.core.filter;
 
 import cn.hutool.core.util.StrUtil;
-import cn.iocoder.yudao.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.dashboard.framework.security.config.SecurityProperties;
 import cn.iocoder.dashboard.framework.security.core.LoginUser;
 import cn.iocoder.dashboard.framework.security.core.service.SecurityAuthFrameworkService;
 import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.dashboard.framework.web.core.handler.GlobalExceptionHandler;
-import cn.iocoder.yudao.util.servlet.ServletUtils;
+import cn.iocoder.yudao.framework.util.servlet.ServletUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AccessDeniedHandlerImpl.java

@@ -1,9 +1,9 @@
 package cn.iocoder.dashboard.framework.security.core.handler;
 
-import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants;
-import cn.iocoder.yudao.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils;
-import cn.iocoder.yudao.util.servlet.ServletUtils;
+import cn.iocoder.yudao.framework.util.servlet.ServletUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.web.access.AccessDeniedHandler;
@@ -16,7 +16,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
-import static cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants.UNAUTHORIZED;
+import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.UNAUTHORIZED;
 
 /**
  * 访问一个需要认证的 URL 资源，已经认证（登录）但是没有权限的情况下，返回 {@link GlobalErrorCodeConstants#FORBIDDEN} 错误码。

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/AuthenticationEntryPointImpl.java

@@ -1,8 +1,8 @@
 package cn.iocoder.dashboard.framework.security.core.handler;
 
-import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants;
-import cn.iocoder.yudao.common.pojo.CommonResult;
-import cn.iocoder.yudao.util.servlet.ServletUtils;
+import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.util.servlet.ServletUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.AuthenticationEntryPoint;
@@ -13,7 +13,7 @@ import javax.servlet.FilterChain;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import static cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants.UNAUTHORIZED;
+import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.UNAUTHORIZED;
 
 /**
  * 访问一个需要认证的 URL 资源，但是此时自己尚未认证（登录）的情况下，返回 {@link GlobalErrorCodeConstants#UNAUTHORIZED} 错误码，从而使前端重定向到登录页

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/security/core/handler/LogoutSuccessHandlerImpl.java

@@ -1,11 +1,11 @@
 package cn.iocoder.dashboard.framework.security.core.handler;
 
 import cn.hutool.core.util.StrUtil;
-import cn.iocoder.yudao.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.dashboard.framework.security.config.SecurityProperties;
 import cn.iocoder.dashboard.framework.security.core.service.SecurityAuthFrameworkService;
 import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils;
-import cn.iocoder.yudao.util.servlet.ServletUtils;
+import cn.iocoder.yudao.framework.util.servlet.ServletUtils;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
 import org.springframework.stereotype.Component;

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsClient.java

@@ -1,6 +1,6 @@
 package cn.iocoder.dashboard.framework.sms.core.client;
 
-import cn.iocoder.yudao.common.core.KeyValue;
+import cn.iocoder.yudao.framework.common.core.KeyValue;
 import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsReceiveRespDTO;
 import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO;
 import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO;

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCodeMapping.java

@@ -1,6 +1,6 @@
 package cn.iocoder.dashboard.framework.sms.core.client;
 
-import cn.iocoder.yudao.common.exception.ErrorCode;
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
 import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants;
 
 import java.util.function.Function;

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/SmsCommonResult.java

@@ -2,8 +2,8 @@ package cn.iocoder.dashboard.framework.sms.core.client;
 
 import cn.hutool.core.exceptions.ExceptionUtil;
 import cn.hutool.core.lang.Assert;
-import cn.iocoder.yudao.common.exception.ErrorCode;
-import cn.iocoder.yudao.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/AbstractSmsClient.java

@@ -1,6 +1,6 @@
 package cn.iocoder.dashboard.framework.sms.core.client.impl;
 
-import cn.iocoder.yudao.common.core.KeyValue;
+import cn.iocoder.yudao.framework.common.core.KeyValue;
 import cn.iocoder.dashboard.framework.sms.core.client.SmsClient;
 import cn.iocoder.dashboard.framework.sms.core.client.SmsCodeMapping;
 import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult;

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClient.java

@@ -3,7 +3,7 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.iocoder.yudao.common.core.KeyValue;
+import cn.iocoder.yudao.framework.common.core.KeyValue;
 import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult;
 import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsReceiveRespDTO;
 import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO;
@@ -11,8 +11,8 @@ import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO;
 import cn.iocoder.dashboard.framework.sms.core.client.impl.AbstractSmsClient;
 import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum;
 import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties;
-import cn.iocoder.yudao.util.collection.MapUtils;
-import cn.iocoder.yudao.util.json.JsonUtils;
+import cn.iocoder.yudao.framework.util.collection.MapUtils;
+import cn.iocoder.yudao.framework.util.json.JsonUtils;
 import com.aliyuncs.AcsRequest;
 import com.aliyuncs.AcsResponse;
 import com.aliyuncs.DefaultAcsClient;
@@ -34,8 +34,8 @@ import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-import static cn.iocoder.yudao.util.date.DateUtils.TIME_ZONE_DEFAULT;
+import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import static cn.iocoder.yudao.framework.util.date.DateUtils.TIME_ZONE_DEFAULT;
 
 /**
  * 阿里短信客户端的实现类

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMapping.java

@@ -1,7 +1,7 @@
 package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun;
 
-import cn.iocoder.yudao.common.exception.ErrorCode;
-import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants;
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
 import cn.iocoder.dashboard.framework.sms.core.client.SmsCodeMapping;
 
 import static cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants.*;

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkCodeMapping.java

@@ -1,7 +1,7 @@
 package cn.iocoder.dashboard.framework.sms.core.client.impl.debug;
 
-import cn.iocoder.yudao.common.exception.ErrorCode;
-import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants;
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
 import cn.iocoder.dashboard.framework.sms.core.client.SmsCodeMapping;
 
 import java.util.Objects;

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/debug/DebugDingTalkSmsClient.java

@@ -7,7 +7,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.digest.DigestUtil;
 import cn.hutool.crypto.digest.HmacAlgorithm;
 import cn.hutool.http.HttpUtil;
-import cn.iocoder.yudao.common.core.KeyValue;
+import cn.iocoder.yudao.framework.common.core.KeyValue;
 import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult;
 import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsReceiveRespDTO;
 import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO;
@@ -15,8 +15,8 @@ import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO;
 import cn.iocoder.dashboard.framework.sms.core.client.impl.AbstractSmsClient;
 import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum;
 import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties;
-import cn.iocoder.yudao.util.collection.MapUtils;
-import cn.iocoder.yudao.util.json.JsonUtils;
+import cn.iocoder.yudao.framework.util.collection.MapUtils;
+import cn.iocoder.yudao.framework.util.json.JsonUtils;
 
 import java.util.HashMap;
 import java.util.List;

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClient.java

@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.URLUtil;
-import cn.iocoder.yudao.common.core.KeyValue;
+import cn.iocoder.yudao.framework.common.core.KeyValue;
 import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult;
 import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsReceiveRespDTO;
 import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO;
@@ -12,7 +12,7 @@ import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO;
 import cn.iocoder.dashboard.framework.sms.core.client.impl.AbstractSmsClient;
 import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum;
 import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties;
-import cn.iocoder.yudao.util.json.JsonUtils;
+import cn.iocoder.yudao.framework.util.json.JsonUtils;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.annotations.VisibleForTesting;
@@ -28,8 +28,8 @@ import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import static cn.iocoder.yudao.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-import static cn.iocoder.yudao.util.date.DateUtils.TIME_ZONE_DEFAULT;
+import static cn.iocoder.yudao.framework.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import static cn.iocoder.yudao.framework.util.date.DateUtils.TIME_ZONE_DEFAULT;
 
 /**
  * 云片短信客户端的实现类

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMapping.java

@@ -1,9 +1,9 @@
 package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian;
 
-import cn.iocoder.yudao.common.exception.ErrorCode;
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
 import cn.iocoder.dashboard.framework.sms.core.client.SmsCodeMapping;
 
-import static cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants.SUCCESS;
+import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.SUCCESS;
 import static cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants.*;
 import static com.yunpian.sdk.constant.Code.*;
 

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/sms/core/enums/SmsFrameworkErrorCodeConstants.java

@@ -1,6 +1,6 @@
 package cn.iocoder.dashboard.framework.sms.core.enums;
 
-import cn.iocoder.yudao.common.exception.ErrorCode;
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
 
 /**
  * 短信框架的错误码枚举

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/test/core/util/AssertUtils.java

@@ -2,9 +2,9 @@ package cn.iocoder.dashboard.framework.test.core.util;
 
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ReflectUtil;
-import cn.iocoder.yudao.common.exception.ErrorCode;
-import cn.iocoder.yudao.common.exception.ServiceException;
-import cn.iocoder.yudao.common.exception.util.ServiceExceptionUtil;
+import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.function.Executable;
 

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/test/core/util/RandomUtils.java

@@ -2,7 +2,7 @@ package cn.iocoder.dashboard.framework.test.core.util;
 
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.RandomUtil;
-import cn.iocoder.yudao.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import uk.co.jemos.podam.api.PodamFactory;
 import uk.co.jemos.podam.api.PodamFactoryImpl;
 

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/tracer/core/aop/BizTraceAspect.java

@@ -3,7 +3,7 @@ package cn.iocoder.dashboard.framework.tracer.core.aop;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.dashboard.framework.tracer.core.annotation.BizTrace;
-import cn.iocoder.yudao.util.sping.SpringExpressionUtils;
+import cn.iocoder.yudao.framework.util.sping.SpringExpressionUtils;
 import io.opentracing.Span;
 import io.opentracing.Tracer;
 import lombok.extern.slf4j.Slf4j;

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/validator/InEnum.java

@@ -1,6 +1,6 @@
 package cn.iocoder.dashboard.framework.validator;
 
-import cn.iocoder.yudao.common.core.IntArrayValuable;
+import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/validator/InEnumValidator.java

@@ -1,6 +1,6 @@
 package cn.iocoder.dashboard.framework.validator;
 
-import cn.iocoder.yudao.common.core.IntArrayValuable;
+import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/CacheRequestBodyFilter.java

@@ -1,6 +1,6 @@
 package cn.iocoder.dashboard.framework.web.core.filter;
 
-import cn.iocoder.yudao.util.servlet.ServletUtils;
+import cn.iocoder.yudao.framework.util.servlet.ServletUtils;
 import org.springframework.web.filter.OncePerRequestFilter;
 
 import javax.servlet.FilterChain;

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/DemoFilter.java

@@ -1,16 +1,16 @@
 package cn.iocoder.dashboard.framework.web.core.filter;
 
 import cn.hutool.core.util.StrUtil;
-import cn.iocoder.yudao.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils;
-import cn.iocoder.yudao.util.servlet.ServletUtils;
+import cn.iocoder.yudao.framework.util.servlet.ServletUtils;
 import org.springframework.web.filter.OncePerRequestFilter;
 
 import javax.servlet.FilterChain;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import static cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants.DEMO_DENY;
+import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.DEMO_DENY;
 
 /**
  * 演示 Filter，禁止用户发起写操作，避免影响测试数据

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/filter/XssRequestWrapper.java

@@ -6,7 +6,7 @@ import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HTMLFilter;
-import cn.iocoder.yudao.util.servlet.ServletUtils;
+import cn.iocoder.yudao.framework.util.servlet.ServletUtils;
 
 import javax.servlet.ReadListener;
 import javax.servlet.ServletInputStream;

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalExceptionHandler.java

@@ -3,15 +3,15 @@ package cn.iocoder.dashboard.framework.web.core.handler;
 import cn.hutool.core.exceptions.ExceptionUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.extra.servlet.ServletUtil;
-import cn.iocoder.yudao.common.exception.ServiceException;
-import cn.iocoder.yudao.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.dashboard.framework.logger.apilog.core.service.ApiErrorLogFrameworkService;
 import cn.iocoder.dashboard.framework.logger.apilog.core.service.dto.ApiErrorLogCreateDTO;
 import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils;
 import cn.iocoder.dashboard.framework.web.core.util.WebFrameworkUtils;
-import cn.iocoder.yudao.util.json.JsonUtils;
-import cn.iocoder.yudao.util.servlet.ServletUtils;
+import cn.iocoder.yudao.framework.util.json.JsonUtils;
+import cn.iocoder.yudao.framework.util.servlet.ServletUtils;
 import io.github.resilience4j.ratelimiter.RequestNotPermitted;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.exception.ExceptionUtils;
@@ -36,7 +36,7 @@ import javax.validation.ValidationException;
 import java.util.Date;
 import java.util.Map;
 
-import static cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants.*;
+import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.*;
 
 /**
  * 全局异常处理器，将 Exception 翻译成 CommonResult + 对应的异常编号

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/handler/GlobalResponseBodyHandler.java

@@ -1,6 +1,6 @@
 package cn.iocoder.dashboard.framework.web.core.handler;
 
-import cn.iocoder.yudao.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.dashboard.framework.web.core.util.WebFrameworkUtils;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.MediaType;

yudao-framework/yudao-framework-all/src/main/java/cn/iocoder/dashboard/framework/web/core/util/WebFrameworkUtils.java

@@ -1,7 +1,7 @@
 package cn.iocoder.dashboard.framework.web.core.util;
 
-import cn.iocoder.yudao.common.enums.UserTypeEnum;
-import cn.iocoder.yudao.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;

yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java

@@ -2,16 +2,16 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun;
 
 import cn.hutool.core.util.ReflectUtil;
 import cn.iocoder.dashboard.framework.BaseMockitoUnitTest;
-import cn.iocoder.yudao.common.core.KeyValue;
-import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants;
+import cn.iocoder.yudao.framework.common.core.KeyValue;
+import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
 import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult;
 import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsReceiveRespDTO;
 import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO;
 import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO;
 import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum;
 import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties;
-import cn.iocoder.yudao.util.collection.MapUtils;
-import cn.iocoder.yudao.util.date.DateUtils;
+import cn.iocoder.yudao.framework.util.collection.MapUtils;
+import cn.iocoder.yudao.framework.util.date.DateUtils;
 import com.aliyuncs.AcsRequest;
 import com.aliyuncs.IAcsClient;
 import com.aliyuncs.dysmsapi.model.v20170525.QuerySmsTemplateRequest;
@@ -30,7 +30,7 @@ import java.util.function.Function;
 
 import static cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants.SMS_API_PARAM_ERROR;
 import static cn.iocoder.dashboard.framework.test.core.util.RandomUtils.*;
-import static cn.iocoder.yudao.util.json.JsonUtils.toJsonString;
+import static cn.iocoder.yudao.framework.util.json.JsonUtils.toJsonString;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.argThat;

yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java

@@ -1,7 +1,7 @@
 package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun;
 
 import cn.iocoder.dashboard.framework.BaseMockitoUnitTest;
-import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants;
+import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
 import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;

yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java

@@ -2,15 +2,15 @@ package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian;
 
 import cn.hutool.core.util.ReflectUtil;
 import cn.iocoder.dashboard.framework.BaseMockitoUnitTest;
-import cn.iocoder.yudao.common.core.KeyValue;
-import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants;
+import cn.iocoder.yudao.framework.common.core.KeyValue;
+import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
 import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult;
 import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsReceiveRespDTO;
 import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsSendRespDTO;
 import cn.iocoder.dashboard.framework.sms.core.client.dto.SmsTemplateRespDTO;
 import cn.iocoder.dashboard.framework.sms.core.enums.SmsTemplateAuditStatusEnum;
 import cn.iocoder.dashboard.framework.sms.core.property.SmsChannelProperties;
-import cn.iocoder.yudao.util.date.DateUtils;
+import cn.iocoder.yudao.framework.util.date.DateUtils;
 import com.google.common.collect.Lists;
 import com.yunpian.sdk.YunpianClient;
 import com.yunpian.sdk.api.SmsApi;

yudao-framework/yudao-framework-all/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java

@@ -1,7 +1,7 @@
 package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian;
 
 import cn.iocoder.dashboard.framework.BaseMockitoUnitTest;
-import cn.iocoder.yudao.common.exception.enums.GlobalErrorCodeConstants;
+import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
 import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;

yudao-framework/yudao-spring-boot-starter-mybatis/pom.xml

@@ -0,0 +1,62 @@
+<?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">
+    <parent>
+        <groupId>cn.iocoder.boot</groupId>
+        <artifactId>yudao-framework</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>yudao-spring-boot-starter-mybatis</artifactId>
+    <packaging>jar</packaging>
+
+    <name>${artifactId}</name>
+    <description>数据库连接池、多数据源、事务、MyBatis 拓展</description>
+    <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
+
+    <properties>
+        <mysql.version>5.1.46</mysql.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-framework-all</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
+        <!-- Web 相关 -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <scope>provided</scope> <!-- 设置为 provided，只有 OncePerRequestFilter 使用到 -->
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <scope>provided</scope> <!-- 设置为 provided，只有 OncePerRequestFilter 使用到 -->
+        </dependency>
+
+        <!-- DB 相关 -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>${mysql.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId> <!-- 多数据源 -->
+        </dependency>
+    </dependencies>
+
+</project>

yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/datasource/config/YudaoDataSourceAutoConfiguration.java

@@ -1,8 +1,9 @@
-package cn.iocoder.dashboard.framework.datasource.config;
+package cn.iocoder.yudao.framework.datasource.config;
 
-import cn.iocoder.dashboard.framework.datasource.core.filter.DruidAdRemoveFilter;
+import cn.iocoder.yudao.framework.datasource.core.filter.DruidAdRemoveFilter;
 import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -15,7 +16,8 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
  */
 @Configuration
 @EnableTransactionManagement(proxyTargetClass = true) // 启动事务管理
-public class DataSourceConfiguration {
+@EnableConfigurationProperties(DruidStatProperties.class)
+public class YudaoDataSourceAutoConfiguration {
 
     /**
      * 创建 DruidAdRemoveFilter 过滤器，过滤 common.js 的广告

yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/datasource/core/enums/DataSourceEnum.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.framework.datasource.core.enums;
+package cn.iocoder.yudao.framework.datasource.core.enums;
 
 /**
  * 对应于多数据源中不同数据源配置

yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/datasource/core/filter/DruidAdRemoveFilter.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.framework.datasource.core.filter;
+package cn.iocoder.yudao.framework.datasource.core.filter;
 
 import com.alibaba.druid.util.Utils;
 import org.springframework.web.filter.OncePerRequestFilter;

yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/datasource/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * 数据库连接池，采用 Druid
+ * 多数据源，采用爆米花
+ */
+package cn.iocoder.yudao.framework.datasource;

yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/config/YudaoMybatisAutoConfiguration.java

@@ -1,6 +1,6 @@
-package cn.iocoder.dashboard.framework.mybatis.config;
+package cn.iocoder.yudao.framework.mybatis.config;
 
-import cn.iocoder.dashboard.framework.mybatis.core.handler.DefaultDBFieldHandler;
+import cn.iocoder.yudao.framework.mybatis.core.handler.DefaultDBFieldHandler;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
@@ -17,7 +17,7 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 @MapperScan(value = "${yudao.info.base-package}", annotationClass = Mapper.class,
         lazyInitialization = "${mybatis.lazy-initialization:false}") // Mapper 懒加载，目前仅用于单元测试
-public class MybatisConfiguration {
+public class YudaoMybatisAutoConfiguration {
 
     @Bean
     public MybatisPlusInterceptor mybatisPlusInterceptor() {

yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/dataobject/BaseDO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.framework.mybatis.core.dataobject;
+package cn.iocoder.yudao.framework.mybatis.core.dataobject;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/handler/DefaultDBFieldHandler.java

@@ -1,6 +1,6 @@
-package cn.iocoder.dashboard.framework.mybatis.core.handler;
+package cn.iocoder.yudao.framework.mybatis.core.handler;
 
-import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.dashboard.framework.security.core.LoginUser;
 import cn.iocoder.dashboard.framework.security.core.util.SecurityFrameworkUtils;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;

yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java

@@ -1,8 +1,8 @@
-package cn.iocoder.dashboard.framework.mybatis.core.mapper;
+package cn.iocoder.yudao.framework.mybatis.core.mapper;
 
-import cn.iocoder.yudao.common.pojo.PageParam;
-import cn.iocoder.yudao.common.pojo.PageResult;
-import cn.iocoder.dashboard.framework.mybatis.core.util.MyBatisUtils;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/QueryWrapperX.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.framework.mybatis.core.query;
+package cn.iocoder.yudao.framework.mybatis.core.query;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ArrayUtils;

yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/type/JsonLongSetTypeHandler.java

@@ -1,6 +1,6 @@
-package cn.iocoder.dashboard.framework.mybatis.core.type;
+package cn.iocoder.yudao.framework.mybatis.core.type;
 
-import cn.iocoder.yudao.util.json.JsonUtils;
+import cn.iocoder.yudao.framework.util.json.JsonUtils;
 import com.baomidou.mybatisplus.extension.handlers.AbstractJsonTypeHandler;
 import com.fasterxml.jackson.core.type.TypeReference;
 

yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/util/MyBatisUtils.java

@@ -1,8 +1,8 @@
-package cn.iocoder.dashboard.framework.mybatis.core.util;
+package cn.iocoder.yudao.framework.mybatis.core.util;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.iocoder.yudao.common.pojo.PageParam;
-import cn.iocoder.yudao.common.pojo.SortingField;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.SortingField;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 

yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/package-info.java

@@ -1,4 +1,4 @@
 /**
  * 使用 MyBatis Plus 提升使用 MyBatis 的开发效率
  */
-package cn.iocoder.dashboard.framework.mybatis;
+package cn.iocoder.yudao.framework.mybatis;

yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/package-info.java

@@ -0,0 +1 @@
+package cn.iocoder.yudao.framework;

yudao-framework/yudao-spring-boot-starter-mybatis/src/main/resources/META-INF/spring.factories

@@ -0,0 +1,3 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+  cn.iocoder.yudao.framework.datasource.config.YudaoDataSourceAutoConfiguration,\
+  cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration