diff --git a/pom.xml b/pom.xml index dd3bb00..3eee00a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.github.yulichang mybatis-plus-join - 1.0.0-SNAPSHOT + 1.0.2 mp An enhanced toolkit of Mybatis-Plus to simplify development. https://github.com/yulichang/mybatis-plus-join @@ -34,18 +34,6 @@ 1.8 - - - - - org.springframework.boot - spring-boot-dependencies - 2.3.2.RELEASE - pom - import - - - com.baomidou @@ -62,22 +50,13 @@ - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - + org.apache.maven.plugins maven-source-plugin - 3.2.1 + 2.2.1 attach-sources @@ -100,6 +79,33 @@ + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + true + + ossrh + https://oss.sonatype.org/ + true + + @@ -117,55 +123,10 @@ release - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ossrh - https://oss.sonatype.org/ - true - - - - org.apache.maven.plugins - maven-release-plugin - 2.5 - - true - false - release - deploy - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - org.apache.maven.plugins maven-source-plugin - 3.2.1 + 2.2.1 attach-sources @@ -188,8 +149,46 @@ + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ossrh + https://oss.sonatype.org/ + true + + + + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + diff --git a/src/main/java/com/github/mybatisplus/interceptor/MyResultInterceptor.java b/src/main/java/com/github/mybatisplus/interceptor/MyResultInterceptor.java deleted file mode 100644 index 61939af..0000000 --- a/src/main/java/com/github/mybatisplus/interceptor/MyResultInterceptor.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.github.mybatisplus.interceptor; - -import com.baomidou.mybatisplus.core.MybatisParameterHandler; -import com.baomidou.mybatisplus.core.toolkit.ClassUtils; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.github.mybatisplus.toolkit.Constant; -import org.apache.ibatis.executor.resultset.DefaultResultSetHandler; -import org.apache.ibatis.executor.resultset.ResultSetHandler; -import org.apache.ibatis.plugin.*; -import org.springframework.cglib.beans.BeanMap; - -import java.lang.reflect.Field; -import java.sql.Statement; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; - -/** - * 结果封装 - * - * @author yulichang - */ -@Intercepts({@Signature(type = ResultSetHandler.class, method = "handleResultSets", args = {Statement.class})}) -public class MyResultInterceptor implements Interceptor { - - private static Field parameterHandler = null; - - static { - try { - parameterHandler = DefaultResultSetHandler.class.getDeclaredField("parameterHandler"); - parameterHandler.setAccessible(true); - } catch (NoSuchFieldException e) { - e.printStackTrace(); - } - } - - @Override - public Object intercept(Invocation invocation) throws Throwable { - DefaultResultSetHandler handler = (DefaultResultSetHandler) invocation.getTarget(); - Object result = invocation.proceed(); - if (Objects.isNull(result)) { - return null; - } - Class val = getFieldVal(handler); - if (val == null) { - return result; - } - if (result instanceof ArrayList) { - List res = new ArrayList<>(); - for (Object i : ((ArrayList) result)) { - if (i instanceof Map) { - res.add(mapToBean((Map) i, val)); - } else { - return result; - } - } - return res; - } else { - return mapToBean((Map) result, val); - } - } - - public static T mapToBean(Map map, Class clazz) { - T bean = ClassUtils.newInstance(clazz); - BeanMap beanMap = BeanMap.create(bean); - map.forEach((k, v) -> beanMap.put(StringUtils.underlineToCamel(k), v)); - return bean; - } - - - /** - * 反射获取方法中的clazz - * 先用反射获取,应该是可以通过拓展框架直接获取的, todo - * - * @see MybatisParameterHandler - */ - public static Class getFieldVal(DefaultResultSetHandler handler) { - try { - MybatisParameterHandler mybatisParameterHandler = (MybatisParameterHandler) parameterHandler.get(handler); - Object object = mybatisParameterHandler.getParameterObject(); - if (Objects.isNull(object)) { - return null; - } - if (object instanceof Map) { - return (Class) ((Map) object).get(Constant.CLAZZ); - } - return null; - } catch (Exception e) { - return null; - } - } - - @Override - public Object plugin(Object target) { - return Plugin.wrap(target, this); - } -} diff --git a/src/main/java/com/github/mybatisplus/MybatisPlusConfiguration.java b/src/main/java/com/github/yulichang/MybatisPlusConfiguration.java similarity index 80% rename from src/main/java/com/github/mybatisplus/MybatisPlusConfiguration.java rename to src/main/java/com/github/yulichang/MybatisPlusConfiguration.java index 6c865ff..d79abb6 100644 --- a/src/main/java/com/github/mybatisplus/MybatisPlusConfiguration.java +++ b/src/main/java/com/github/yulichang/MybatisPlusConfiguration.java @@ -1,7 +1,7 @@ -package com.github.mybatisplus; +package com.github.yulichang; -import com.github.mybatisplus.injector.MySqlInjector; -import com.github.mybatisplus.interceptor.MyResultInterceptor; +import com.github.yulichang.injector.MySqlInjector; +import com.github.yulichang.interceptor.MyResultInterceptor; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/github/mybatisplus/base/MyBaseMapper.java b/src/main/java/com/github/yulichang/base/MyBaseMapper.java similarity index 93% rename from src/main/java/com/github/mybatisplus/base/MyBaseMapper.java rename to src/main/java/com/github/yulichang/base/MyBaseMapper.java index 2eb7568..a5a0d92 100644 --- a/src/main/java/com/github/mybatisplus/base/MyBaseMapper.java +++ b/src/main/java/com/github/yulichang/base/MyBaseMapper.java @@ -1,10 +1,10 @@ -package com.github.mybatisplus.base; +package com.github.yulichang.base; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.github.mybatisplus.interfaces.BaseJoin; -import com.github.mybatisplus.toolkit.Constant; +import com.github.yulichang.interfaces.BaseJoin; +import com.github.yulichang.toolkit.Constant; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/github/mybatisplus/base/MyBaseService.java b/src/main/java/com/github/yulichang/base/MyBaseService.java similarity index 92% rename from src/main/java/com/github/mybatisplus/base/MyBaseService.java rename to src/main/java/com/github/yulichang/base/MyBaseService.java index f8aec54..de137b8 100644 --- a/src/main/java/com/github/mybatisplus/base/MyBaseService.java +++ b/src/main/java/com/github/yulichang/base/MyBaseService.java @@ -1,8 +1,8 @@ -package com.github.mybatisplus.base; +package com.github.yulichang.base; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.github.mybatisplus.interfaces.BaseJoin; +import com.github.yulichang.interfaces.BaseJoin; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/github/mybatisplus/base/MyBaseServiceImpl.java b/src/main/java/com/github/yulichang/base/MyBaseServiceImpl.java similarity index 93% rename from src/main/java/com/github/mybatisplus/base/MyBaseServiceImpl.java rename to src/main/java/com/github/yulichang/base/MyBaseServiceImpl.java index 7444a49..daad273 100644 --- a/src/main/java/com/github/mybatisplus/base/MyBaseServiceImpl.java +++ b/src/main/java/com/github/yulichang/base/MyBaseServiceImpl.java @@ -1,8 +1,8 @@ -package com.github.mybatisplus.base; +package com.github.yulichang.base; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.mybatisplus.interfaces.BaseJoin; +import com.github.yulichang.interfaces.BaseJoin; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/github/mybatisplus/injector/MySqlInjector.java b/src/main/java/com/github/yulichang/injector/MySqlInjector.java similarity index 89% rename from src/main/java/com/github/mybatisplus/injector/MySqlInjector.java rename to src/main/java/com/github/yulichang/injector/MySqlInjector.java index 86b6ee6..acb7746 100644 --- a/src/main/java/com/github/mybatisplus/injector/MySqlInjector.java +++ b/src/main/java/com/github/yulichang/injector/MySqlInjector.java @@ -1,8 +1,8 @@ -package com.github.mybatisplus.injector; +package com.github.yulichang.injector; import com.baomidou.mybatisplus.core.injector.AbstractMethod; import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector; -import com.github.mybatisplus.method.*; +import com.github.yulichang.method.*; import java.util.List; diff --git a/src/main/java/com/github/yulichang/interceptor/MyResultInterceptor.java b/src/main/java/com/github/yulichang/interceptor/MyResultInterceptor.java new file mode 100644 index 0000000..d60c201 --- /dev/null +++ b/src/main/java/com/github/yulichang/interceptor/MyResultInterceptor.java @@ -0,0 +1,73 @@ +package com.github.yulichang.interceptor; + +import com.baomidou.mybatisplus.core.MybatisParameterHandler; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.github.yulichang.toolkit.Constant; +import org.apache.ibatis.executor.statement.StatementHandler; +import org.apache.ibatis.mapping.MappedStatement; +import org.apache.ibatis.mapping.ResultMap; +import org.apache.ibatis.plugin.*; + +import java.lang.reflect.Field; +import java.sql.Connection; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + * 结果封装 + * + * @author yulichang + */ +@Intercepts({ + @Signature(type = StatementHandler.class, method = "prepare", args = {Connection.class, Integer.class}), +}) +//@SuppressWarnings("all") +public class MyResultInterceptor implements Interceptor { + + /** + * 缓存初始化反射字段 + * todo + * 应该可以想mybatis-plus那样用自定义的MybatisParameterHandler直接获取mappedStatement和resultMap,而不是反射获取 + */ + private static Field mappedStatement = null; + private static Field type = null; + + static { + try { + mappedStatement = MybatisParameterHandler.class.getDeclaredField("mappedStatement"); + mappedStatement.setAccessible(true); + type = ResultMap.class.getDeclaredField("type"); + type.setAccessible(true); + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } + } + + @Override + public Object intercept(Invocation invocation) throws Throwable { + if (Objects.nonNull(invocation.getTarget()) && invocation.getTarget() instanceof MybatisParameterHandler) { + MybatisParameterHandler mybatisParameterHandler = (MybatisParameterHandler) invocation.getTarget(); + Map map = (Map) mybatisParameterHandler.getParameterObject(); + if (CollectionUtils.isNotEmpty(map)) { + try { + Class resClazz = (Class) map.get(Constant.CLAZZ); + MappedStatement statement = (MappedStatement) mappedStatement.get(mybatisParameterHandler); + List list = statement.getResultMaps(); + if (CollectionUtils.isNotEmpty(list)) { + ResultMap resultMap = list.get(0); + type.set(resultMap, resClazz); + } + } catch (Exception e) { + return invocation.proceed(); + } + } + } + return invocation.proceed(); + } + + @Override + public Object plugin(Object target) { + return Plugin.wrap(target, this); + } +} diff --git a/src/main/java/com/github/mybatisplus/interfaces/BaseJoin.java b/src/main/java/com/github/yulichang/interfaces/BaseJoin.java similarity index 58% rename from src/main/java/com/github/mybatisplus/interfaces/BaseJoin.java rename to src/main/java/com/github/yulichang/interfaces/BaseJoin.java index f3e6dcd..dc50d0c 100644 --- a/src/main/java/com/github/mybatisplus/interfaces/BaseJoin.java +++ b/src/main/java/com/github/yulichang/interfaces/BaseJoin.java @@ -1,4 +1,4 @@ -package com.github.mybatisplus.interfaces; +package com.github.yulichang.interfaces; /** * @author yulichang diff --git a/src/main/java/com/github/mybatisplus/method/MyAbstractMethod.java b/src/main/java/com/github/yulichang/method/MyAbstractMethod.java similarity index 93% rename from src/main/java/com/github/mybatisplus/method/MyAbstractMethod.java rename to src/main/java/com/github/yulichang/method/MyAbstractMethod.java index 28d6b62..108be31 100644 --- a/src/main/java/com/github/mybatisplus/method/MyAbstractMethod.java +++ b/src/main/java/com/github/yulichang/method/MyAbstractMethod.java @@ -1,10 +1,10 @@ -package com.github.mybatisplus.method; +package com.github.yulichang.method; import com.baomidou.mybatisplus.core.injector.AbstractMethod; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.core.toolkit.sql.SqlScriptUtils; -import com.github.mybatisplus.toolkit.Constant; +import com.github.yulichang.toolkit.Constant; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/github/mybatisplus/method/SelectJoinList.java b/src/main/java/com/github/yulichang/method/SelectJoinList.java similarity index 84% rename from src/main/java/com/github/mybatisplus/method/SelectJoinList.java rename to src/main/java/com/github/yulichang/method/SelectJoinList.java index 5bdb41b..73671f7 100644 --- a/src/main/java/com/github/mybatisplus/method/SelectJoinList.java +++ b/src/main/java/com/github/yulichang/method/SelectJoinList.java @@ -1,12 +1,9 @@ -package com.github.mybatisplus.method; +package com.github.yulichang.method; import com.baomidou.mybatisplus.core.metadata.TableInfo; -import com.github.mybatisplus.toolkit.Constant; import org.apache.ibatis.mapping.MappedStatement; import org.apache.ibatis.mapping.SqlSource; -import java.util.Map; - /** * copy {@link com.baomidou.mybatisplus.core.injector.methods.SelectMaps} */ @@ -18,6 +15,6 @@ public class SelectJoinList extends MyAbstractMethod { String sql = String.format(sqlMethod.getSql(), sqlSelectColumns(tableInfo, true), tableInfo.getTableName(), sqlWhereEntityWrapper(true, tableInfo), sqlComment()); SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass); - return this.addSelectMappedStatementForOther(mapperClass, sqlMethod.getMethod(), sqlSource, Map.class); + return this.addSelectMappedStatementForOther(mapperClass, sqlMethod.getMethod(), sqlSource, Object.class); } } diff --git a/src/main/java/com/github/mybatisplus/method/SelectJoinMap.java b/src/main/java/com/github/yulichang/method/SelectJoinMap.java similarity index 95% rename from src/main/java/com/github/mybatisplus/method/SelectJoinMap.java rename to src/main/java/com/github/yulichang/method/SelectJoinMap.java index e7bcd26..624970a 100644 --- a/src/main/java/com/github/mybatisplus/method/SelectJoinMap.java +++ b/src/main/java/com/github/yulichang/method/SelectJoinMap.java @@ -1,4 +1,4 @@ -package com.github.mybatisplus.method; +package com.github.yulichang.method; import com.baomidou.mybatisplus.core.metadata.TableInfo; import org.apache.ibatis.mapping.MappedStatement; diff --git a/src/main/java/com/github/mybatisplus/method/SelectJoinMaps.java b/src/main/java/com/github/yulichang/method/SelectJoinMaps.java similarity index 91% rename from src/main/java/com/github/mybatisplus/method/SelectJoinMaps.java rename to src/main/java/com/github/yulichang/method/SelectJoinMaps.java index 6a440f1..10c2388 100644 --- a/src/main/java/com/github/mybatisplus/method/SelectJoinMaps.java +++ b/src/main/java/com/github/yulichang/method/SelectJoinMaps.java @@ -1,7 +1,6 @@ -package com.github.mybatisplus.method; +package com.github.yulichang.method; import com.baomidou.mybatisplus.core.metadata.TableInfo; -import com.github.mybatisplus.toolkit.Constant; import org.apache.ibatis.mapping.MappedStatement; import org.apache.ibatis.mapping.SqlSource; diff --git a/src/main/java/com/github/mybatisplus/method/SelectJoinMapsPage.java b/src/main/java/com/github/yulichang/method/SelectJoinMapsPage.java similarity index 91% rename from src/main/java/com/github/mybatisplus/method/SelectJoinMapsPage.java rename to src/main/java/com/github/yulichang/method/SelectJoinMapsPage.java index dda4a49..5fd27b9 100644 --- a/src/main/java/com/github/mybatisplus/method/SelectJoinMapsPage.java +++ b/src/main/java/com/github/yulichang/method/SelectJoinMapsPage.java @@ -1,7 +1,6 @@ -package com.github.mybatisplus.method; +package com.github.yulichang.method; import com.baomidou.mybatisplus.core.metadata.TableInfo; -import com.github.mybatisplus.toolkit.Constant; import org.apache.ibatis.mapping.MappedStatement; import org.apache.ibatis.mapping.SqlSource; diff --git a/src/main/java/com/github/mybatisplus/method/SelectJoinOne.java b/src/main/java/com/github/yulichang/method/SelectJoinOne.java similarity index 83% rename from src/main/java/com/github/mybatisplus/method/SelectJoinOne.java rename to src/main/java/com/github/yulichang/method/SelectJoinOne.java index 5ef352f..61bfad9 100644 --- a/src/main/java/com/github/mybatisplus/method/SelectJoinOne.java +++ b/src/main/java/com/github/yulichang/method/SelectJoinOne.java @@ -1,12 +1,9 @@ -package com.github.mybatisplus.method; +package com.github.yulichang.method; import com.baomidou.mybatisplus.core.metadata.TableInfo; -import com.github.mybatisplus.toolkit.Constant; import org.apache.ibatis.mapping.MappedStatement; import org.apache.ibatis.mapping.SqlSource; -import java.util.Map; - /** * copy {@link com.baomidou.mybatisplus.core.injector.methods.SelectMaps} */ @@ -18,6 +15,6 @@ public class SelectJoinOne extends MyAbstractMethod { String sql = String.format(sqlMethod.getSql(), sqlSelectColumns(tableInfo, true), tableInfo.getTableName(), sqlWhereEntityWrapper(true, tableInfo), sqlComment()); SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass); - return this.addSelectMappedStatementForOther(mapperClass, sqlMethod.getMethod(), sqlSource, Map.class); + return this.addSelectMappedStatementForOther(mapperClass, sqlMethod.getMethod(), sqlSource, Object.class); } } diff --git a/src/main/java/com/github/mybatisplus/method/SelectJoinPage.java b/src/main/java/com/github/yulichang/method/SelectJoinPage.java similarity index 84% rename from src/main/java/com/github/mybatisplus/method/SelectJoinPage.java rename to src/main/java/com/github/yulichang/method/SelectJoinPage.java index 1c6cf6c..7ca7dd3 100644 --- a/src/main/java/com/github/mybatisplus/method/SelectJoinPage.java +++ b/src/main/java/com/github/yulichang/method/SelectJoinPage.java @@ -1,12 +1,9 @@ -package com.github.mybatisplus.method; +package com.github.yulichang.method; import com.baomidou.mybatisplus.core.metadata.TableInfo; -import com.github.mybatisplus.toolkit.Constant; import org.apache.ibatis.mapping.MappedStatement; import org.apache.ibatis.mapping.SqlSource; -import java.util.Map; - /** * copy {@link com.baomidou.mybatisplus.core.injector.methods.SelectMaps} */ @@ -18,6 +15,6 @@ public class SelectJoinPage extends MyAbstractMethod { String sql = String.format(sqlMethod.getSql(), sqlSelectColumns(tableInfo, true), tableInfo.getTableName(), sqlWhereEntityWrapper(true, tableInfo), sqlComment()); SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass); - return this.addSelectMappedStatementForOther(mapperClass, sqlMethod.getMethod(), sqlSource, Map.class); + return this.addSelectMappedStatementForOther(mapperClass, sqlMethod.getMethod(), sqlSource, Object.class); } } diff --git a/src/main/java/com/github/mybatisplus/method/SqlMethod.java b/src/main/java/com/github/yulichang/method/SqlMethod.java similarity index 98% rename from src/main/java/com/github/mybatisplus/method/SqlMethod.java rename to src/main/java/com/github/yulichang/method/SqlMethod.java index 4e1e4a7..75faa14 100644 --- a/src/main/java/com/github/mybatisplus/method/SqlMethod.java +++ b/src/main/java/com/github/yulichang/method/SqlMethod.java @@ -1,4 +1,4 @@ -package com.github.mybatisplus.method; +package com.github.yulichang.method; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/com/github/mybatisplus/query/MyAbstractLambdaWrapper.java b/src/main/java/com/github/yulichang/query/MyAbstractLambdaWrapper.java similarity index 97% rename from src/main/java/com/github/mybatisplus/query/MyAbstractLambdaWrapper.java rename to src/main/java/com/github/yulichang/query/MyAbstractLambdaWrapper.java index b94863b..ff27cec 100644 --- a/src/main/java/com/github/mybatisplus/query/MyAbstractLambdaWrapper.java +++ b/src/main/java/com/github/yulichang/query/MyAbstractLambdaWrapper.java @@ -1,4 +1,4 @@ -package com.github.mybatisplus.query; +package com.github.yulichang.query; import com.baomidou.mybatisplus.core.conditions.AbstractWrapper; import com.baomidou.mybatisplus.core.toolkit.Assert; @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.core.toolkit.support.ColumnCache; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.baomidou.mybatisplus.core.toolkit.support.SerializedLambda; -import com.github.mybatisplus.toolkit.Constant; +import com.github.yulichang.toolkit.Constant; import org.apache.ibatis.reflection.property.PropertyNamer; import java.util.Arrays; diff --git a/src/main/java/com/github/mybatisplus/query/MyLambdaQueryWrapper.java b/src/main/java/com/github/yulichang/query/MyLambdaQueryWrapper.java similarity index 98% rename from src/main/java/com/github/mybatisplus/query/MyLambdaQueryWrapper.java rename to src/main/java/com/github/yulichang/query/MyLambdaQueryWrapper.java index aa2cd32..378fdf0 100644 --- a/src/main/java/com/github/mybatisplus/query/MyLambdaQueryWrapper.java +++ b/src/main/java/com/github/yulichang/query/MyLambdaQueryWrapper.java @@ -1,4 +1,4 @@ -package com.github.mybatisplus.query; +package com.github.yulichang.query; import com.baomidou.mybatisplus.core.conditions.SharedString; import com.baomidou.mybatisplus.core.conditions.query.Query; @@ -11,8 +11,8 @@ import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; -import com.github.mybatisplus.query.interfaces.MyJoin; -import com.github.mybatisplus.toolkit.Constant; +import com.github.yulichang.query.interfaces.MyJoin; +import com.github.yulichang.toolkit.Constant; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/com/github/mybatisplus/query/MyQueryWrapper.java b/src/main/java/com/github/yulichang/query/MyQueryWrapper.java similarity index 97% rename from src/main/java/com/github/mybatisplus/query/MyQueryWrapper.java rename to src/main/java/com/github/yulichang/query/MyQueryWrapper.java index 8cfdca2..40d551d 100644 --- a/src/main/java/com/github/mybatisplus/query/MyQueryWrapper.java +++ b/src/main/java/com/github/yulichang/query/MyQueryWrapper.java @@ -1,4 +1,4 @@ -package com.github.mybatisplus.query; +package com.github.yulichang.query; import com.baomidou.mybatisplus.core.conditions.AbstractWrapper; import com.baomidou.mybatisplus.core.conditions.SharedString; @@ -10,8 +10,8 @@ import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; import com.baomidou.mybatisplus.core.toolkit.ArrayUtils; import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.github.mybatisplus.query.interfaces.MyJoin; -import com.github.mybatisplus.toolkit.Constant; +import com.github.yulichang.query.interfaces.MyJoin; +import com.github.yulichang.toolkit.Constant; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/github/mybatisplus/query/interfaces/MyJoin.java b/src/main/java/com/github/yulichang/query/interfaces/MyJoin.java similarity index 85% rename from src/main/java/com/github/mybatisplus/query/interfaces/MyJoin.java rename to src/main/java/com/github/yulichang/query/interfaces/MyJoin.java index 4df3eff..486731f 100644 --- a/src/main/java/com/github/mybatisplus/query/interfaces/MyJoin.java +++ b/src/main/java/com/github/yulichang/query/interfaces/MyJoin.java @@ -1,7 +1,7 @@ -package com.github.mybatisplus.query.interfaces; +package com.github.yulichang.query.interfaces; -import com.github.mybatisplus.interfaces.BaseJoin; -import com.github.mybatisplus.toolkit.Constant; +import com.github.yulichang.interfaces.BaseJoin; +import com.github.yulichang.toolkit.Constant; /** * @author yulichang diff --git a/src/main/java/com/github/mybatisplus/toolkit/Constant.java b/src/main/java/com/github/yulichang/toolkit/Constant.java similarity index 95% rename from src/main/java/com/github/mybatisplus/toolkit/Constant.java rename to src/main/java/com/github/yulichang/toolkit/Constant.java index 7431306..c9eb9f0 100644 --- a/src/main/java/com/github/mybatisplus/toolkit/Constant.java +++ b/src/main/java/com/github/yulichang/toolkit/Constant.java @@ -1,4 +1,4 @@ -package com.github.mybatisplus.toolkit; +package com.github.yulichang.toolkit; import com.baomidou.mybatisplus.core.toolkit.StringPool; diff --git a/src/main/java/com/github/mybatisplus/toolkit/MyLambdaUtils.java b/src/main/java/com/github/yulichang/toolkit/MyLambdaUtils.java similarity index 95% rename from src/main/java/com/github/mybatisplus/toolkit/MyLambdaUtils.java rename to src/main/java/com/github/yulichang/toolkit/MyLambdaUtils.java index 6259462..c3c3455 100644 --- a/src/main/java/com/github/mybatisplus/toolkit/MyLambdaUtils.java +++ b/src/main/java/com/github/yulichang/toolkit/MyLambdaUtils.java @@ -1,4 +1,4 @@ -package com.github.mybatisplus.toolkit; +package com.github.yulichang.toolkit; import com.baomidou.mybatisplus.core.toolkit.LambdaUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; diff --git a/src/main/java/com/github/mybatisplus/wrapper/MyAbstractLambdaWrapper.java b/src/main/java/com/github/yulichang/wrapper/MyAbstractLambdaWrapper.java similarity index 98% rename from src/main/java/com/github/mybatisplus/wrapper/MyAbstractLambdaWrapper.java rename to src/main/java/com/github/yulichang/wrapper/MyAbstractLambdaWrapper.java index 5020a8e..7903b86 100644 --- a/src/main/java/com/github/mybatisplus/wrapper/MyAbstractLambdaWrapper.java +++ b/src/main/java/com/github/yulichang/wrapper/MyAbstractLambdaWrapper.java @@ -1,4 +1,4 @@ -package com.github.mybatisplus.wrapper; +package com.github.yulichang.wrapper; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.core.toolkit.support.ColumnCache; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.baomidou.mybatisplus.core.toolkit.support.SerializedLambda; -import com.github.mybatisplus.toolkit.MyLambdaUtils; +import com.github.yulichang.toolkit.MyLambdaUtils; import org.apache.ibatis.reflection.property.PropertyNamer; import java.util.Arrays; diff --git a/src/main/java/com/github/mybatisplus/wrapper/MyAbstractWrapper.java b/src/main/java/com/github/yulichang/wrapper/MyAbstractWrapper.java similarity index 99% rename from src/main/java/com/github/mybatisplus/wrapper/MyAbstractWrapper.java rename to src/main/java/com/github/yulichang/wrapper/MyAbstractWrapper.java index 3d1ea5f..be26106 100644 --- a/src/main/java/com/github/mybatisplus/wrapper/MyAbstractWrapper.java +++ b/src/main/java/com/github/yulichang/wrapper/MyAbstractWrapper.java @@ -1,4 +1,4 @@ -package com.github.mybatisplus.wrapper; +package com.github.yulichang.wrapper; import com.baomidou.mybatisplus.core.conditions.ISqlSegment; import com.baomidou.mybatisplus.core.conditions.SharedString; @@ -12,8 +12,8 @@ import com.baomidou.mybatisplus.core.toolkit.*; import com.baomidou.mybatisplus.core.toolkit.sql.SqlUtils; import com.baomidou.mybatisplus.core.toolkit.sql.StringEscape; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; -import com.github.mybatisplus.wrapper.interfaces.MyCompare; -import com.github.mybatisplus.wrapper.interfaces.MyFunc; +import com.github.yulichang.wrapper.interfaces.MyCompare; +import com.github.yulichang.wrapper.interfaces.MyFunc; import java.util.Arrays; import java.util.Collection; diff --git a/src/main/java/com/github/mybatisplus/wrapper/MyJoinLambdaQueryWrapper.java b/src/main/java/com/github/yulichang/wrapper/MyJoinLambdaQueryWrapper.java similarity index 96% rename from src/main/java/com/github/mybatisplus/wrapper/MyJoinLambdaQueryWrapper.java rename to src/main/java/com/github/yulichang/wrapper/MyJoinLambdaQueryWrapper.java index 66622d0..db6f3e0 100644 --- a/src/main/java/com/github/mybatisplus/wrapper/MyJoinLambdaQueryWrapper.java +++ b/src/main/java/com/github/yulichang/wrapper/MyJoinLambdaQueryWrapper.java @@ -1,4 +1,4 @@ -package com.github.mybatisplus.wrapper; +package com.github.yulichang.wrapper; import com.baomidou.mybatisplus.core.conditions.SharedString; import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments; @@ -10,10 +10,10 @@ import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; -import com.github.mybatisplus.toolkit.Constant; -import com.github.mybatisplus.toolkit.MyLambdaUtils; -import com.github.mybatisplus.wrapper.interfaces.MyLambdaJoin; -import com.github.mybatisplus.wrapper.interfaces.MySFunctionQuery; +import com.github.yulichang.toolkit.Constant; +import com.github.yulichang.toolkit.MyLambdaUtils; +import com.github.yulichang.wrapper.interfaces.MyLambdaJoin; +import com.github.yulichang.wrapper.interfaces.MySFunctionQuery; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/github/mybatisplus/wrapper/interfaces/MyCompare.java b/src/main/java/com/github/yulichang/wrapper/interfaces/MyCompare.java similarity index 99% rename from src/main/java/com/github/mybatisplus/wrapper/interfaces/MyCompare.java rename to src/main/java/com/github/yulichang/wrapper/interfaces/MyCompare.java index 247da86..77a85c2 100644 --- a/src/main/java/com/github/mybatisplus/wrapper/interfaces/MyCompare.java +++ b/src/main/java/com/github/yulichang/wrapper/interfaces/MyCompare.java @@ -1,4 +1,4 @@ -package com.github.mybatisplus.wrapper.interfaces; +package com.github.yulichang.wrapper.interfaces; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; diff --git a/src/main/java/com/github/mybatisplus/wrapper/interfaces/MyFunc.java b/src/main/java/com/github/yulichang/wrapper/interfaces/MyFunc.java similarity index 99% rename from src/main/java/com/github/mybatisplus/wrapper/interfaces/MyFunc.java rename to src/main/java/com/github/yulichang/wrapper/interfaces/MyFunc.java index f30dcb3..c697ba3 100644 --- a/src/main/java/com/github/mybatisplus/wrapper/interfaces/MyFunc.java +++ b/src/main/java/com/github/yulichang/wrapper/interfaces/MyFunc.java @@ -1,4 +1,4 @@ -package com.github.mybatisplus.wrapper.interfaces; +package com.github.yulichang.wrapper.interfaces; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; diff --git a/src/main/java/com/github/mybatisplus/wrapper/interfaces/MyLambdaJoin.java b/src/main/java/com/github/yulichang/wrapper/interfaces/MyLambdaJoin.java similarity index 90% rename from src/main/java/com/github/mybatisplus/wrapper/interfaces/MyLambdaJoin.java rename to src/main/java/com/github/yulichang/wrapper/interfaces/MyLambdaJoin.java index 8c5d267..3216b56 100644 --- a/src/main/java/com/github/mybatisplus/wrapper/interfaces/MyLambdaJoin.java +++ b/src/main/java/com/github/yulichang/wrapper/interfaces/MyLambdaJoin.java @@ -1,8 +1,8 @@ -package com.github.mybatisplus.wrapper.interfaces; +package com.github.yulichang.wrapper.interfaces; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; -import com.github.mybatisplus.interfaces.BaseJoin; -import com.github.mybatisplus.toolkit.Constant; +import com.github.yulichang.interfaces.BaseJoin; +import com.github.yulichang.toolkit.Constant; /** * @author yulichang diff --git a/src/main/java/com/github/mybatisplus/wrapper/interfaces/MySFunctionQuery.java b/src/main/java/com/github/yulichang/wrapper/interfaces/MySFunctionQuery.java similarity index 96% rename from src/main/java/com/github/mybatisplus/wrapper/interfaces/MySFunctionQuery.java rename to src/main/java/com/github/yulichang/wrapper/interfaces/MySFunctionQuery.java index 7789635..e303d2f 100644 --- a/src/main/java/com/github/mybatisplus/wrapper/interfaces/MySFunctionQuery.java +++ b/src/main/java/com/github/yulichang/wrapper/interfaces/MySFunctionQuery.java @@ -1,4 +1,4 @@ -package com.github.mybatisplus.wrapper.interfaces; +package com.github.yulichang.wrapper.interfaces; import com.baomidou.mybatisplus.core.metadata.TableFieldInfo; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; diff --git a/src/main/resources/META-INF/spring.factories b/src/main/resources/META-INF/spring.factories index 4f1b271..d0f8f3c 100644 --- a/src/main/resources/META-INF/spring.factories +++ b/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.github.mybatisplus.MybatisPlusConfiguration + com.github.yulichang.MybatisPlusConfiguration