根据表名调整实体,调整登录失败响应

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/Role.java

@@ -8,7 +8,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.util.Set;
 
-@TableName(value = "t_role")
+@TableName(value = "sys_role")
 public class Role extends BaseEntity {
 
     private static final long serialVersionUID = 1L;

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/User.java

@@ -12,7 +12,7 @@ import java.util.Set;
 /**
  *机构人员信息
  */
-@TableName(value = "t_user")
+@TableName(value = "sys_user")
 public class User extends BaseEntity{
     private static final long serialVersionUID = 1L;
 

soc-auth/src/main/java/com/xunmei/auth/controller/TokenController.java

@@ -35,11 +35,17 @@ public class TokenController
     @PostMapping("login")
     public R<?> login(@RequestBody LoginBody form)
     {
+
+        try {
+            LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
+            userInfo.setToken(tokenService.createToken(userInfo).get("access_token").toString());
+            // 获取登录token
+            return R.ok(userInfo);
+        }catch (Exception e){
+            return R.fail(e.getMessage());
+        }
         // 用户登录
-        LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
-        userInfo.setToken(tokenService.createToken(userInfo).get("access_token").toString());
-        // 获取登录token
-        return R.ok(userInfo);
+
     }
 
 

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/exception/ServiceException.java

@@ -18,11 +18,12 @@ public final class ServiceException extends RuntimeException
      * 错误提示
      */
     private String message;
+    private String data;
 
     /**
      * 错误明细，内部调试错误
      *
-     * 和 {@link CommonResult#getDetailMessage()} 一致的设计
+     * 和 {@link ()} 一致的设计
      */
     private String detailMessage;
 
@@ -43,6 +44,12 @@ public final class ServiceException extends RuntimeException
         this.message = message;
         this.code = code;
     }
+    public ServiceException(String message, Integer code, String data)
+    {
+        this.message = message;
+        this.code = code;
+        this.data = data;
+    }
 
     public String getDetailMessage()
     {

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/JobController.java

@@ -2,8 +2,6 @@ package com.xunmei.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.web.domain.AjaxResult;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import org.springframework.web.bind.annotation.*;
 import com.xunmei.system.service.IJobService;
 import com.xunmei.system.domain.Job;
@@ -11,10 +9,9 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import static com.xunmei.common.core.web.domain.AjaxResult.success;
-import static com.xunmei.common.core.web.domain.AjaxResult.error;
 import javax.annotation.Resource;
 import com.xunmei.common.security.annotation.RequiresPermissions;
+import com.xunmei.common.core.web.controller.BaseController;
 
 import org.springframework.web.bind.annotation.RestController;
 
@@ -29,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(tags = {"JobController"})
 @RestController
 @RequestMapping("/job")
-public class JobController {
+public class JobController extends BaseController {
 
     private Logger log = LoggerFactory.getLogger(getClass());
     @Resource

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/MenuController.java

@@ -2,24 +2,26 @@ package com.xunmei.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.web.domain.AjaxResult;
-import com.xunmei.system.api.model.LoginUser;
+import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.system.domain.vo.AppType;
 import com.xunmei.system.service.IMenuService;
 import org.springframework.web.bind.annotation.*;
-import com.xunmei.system.domain.SysMenu;
+import com.xunmei.system.domain.Menu;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import static com.xunmei.common.core.web.domain.AjaxResult.success;
 import static com.xunmei.common.core.web.domain.AjaxResult.error;
+
 import javax.annotation.Resource;
+
 import com.xunmei.common.security.annotation.RequiresPermissions;
 
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
-import java.util.Optional;
 
 /**
  * <p>
@@ -38,12 +40,12 @@ public class MenuController {
     @Resource
     private IMenuService sysMenuService;
 
-
     @ApiOperation(value = "按组列表")
-    @GetMapping(value = {"/group/list/{appType}", "/group/list"})
+    @RequiresPermissions("system:job:findByPage")
+    @GetMapping(value = {"/findMenuByUserId", "/group/list"})
     AjaxResult groupList(@PathVariable(required = false) AppType appType) {
 
-        List<Object> result = null;
+        List<Menu> result = sysMenuService.findMenuByUserId(SecurityUtils.getUserId());
         return success(result);
         //}
     }
@@ -52,9 +54,9 @@ public class MenuController {
     @ApiOperation(value = "新增菜单权限表")
     @RequiresPermissions("system:SysMenu:add")
     @PostMapping("/add")
-    public AjaxResult add(@RequestBody SysMenu sysMenu){
+    public AjaxResult add(@RequestBody Menu menu) {
         try {
-            return sysMenuService.add(sysMenu);
+            return sysMenuService.add(menu);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             return error();
@@ -64,7 +66,7 @@ public class MenuController {
     @ApiOperation(value = "删除菜单权限表")
     @RequiresPermissions("system:SysMenu:delete")
     @DeleteMapping("/{id}")
-    public AjaxResult delete(@PathVariable("id") Long id){
+    public AjaxResult delete(@PathVariable("id") Long id) {
         try {
             return sysMenuService.delete(id);
         } catch (Exception e) {
@@ -76,9 +78,9 @@ public class MenuController {
     @ApiOperation(value = "更新菜单权限表")
     @RequiresPermissions("system:SysMenu:update")
     @PutMapping("/update")
-    public AjaxResult update(@RequestBody SysMenu sysMenu){
+    public AjaxResult update(@RequestBody Menu menu) {
         try {
-            return sysMenuService.updateData(sysMenu);
+            return sysMenuService.updateData(menu);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             return error();
@@ -88,9 +90,9 @@ public class MenuController {
     @ApiOperation(value = "查询菜单权限表分页数据")
     @RequiresPermissions("system:SysMenu:findByPage")
     @GetMapping("/findByPage")
-    public AjaxResult findListByPage(Page<SysMenu> page, SysMenu sysMenu){
+    public AjaxResult findListByPage(Page<Menu> page, Menu menu) {
         try {
-            return sysMenuService.findListByPage(page, sysMenu);
+            return sysMenuService.findListByPage(page, menu);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             return error();
@@ -100,7 +102,7 @@ public class MenuController {
     @ApiOperation(value = "id查询菜单权限表")
     @RequiresPermissions("system:SysMenu:findById")
     @GetMapping("/{id}")
-    public AjaxResult findById(@PathVariable Long id){
+    public AjaxResult findById(@PathVariable Long id) {
         try {
             return sysMenuService.findById(id);
         } catch (Exception e) {

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysMenu.java → soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/Menu.java

@@ -15,8 +15,8 @@ import java.util.List;
 /**
  * 菜单权限 sys_menu
  */
-@TableName(value = "t_menu")
-public class SysMenu extends BaseEntity {
+@TableName(value = "sys_menu")
+public class Menu extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
@@ -71,7 +71,7 @@ public class SysMenu extends BaseEntity {
 
     /** 子菜单 */
     @TableField(exist = false)
-    private List<SysMenu> children = new ArrayList<SysMenu>();
+    private List<Menu> children = new ArrayList<Menu>();
 
     public Long getId() {
         return id;
@@ -229,12 +229,12 @@ public class SysMenu extends BaseEntity {
         this.icon = icon;
     }
 
-    public List<SysMenu> getChildren()
+    public List<Menu> getChildren()
     {
         return children;
     }
 
-    public void setChildren(List<SysMenu> children)
+    public void setChildren(List<Menu> children)
     {
         this.children = children;
     }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/MenuMapper.java

@@ -1,18 +1,18 @@
 package com.xunmei.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xunmei.system.domain.SysMenu;
+import com.xunmei.system.domain.Menu;
 
 import java.util.List;
 
-public interface MenuMapper extends BaseMapper<SysMenu> {
+public interface MenuMapper extends BaseMapper<Menu> {
 
     /**
      * 根据用户查询系统菜单列表
      * @param menu 菜单信息
      * @return 菜单列表
      */
-    List<SysMenu> selectMenuListByUserId(SysMenu menu);
+    List<Menu> selectMenuListByUserId(Menu menu);
 
     /**
      * 根据角色ID查询权限
@@ -29,4 +29,5 @@ public interface MenuMapper extends BaseMapper<SysMenu> {
      */
     List<String> selectMenuPermsByUserId(Long userId);
 
+    List<Menu> selectMenuByUserIdWhereMF(Long userId);
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/IMenuService.java

@@ -3,14 +3,15 @@ package com.xunmei.system.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.web.domain.AjaxResult;
-import com.xunmei.system.domain.SysMenu;
+import com.xunmei.system.domain.Menu;
 
+import java.util.List;
 import java.util.Set;
 
 /**
  * @author luojun
  */
-public interface IMenuService extends IService<SysMenu> {
+public interface IMenuService extends IService<Menu> {
 
     /**
      * 根据角色ID查询权限
@@ -30,18 +31,18 @@ public interface IMenuService extends IService<SysMenu> {
      * 查询定时任务调度表分页数据
      *
      * @param page      页码
-     * @param sysMenu 每页条数
+     * @param menu 每页条数
      * @return AjaxResult
      */
-    AjaxResult findListByPage(Page<SysMenu> page, SysMenu sysMenu);
+    AjaxResult findListByPage(Page<Menu> page, Menu menu);
 
     /**
      * 添加定时任务调度表
      *
-     * @param sysMenu 定时任务调度表
+     * @param menu 定时任务调度表
      * @return JsonBean
      */
-    AjaxResult add(SysMenu sysMenu);
+    AjaxResult add(Menu menu);
 
     /**
      * 删除定时任务调度表
@@ -54,10 +55,10 @@ public interface IMenuService extends IService<SysMenu> {
     /**
      * 修改定时任务调度表
      *
-     * @param sysMenu 定时任务调度表
+     * @param menu 定时任务调度表
      * @return AjaxResult
      */
-    AjaxResult updateData(SysMenu sysMenu);
+    AjaxResult updateData(Menu menu);
 
     /**
      * id查询数据
@@ -66,4 +67,6 @@ public interface IMenuService extends IService<SysMenu> {
      * @return AjaxResult
      */
     AjaxResult findById(Long id);
+
+    List<Menu> findMenuByUserId(Long id);
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/MenuServiceImpl.java

@@ -5,15 +5,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.utils.StringUtils;
 import com.xunmei.common.core.web.domain.AjaxResult;
-import com.xunmei.system.domain.SysMenu;
+import com.xunmei.system.domain.Menu;
 import com.xunmei.system.mapper.MenuMapper;
 import com.xunmei.system.service.IMenuService;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import static com.xunmei.common.core.web.domain.AjaxResult.success;
 
@@ -21,17 +18,17 @@ import static com.xunmei.common.core.web.domain.AjaxResult.success;
  * @author luojun
  */
 @Service
-public class MenuServiceImpl extends ServiceImpl<MenuMapper, SysMenu> implements IMenuService {
+public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IMenuService {
 
     @Override
-    public AjaxResult findListByPage(Page<SysMenu> page, SysMenu sysMenu) {
-        QueryWrapper<SysMenu> where = new QueryWrapper<>(sysMenu);
+    public AjaxResult findListByPage(Page<Menu> page, Menu menu) {
+        QueryWrapper<Menu> where = new QueryWrapper<>(menu);
         return success(baseMapper.selectPage(page, where));
     }
 
     @Override
-    public AjaxResult add(SysMenu sysMenu) {
-        return success(baseMapper.insert(sysMenu));
+    public AjaxResult add(Menu menu) {
+        return success(baseMapper.insert(menu));
     }
 
     @Override
@@ -40,8 +37,8 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, SysMenu> implements
     }
 
     @Override
-    public AjaxResult updateData(SysMenu sysMenu) {
-        return success(baseMapper.updateById(sysMenu));
+    public AjaxResult updateData(Menu menu) {
+        return success(baseMapper.updateById(menu));
     }
 
     @Override
@@ -50,6 +47,56 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, SysMenu> implements
     }
 
     @Override
+    public List<Menu> findMenuByUserId(Long id) {
+        List<Menu> list = recursionMethod(baseMapper.selectMenuByUserIdWhereMF(id));
+        return list;
+    }
+
+
+
+    /**
+     * 递归方法转换成树形结构
+     * @param treeList
+     * @return
+     */
+    public static List<Menu> recursionMethod(List<Menu> treeList) {
+        List<Menu> trees = new ArrayList<>();
+        for (Menu tree : treeList) {
+            // 找出父节点
+            if (0 == tree.getParentId()) {
+                // 调用递归方法填充子节点列表
+                trees.add(findChildren(tree, treeList));
+            }
+        }
+        return trees;
+    }
+    /**
+     * 递归方法
+     * @param tree 父节点对象
+     * @param treeList 所有的List
+     * @return
+     */
+    public static Menu findChildren(Menu tree, List<Menu> treeList) {
+        for (Menu node : treeList) {
+            if (tree.getId().equals(node.getParentId())) {
+                if (tree.getChildren() == null) {
+                    tree.setChildren(new ArrayList<>());
+                }
+                // 递归 调用自身
+                tree.getChildren().add(findChildren(node, treeList));
+            }
+        }
+        return tree;
+    }
+
+
+
+
+
+
+
+
+    @Override
     public Set<String> selectMenuPermsByRoleId(Long roleId) {
         List<String> perms = baseMapper.selectMenuPermsByRoleId(roleId);
         Set<String> permsSet = new HashSet<>();

soc-modules/soc-modules-system/src/main/resources/mapper/system/MenuMapper.xml

@@ -4,10 +4,10 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.system.mapper.MenuMapper">
 
-    <select id="selectMenuListByUserId" resultType="com.xunmei.system.domain.SysMenu"
-            parameterType="com.xunmei.system.domain.SysMenu">
+    <select id="selectMenuListByUserId" resultType="com.xunmei.system.domain.Menu"
+            parameterType="com.xunmei.system.domain.Menu">
         SELECT DISTINCT
-            m.menu_id,
+            m.id,
             m.parent_id,
             m.menu_name,
             m.path,
@@ -23,10 +23,10 @@
             m.order_num,
             m.create_time
         FROM
-            t_menu m
-                LEFT JOIN t_role_menu rm ON m.menu_id = rm.menu_id
-                LEFT JOIN t_user_role ur ON rm.role_id = ur.role_id
-                LEFT JOIN t_role ro ON ur.role_id = ro.id
+            sys_menu m
+                LEFT JOIN sys_role_menu rm ON m.id = rm.menu_id
+                LEFT JOIN sys_user_role ur ON rm.role_id = ur.role_id
+                LEFT JOIN sys_role ro ON ur.role_id = ro.id
         where ur.user_id = #{params.userId}
         <if test="menuName != null and menuName != ''">
             AND m.menu_name like concat('%', #{menuName}, '%')
@@ -42,16 +42,40 @@
 
     <select id="selectMenuPermsByRoleId" resultType="java.lang.String" parameterType="java.lang.Long">
         select distinct m.perms
-        from t_menu m
-                 left join t_role_menu rm on m.id = rm.menu_id
+        from sys_menu m
+                 left join sys_role_menu rm on m.id = rm.menu_id
         where m.status = 0 and rm.role_id = #{roleId}
     </select>
     <select id="selectMenuPermsByUserId" resultType="java.lang.String" parameterType="java.lang.Long">
         select distinct m.perms
-        from t_menu m
-                 left join t_role_menu rm on m.id = rm.menu_id
-                 left join t_user_role ur on rm.role_id = ur.role_id
-                 left join t_role r on r.id = ur.role_id
+        from sys_menu m
+                 left join sys_role_menu rm on m.id = rm.menu_id
+                 left join sys_user_role ur on rm.role_id = ur.role_id
+                 left join sys_role r on r.id = ur.role_id
         where m.status = 0 and r.status = 0 and ur.user_id = #{userId}
     </select>
+    <select id="selectMenuByUserIdWhereMF" resultType="com.xunmei.system.domain.Menu">
+        SELECT DISTINCT
+            m.id,
+            m.parent_id,
+            m.menu_name,
+            m.path,
+            m.component,
+            m.`query`,
+            m.visible,
+            m.STATUS,
+            ifnull( m.perms, '' ) AS perms,
+            m.is_frame,
+            m.is_cache,
+            m.menu_type,
+            m.icon,
+            m.order_num,
+            m.create_time
+        FROM
+            sys_menu m
+                LEFT JOIN sys_role_menu rm ON m.id = rm.menu_id
+                LEFT JOIN sys_user_role ur ON rm.role_id = ur.role_id
+                LEFT JOIN sys_role ro ON ur.role_id = ro.id
+        where m.menu_type in ('M','F') and ur.user_id = #{params.userId}
+    </select>
 </mapper>

soc-modules/soc-modules-system/src/main/resources/mapper/system/OrgMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.xunmei.system.mapper.OrgMapper">
 
 	<select id="selectPage" resultType="com.xunmei.system.api.domain.Org">
-        select * from  t_org
+        select * from  sys_org
     </select>
 
 </mapper> 

soc-modules/soc-modules-system/src/main/resources/mapper/system/RoleMapper.xml

@@ -18,8 +18,8 @@
             r.create_time,
             r.remark
         FROM
-            t_role r
-                LEFT JOIN t_user_role ur ON ur.role_id = r.id
+            sys_role r
+                LEFT JOIN sys_user_role ur ON ur.role_id = r.id
     </sql>
 
     <select id="selectRolePermissionByUserId" resultType="com.xunmei.system.api.domain.Role"

soc-modules/soc-modules-system/src/main/resources/mapper/system/UserMapper.xml

@@ -6,19 +6,19 @@
 
     <select id="selectPage" resultType="com.xunmei.system.api.domain.User">
         select *
-        from t_user
+        from sys_user
     </select>
 
     <select id="checkUserNameUnique" resultType="com.xunmei.system.api.domain.User"
             parameterType="java.lang.String">
         select id, username
-        from t_user
+        from sys_user
         where username = #{userName}
           and deleted = '0'
         limit 1
     </select>
     <select id="selectPageData" resultType="com.xunmei.system.vo.user.UserPageVo">
-        select * from t_user u
+        select * from sys_user u
         <where>
             <if test="request.username != null and request.username != ''">
                 and u.username like concat('%', #{request.username}, '%')

soc-modules/soc-modules-system/src/main/resources/templates/controller.java.ftl

@@ -2,8 +2,6 @@ package ${package.Controller};
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.web.domain.AjaxResult;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import org.springframework.web.bind.annotation.*;
 import ${package.Service}.${table.serviceName};
 import ${package.Entity}.${entity};
@@ -11,10 +9,9 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import static com.xunmei.common.core.web.domain.AjaxResult.success;
-import static com.xunmei.common.core.web.domain.AjaxResult.error;
 import javax.annotation.Resource;
 import com.xunmei.common.security.annotation.RequiresPermissions;
+import com.xunmei.common.core.web.controller.BaseController;
 
 <#if restControllerStyle>
 import org.springframework.web.bind.annotation.RestController;
@@ -39,7 +36,7 @@ import ${superControllerClassPackage};
 <#else>
 @Controller
 </#if>@RequestMapping("/${entity?uncap_first}")
-<#if kotlin>class ${table.controllerName}<#if superControllerClass??>:${superControllerClass}()</#if><#else><#if superControllerClass??>public class ${table.controllerName} extends ${superControllerClass}{<#else>public class ${table.controllerName} {</#if>
+<#if kotlin>class ${table.controllerName}<#if superControllerClass??>:${superControllerClass}()</#if><#else><#if superControllerClass??>public class ${table.controllerName} extends ${superControllerClass}{<#else>public class ${table.controllerName} extends BaseController {</#if>
 
     private Logger log = LoggerFactory.getLogger(getClass());
     @Resource

soc-modules/soc-modules-system/src/main/resources/templates/entity.java.ftl

@@ -12,7 +12,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 </#if>
-
 /**
  * <p>
  * ${table.comment!}