21/2/22 增加security 权限 角色 用户的一些基本操作

common-springboot/src/main/java/com/gihon/security/config/MySecurityConfiguration.java

@@ -55,7 +55,6 @@ public class MySecurityConfiguration extends WebSecurityConfigurerAdapter {
                 // .failureForwardUrl("/fail"); // 登录失败后，跳转地址
                 // .failureUrl("/fail"); // 登录失败后，响应重定向
                 .failureHandler(new MyFailureHandler("/security/fail")); // 登录失败后，自定义处理逻辑
-
         /**
          * 设置权限相关
          * 可以通过对ExpressionUrlAuthorizationConfigurer配置，实现对URL地址的权限管理。

common-springboot/src/main/java/com/gihon/security/controller/UserController.java

@@ -19,6 +19,7 @@ import java.util.List;
  *
  */
 @RestController
+@RequestMapping("/user")
 public class UserController {
     @Resource
     private UserMapper userMapper;
@@ -26,7 +27,7 @@ public class UserController {
     private UserService userService;
 
     /**
-     * 主要功能：分页查看用户列表
+     * 主要功能：分页查询用户列表
      * @data 2021/2/19 9:45
      * @author: dl
      * @description 分页查看用户
@@ -35,26 +36,26 @@ public class UserController {
      * @return com.gihon.common.http.HttpResult
      */
     //@Secured(value = {"ROLE_管理员", "ROLE_超级管理员"})
-    @GetMapping("/pageFindUsers")
-    public HttpResult<User> pageFindUsers(
+    @GetMapping("/getUsersByPage")
+    public HttpResult<User> getUsersByPage(
             @RequestParam(name = "page", defaultValue = "0") int page,
             @RequestParam(name = "page", defaultValue = "10") int rows) {
         HttpResult<User> byPage = userService.findByPage(page, rows);
         return byPage;
     }
     /**
-     * 主要功能：用户信息by用户ID
+     * 主要功能：查询 用户信息by用户ID
      * @data 2021/2/19 10:05
      * @author: dl
      * @description 根据用户主键
      * 查找用户信息
-     * @param	user
+     * @param	id
      * @return com.gihon.common.http.HttpResult
      *
      */
-    @RequestMapping("/userFindOne")
-    public HttpResult userFindOne(User user){
-        User userInfo = userMapper.selectById(user);
+    @GetMapping("/userByID")
+    public HttpResult userFindOne(@RequestParam Long id){
+        User userInfo = userService.getById(id);
         return HttpResult.ok(userInfo);
     }
     /**
@@ -71,11 +72,10 @@ public class UserController {
      */
 
     //@Secured(value = {"addUser"})
-    @RequestMapping("/addUser")
-    @Transactional(rollbackFor = Exception.class)
-    public HttpResult<User> addUser(User user) {
+    @PostMapping("/addUser")
+    public HttpResult<User> addUser(@RequestBody User user) {
         HttpResult<User> addUser = userService.addUser(user);
-        return addUser;
+        return HttpResult.ok();
     }
     /**
      * 主要功能：删除用户
@@ -87,7 +87,6 @@ public class UserController {
      * @return com.gihon.common.http.HttpResult
      *
      */
-    @PreAuthorize("hasAuthority('delUser')")
     @Transactional(rollbackFor = Exception.class)
     @GetMapping(value = "/deleteUser")
     public HttpResult deleteUser(@RequestParam Long id) {
@@ -117,7 +116,7 @@ public class UserController {
      * @return com.gihon.common.http.HttpResult<com.gihon.security.pojo.User>
      *
      */
-    public HttpResult<User> setUser(String username, String password) {
+    public HttpResult<User> modifyUser(String username, String password) {
         //修改新密码
         MyPasswordEncoder encoder = new MyPasswordEncoder();
         User user = User.builder().username(username).build();
@@ -140,7 +139,8 @@ public class UserController {
      * @param	id	 用户id
      * @return com.gihon.common.http.HttpResult<java.util.List<java.lang.String>>
      */
-    public HttpResult<List<String>> findPermissionsByUserId(Long id){
+    @RequestMapping("/getPermissionsByUserId")
+    public HttpResult<List<String>> getPermissionsByUserId(Long id){
         List<String> permissions = userService.findPermissionsByUserId(id);
         return HttpResult.ok(permissions);
     }

common-springboot/src/main/java/com/gihon/security/pojo/Permission.java

@@ -20,13 +20,15 @@ import java.io.Serializable;
 @NoArgsConstructor
 @EqualsAndHashCode
 @ToString
-@TableName(value = "common_security.tb_permission")
+@TableName(value = "tb_permission")
 public class Permission implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     private String name;
     private String url;
+    //父ID ，
     private String parentId;
+    //权限字符串
     private String permission;
 
 }

common-springboot/src/main/java/com/gihon/security/service/RoleService.java

@@ -1,10 +1,11 @@
 package com.gihon.security.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.gihon.common.http.HttpResult;
 import com.gihon.security.pojo.Role;
 
 import java.util.List;
 
-public interface RoleService {
+public interface RoleService extends IService<Role> {
     HttpResult<List<Role>> findPermissionByRoleId(Long id);
 }

common-springboot/src/main/java/com/gihon/security/service/UserService.java

@@ -1,11 +1,12 @@
 package com.gihon.security.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.gihon.common.http.HttpResult;
 import com.gihon.security.pojo.User;
 
 import java.util.List;
 
-public interface UserService {
+public interface UserService  extends IService<User> {
 
     HttpResult<User> findByPage(int page, int rows);
 

common-springboot/src/main/java/com/gihon/security/service/impl/RoleServiceImpl.java

@@ -1,5 +1,6 @@
 package com.gihon.security.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gihon.common.http.HttpResult;
 import com.gihon.security.mapper.RoleMapper;
 import com.gihon.security.pojo.Role;
@@ -16,7 +17,7 @@ import java.util.List;
  * @create: 02月20日 13时
  **/
 @Service
-public class RoleServiceImpl implements RoleService {
+public class RoleServiceImpl extends ServiceImpl<RoleMapper,Role> implements RoleService {
     @Autowired
     private RoleMapper roleMapper;
     @Override

common-springboot/src/main/java/com/gihon/security/service/impl/UserServiceImpl.java

@@ -1,6 +1,8 @@
 package com.gihon.security.service.impl;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gihon.common.http.HttpResult;
 import com.gihon.security.encoder.MyPasswordEncoder;
 import com.gihon.security.mapper.UserMapper;
@@ -8,6 +10,7 @@ import com.gihon.security.pojo.User;
 import com.gihon.security.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.util.List;
 /**
  * @program: common-parent
@@ -16,7 +19,7 @@ import java.util.List;
  * @create: 02月20日 09时
  **/
 @Service
-public class UserServiceImpl implements UserService {
+public class UserServiceImpl extends ServiceImpl<UserMapper,User>  implements UserService {
     @Autowired
     private UserMapper userMapper;
     @Autowired

common-springboot/src/main/java/com/gihon/security/service/impl/permissionServiceImpl.java

@@ -1,11 +1,11 @@
 package com.gihon.security.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gihon.common.http.HttpResult;
 import com.gihon.security.mapper.PermissionMapper;
 import com.gihon.security.pojo.Permission;
 import com.gihon.security.service.permissionService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -17,9 +17,7 @@ import java.util.List;
  * @create: 02月20日 09时
  **/
 @Service
-public class permissionServiceImpl implements permissionService {
-    @Autowired
-    private PermissionMapper permissionMapper;
+public class permissionServiceImpl extends ServiceImpl<PermissionMapper,Permission> implements permissionService {
     /**
      * 主要功能：扩展已有权限
      * @data 2021/2/20 9:49
@@ -31,10 +29,11 @@ public class permissionServiceImpl implements permissionService {
      */
     @Override
     public HttpResult setPermission(Long id, String permissionStr) {
-        Permission permission = permissionMapper.selectById(id);
+        Permission permission = this.getById(id);
         String oldPermission = permission.getPermission()+permissionStr;
         permission.setPermission(oldPermission);
-        int update = permissionMapper.update(permission, new QueryWrapper<Permission>().eq("id", id));
+        int update = baseMapper.update(permission, new QueryWrapper<Permission>().eq("id", id));
+
         if (update == 0) {
             return HttpResult.error("修改权限失败");
         }
@@ -43,7 +42,7 @@ public class permissionServiceImpl implements permissionService {
 
     @Override
     public HttpResult findPermissionsByUserId(Long id) {
-        List<Permission> permissions = permissionMapper.findPermissions(id.toString());
+        List<Permission> permissions = baseMapper.findPermissions(id.toString());
         return HttpResult.ok(permissions);
     }
 }

common-springboot/src/main/java/com/gihon/security/service/permissionService.java

@@ -1,6 +1,8 @@
 package com.gihon.security.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.gihon.common.http.HttpResult;
+import com.gihon.security.pojo.Permission;
 
 /**
  * @program: common-parent
@@ -8,10 +10,13 @@ import com.gihon.common.http.HttpResult;
  * @author: dl
  * @create: 02月20日 09时
  **/
-public interface permissionService {
+
+public interface permissionService  extends IService<Permission> {
 
 
     HttpResult setPermission(Long id, String permissionStr);
 
     HttpResult findPermissionsByUserId(Long id);
+
+
 }