From 8eaeb3c360d50090fea26754f8742b38f5c6fbcf Mon Sep 17 00:00:00 2001 From: fangcheng Date: Mon, 6 Mar 2017 11:38:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E5=BF=85=E8=A6=81?= =?UTF-8?q?=E7=9A=84=E8=80=81=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/cm/controller/LoginController.java | 226 ++++++++++----------- .../lyms/cm/controller/sys/ResourceController.java | 34 ---- .../com/lyms/cm/controller/sys/RoleController.java | 34 ---- .../com/lyms/cm/controller/sys/UserController.java | 85 -------- .../java/com/lyms/cm/dao/sys/ResourceMapper.java | 24 --- .../java/com/lyms/cm/dao/sys/ResourceMapper.xml | 10 - .../main/java/com/lyms/cm/dao/sys/RoleMapper.java | 20 -- .../main/java/com/lyms/cm/dao/sys/RoleMapper.xml | 6 - .../main/java/com/lyms/cm/dao/sys/UserMapper.java | 18 -- .../main/java/com/lyms/cm/dao/sys/UserMapper.xml | 6 - .../main/java/com/lyms/cm/entity/sys/Resource.java | 134 ------------ .../src/main/java/com/lyms/cm/entity/sys/Role.java | 74 ------- .../src/main/java/com/lyms/cm/entity/sys/User.java | 74 ------- .../com/lyms/cm/service/sys/ResourceService.java | 38 ---- .../java/com/lyms/cm/service/sys/RoleService.java | 16 -- .../java/com/lyms/cm/service/sys/UserService.java | 26 --- .../cm/service/sys/impl/ResourceServiceImpl.java | 134 ------------ .../lyms/cm/service/sys/impl/RoleServiceImpl.java | 21 -- .../lyms/cm/service/sys/impl/UserServiceImpl.java | 66 ------ .../main/java/com/lyms/cm/shiro/ShiroRealm.java | 176 ++++++++-------- 20 files changed, 201 insertions(+), 1021 deletions(-) delete mode 100644 center.manager/src/main/java/com/lyms/cm/controller/sys/ResourceController.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/controller/sys/RoleController.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/controller/sys/UserController.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/dao/sys/ResourceMapper.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/dao/sys/ResourceMapper.xml delete mode 100644 center.manager/src/main/java/com/lyms/cm/dao/sys/RoleMapper.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/dao/sys/RoleMapper.xml delete mode 100644 center.manager/src/main/java/com/lyms/cm/dao/sys/UserMapper.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/dao/sys/UserMapper.xml delete mode 100644 center.manager/src/main/java/com/lyms/cm/entity/sys/Resource.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/entity/sys/Role.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/entity/sys/User.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/ResourceService.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/RoleService.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/UserService.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/impl/ResourceServiceImpl.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/impl/RoleServiceImpl.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/impl/UserServiceImpl.java diff --git a/center.manager/src/main/java/com/lyms/cm/controller/LoginController.java b/center.manager/src/main/java/com/lyms/cm/controller/LoginController.java index 626ef2a..6c9ceb6 100644 --- a/center.manager/src/main/java/com/lyms/cm/controller/LoginController.java +++ b/center.manager/src/main/java/com/lyms/cm/controller/LoginController.java @@ -1,113 +1,113 @@ -package com.lyms.cm.controller; - -import java.util.List; - -import org.apache.shiro.SecurityUtils; -import org.apache.shiro.authc.AccountException; -import org.apache.shiro.authc.AuthenticationException; -import org.apache.shiro.authc.AuthenticationToken; -import org.apache.shiro.authc.LockedAccountException; -import org.apache.shiro.authc.UnknownAccountException; -import org.apache.shiro.authc.UsernamePasswordToken; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; - -import com.lyms.cm.entity.sys.TreeNode; -import com.lyms.cm.entity.sys.User; -import com.lyms.cm.service.sys.ResourceService; -import com.lyms.cm.service.sys.UserService; -import com.lyms.constants.Constants; -import com.lyms.constants.SysResourceType; -import com.lyms.shiro.ShiroWebUtils; -import com.lyms.util.StrUtils; -import com.lyms.web.controller.BaseController; - -@Controller -public class LoginController extends BaseController { - - private static final String VIEW_LOGIN = "/login/login"; - - - - @Autowired - private UserService userService; - - @Autowired - private ResourceService resourceService; - - @RequestMapping("/") - public String index(Model model) { - if(!ShiroWebUtils.isLogin()){ - return redirectTo(VIEW_LOGIN); - } - String username = ShiroWebUtils.getCurrentUserName(); - User user = userService.getUserByUserName(username); - List menus = resourceService.getPermissionMenuTreeByPid(SysResourceType.MANAGER_ROOT_MENU_RESOURCE_ID,user); - model.addAttribute("menus", menus); - return "/index"; - } - - @RequestMapping("/home") - public String home() { - return "/home"; - } - /** - *
  • @Description:导航到登录(GET) - *
  • @param model - *
  • @return - *
  • 创建人：方承 - *
  • 创建时间：2016年11月27日 - *
  • 修改人： - *
  • 修改时间： - */ - @RequestMapping(value = "/login", method = RequestMethod.GET) - public String login(Model model){ - model.addAttribute(Constants.CAPTCHA_TOKEN, StrUtils.uuid()); - return VIEW_LOGIN; - } - - /** - *
  • @Description:登录验证方法,详细查看ShiroRealm.class - *
  • @param req - *
  • @param model - *
  • @return - *
  • 创建人：方承 - *
  • 创建时间：2016年11月25日 - *
  • 修改人： - *
  • 修改时间： - */ - @RequestMapping(value = "/login", method = RequestMethod.POST) - public String login(String username, String password,@RequestParam(value = "rememberMe",defaultValue = "0") int rememberMe, Model model) { - String view = VIEW_LOGIN; - if(StrUtils.isEmpty(username) || StrUtils.isEmpty(password)){ - model.addAttribute(Constants.CAPTCHA_TOKEN, StrUtils.uuid()); - return view; - } - AuthenticationToken token = new UsernamePasswordToken(username, password); - if (rememberMe == 1) { - ((UsernamePasswordToken) token).setRememberMe(true); - } - try { - //查看ShiroRealm.class - SecurityUtils.getSubject().login(token); - return redirectTo("/"); - } catch (AuthenticationException e) { - if (e instanceof UnknownAccountException) { - model.addAttribute("message", "用户不存在"); - } else if (e instanceof AccountException) { - model.addAttribute("message", "用户名密码错误"); - } else if (e instanceof LockedAccountException) { - model.addAttribute("message", "用户被禁用"); - } else { - model.addAttribute("message", "用户认证失败"); - } - } - model.addAttribute(Constants.CAPTCHA_TOKEN, StrUtils.uuid()); - return view; - } - -} +//package com.lyms.cm.controller; +// +//import java.util.List; +// +//import org.apache.shiro.SecurityUtils; +//import org.apache.shiro.authc.AccountException; +//import org.apache.shiro.authc.AuthenticationException; +//import org.apache.shiro.authc.AuthenticationToken; +//import org.apache.shiro.authc.LockedAccountException; +//import org.apache.shiro.authc.UnknownAccountException; +//import org.apache.shiro.authc.UsernamePasswordToken; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.stereotype.Controller; +//import org.springframework.ui.Model; +//import org.springframework.web.bind.annotation.RequestMapping; +//import org.springframework.web.bind.annotation.RequestMethod; +//import org.springframework.web.bind.annotation.RequestParam; +// +//import com.lyms.cm.entity.sys.TreeNode; +//import com.lyms.cm.entity.sys.User; +//import com.lyms.cm.service.sys.ResourceService; +//import com.lyms.cm.service.sys.UserService; +//import com.lyms.constants.Constants; +//import com.lyms.constants.SysResourceType; +//import com.lyms.shiro.ShiroWebUtils; +//import com.lyms.util.StrUtils; +//import com.lyms.web.controller.BaseController; +// +//@Controller +//public class LoginController extends BaseController { +// +// private static final String VIEW_LOGIN = "/login/login"; +// +// +// +// @Autowired +// private UserService userService; +// +// @Autowired +// private ResourceService resourceService; +// +// @RequestMapping("/") +// public String index(Model model) { +// if(!ShiroWebUtils.isLogin()){ +// return redirectTo(VIEW_LOGIN); +// } +// String username = ShiroWebUtils.getCurrentUserName(); +// User user = userService.getUserByUserName(username); +// List menus = resourceService.getPermissionMenuTreeByPid(SysResourceType.MANAGER_ROOT_MENU_RESOURCE_ID,user); +// model.addAttribute("menus", menus); +// return "/index"; +// } +// +// @RequestMapping("/home") +// public String home() { +// return "/home"; +// } +// /** +// *
  • @Description:导航到登录(GET) +// *
  • @param model +// *
  • @return +// *
  • 创建人：方承 +// *
  • 创建时间：2016年11月27日 +// *
  • 修改人： +// *
  • 修改时间： +// */ +// @RequestMapping(value = "/login", method = RequestMethod.GET) +// public String login(Model model){ +// model.addAttribute(Constants.CAPTCHA_TOKEN, StrUtils.uuid()); +// return VIEW_LOGIN; +// } +// +// /** +// *
  • @Description:登录验证方法,详细查看ShiroRealm.class +// *
  • @param req +// *
  • @param model +// *
  • @return +// *
  • 创建人：方承 +// *
  • 创建时间：2016年11月25日 +// *
  • 修改人： +// *
  • 修改时间： +// */ +// @RequestMapping(value = "/login", method = RequestMethod.POST) +// public String login(String username, String password,@RequestParam(value = "rememberMe",defaultValue = "0") int rememberMe, Model model) { +// String view = VIEW_LOGIN; +// if(StrUtils.isEmpty(username) || StrUtils.isEmpty(password)){ +// model.addAttribute(Constants.CAPTCHA_TOKEN, StrUtils.uuid()); +// return view; +// } +// AuthenticationToken token = new UsernamePasswordToken(username, password); +// if (rememberMe == 1) { +// ((UsernamePasswordToken) token).setRememberMe(true); +// } +// try { +// //查看ShiroRealm.class +// SecurityUtils.getSubject().login(token); +// return redirectTo("/"); +// } catch (AuthenticationException e) { +// if (e instanceof UnknownAccountException) { +// model.addAttribute("message", "用户不存在"); +// } else if (e instanceof AccountException) { +// model.addAttribute("message", "用户名密码错误"); +// } else if (e instanceof LockedAccountException) { +// model.addAttribute("message", "用户被禁用"); +// } else { +// model.addAttribute("message", "用户认证失败"); +// } +// } +// model.addAttribute(Constants.CAPTCHA_TOKEN, StrUtils.uuid()); +// return view; +// } +// +//} diff --git a/center.manager/src/main/java/com/lyms/cm/controller/sys/ResourceController.java b/center.manager/src/main/java/com/lyms/cm/controller/sys/ResourceController.java deleted file mode 100644 index 5df1d46..0000000 --- a/center.manager/src/main/java/com/lyms/cm/controller/sys/ResourceController.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.lyms.cm.controller.sys; - -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.lyms.cm.entity.sys.Resource; -import com.lyms.cm.service.sys.ResourceService; -import com.lyms.web.controller.BaseController; - -@Controller -@RequestMapping("/resource") -public class ResourceController extends BaseController { - - @Autowired - private ResourceService resourceService; - - @RequestMapping("/list") - public String list() { - return "/resource/resource_list"; - } - - @RequestMapping("/getResourceList") - @ResponseBody - public Map getResourceList(){ - Page page = getPage(); - return toGridData(resourceService.selectPage(page, new EntityWrapper().orderBy("sorted"))); - } -} diff --git a/center.manager/src/main/java/com/lyms/cm/controller/sys/RoleController.java b/center.manager/src/main/java/com/lyms/cm/controller/sys/RoleController.java deleted file mode 100644 index 37d5fb3..0000000 --- a/center.manager/src/main/java/com/lyms/cm/controller/sys/RoleController.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.lyms.cm.controller.sys; - -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -import com.baomidou.mybatisplus.plugins.Page; -import com.lyms.cm.entity.sys.Role; -import com.lyms.cm.service.sys.RoleService; -import com.lyms.web.controller.BaseController; - -@Controller -@RequestMapping("/role") -public class RoleController extends BaseController { - - @Autowired - private RoleService roleService; - - - @RequestMapping("/list") - public String list() { - return "/role/role_list"; - } - - @RequestMapping("/getRoleList") - @ResponseBody - public Map getRoleList(){ - Page page = getPage(); - return toGridData(roleService.selectPage(page, null)); - } -} diff --git a/center.manager/src/main/java/com/lyms/cm/controller/sys/UserController.java b/center.manager/src/main/java/com/lyms/cm/controller/sys/UserController.java deleted file mode 100644 index 0957d1d..0000000 --- a/center.manager/src/main/java/com/lyms/cm/controller/sys/UserController.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.lyms.cm.controller.sys; - -import java.util.Map; - -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -import com.baomidou.mybatisplus.plugins.Page; -import com.lyms.cm.entity.sys.User; -import com.lyms.cm.service.sys.UserService; -import com.lyms.constants.OperationName; -import com.lyms.shiro.HashUtils; -import com.lyms.util.StrUtils; -import com.lyms.web.bean.AjaxResult; -import com.lyms.web.controller.BaseController; - -@Controller -@RequestMapping("/user") -public class UserController extends BaseController{ - @Autowired - private UserService userService; - - @RequiresPermissions("user:view") - @RequestMapping("/list") - public String list() { - return "/user/user_list"; - } - - /** - * 概要. - *
    - * @param id - * @param model - * @return - * @return String - * @author 自己的中文名 - * @date 2016年7月7日 下午4:35:09 - */ - @RequestMapping(value = "/{id}/toEdit") - public String toEdit(@PathVariable String id, Model model) { - model.addAttribute("user", userService.selectById(id)); - return "/user/user_edit"; - } - - @RequestMapping(value = "/create") - @ResponseBody - public AjaxResult create(User user, AjaxResult ajaxResult) { - user.setId(StrUtils.uuid()); - user.setPassword(HashUtils.md5(user.getPassword())); - boolean rs = userService.insert(user); - return handleAjaxResult(ajaxResult, rs, OperationName.CREATE); - } - - @RequestMapping(value = "/update") - @ResponseBody - public AjaxResult update(User user, AjaxResult ajaxResult) { - if (!StringUtils.isEmpty(user.getPassword())) { - user.setPassword(HashUtils.md5(user.getPassword())); - } - boolean ret = userService.updateById(user); - return handleAjaxResult(ajaxResult, ret, OperationName.UPDATE); - } - - @RequestMapping(value = "/{id}/delete") - @ResponseBody - public AjaxResult delete(@PathVariable String id, AjaxResult ajaxResult) { - if ("1".equals(id)) - return new AjaxResult(false, "不能删除超级管理员"); - boolean rs = userService.deleteById(id); - return handleAjaxResult(ajaxResult, rs, OperationName.DELETE); - } - - @RequestMapping("/getUserList") - @ResponseBody - public Map getUserList(){ - Page page = getPage(); - return toGridData(userService.selectPage(page, null)); - } -} diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/ResourceMapper.java b/center.manager/src/main/java/com/lyms/cm/dao/sys/ResourceMapper.java deleted file mode 100644 index b889777..0000000 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/ResourceMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.lyms.cm.dao.sys; - -import java.util.List; - -import org.springframework.stereotype.Repository; - -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.lyms.cm.entity.sys.Resource; -import com.lyms.cm.entity.sys.TreeNode; - -/** - *

    - * Mapper接口 - *

    - * - * @author 风车车 - * @since 2016-12-12 - */ -@Repository -public interface ResourceMapper extends BaseMapper { - - List getMenuTreeByPid(String pid); - -} \ No newline at end of file diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/ResourceMapper.xml b/center.manager/src/main/java/com/lyms/cm/dao/sys/ResourceMapper.xml deleted file mode 100644 index 65bf080..0000000 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/ResourceMapper.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/RoleMapper.java b/center.manager/src/main/java/com/lyms/cm/dao/sys/RoleMapper.java deleted file mode 100644 index e48e571..0000000 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/RoleMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.lyms.cm.dao.sys; - - -import org.springframework.stereotype.Repository; - -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.lyms.cm.entity.sys.Role; - -/** - *

    - * Mapper接口 - *

    - * - * @author 风车车 - * @since 2016-12-12 - */ -@Repository -public interface RoleMapper extends BaseMapper { - -} \ No newline at end of file diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/RoleMapper.xml b/center.manager/src/main/java/com/lyms/cm/dao/sys/RoleMapper.xml deleted file mode 100644 index a3b2822..0000000 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/RoleMapper.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/UserMapper.java b/center.manager/src/main/java/com/lyms/cm/dao/sys/UserMapper.java deleted file mode 100644 index 8b9df30..0000000 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/UserMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.lyms.cm.dao.sys; - -import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.lyms.cm.entity.sys.User; - -/** - *

    - * Mapper接口 - *

    - * - * @author 风车车 - * @since 2017-12-12 - */ -@Repository -public interface UserMapper extends BaseMapper { - -} \ No newline at end of file diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/UserMapper.xml b/center.manager/src/main/java/com/lyms/cm/dao/sys/UserMapper.xml deleted file mode 100644 index 7f7895b..0000000 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/UserMapper.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/center.manager/src/main/java/com/lyms/cm/entity/sys/Resource.java b/center.manager/src/main/java/com/lyms/cm/entity/sys/Resource.java deleted file mode 100644 index 918e7ab..0000000 --- a/center.manager/src/main/java/com/lyms/cm/entity/sys/Resource.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.lyms.cm.entity.sys; - -import java.io.Serializable; - -import com.baomidou.mybatisplus.activerecord.Model; - -/** - *

    - * - *

    - * - * @author 风车车 - * @since 2016-12-12 - */ -public class Resource extends Model { - - private static final long serialVersionUID = 1L; - - /** - * - */ - private String id; - /** - * - */ - private String name; - /** - * - */ - private String description; - /** - * - */ - private Integer type; - /** - * - */ - private String permissions; - /** - * - */ - private String url; - /** - * - */ - private String icon; - /** - * - */ - private String pid; - /** - * - */ - private String sorted; - - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public Integer getType() { - return type; - } - - public void setType(Integer type) { - this.type = type; - } - - public String getPermissions() { - return permissions; - } - - public void setPermissions(String permissions) { - this.permissions = permissions; - } - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - - public String getIcon() { - return icon; - } - - public void setIcon(String icon) { - this.icon = icon; - } - - public String getPid() { - return pid; - } - - public void setPid(String pid) { - this.pid = pid; - } - - public String getSorted() { - return sorted; - } - - public void setSorted(String sorted) { - this.sorted = sorted; - } - - @Override - protected Serializable pkVal() { - return this.id; - } - -} diff --git a/center.manager/src/main/java/com/lyms/cm/entity/sys/Role.java b/center.manager/src/main/java/com/lyms/cm/entity/sys/Role.java deleted file mode 100644 index 5f44c48..0000000 --- a/center.manager/src/main/java/com/lyms/cm/entity/sys/Role.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.lyms.cm.entity.sys; - -import java.io.Serializable; - -import com.baomidou.mybatisplus.activerecord.Model; - -/** - *

    - * - *

    - * - * @author 风车车 - * @since 2016-12-12 - */ -public class Role extends Model { - - private static final long serialVersionUID = 1L; - - /** - * - */ - private String id; - /** - * - */ - private String name; - /** - * - */ - private String description; - /** - * - */ - private String resources; - - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getResources() { - return resources; - } - - public void setResources(String resources) { - this.resources = resources; - } - - @Override - protected Serializable pkVal() { - return this.id; - } - -} diff --git a/center.manager/src/main/java/com/lyms/cm/entity/sys/User.java b/center.manager/src/main/java/com/lyms/cm/entity/sys/User.java deleted file mode 100644 index 2c8aee7..0000000 --- a/center.manager/src/main/java/com/lyms/cm/entity/sys/User.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.lyms.cm.entity.sys; - -import java.io.Serializable; - -import com.baomidou.mybatisplus.activerecord.Model; - -/** - *

    - * - *

    - * - * @author 风车车 - * @since 2016-12-12 - */ -public class User extends Model { - - private static final long serialVersionUID = 1L; - - /** - * - */ - private String id; - /** - * - */ - private String username; - /** - * - */ - private String password; - /** - * - */ - private String roles; - - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getRoles() { - return roles; - } - - public void setRoles(String roles) { - this.roles = roles; - } - - @Override - protected Serializable pkVal() { - return this.id; - } - -} diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/ResourceService.java b/center.manager/src/main/java/com/lyms/cm/service/sys/ResourceService.java deleted file mode 100644 index 74e0c8d..0000000 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/ResourceService.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.lyms.cm.service.sys; - -import java.util.List; -import java.util.Set; - -import com.lyms.cm.entity.sys.Resource; -import com.lyms.cm.entity.sys.TreeNode; -import com.lyms.cm.entity.sys.User; -import com.lyms.web.service.BaseService; - - -/** - *

    - * 服务类 - *

    - * - * @author 风车车 - * @since 2016-12-12 - */ -public interface ResourceService extends BaseService { - - List getMenuTreeByPid(String pid); - - /** - *
  • @Description:TODO(方法描述) - *
  • @param managerRootMenuResourceId - *
  • @param user - *
  • @return - *
  • 创建人：方承 - *
  • 创建时间：2016年9月21日 - *
  • 修改人： - *
  • 修改时间： - */ - List getPermissionMenuTreeByPid(String managerRootMenuResourceId, User user); - - Set getResourcePermissionSet(Set resourceIds); - -} diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/RoleService.java b/center.manager/src/main/java/com/lyms/cm/service/sys/RoleService.java deleted file mode 100644 index f3eaacc..0000000 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/RoleService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.lyms.cm.service.sys; - -import com.lyms.cm.entity.sys.Role; -import com.lyms.web.service.BaseService; - -/** - *

    - * 服务类 - *

    - * - * @author 风车车 - * @since 2016-12-12 - */ -public interface RoleService extends BaseService { - -} diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/UserService.java b/center.manager/src/main/java/com/lyms/cm/service/sys/UserService.java deleted file mode 100644 index 6a44f4a..0000000 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/UserService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.lyms.cm.service.sys; - -import java.util.Map; -import java.util.Set; - -import com.lyms.cm.entity.sys.User; -import com.lyms.web.service.BaseService; - - -/** - *

    - * 服务类 - *

    - * - * @author 风车车 - * @since 2016-12-12 - */ -public interface UserService extends BaseService { - - public User getUserByUserName(String username); - - public Map getUserResourceIdMap(User user); - - public Set getUserResourceIdSet(User user); - -} diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/ResourceServiceImpl.java b/center.manager/src/main/java/com/lyms/cm/service/sys/impl/ResourceServiceImpl.java deleted file mode 100644 index c8f1b5f..0000000 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/ResourceServiceImpl.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.lyms.cm.service.sys.impl; - -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import com.lyms.cm.dao.sys.ResourceMapper; -import com.lyms.cm.entity.sys.Resource; -import com.lyms.cm.entity.sys.TreeNode; -import com.lyms.cm.entity.sys.User; -import com.lyms.cm.service.sys.ResourceService; -import com.lyms.cm.service.sys.UserService; -import com.lyms.util.InstanceUtils; -import com.lyms.util.SqlUtils; - -/** - *

    - * 服务实现类 - *

    - * - * @author 风车车 - * @since 2016-12-12 - */ -@Service -public class ResourceServiceImpl extends ServiceImpl implements ResourceService { - - @Autowired - private UserService userService; - - @Autowired - private ResourceMapper resourceMapper; - - - @Override - public List getMenuTreeByPid(String pid) { - List allMenu = resourceMapper.getMenuTreeByPid(pid); - //迭代获取子节点 - for (TreeNode menuNode : allMenu) { - List subMenu = resourceMapper.getMenuTreeByPid(menuNode.getId()+""); - if(subMenu != null && subMenu.size() > 0){ - menuNode.setChildren(subMenu); - getSubMenuTreeByNodeList(subMenu); - } - } - return allMenu; - } - - /** - * @param treeNodeList 迭代处理子节点 - */ - private void getSubMenuTreeByNodeList(List treeNodeList) { - if(treeNodeList != null && treeNodeList.size() > 0){ - //迭代获取子节点 - for (TreeNode menuNode : treeNodeList) { - List subMenu = resourceMapper.getMenuTreeByPid(menuNode.getId()+""); - if(subMenu != null && subMenu.size() > 0){ - menuNode.setChildren(subMenu); - getSubMenuTreeByNodeList(subMenu); - } - } - } - } - - //权限菜单 - @Override - public List getPermissionMenuTreeByPid(String pid, User user) { - //用户权限列表 - Map permissionsMap = userService.getUserResourceIdMap(user); - //所有菜单 - List allMenu = resourceMapper.getMenuTreeByPid(pid); - //初始化要返回的有权限的菜单 - List allPermissionMenu = InstanceUtils.newArrayList(); - //迭代获取子节点 - for (TreeNode menuNode : allMenu) { - if(permissionsMap.get(menuNode.getId()) != null){ - allPermissionMenu.add(menuNode); - List subMenus = resourceMapper.getMenuTreeByPid(menuNode.getId()+""); - if(subMenus != null && subMenus.size() > 0){ - List permissionSubMenu = InstanceUtils.newArrayList(); - for(TreeNode submenu : subMenus){ - if(permissionsMap.get(submenu.getId()) != null){ - permissionSubMenu.add(submenu); - } - } - menuNode.setChildren(permissionSubMenu); - getPermissionSubMenuTreeByNodeList(permissionSubMenu,permissionsMap); - } - } - } - return allPermissionMenu; - - } - - /** - * @param treeNodeList 迭代处理获取有权限的子节点 - */ - private void getPermissionSubMenuTreeByNodeList(List treeNodeList,Map permissionMap) { - if(treeNodeList != null && treeNodeList.size() > 0){ - //迭代获取子节点 - for (TreeNode menuNode : treeNodeList) { - List subMenus = resourceMapper.getMenuTreeByPid(menuNode.getId()+""); - if(subMenus != null && subMenus.size() > 0){ - List permissionSubMenu = InstanceUtils.newArrayList(); - for(TreeNode subMenu : subMenus){ - if(permissionMap.get(subMenu.getId()) != null){ - permissionSubMenu.add(subMenu); - } - } - menuNode.setChildren(permissionSubMenu); - getPermissionSubMenuTreeByNodeList(permissionSubMenu,permissionMap); - } - } - } - } - @Override - public Set getResourcePermissionSet(Set resourceIds) { - EntityWrapper ew = new EntityWrapper(); - ew.where("id in (" + SqlUtils.handleIdsInsql(resourceIds,"'") + ")"); - List resources = resourceMapper.selectList(ew); - Set permissionSet = InstanceUtils.newHashSet(); - for(Resource resource: resources){ - if(!StringUtils.isEmpty(resource.getPermissions())) - permissionSet.add(resource.getPermissions()); - } - - return permissionSet; - } -} diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/RoleServiceImpl.java b/center.manager/src/main/java/com/lyms/cm/service/sys/impl/RoleServiceImpl.java deleted file mode 100644 index 8c5f915..0000000 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/RoleServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.lyms.cm.service.sys.impl; - -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import com.lyms.cm.dao.sys.RoleMapper; -import com.lyms.cm.entity.sys.Role; -import com.lyms.cm.service.sys.RoleService; - -/** - *

    - * 服务实现类 - *

    - * - * @author 风车车 - * @since 2016-12-12 - */ -@Service -public class RoleServiceImpl extends ServiceImpl implements RoleService { - -} diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/UserServiceImpl.java b/center.manager/src/main/java/com/lyms/cm/service/sys/impl/UserServiceImpl.java deleted file mode 100644 index 8ee1d25..0000000 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/UserServiceImpl.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.lyms.cm.service.sys.impl; - -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import com.lyms.cm.dao.sys.RoleMapper; -import com.lyms.cm.dao.sys.UserMapper; -import com.lyms.cm.entity.sys.Role; -import com.lyms.cm.entity.sys.User; -import com.lyms.cm.service.sys.UserService; -import com.lyms.util.InstanceUtils; -import com.lyms.util.SqlUtils; - -/** - *

    - * 服务实现类 - *

    - * - * @author 风车车 - * @since 2016-12-12 - */ -@Service -public class UserServiceImpl extends ServiceImpl implements UserService { - - @Autowired - private RoleMapper roleMapper; - - @Override - public User getUserByUserName(String username) { - return selectOne(new EntityWrapper().where("username={0}", username)); - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - @Override - public Set getUserResourceIdSet(User user) { - EntityWrapper ew = new EntityWrapper(); - ew.where("id in ({0})", SqlUtils.handleIdsInsql(user.getRoles(),"'")); - List roles = roleMapper.selectList(ew); - List allResourceList = InstanceUtils.newArrayList(); - for(Role role : roles){ - String[] resources = role.getResources().split(","); - List rlist = Arrays.asList(resources); - allResourceList.addAll(rlist); - } - return new HashSet(allResourceList); - } - - - @Override - public Map getUserResourceIdMap(User user){ - Set resourceId = getUserResourceIdSet(user); - Map resourceMap = InstanceUtils.newHashMap(); - for(String p : resourceId){ - resourceMap.put(p, ""); - } - return resourceMap; - } -} diff --git a/center.manager/src/main/java/com/lyms/cm/shiro/ShiroRealm.java b/center.manager/src/main/java/com/lyms/cm/shiro/ShiroRealm.java index 7e67941..fc00073 100644 --- a/center.manager/src/main/java/com/lyms/cm/shiro/ShiroRealm.java +++ b/center.manager/src/main/java/com/lyms/cm/shiro/ShiroRealm.java @@ -1,88 +1,88 @@ -package com.lyms.cm.shiro; - -import java.util.Arrays; -import java.util.HashSet; - -import org.apache.shiro.authc.AccountException; -import org.apache.shiro.authc.AuthenticationException; -import org.apache.shiro.authc.AuthenticationInfo; -import org.apache.shiro.authc.AuthenticationToken; -import org.apache.shiro.authc.SimpleAuthenticationInfo; -import org.apache.shiro.authc.UnknownAccountException; -import org.apache.shiro.authc.UsernamePasswordToken; -import org.apache.shiro.authc.credential.AllowAllCredentialsMatcher; -import org.apache.shiro.authz.AuthorizationInfo; -import org.apache.shiro.authz.SimpleAuthorizationInfo; -import org.apache.shiro.realm.AuthorizingRealm; -import org.apache.shiro.subject.PrincipalCollection; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; - -import com.lyms.cm.entity.sys.User; -import com.lyms.cm.service.sys.ResourceService; -import com.lyms.cm.service.sys.UserService; -import com.lyms.shiro.HashUtils; -import com.lyms.shiro.ShiroWebUtils; -import com.lyms.util.StrUtils; - -/** - *
  • @ClassName: ShiroRealm - *
  • @Description: 自定义Realm授权与验证实现 - *
  • @author 方承 - *
  • @date 2015年12月29日 - *
  • - */ -public class ShiroRealm extends AuthorizingRealm { - - @SuppressWarnings("unused") - private static Logger logger = LoggerFactory.getLogger(ShiroRealm.class); - - - public ShiroRealm() { - super(new AllowAllCredentialsMatcher()); - setAuthenticationTokenClass(UsernamePasswordToken.class); - //FIXME: 暂时禁用Cache - setCachingEnabled(false); - } - - @Autowired - private UserService userService; - - @Autowired - private ResourceService resourceService; - - @Override - protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) { - String username = (String) principals.getPrimaryPrincipal(); - User user = userService.getUserByUserName(username); - // 授权 - SimpleAuthorizationInfo authorizationInfo = new SimpleAuthorizationInfo(); - if(StrUtils.isNotEmpty(user.getRoles())){ - authorizationInfo.setRoles(new HashSet(Arrays.asList(user.getRoles().split(",")))); - } - authorizationInfo.setStringPermissions(resourceService.getResourcePermissionSet(userService.getUserResourceIdSet(user))); - return authorizationInfo; - } - - @Override - protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authcToken) throws AuthenticationException { - UsernamePasswordToken token = (UsernamePasswordToken) authcToken; - String username = token.getUsername(); - User user = userService.getUserByUserName(username); - if (user == null) { - throw new UnknownAccountException("未知用户"); - } - StringBuilder pwd = new StringBuilder(100); - for (int i = 0; i < token.getPassword().length; i++) { - pwd.append(token.getPassword()[i]); - } - if (!StrUtils.equals(user.getPassword(), HashUtils.md5(pwd.toString()))) { - throw new AccountException("用户名密码不一致"); - } - ShiroWebUtils.saveCurrentUser(user); - AuthenticationInfo authcInfo = new SimpleAuthenticationInfo(username, pwd.toString(), username); - return authcInfo; - } - -} +//package com.lyms.cm.shiro; +// +//import java.util.Arrays; +//import java.util.HashSet; +// +//import org.apache.shiro.authc.AccountException; +//import org.apache.shiro.authc.AuthenticationException; +//import org.apache.shiro.authc.AuthenticationInfo; +//import org.apache.shiro.authc.AuthenticationToken; +//import org.apache.shiro.authc.SimpleAuthenticationInfo; +//import org.apache.shiro.authc.UnknownAccountException; +//import org.apache.shiro.authc.UsernamePasswordToken; +//import org.apache.shiro.authc.credential.AllowAllCredentialsMatcher; +//import org.apache.shiro.authz.AuthorizationInfo; +//import org.apache.shiro.authz.SimpleAuthorizationInfo; +//import org.apache.shiro.realm.AuthorizingRealm; +//import org.apache.shiro.subject.PrincipalCollection; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +//import org.springframework.beans.factory.annotation.Autowired; +// +//import com.lyms.cm.entity.sys.User; +//import com.lyms.cm.service.sys.ResourceService; +//import com.lyms.cm.service.sys.UserService; +//import com.lyms.shiro.HashUtils; +//import com.lyms.shiro.ShiroWebUtils; +//import com.lyms.util.StrUtils; +// +///** +// *
  • @ClassName: ShiroRealm +// *
  • @Description: 自定义Realm授权与验证实现 +// *
  • @author 方承 +// *
  • @date 2015年12月29日 +// *
  • +// */ +//public class ShiroRealm extends AuthorizingRealm { +// +// @SuppressWarnings("unused") +// private static Logger logger = LoggerFactory.getLogger(ShiroRealm.class); +// +// +// public ShiroRealm() { +// super(new AllowAllCredentialsMatcher()); +// setAuthenticationTokenClass(UsernamePasswordToken.class); +// //FIXME: 暂时禁用Cache +// setCachingEnabled(false); +// } +// +// @Autowired +// private UserService userService; +// +// @Autowired +// private ResourceService resourceService; +// +// @Override +// protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) { +// String username = (String) principals.getPrimaryPrincipal(); +// User user = userService.getUserByUserName(username); +// // 授权 +// SimpleAuthorizationInfo authorizationInfo = new SimpleAuthorizationInfo(); +// if(StrUtils.isNotEmpty(user.getRoles())){ +// authorizationInfo.setRoles(new HashSet(Arrays.asList(user.getRoles().split(",")))); +// } +// authorizationInfo.setStringPermissions(resourceService.getResourcePermissionSet(userService.getUserResourceIdSet(user))); +// return authorizationInfo; +// } +// +// @Override +// protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authcToken) throws AuthenticationException { +// UsernamePasswordToken token = (UsernamePasswordToken) authcToken; +// String username = token.getUsername(); +// User user = userService.getUserByUserName(username); +// if (user == null) { +// throw new UnknownAccountException("未知用户"); +// } +// StringBuilder pwd = new StringBuilder(100); +// for (int i = 0; i < token.getPassword().length; i++) { +// pwd.append(token.getPassword()[i]); +// } +// if (!StrUtils.equals(user.getPassword(), HashUtils.md5(pwd.toString()))) { +// throw new AccountException("用户名密码不一致"); +// } +// ShiroWebUtils.saveCurrentUser(user); +// AuthenticationInfo authcInfo = new SimpleAuthenticationInfo(username, pwd.toString(), username); +// return authcInfo; +// } +// +//} -- 1.8.3.1