diff --git a/talkonlineweb/pom.xml b/talkonlineweb/pom.xml index f6ed949..35a3909 100644 --- a/talkonlineweb/pom.xml +++ b/talkonlineweb/pom.xml @@ -26,6 +26,11 @@ + + + org.springframework.boot + spring-boot-starter-validation + org.springframework.boot diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/config/MyBatisConfigs.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/config/MyBatisConfigs.java index c895cca..9fbb89a 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/config/MyBatisConfigs.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/config/MyBatisConfigs.java @@ -9,10 +9,10 @@ import org.springframework.context.annotation.Configuration; @Configuration public class MyBatisConfigs { -// @Bean -// public MybatisPlusInterceptor mybatisPlusInterceptor() { -// MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); -// interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); -// return interceptor; -// } + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); + return interceptor; + } } diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/config/MyWebInterceptor.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/config/MyWebInterceptor.java index 36e8c16..016a4e2 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/config/MyWebInterceptor.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/config/MyWebInterceptor.java @@ -10,6 +10,7 @@ import lombok.extern.java.Log; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerInterceptor; +import org.springframework.web.servlet.resource.ResourceHttpRequestHandler; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -34,7 +35,13 @@ public class MyWebInterceptor implements HandlerInterceptor { System.out.println(handler); - TokenRequired clientRequired = findAnnotation((HandlerMethod) handler, TokenRequired.class); + TokenRequired clientRequired = null; + if(handler instanceof HandlerMethod){ + clientRequired=findAnnotation((HandlerMethod) handler, TokenRequired.class); + } +// if(handler instanceof ResourceHttpRequestHandler){ +// clientRequired=findAnnotation((ResourceHttpRequestHandler) handler, TokenRequired.class); +// } if (null == clientRequired) return true; diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PermissController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PermissController.java new file mode 100644 index 0000000..bc2d67c --- /dev/null +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PermissController.java @@ -0,0 +1,68 @@ +package com.lyms.talkonlineweb.controller; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.lyms.talkonlineweb.domain.LymsPermission; +import com.lyms.talkonlineweb.domain.LymsUser; +import com.lyms.talkonlineweb.result.BaseResponse; +import com.lyms.talkonlineweb.service.LymsPermissionService; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 权限管理 + */ + +@RestController +@Log4j2 +public class PermissController { + @Autowired + private LymsPermissionService lymsPermissionService; + + /** + * 添加或修改权限 + * @param perm + * @return + */ + @PostMapping("savePerm") + public BaseResponse savePerm(LymsPermission perm){ + BaseResponse baseResponse=new BaseResponse(); + boolean f=lymsPermissionService.saveOrUpdate(perm); + baseResponse.setErrorcode(f==true?0:1); + return baseResponse; + } + + /** + * 删除权限 + * @param perm + * @return + */ + @PostMapping("delPerm") + public BaseResponse delPerm(LymsPermission perm){ + BaseResponse baseResponse=new BaseResponse(); + boolean f=lymsPermissionService.remove(Wrappers.query(perm)); + baseResponse.setErrorcode(f==true?0:1); + return baseResponse; + } + + /** + * 获取权限列表 + * @param perm + * @param current + * @param size + * @return + */ + @PostMapping("sltPerm") + public BaseResponse sltPerm(LymsPermission perm,int current,int size){ + BaseResponse baseResponse=new BaseResponse(); + Page page=new Page<>(current,size); + + Page perIPage=lymsPermissionService.page(page,Wrappers.query(perm).orderByDesc("updated_time","createdtime")); + baseResponse.setObject(perIPage); + + return baseResponse; + } + +} diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/RoleController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/RoleController.java new file mode 100644 index 0000000..cb01041 --- /dev/null +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/RoleController.java @@ -0,0 +1,122 @@ +package com.lyms.talkonlineweb.controller; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.lyms.talkonlineweb.domain.LymsRole; +import com.lyms.talkonlineweb.domain.LymsUser; +import com.lyms.talkonlineweb.result.BaseResponse; +import com.lyms.talkonlineweb.service.LymsRoleService; +import com.lyms.talkonlineweb.service.LymsUserService; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Date; +import java.util.List; + +/** + * 角色管理 + */ +@RestController +@Log4j2 +public class RoleController { + @Autowired + private LymsUserService lymsUserService; + + @Autowired + private LymsRoleService lymsRoleService; + /** + * 保存角色 + * @param role + * @return + */ + @PostMapping("saveRole") + public BaseResponse saveRole(LymsRole role){ + BaseResponse baseResponse=new BaseResponse(); + +// LymsUser user=lymsUserService.getUserByToken(Authorization); +// role.setCreatedby(user.getUid()); + + if(role.getRid()==null){ + role.setCreatedtime(new Date()); + }else { +// role.setUpdatedby(user.getUid()); + role.setUpdatedTime(new Date()); + } + boolean f=false; + + if(!StringUtils.isEmpty(role.getRname())){ + f=lymsRoleService.saveOrUpdate(role); + } + + baseResponse.setErrorcode(f==true?0:1); + return baseResponse; + } + + /** + * 查询角色列表 + * @param role + * @param current + * @param size + * @return + */ + @GetMapping("sltRole") + public BaseResponse sltRole(LymsRole role,int current,int size){ + BaseResponse baseResponse=new BaseResponse(); + Page page=new Page<>(current,size); + Page rolePage=lymsRoleService.page(page, Wrappers.query(role).orderByDesc("updated_time","createdtime")); + baseResponse.setObject(rolePage); + return baseResponse; + } + + /** + * 删除角色 + * @param rid + * @return + */ + @GetMapping("delRole") + public BaseResponse delRole(int rid){ + BaseResponse baseResponse=new BaseResponse(); + boolean f=lymsRoleService.removeById(rid); + baseResponse.setErrorcode(f==true?0:1); + return baseResponse; + } + + /** + * 根据用户获取角色 + * @param uid + * @return + */ + @GetMapping("getRolesByUid") + public BaseResponse getRolesByUid(int uid){ + BaseResponse baseResponse=new BaseResponse(); + List rLst=lymsRoleService.getRolesByUid(uid); + baseResponse.setObject(rLst); + return baseResponse; + } + + /** + * 添加角色包含的权限 + * @param rid + * @param perms 如果是多个权限需要用","分割 + * @return + */ + @PostMapping("addRoleByPerms") + public BaseResponse addRoleByPerms(int rid,String perms){ + BaseResponse baseResponse=new BaseResponse(); + String[] pArr=perms.split(","); + int cnt=0; + + cnt=lymsRoleService.delPersByRole(rid);//删除旧的关系 + for (int i = 0; i < pArr.length; i++) { + cnt=lymsRoleService.addRoleByPerms(rid,Integer.parseInt(pArr[i])); + } +// baseResponse.setObject(rLst); + return baseResponse; + } + +} diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/TestController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/TestController.java index 4940c84..8a29240 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/TestController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/TestController.java @@ -16,13 +16,13 @@ import java.util.List; public class TestController { - @Autowired - private LymsUserService lymsUserService; - - @GetMapping("lstUser") - @TokenRequired - public List listUser(){ - log.info("List user!!"); - return lymsUserService.list(); - } +// @Autowired +// private LymsUserService lymsUserService; +// +// @GetMapping("lstUser") +// @TokenRequired +// public List listUser(){ +// log.info("List user!!"); +// return lymsUserService.list(); +// } } diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/UserContoller.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/UserContoller.java index 736b3da..e4fd540 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/UserContoller.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/UserContoller.java @@ -2,17 +2,25 @@ package com.lyms.talkonlineweb.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.lyms.talkonlineweb.annotation.TokenRequired; import com.lyms.talkonlineweb.domain.LymsUser; import com.lyms.talkonlineweb.mapper.LymsUserMapper; import com.lyms.talkonlineweb.result.BaseResponse; +import com.lyms.talkonlineweb.result.CheckResult; import com.lyms.talkonlineweb.service.LymsUserService; import com.lyms.talkonlineweb.util.Constant; import com.lyms.talkonlineweb.util.JwtUtils; +import io.jsonwebtoken.Claims; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.util.DigestUtils; +import org.springframework.validation.BindingResult; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpSession; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -31,21 +39,121 @@ public class UserContoller { private LymsUserMapper lymsUserMapper; @GetMapping("login") - public BaseResponse login(String username,String passwd){ + public BaseResponse login(String username, String passwd){ // QueryWrapper queryWrapper= Wrappers.query(LymsUser.class); log.info(">>>>>"); BaseResponse baseResponse=new BaseResponse(); Map tMap=new HashMap<>(); tMap.put("token",""); - List uLst=lymsUserMapper.sltUser(username,passwd); + List uLst=lymsUserMapper.sltUser(username,DigestUtils.md5DigestAsHex(passwd.getBytes())); if(uLst.size()>0){ - String JWT = JwtUtils.createJWT("1", username, Constant.JWT_TTL); + LymsUser user=uLst.get(0); + String JWT = JwtUtils.createJWT("1", user.getLogin(), Constant.JWT_TTL); tMap.put("token",JWT); + user.setPasswd(null); + tMap.put("user",user); } baseResponse.setObject(tMap); baseResponse.setErrorcode(0); return baseResponse; } + + /** + * 得到用户权限 + * @return + */ + @PostMapping("getPermission") + public BaseResponse getPermission(@RequestHeader String authorization){ + + BaseResponse baseResponse=new BaseResponse(); + try { + Claims claims =JwtUtils.parseJWT(authorization); + String username=claims.getSubject(); + + List> permiss=lymsUserService.getPermissionByUsername(username); + baseResponse.setObject(permiss); + } catch (Exception e) { + log.error(e.getMessage()); + e.printStackTrace(); + baseResponse.setErrorcode(1); + baseResponse.setErrormsg(e.getMessage()); + } + + return baseResponse; + } + + /** + * 添加用户 + * @param user + * @param authorization + * @return + */ + @RequestMapping("saveUser") + public BaseResponse saveUser(@Validated LymsUser user, BindingResult result, @RequestHeader String authorization){ + BaseResponse baseResponse=new BaseResponse(); + baseResponse.setErrormsg(""); + try { + LymsUser curUser=lymsUserService.getUserByToken(authorization); + user.setCreatedby(curUser.getUid()); + user.setCreatedtime(new Date()); + if(user.getUid()==null){ + user.setPasswd(DigestUtils.md5DigestAsHex("123456".getBytes())); + } + + if(result.hasErrors()){ + result.getAllErrors().forEach(e->{ + baseResponse.setErrormsg(baseResponse.getErrormsg()+e.getDefaultMessage()+";"); + }); + baseResponse.setErrorcode(1); + return baseResponse; + } + + boolean f=lymsUserService.saveOrUpdate(user); + baseResponse.setErrorcode(f==true?0:1); + } catch (Exception e) { + log.error(e.getMessage()); + e.printStackTrace(); + baseResponse.setErrorcode(1); + baseResponse.setErrormsg(e.getMessage()); + } + + return baseResponse; + } + + /** + * 删除用户 + * @param uid + * @return + */ + @PostMapping("delUser") + public BaseResponse delUser(int uid){ + BaseResponse baseResponse=new BaseResponse(); + boolean f=lymsUserService.removeById(uid); + baseResponse.setErrorcode(f==true?0:1); + if(!f){ + baseResponse.setErrormsg("不存在改用户!"); + } + return baseResponse; + } + + /** + * 查询用户列表 + * @param user + * @param current + * @param size + * @return + */ + @GetMapping("sltUser") + public BaseResponse sltUser(LymsUser user,int current,int size){ + BaseResponse baseResponse=new BaseResponse(); + Page page=new Page<>(current,size); + Page userIPage=lymsUserService.page(page,Wrappers.query(user).orderByDesc("updated_time","createdtime")); + baseResponse.setObject(userIPage); + + return baseResponse; + } + + } diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsUser.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsUser.java index 547a2a8..0a7408c 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsUser.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsUser.java @@ -6,8 +6,11 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; + import lombok.Data; +import javax.validation.constraints.NotNull; + /** * 用户 * @TableName lyms_user @@ -24,12 +27,14 @@ public class LymsUser implements Serializable { /** * 姓名 */ + @NotNull(message = "姓名不能为空") @TableField(value = "uname") private String uname; /** * 登录账号 */ + @NotNull(message = "登录账号不能为空") @TableField(value = "login") private String login; @@ -66,7 +71,7 @@ public class LymsUser implements Serializable { /** * 更新时间 */ - @TableField(value = "updated_time") + @TableField(value = "updated_time",update = "now()") private Date updatedTime; @TableField(exist = false) diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsUserMapper.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsUserMapper.java index 11b0ccf..61474ca 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsUserMapper.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsUserMapper.java @@ -12,7 +12,7 @@ import java.util.List; */ public interface LymsUserMapper extends BaseMapper { - @Select("select * from lyms_user where login=#{login} and passwd=password(#{passwd}) ") + @Select("select * from lyms_user where login=#{login} and passwd=#{passwd} ") public List sltUser(@Param("login") String login, @Param("passwd") String passwd); diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsUserService.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsUserService.java index 84feaab..a77a814 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsUserService.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsUserService.java @@ -3,9 +3,15 @@ package com.lyms.talkonlineweb.service; import com.lyms.talkonlineweb.domain.LymsUser; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; +import java.util.Map; + /** * */ public interface LymsUserService extends IService { + List> getPermissionByUsername(String username) throws Exception; + + LymsUser getUserByToken(String token); } diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsUserServiceImpl.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsUserServiceImpl.java index 72d8d09..e0156ec 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsUserServiceImpl.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsUserServiceImpl.java @@ -1,18 +1,95 @@ package com.lyms.talkonlineweb.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.lyms.talkonlineweb.domain.LymsPermission; +import com.lyms.talkonlineweb.domain.LymsRole; import com.lyms.talkonlineweb.domain.LymsUser; +import com.lyms.talkonlineweb.mapper.LymsPermissionMapper; +import com.lyms.talkonlineweb.mapper.LymsRoleMapper; import com.lyms.talkonlineweb.service.LymsUserService; import com.lyms.talkonlineweb.mapper.LymsUserMapper; +import com.lyms.talkonlineweb.util.Constant; +import com.lyms.talkonlineweb.util.JwtUtils; +import io.jsonwebtoken.Claims; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * */ @Service +@Log4j2 public class LymsUserServiceImpl extends ServiceImpl implements LymsUserService{ + @Autowired + private LymsUserMapper lymsUserMapper; + + @Autowired + private LymsRoleMapper lymsRoleMapper; + + @Autowired + private LymsPermissionMapper lymsPermissionMapper; + + /** + * 根据登录用户获取权限 + * @param username + * @return + */ + @Override + public List> getPermissionByUsername(String username) throws Exception { + List> rs=new ArrayList<>(); + + Map param=new HashMap<>(); + param.put("login",username); + List uLst= lymsUserMapper.selectByMap(param); + + if(uLst.size()<1){ + throw new Exception("系统错误"); + } + List rLst=lymsRoleMapper.sltRoleByUser(uLst.get(0).getUid()); + + int rid=rLst.get(0).getRid(); +// 首次取一次菜单 + List pLst=lymsPermissionMapper.sltPermissByRole(rid, Constant.ROOT_MENU); + + for (LymsPermission p:pLst) { + //获取二级菜单 + List sLst=lymsPermissionMapper.sltPermissByRole(rid, p.getId()); + Map oneMap=new HashMap<>(); + oneMap.put("menu",p); + oneMap.put("children",sLst); + rs.add(oneMap); + } + + return rs; + } + + /** + * 根据token获取用户 + * @param token + * @return + */ + @Override + public LymsUser getUserByToken(String token) { + Claims claims = null; + try { + claims = JwtUtils.parseJWT(token); + } catch (Exception e) { + e.printStackTrace(); + } + String username=claims.getSubject(); + Map param=new HashMap<>(); + param.put("login",username); + List uLst= lymsUserMapper.selectByMap(param); + return uLst.size()>0?uLst.get(0):null; + } } diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/util/Constant.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/util/Constant.java index 2813e62..0ef7aa3 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/util/Constant.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/util/Constant.java @@ -5,4 +5,6 @@ public class Constant { public static final int JWT_ERRCODE_EXPIRE = 500; public static final int JWT_ERRCODE_FAIL = 501; public static final long JWT_TTL=24*60*60*1000;//1天 + public static final int ROOT_MENU = 0;//一级菜单 + public static final String CUR_USER = "cur_user";//当前用户 }