!33 fix【重构】Mapper 去掉@MapperScan配置，手动增加@mapper feature

Merge pull request !33 from nethanhan/master

README.md

@@ -36,7 +36,7 @@ Spring Boot |  2.2.4.RELEASE
 Spring Cloud | Hoxton.SR1   
 Spring Security OAuth2 | 2.3.6
 Mybatis Plus | 3.3.1
-hutool | 5.1.1
+hutool | 5.1.2
 Avue | 2.3.5
    
 

pig-codegen/src/main/java/com/pig4cloud/pig/codegen/config/MybatisPlusConfigurer.java → pig-codegen/src/main/java/com/pig4cloud/pig/codegen/config/MybatisPlusConfiguration.java

@@ -17,7 +17,6 @@
 package com.pig4cloud.pig.codegen.config;
 
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -26,8 +25,7 @@ import org.springframework.context.annotation.Configuration;
  * @date 2019/2/1
  */
 @Configuration
-@MapperScan("com.pig4cloud.pig.codegen.mapper")
-public class MybatisPlusConfigurer {
+public class MybatisPlusConfiguration {
 	/**
 	 * 分页插件
 	 *

pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/SysGeneratorMapper.java

@@ -18,6 +18,7 @@ package com.pig4cloud.pig.codegen.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -29,6 +30,7 @@ import java.util.Map;
  * @author lengleng
  * @date 2019/2/1
  */
+@Mapper
 public interface SysGeneratorMapper {
 
 	/**

pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/config/MybatisPlusConfigurer.java → pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/config/MybatisPlusConfiguration.java

@@ -18,7 +18,6 @@ package com.pig4cloud.pig.admin.config;
 
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import com.pig4cloud.pig.common.core.mybatis.DataScopeInterceptor;
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -27,8 +26,7 @@ import org.springframework.context.annotation.Configuration;
  * @date 2019/2/1
  */
 @Configuration
-@MapperScan("com.pig4cloud.pig.admin.mapper")
-public class MybatisPlusConfigurer {
+public class MybatisPlusConfiguration {
 	/**
 	 * 分页插件
 	 *

pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDeptMapper.java

@@ -18,6 +18,7 @@ package com.pig4cloud.pig.admin.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pig4cloud.pig.admin.api.entity.SysDept;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
@@ -29,6 +30,7 @@ import java.util.List;
  * @author lengleng
  * @since 2019/2/1
  */
+@Mapper
 public interface SysDeptMapper extends BaseMapper<SysDept> {
 
 	/**

pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDeptRelationMapper.java

@@ -18,6 +18,7 @@ package com.pig4cloud.pig.admin.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pig4cloud.pig.admin.api.entity.SysDeptRelation;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -27,6 +28,7 @@ import com.pig4cloud.pig.admin.api.entity.SysDeptRelation;
  * @author lengleng
  * @since 2019/2/1
  */
+@Mapper
 public interface SysDeptRelationMapper extends BaseMapper<SysDeptRelation> {
 	/**
 	 * 删除部门关系表数据

pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDictMapper.java

@@ -18,6 +18,7 @@ package com.pig4cloud.pig.admin.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pig4cloud.pig.admin.api.entity.SysDict;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -27,6 +28,7 @@ import com.pig4cloud.pig.admin.api.entity.SysDict;
  * @author lengleng
  * @since 2019/2/1
  */
+@Mapper
 public interface SysDictMapper extends BaseMapper<SysDict> {
 
 }

pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysLogMapper.java

@@ -18,6 +18,7 @@ package com.pig4cloud.pig.admin.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pig4cloud.pig.admin.api.entity.SysLog;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -27,5 +28,6 @@ import com.pig4cloud.pig.admin.api.entity.SysLog;
  * @author lengleng
  * @since 2019/2/1
  */
+@Mapper
 public interface SysLogMapper extends BaseMapper<SysLog> {
 }

pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysMenuMapper.java

@@ -19,6 +19,7 @@ package com.pig4cloud.pig.admin.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pig4cloud.pig.admin.api.entity.SysMenu;
 import com.pig4cloud.pig.admin.api.vo.MenuVO;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
@@ -30,6 +31,7 @@ import java.util.List;
  * @author lengleng
  * @since 2019/2/1
  */
+@Mapper
 public interface SysMenuMapper extends BaseMapper<SysMenu> {
 
 	/**

pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysOauthClientDetailsMapper.java

@@ -19,6 +19,7 @@ package com.pig4cloud.pig.admin.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pig4cloud.pig.admin.api.entity.SysOauthClientDetails;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -28,6 +29,7 @@ import com.pig4cloud.pig.admin.api.entity.SysOauthClientDetails;
  * @author lengleng
  * @since 2019/2/1
  */
+@Mapper
 public interface SysOauthClientDetailsMapper extends BaseMapper<SysOauthClientDetails> {
 
 }

pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysRoleMapper.java

@@ -18,6 +18,7 @@ package com.pig4cloud.pig.admin.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pig4cloud.pig.admin.api.entity.SysRole;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
@@ -29,6 +30,7 @@ import java.util.List;
  * @author lengleng
  * @since 2019/2/1
  */
+@Mapper
 public interface SysRoleMapper extends BaseMapper<SysRole> {
 	/**
 	 * 通过用户ID，查询角色信息

pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysRoleMenuMapper.java

@@ -19,6 +19,7 @@ package com.pig4cloud.pig.admin.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pig4cloud.pig.admin.api.entity.SysRoleMenu;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -28,6 +29,7 @@ import com.pig4cloud.pig.admin.api.entity.SysRoleMenu;
  * @author lengleng
  * @since 2019/2/1
  */
+@Mapper
 public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
 
 }

pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysUserMapper.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.pig.admin.api.dto.UserDTO;
 import com.pig4cloud.pig.admin.api.entity.SysUser;
 import com.pig4cloud.pig.admin.api.vo.UserVO;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -34,6 +35,7 @@ import java.util.List;
  * @author lengleng
  * @since 2019/2/1
  */
+@Mapper
 public interface SysUserMapper extends BaseMapper<SysUser> {
 	/**
 	 * 通过用户名查询用户信息（含有角色信息）

pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysUserRoleMapper.java

@@ -19,6 +19,7 @@ package com.pig4cloud.pig.admin.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pig4cloud.pig.admin.api.entity.SysUserRole;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -29,6 +30,7 @@ import org.apache.ibatis.annotations.Param;
  * @author lengleng
  * @since 2019/2/1
  */
+@Mapper
 public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
 	/**
 	 * 根据用户Id删除该用户的角色关系

pom.xml

@@ -40,8 +40,8 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
-		<spring-boot-admin.version>2.2.1</spring-boot-admin.version>
-		<hutool.version>5.1.1</hutool.version>
+		<spring-boot-admin.version>2.2.2</spring-boot-admin.version>
+		<hutool.version>5.1.2</hutool.version>
 		<mybatis-plus.version>3.3.1</mybatis-plus.version>
 		<kaptcha.version>0.0.9</kaptcha.version>
 		<velocity.version>1.7</velocity.version>