类命名前缀需加入模块名称

src/main/java/com/diagbot/config/CustomTokenEnhancer.java

@@ -1,7 +1,6 @@
 package com.diagbot.config;
 
-import com.diagbot.entity.User;
-import com.diagbot.entity.UserUaa;
+import com.diagbot.entity.SysUserUaa;
 import org.springframework.security.oauth2.common.DefaultOAuth2AccessToken;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
 import org.springframework.security.oauth2.provider.OAuth2Authentication;
@@ -20,7 +19,7 @@ public class CustomTokenEnhancer implements TokenEnhancer {
     @Override
     public OAuth2AccessToken enhance(OAuth2AccessToken accessToken, OAuth2Authentication authentication) {
         final Map<String, Object> additionalInfo = new HashMap<>();
-        UserUaa user = (UserUaa) authentication.getUserAuthentication().getPrincipal();
+        SysUserUaa user = (SysUserUaa) authentication.getUserAuthentication().getPrincipal();
         additionalInfo.put("user_id", user.getId());
         //		additionalInfo.put("username", user.getUsername());
         //		additionalInfo.put("authorities", user.getAuthorities());

src/main/java/com/diagbot/entity/Permission.java

@@ -17,7 +17,7 @@ import java.util.Date;
  * @since 2018-08-30
  */
 @TableName("sys_permission")
-public class Permission implements Serializable {
+public class SysPermission implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/diagbot/entity/User.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
  * @since 2020-04-09
  */
 @TableName("sys_user")
-public class User implements Serializable {
+public class SysUser implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/diagbot/entity/UserUaa.java

@@ -20,7 +20,7 @@ import java.util.List;
  * @author gaodm
  * @since 2018-08-30
  */
-public class UserUaa implements UserDetails, Serializable {
+public class SysUserUaa implements UserDetails, Serializable {
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/diagbot/facade/UserFacade.java

@@ -5,12 +5,12 @@ import com.diagbot.client.AuthServiceClient;
 import com.diagbot.dto.JwtDTO;
 import com.diagbot.entity.JWT;
 import com.diagbot.entity.JwtStore;
-import com.diagbot.entity.User;
+import com.diagbot.entity.SysUser;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.exception.ServiceErrorCode;
-import com.diagbot.service.impl.UserServiceImpl;
+import com.diagbot.service.impl.SysUserServiceImpl;
 import com.diagbot.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.factory.PasswordEncoderFactories;
@@ -24,7 +24,7 @@ import org.springframework.stereotype.Component;
  * @time: 2018/8/6 9:00
  */
 @Component
-public class UserFacade extends UserServiceImpl {
+public class SysUserFacade extends SysUserServiceImpl {
 
     @Autowired
     private TokenFacade tokenFacade;
@@ -49,10 +49,10 @@ public class UserFacade extends UserServiceImpl {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
                     "请输入密码");
         }
-        QueryWrapper<User> userQueryWrapper = new QueryWrapper<>();
+        QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
         userQueryWrapper.eq("username", username)
                 .eq("is_deleted", IsDeleteEnum.N.getKey());
-        User user = this.getOne(userQueryWrapper, false);
+        SysUser user = this.getOne(userQueryWrapper, false);
         if (null == user) {
             throw new CommonException(ServiceErrorCode.USER_NOT_FOUND);
         }

src/main/java/com/diagbot/facade/TokenFacade.java

@@ -1,6 +1,6 @@
 package com.diagbot.facade;
 
-import com.diagbot.service.impl.TokenServiceImpl;
+import com.diagbot.service.impl.SysTokenServiceImpl;
 import org.springframework.stereotype.Component;
 
 /**
@@ -9,5 +9,5 @@ import org.springframework.stereotype.Component;
  * @time: 2018/10/29 14:24
  */
 @Component
-public class TokenFacade extends TokenServiceImpl {
+public class TokenFacade extends SysTokenServiceImpl {
 }

src/main/java/com/diagbot/mapper/PermissionMapper.java

@@ -1,7 +1,7 @@
 package com.diagbot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.entity.Permission;
+import com.diagbot.entity.SysPermission;
 
 import java.util.List;
 
@@ -13,6 +13,6 @@ import java.util.List;
  * @author gaodm
  * @since 2018-08-22
  */
-public interface PermissionMapper extends BaseMapper<Permission> {
-    List<Permission> getByUserId(Long userId);
+public interface SysPermissionMapper extends BaseMapper<SysPermission> {
+    List<SysPermission> getByUserId(Long userId);
 }

src/main/java/com/diagbot/mapper/UserMapper.java

@@ -1,6 +1,6 @@
 package com.diagbot.mapper;
 
-import com.diagbot.entity.User;
+import com.diagbot.entity.SysUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author gaodm
  * @since 2020-04-09
  */
-public interface UserMapper extends BaseMapper<User> {
+public interface SysUserMapper extends BaseMapper<SysUser> {
 
 }

src/main/java/com/diagbot/mapper/SysUserUaaMapper.java

@@ -0,0 +1,15 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.SysUserUaa;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author gaodm
+ * @since 2018-08-02
+ */
+public interface SysUserUaaMapper {
+    SysUserUaa getByUserName(String username);
+}

src/main/java/com/diagbot/mapper/UserUaaMapper.java

@@ -1,15 +0,0 @@
-package com.diagbot.mapper;
-
-import com.diagbot.entity.UserUaa;
-
-/**
- * <p>
- * Mapper 接口
- * </p>
- *
- * @author gaodm
- * @since 2018-08-02
- */
-public interface UserUaaMapper {
-    UserUaa getByUserName(String username);
-}

src/main/java/com/diagbot/service/TokenService.java

@@ -7,7 +7,7 @@ import com.diagbot.entity.JwtStore;
  * @author: gaodm
  * @time: 2018/10/29 13:35
  */
-public interface TokenService {
+public interface SysTokenService {
 
     /**
      * 创建token

src/main/java/com/diagbot/service/UserService.java

@@ -1,6 +1,6 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.User;
+import com.diagbot.entity.SysUser;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author gaodm
  * @since 2020-04-09
  */
-public interface UserService extends IService<User> {
+public interface SysUserService extends IService<SysUser> {
 
 }

src/main/java/com/diagbot/service/UrlUserService.java

@@ -1,9 +1,9 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.Permission;
-import com.diagbot.entity.UserUaa;
-import com.diagbot.mapper.PermissionMapper;
-import com.diagbot.mapper.UserUaaMapper;
+import com.diagbot.entity.SysPermission;
+import com.diagbot.entity.SysUserUaa;
+import com.diagbot.mapper.SysPermissionMapper;
+import com.diagbot.mapper.SysUserUaaMapper;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.GrantedAuthority;
@@ -23,18 +23,18 @@ import java.util.List;
 @Service
 public class UrlUserService implements UserDetailsService {
     @Autowired
-    UserUaaMapper userUaaMapper;
+    SysUserUaaMapper userUaaMapper;
     @Autowired
-    PermissionMapper permissionMapper;
+    SysPermissionMapper permissionMapper;
 
     @Override
     public UserDetails loadUserByUsername(String userName) { //重写loadUserByUsername 方法获得 userdetails 类型用户
 
-        UserUaa user = userUaaMapper.getByUserName(userName);
+        SysUserUaa user = userUaaMapper.getByUserName(userName);
         if (user != null) {
-            List<Permission> permissions = permissionMapper.getByUserId(user.getId());
+            List<SysPermission> permissions = permissionMapper.getByUserId(user.getId());
             List<GrantedAuthority> grantedAuthorities = new ArrayList<>();
-            for (Permission permission : permissions) {
+            for (SysPermission permission : permissions) {
                 if (null != permission && StringUtils.isNotBlank(permission.getPermissionUrl())) {
                     GrantedAuthority grantedAuthority
                             = new UrlGrantedAuthority(permission.getPermissionUrl(), permission.getMethod());

src/main/java/com/diagbot/service/impl/TokenServiceImpl.java

@@ -3,7 +3,7 @@ package com.diagbot.service.impl;
 import com.auth0.jwt.interfaces.Claim;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import com.diagbot.entity.JwtStore;
-import com.diagbot.service.TokenService;
+import com.diagbot.service.SysTokenService;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.JwtUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -25,7 +25,7 @@ import java.util.Map;
  */
 @Slf4j
 @Service
-public class TokenServiceImpl implements TokenService {
+public class SysTokenServiceImpl implements SysTokenService {
 
     @Autowired
     @Qualifier("redisTemplateForToken")

src/main/java/com/diagbot/service/impl/UserServiceImpl.java

@@ -1,8 +1,8 @@
 package com.diagbot.service.impl;
 
-import com.diagbot.entity.User;
-import com.diagbot.mapper.UserMapper;
-import com.diagbot.service.UserService;
+import com.diagbot.entity.SysUser;
+import com.diagbot.mapper.SysUserMapper;
+import com.diagbot.service.SysUserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2020-04-09
  */
 @Service
-public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
+public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements SysUserService {
 
 }

src/main/java/com/diagbot/web/UserController.java

@@ -6,7 +6,7 @@ import com.diagbot.dto.JwtDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.Token;
 import com.diagbot.facade.TokenFacade;
-import com.diagbot.facade.UserFacade;
+import com.diagbot.facade.SysUserFacade;
 import com.diagbot.vo.JwtVO;
 import com.diagbot.vo.UserLoginVO;
 import io.swagger.annotations.Api;
@@ -26,12 +26,12 @@ import springfox.documentation.annotations.ApiIgnore;
  */
 @RestController
 @Api(value = "用户账号注册等API", tags = { "用户账号注册等API" })
-@RequestMapping("/user")
+@RequestMapping("/sys/user")
 @SuppressWarnings("unchecked")
-public class UserController {
+public class SysUserController {
 
     @Autowired
-    private UserFacade userFacade;
+    private SysUserFacade userFacade;
     @Autowired
     private TokenFacade tokenFacade;
 

src/main/resources/mapper/PermissionMapper.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.PermissionMapper">
+<mapper namespace="com.diagbot.mapper.SysPermissionMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.Permission">
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.SysPermission">
         <id column="id" property="id"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
@@ -17,7 +17,7 @@
         <result column="descritpion" property="descritpion"/>
     </resultMap>
 
-    <select id="getByUserId" parameterType="java.lang.Long" resultType="com.diagbot.entity.Permission">
+    <select id="getByUserId" parameterType="java.lang.Long" resultType="com.diagbot.entity.SysPermission">
       select DISTINCT p.permissionUrl, p.method from sys_user u, sys_user_role sru, sys_role_permission rp, sys_permission p
       where u.is_deleted = 'N' and sru.is_deleted = 'N' and rp.is_deleted = 'N' and p.is_deleted = 'N'
       and u.id = sru.user_id and sru.role_id = rp.role_id and rp.permission_id = p.id

src/main/resources/mapper/UserMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.UserMapper">
+<mapper namespace="com.diagbot.mapper.SysUserMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.User">
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.SysUser">
         <id column="id" property="id" />
         <result column="is_deleted" property="isDeleted" />
         <result column="gmt_create" property="gmtCreate" />

src/main/resources/mapper/UserUaaMapper.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.UserUaaMapper">
+<mapper namespace="com.diagbot.mapper.SysUserUaaMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.UserUaa">
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.SysUserUaa">
         <id column="id" property="id"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
@@ -16,7 +16,7 @@
     </resultMap>
 
 
-    <resultMap id="userUaaMap" type="com.diagbot.entity.UserUaa">
+    <resultMap id="userUaaMap" type="com.diagbot.entity.SysUserUaa">
         <id column="id" property="id"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>

src/test/java/com/diagbot/CodeGeneration.java

@@ -54,7 +54,7 @@ public class CodeGeneration {
 
         // 策略配置
         StrategyConfig strategy = new StrategyConfig();
-        strategy.setTablePrefix(new String[] { "sys_" });// 此处可以修改为您的表前缀
+//        strategy.setTablePrefix(new String[] { "sys_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
         strategy.setInclude(new String[] { "sys_user" }); // 需要生成的表