修改接口不规范的地方 补充基本表操作

common-springboot/src/main/java/com/gihon/permission/controller/PermissionController.java

@@ -0,0 +1,60 @@
+package com.gihon.permission.controller;
+
+import com.gihon.common.web.response.Response;
+import com.gihon.permission.entity.Permission;
+import com.gihon.permission.service.permissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * @program: common-parent
+ * @description:
+ * @author: dl
+ * @create: 02月19日 09时
+ **/
+@RequestMapping("/Permission")
+public class PermissionController {
+    @Autowired
+    private permissionService permissionService;
+    /**
+     * 处理内容： 查看用户权限
+     * @param id 用户id
+     * @return 用户拥有的权限列表
+     */
+    @GetMapping("/getPermissionsByUserId")
+    @ResponseBody
+    public Response<Permission> getPermission(Long id){
+        Response permissions = permissionService.findPermissionsByUserId(id);
+        return permissions;
+    }
+
+    public Response setPermission(Long id ,String permissionStr){
+        Response modifyPermission = permissionService.modifyPermission(id, permissionStr);
+        return modifyPermission;
+    }
+    /**
+     * 主要功能：
+     * @description 根据id 查找权限信息
+     * @author: dl
+     * @data 2021/2/23 15:33
+     * @param	id
+     * @return com.gihon.common.web.response.Response
+     */
+    @RequestMapping("/getPermissionById")
+    @ResponseBody
+    public Response getPermissionById(Long id){
+        Response response = permissionService.getpermissionById(id);
+        return response;
+    }
+
+
+    @RequestMapping("/deletePermissionById")
+    @ResponseBody
+    public Response deletePermissionById(Long id){
+        Response response = permissionService.deletePermissionById(id);
+        return response;
+    }
+
+}

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

@@ -1,4 +1,4 @@
-package com.gihon.security.pojo;
+package com.gihon.permission.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

common-springboot/src/main/java/com/gihon/security/mapper/PermissionMapper.java → common-springboot/src/main/java/com/gihon/permission/mapper/PermissionMapper.java

@@ -1,7 +1,7 @@
-package com.gihon.security.mapper;
+package com.gihon.permission.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gihon.security.pojo.Permission;
+import com.gihon.permission.entity.Permission;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;

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

@@ -0,0 +1,74 @@
+package com.gihon.permission.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gihon.common.web.response.Response;
+import com.gihon.common.web.response.ResponseStatus;
+import com.gihon.permission.mapper.PermissionMapper;
+import com.gihon.permission.entity.Permission;
+import com.gihon.permission.service.permissionService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @program: common-parent
+ * @description:
+ * @author: dl
+ * @create: 02月20日 09时
+ **/
+@Service
+public class permissionServiceImpl extends ServiceImpl<PermissionMapper,Permission> implements permissionService {
+    /**
+     * 主要功能：
+     * @description 根据 用户id 查询所有权限
+     * @author: dl
+     * @data 2021/2/22 18:11
+     * @param	id
+     * @return com.gihon.common.web.response.Response<java.util.List<com.gihon.permission.entity.Permission>>
+     */
+    @Override
+    public Response<List<Permission>> findPermissionsByUserId(Long id) {
+
+        List<Permission> permissions = baseMapper.findPermissions(id);
+        return Response.ok(permissions);
+    }
+
+    @Override
+    public Response getpermissionById(Long id) {
+        Permission byId = this.getById(id);
+        return Response.ok(byId);
+    }
+
+    @Override
+    public Response deletePermissionById(Long id) {
+        boolean b = this.removeById(id);
+        if (!b){
+            return Response.error(ResponseStatus.MAPPER_ERROR,"删除失败");
+        }
+        return Response.ok();
+    }
+
+    /**
+     * 主要功能：修改已有权限
+     * @data 2021/2/20 9:49
+     * @author: dl
+     * @param	id	权限id
+     * @param	permissionStr	新增加权限
+     * @return com.gihon.common.http.HttpResult
+     *
+     */
+    @Override
+    public Response modifyPermission(Long id, String permissionStr) {
+        Permission permission = this.getById(id);
+        permission.setPermission(permissionStr);
+        int update = baseMapper.update(permission, new QueryWrapper<Permission>().eq("id", id));
+
+        if (update == 0) {
+            return Response.error(ResponseStatus.MAPPER_ERROR);
+        }
+        return Response.ok();
+    }
+
+
+}

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

@@ -0,0 +1,27 @@
+package com.gihon.permission.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gihon.common.web.response.Response;
+import com.gihon.permission.entity.Permission;
+
+import java.util.List;
+
+/**
+ * @program: common-parent
+ * @description:
+ * @author: dl
+ * @create: 02月20日 09时
+ **/
+
+public interface permissionService  extends IService<Permission> {
+
+
+    Response modifyPermission(Long id, String permissionStr);
+
+    Response<List<Permission>> findPermissionsByUserId(Long id);
+
+
+    Response getpermissionById(Long id);
+
+    Response deletePermissionById(Long id);
+}

common-springboot/src/main/java/com/gihon/security/controller/RoleController.java → common-springboot/src/main/java/com/gihon/role/controller/RoleController.java

@@ -1,8 +1,8 @@
-package com.gihon.security.controller;
-import com.gihon.common.http.HttpResult;
-import com.gihon.security.mapper.RoleMapper;
-import com.gihon.security.pojo.Role;
-import com.gihon.security.service.RoleService;
+package com.gihon.role.controller;
+import com.gihon.common.web.response.Response;
+import com.gihon.common.web.response.ResponseStatus;
+import com.gihon.role.entity.Role;
+import com.gihon.role.service.RoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
@@ -19,31 +19,24 @@ import java.util.List;
  **/
 @RestController
 public class RoleController {
-    @Autowired
-    private RoleMapper roleMapper;
     @Autowired
     private RoleService roleService;
     /**
      * 主要功能：
-     * @description 根据
+     * @description 增加角色
      * @author: dl
      * @data 2021/2/20 13:10
      * @param	id	角色id
      * @param	rolename 角色名称
-     * @return com.gihon.common.http.HttpResult
+     * @return com.gihon.common.http.Response
      */
     @PreAuthorize("hasAuthority('addRole')")
     @Transactional(rollbackFor = Exception.class)
     @PostMapping(value = "/addRole")
-    public HttpResult addRole(Long id, String rolename) {
+    public Response addRole(Long id, String rolename) {
         Role role = new Role(id, rolename);
-        try {
-            int insert = roleMapper.insert(role);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return HttpResult.error("添加失败");
-        }
-        return HttpResult.ok();
+        boolean is_save = roleService.save(role);
+        return Response.ok();
     }
     /**
      * 主要功能：
@@ -51,14 +44,14 @@ public class RoleController {
      * @author: dl
      * @data 2021/2/20 13:18
      * @param	id	 Role ID
-     * @return com.gihon.common.http.HttpResult
+     * @return com.gihon.common.http.Response
      */
-    public HttpResult 删除角色(Long id){
-        int i = roleMapper.deleteById(id);
-        if (i == 0) {
-            return HttpResult.error("添加失败");
+    public Response 删除角色(Long id){
+        boolean is_remove = roleService.removeById(id);
+        if (!is_remove) {
+            return Response.error(ResponseStatus.MAPPER_ERROR);
         }
-        return HttpResult.ok();
+        return Response.ok();
     }
     /**
      * 主要功能：
@@ -67,18 +60,18 @@ public class RoleController {
      * @data 2021/2/20 13:25
      * @param	id
      * @param	rolename
-     * @return com.gihon.common.http.HttpResult
+     * @return com.gihon.common.http.Response
      */
-    public HttpResult setRole(long id,String rolename){
+    public Response setRole(long id,String rolename){
         Role role = Role.builder()
                 .id(id)
                 .name(rolename)
                 .build();
-        int update = roleMapper.updateById(role);
-        if (update == 0) {
-            return HttpResult.error("修改角色名称失败");
+        boolean b = roleService.updateById(role);
+        if (!b) {
+            return Response.error(ResponseStatus.MAPPER_ERROR,"角色数据库访问,修改失败");
         }
-        return HttpResult.ok();
+        return Response.ok();
     }
     /**
      * 主要功能：
@@ -86,11 +79,11 @@ public class RoleController {
      * @author: dl
      * @data 2021/2/20 13:27
      * @param	id
-     * @return com.gihon.common.http.HttpResult
+     * @return com.gihon.common.http.Response
      */
-    public HttpResult findRole(Long id){
-        Role role = roleMapper.selectById(id);
-        return HttpResult.ok(role);
+    public Response findRole(Long id){
+        Role role = roleService.getById(id);
+        return Response.ok(role);
     }
     /**
      * 主要功能：
@@ -98,10 +91,10 @@ public class RoleController {
      * @author: dl
      * @data 2021/2/20 14:06
      * @param	id
-     * @return com.gihon.common.http.HttpResult
+     * @return com.gihon.common.http.Response
      */
-    public HttpResult findPermissionByRoleId(Long id){
-        HttpResult<List<Role>> permissionsByRoleId = roleService.findPermissionByRoleId(id);
+    public Response findPermissionByRoleId(Long id){
+        Response<List<Role>> permissionsByRoleId = roleService.findPermissionByRoleId(id);
         return permissionsByRoleId;
     }
 

common-springboot/src/main/java/com/gihon/security/pojo/Role.java → common-springboot/src/main/java/com/gihon/role/entity/Role.java

@@ -1,4 +1,4 @@
-package com.gihon.security.pojo;
+package com.gihon.role.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

common-springboot/src/main/java/com/gihon/security/mapper/RoleMapper.java → common-springboot/src/main/java/com/gihon/role/mapper/RoleMapper.java

@@ -1,7 +1,7 @@
-package com.gihon.security.mapper;
+package com.gihon.role.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gihon.security.pojo.Role;
+import com.gihon.role.entity.Role;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;

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

@@ -0,0 +1,11 @@
+package com.gihon.role.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gihon.common.web.response.Response;
+import com.gihon.role.entity.Role;
+
+import java.util.List;
+
+public interface RoleService extends IService<Role> {
+    Response<List<Role>> findPermissionByRoleId(Long id);
+}

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

@@ -1,10 +1,10 @@
-package com.gihon.security.service.impl;
+package com.gihon.role.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;
-import com.gihon.security.service.RoleService;
+import com.gihon.common.web.response.Response;
+import com.gihon.role.mapper.RoleMapper;
+import com.gihon.role.entity.Role;
+import com.gihon.role.service.RoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -21,9 +21,9 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper,Role> implements Rol
     @Autowired
     private RoleMapper roleMapper;
     @Override
-    public HttpResult<List<Role>> findPermissionByRoleId(Long id) {
+    public Response<List<Role>> findPermissionByRoleId(Long id) {
         List<Role> roles = roleMapper.selectPermissionByRoleId(id);
 
-        return  HttpResult.ok(roles);
+        return  Response.ok(roles);
     }
 }

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

@@ -124,7 +124,7 @@ public class MySecurityConfiguration extends WebSecurityConfigurerAdapter {
                 .logoutSuccessUrl("/security/"); // 退出后的跳转地址，重定向。 默认是 loginPage?logout
 
         // csrf安全处理, 关闭csrf。 防止恶意攻击的技术。 security4+ 默认开启的。
-        // http.csrf().disable();
+         http.csrf().disable();
     }
 
 //    @Autowired

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

@@ -0,0 +1,22 @@
+package com.gihon.security.config;
+
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @program: common-parent
+ * @description:
+ * @author: dl
+ * @create: 02月23日 10时
+ **/
+
+@Configuration
+public class MybatisPlusConfig {
+    @Bean
+    public PaginationInterceptor paginationInterceptor() {
+        PaginationInterceptor page = new PaginationInterceptor();
+        page.setDialectType("mysql");
+        return page;
+    }
+}

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

@@ -1,37 +0,0 @@
-package com.gihon.security.controller;
-
-import com.gihon.common.http.HttpResult;
-import com.gihon.security.pojo.Permission;
-import com.gihon.security.service.permissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * @program: common-parent
- * @description:
- * @author: dl
- * @create: 02月19日 09时
- **/
-public class PermissionController {
-    @Autowired
-    private permissionService permissionService;
-    /**
-     * 处理内容： 查看用户权限
-     * @param id 用户id
-     * @return 用户拥有的权限列表
-     */
-    @GetMapping("/getPermissionsByUserId")
-    @ResponseBody
-    public HttpResult<Permission> addPermission(Long id){
-        HttpResult permissions = permissionService.findPermissionsByUserId(id);
-        return permissions;
-    }
-    public HttpResult setPermission(Long id ,String permissionStr){
-        HttpResult httpResult = permissionService.setPermission(id, permissionStr);
-        return httpResult;
-    }
-
-
-
-}

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

@@ -1,11 +0,0 @@
-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 extends IService<Role> {
-    HttpResult<List<Role>> findPermissionByRoleId(Long id);
-}

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

@@ -1,16 +0,0 @@
-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  extends IService<User> {
-
-    HttpResult<User> findByPage(int page, int rows);
-
-    HttpResult<User> addUser(User user);
-
-    List<String> findPermissionsByUserId(Long id);
-}

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

@@ -1,7 +1,7 @@
 package com.gihon.security.service.impl;
 
-import com.gihon.security.mapper.UserMapper;
-import com.gihon.security.pojo.User;
+import com.gihon.user.mapper.UserMapper;
+import com.gihon.user.entity.User;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;

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

@@ -1,133 +0,0 @@
-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;
-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
- * @description:
- * @author: dl
- * @create: 02月20日 09时
- **/
-@Service
-public class UserServiceImpl extends ServiceImpl<UserMapper,User>  implements UserService {
-    @Autowired
-    private UserMapper userMapper;
-    @Autowired
-    private UserService userService;
-    /**
-     * 主要功能：
-     * @description 根据用户主键查找 用户信息
-     * @author: dl
-     * @data 2021/2/20 11:43
-     * @param	id	 用户信息
-     * @return com.gihon.common.http.HttpResult<com.gihon.security.pojo.User>
-     */
-    public HttpResult<User> findUserOne(Long id){
-        User user = userMapper.selectById(id);
-        if (user==null){
-            return HttpResult.error("未查找到此用户");
-        }
-        return HttpResult.ok();
-    }
-    /**
-     * 主要功能：
-     * @description 分页查询用户信息
-     * @author: dl
-     * @data 2021/2/20 11:38
-     * @param	page
-     * @param	rows
-     * @return com.gihon.common.http.HttpResult<com.gihon.security.pojo.User>
-     */
-    @Override
-    public HttpResult<User> findByPage(int page, int rows) {
-        //分页配置
-        Page<User> itemParamPage = new Page<>(page, rows);
-        ////查询条件
-        //QueryWrapper<User> Wrapper = new QueryWrapper<>();
-        ////根据主键排序
-        //Wrapper.orderByAsc("id");
-        //得到分页数据
-        Page<User> resultPage = (Page<User>) userMapper.selectPage(itemParamPage, null);
-        List<User> list = resultPage.getRecords();
-        return HttpResult.ok(list);
-    }
-    /**
-     * 主要功能：
-     * @description 根据输入信息增加用户
-     * @author: dl
-     * @data 2021/2/20 11:39
-     * @param	user
-     * @return com.gihon.common.http.HttpResult<com.gihon.security.pojo.User>
-     */
-    @Override
-    public HttpResult<User> addUser(User user) {
-        QueryWrapper<User> wrapper = new QueryWrapper<>(user);
-        //不允许增加重复用户
-        User user1 = userMapper.selectOne(wrapper);
-        if (user1 != null) {
-            return HttpResult.error("用户已存在");
-        }
-        //密码加密
-        String passWord = new MyPasswordEncoder().encode(user.getPassword());
-        user.setPassword(passWord);
-        int i = userMapper.insert(user);
-        //增加失败
-        if (i == 0) {
-            return HttpResult.error("添加用户，访问数据库失败");
-        }
-        return HttpResult.ok();
-    }
-
-    @Override
-    public List<String> findPermissionsByUserId(Long id) {
-        List<String> strings = userMapper.selectPermissionsByUserId(id);
-        return strings;
-    }
-
-    /**
-     * 主要功能：
-     * @description 根据主键删除用户
-     * @author: dl
-     * @data 2021/2/20 11:41
-     * @param	id	 用户主键
-     * @return com.gihon.common.http.HttpResult<com.gihon.security.pojo.User>
-     */
-    public HttpResult<User> deleteUser(Long id){
-        int i = userMapper.deleteById(id);
-        if (i == 0) {
-            return HttpResult.error("删除用户，访问数据库失败");
-        }
-        return HttpResult.ok();
-    }
-    /**
-     * 主要功能：
-     * @description 根据输入密码和用户id
-     * 修改用户信息
-     * @author: dl
-     * @data 2021/2/20 11:52
-     * @param	id
-     * @param	password
-     * @return com.gihon.common.http.HttpResult<com.gihon.security.pojo.User>
-     */
-    public HttpResult<User> setPasswordByUserId(Long id,String password){
-        User user = User.builder()
-                .id(id)
-                .password(password)
-                .build();
-        int update = userMapper.updateById(user);
-        if (update == 0) {
-            return HttpResult.error("数据库 修改此用户失败");
-        }
-        return HttpResult.ok();
-    }
-}

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

@@ -1,48 +0,0 @@
-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.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @program: common-parent
- * @description:
- * @author: dl
- * @create: 02月20日 09时
- **/
-@Service
-public class permissionServiceImpl extends ServiceImpl<PermissionMapper,Permission> implements permissionService {
-    /**
-     * 主要功能：扩展已有权限
-     * @data 2021/2/20 9:49
-     * @author: dl
-     * @param	id	权限id
-     * @param	permissionStr	新增加权限
-     * @return com.gihon.common.http.HttpResult
-     *
-     */
-    @Override
-    public HttpResult setPermission(Long id, String permissionStr) {
-        Permission permission = this.getById(id);
-        String oldPermission = permission.getPermission()+permissionStr;
-        permission.setPermission(oldPermission);
-        int update = baseMapper.update(permission, new QueryWrapper<Permission>().eq("id", id));
-
-        if (update == 0) {
-            return HttpResult.error("修改权限失败");
-        }
-        return HttpResult.ok();
-    }
-
-    @Override
-    public HttpResult findPermissionsByUserId(Long id) {
-        List<Permission> permissions = baseMapper.findPermissions(id);
-        return HttpResult.ok(permissions);
-    }
-}

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

@@ -1,22 +0,0 @@
-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
- * @description:
- * @author: dl
- * @create: 02月20日 09时
- **/
-
-public interface permissionService  extends IService<Permission> {
-
-
-    HttpResult setPermission(Long id, String permissionStr);
-
-    HttpResult findPermissionsByUserId(Long id);
-
-
-}

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

@@ -1,12 +1,14 @@
-package com.gihon.security.controller;
+package com.gihon.user.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gihon.common.http.HttpResult;
+import com.gihon.common.web.response.PageBean;
+import com.gihon.common.web.response.PageResponse;
+import com.gihon.common.web.response.Response;
+import com.gihon.common.web.response.ResponseStatus;
 import com.gihon.security.encoder.MyPasswordEncoder;
-import com.gihon.security.pojo.User;
-import com.gihon.security.service.UserService;
+import com.gihon.user.entity.User;
+import com.gihon.user.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
@@ -29,14 +31,14 @@ public class UserController {
      * @description 分页查看用户
      * @param	page    页数
      * @param	rows	页小大
-     * @return com.gihon.common.http.HttpResult
+     * @return com.gihon.common.http.Response
      */
     //@Secured(value = {"ROLE_管理员", "ROLE_超级管理员"})
     @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);
+    public PageResponse<PageBean<User>> getUsersByPage(
+            @RequestParam(required = false,defaultValue = "0") int page,
+            @RequestParam(required = false, defaultValue = "10") int rows) {
+        PageResponse byPage = userService.getByPage(page, rows);
         return byPage;
     }
     /**
@@ -46,13 +48,26 @@ public class UserController {
      * @description 根据用户主键
      * 查找用户信息
      * @param	id
-     * @return com.gihon.common.http.HttpResult
+     * @return com.gihon.common.http.Response
      *
      */
     @GetMapping("/userByID")
-    public HttpResult userFindOne(@RequestParam Long id){
+    public Response userFindOne(@RequestParam Long id){
         User userInfo = userService.getById(id);
-        return HttpResult.ok(userInfo);
+        return Response.ok(userInfo);
+    }
+    /**
+     * 主要功能：
+     * @description 根据用户id 查找对应权限
+     * @author: dl
+     * @data 2021/2/20 14:24
+     * @param	id	 用户id
+     * @return com.gihon.common.http.Response<java.util.List<java.lang.String>>
+     */
+    @RequestMapping("/getPermissionsByUserId")
+    public Response<List<String>> getPermissionsByUserId(Long id){
+        List<String> permissions = userService.findPermissionsByUserId(id);
+        return Response.ok(permissions);
     }
     /**
      * 主要功能：增加用户
@@ -63,15 +78,31 @@ public class UserController {
      * 使用自定义加密器加密用户输入密码后  存储
      *
      * @param	user
-     * @return com.gihon.common.http.HttpResult
+     * @return com.gihon.common.http.Response
      *
      */
 
     //@Secured(value = {"addUser"})
     @PostMapping("/addUser")
-    public HttpResult<User> addUser(@RequestBody User user) {
-        HttpResult<User> addUser = userService.addUser(user);
-        return HttpResult.ok();
+    public Response<User> addUser(@RequestBody User user) {
+        Response<User> addUser = userService.addUser(user);
+        return Response.ok();
+    }
+    //增加用户角色
+    /**
+     * 主要功能：
+     * @description   用户ById  增加 角色ById
+     * @author: dl
+     * @data 2021/2/23 15:12
+     * @param	user
+     * @param	RoleIds
+     * @return com.gihon.common.web.response.Response
+     */
+    @RequestMapping("/addRole4User")
+    @ResponseBody
+    public Response addRole4User(@RequestBody User user,@RequestParam("RoleIds") Long[] RoleIds){
+        Response response = userService.addRole4User(user,RoleIds);
+        return Response.ok();
     }
     /**
      * 主要功能：删除用户
@@ -80,22 +111,21 @@ public class UserController {
      * @description 根据用户主键
      * 删除用户信息
      * @param	id
-     * @return com.gihon.common.http.HttpResult
-     *
+     * @return com.gihon.common.http.Response
      */
     @Transactional(rollbackFor = Exception.class)
     @GetMapping(value = "/deleteUser")
-    public HttpResult deleteUser(@RequestParam Long id) {
+    public Response deleteUser(@RequestParam Long id) {
         boolean b = userService.removeById(id);
         //添加数据失败
         if (!b) {
-            return HttpResult.error("删除用户失败");
+            return Response.error(ResponseStatus.MAPPER_ERROR,"删除用户失败");
         }
-        return HttpResult.ok();
+        return Response.ok();
 
     }
 
-    @PreAuthorize("hasAuthority('updateUser')")
+    //@PreAuthorize("hasAuthority('updateUser')")
     @Transactional(rollbackFor = Exception.class)
     @PostMapping(value = "/setUser")
     /**
@@ -106,10 +136,10 @@ public class UserController {
      * 修改用户密码
      * @param	username
      * @param	password
-     * @return com.gihon.common.http.HttpResult<com.gihon.security.pojo.User>
+     * @return com.gihon.common.http.Response<com.gihon.user.entity.User>
      *
      */
-    public HttpResult<User> modifyUser(String username, String password) {
+    public Response<User> modifyUser(String username, String password) {
         //修改新密码
         MyPasswordEncoder encoder = new MyPasswordEncoder();
         User user = User.builder().username(username).build();
@@ -118,27 +148,11 @@ public class UserController {
         boolean update = userService.update(user, new QueryWrapper<User>()
                 .eq("username", user.getUsername())
         );
-        //userService.lambdaUpdate().eq(User::getId,1)
-        //        .set(User::getId,1)
-        //        .set(User::getUsername,"213")
-        //        .update();
         //修改结果
         if (!update) {
-            return HttpResult.error("修改密码访问数据库失败");
+            return Response.error(ResponseStatus.MAPPER_ERROR,"修改密码访问数据库失败");
         }
-        return HttpResult.ok();
-    }
-    /**
-     * 主要功能：
-     * @description 根据用户id 查找对应权限
-     * @author: dl
-     * @data 2021/2/20 14:24
-     * @param	id	 用户id
-     * @return com.gihon.common.http.HttpResult<java.util.List<java.lang.String>>
-     */
-    @RequestMapping("/getPermissionsByUserId")
-    public HttpResult<List<String>> getPermissionsByUserId(Long id){
-        List<String> permissions = userService.findPermissionsByUserId(id);
-        return HttpResult.ok(permissions);
+        return Response.ok();
     }
+
 }

common-springboot/src/main/java/com/gihon/security/pojo/User.java → common-springboot/src/main/java/com/gihon/user/entity/User.java

@@ -1,4 +1,4 @@
-package com.gihon.security.pojo;
+package com.gihon.user.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -14,7 +14,7 @@ import java.io.Serializable;
 
 @EqualsAndHashCode
 @ToString
-@TableName(value = "comon_security.tb_user")
+@TableName(value = "tb_user")
 @Builder
 @Data
 @NoArgsConstructor

common-springboot/src/main/java/com/gihon/security/mapper/UserMapper.java → common-springboot/src/main/java/com/gihon/user/mapper/UserMapper.java

@@ -1,8 +1,9 @@
-package com.gihon.security.mapper;
+package com.gihon.user.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gihon.security.pojo.User;
+import com.gihon.user.entity.User;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -19,6 +20,8 @@ public interface UserMapper extends BaseMapper<User> {
     @Select("select permission from tb_permission where id in ( select perm_id from tb_role_perm where role_id in ( select role_id from tb_user_role where user_id = #{userId} ) )")
     List<String> selectPermissionsByUserId(Long userId);
 
+    int insertRolestoUser(@Param("userid") Long userid, @Param("roleIds") Long [] roleIds);
+
 
 
 

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

@@ -0,0 +1,19 @@
+package com.gihon.user.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gihon.common.web.response.PageResponse;
+import com.gihon.common.web.response.Response;
+import com.gihon.user.entity.User;
+
+import java.util.List;
+
+public interface UserService  extends IService<User> {
+
+    PageResponse<User> getByPage(int page, int rows);
+
+    Response<User> addUser(User user);
+
+    List<String> findPermissionsByUserId(Long id);
+
+    Response addRole4User(User user, Long[] id);
+}

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

@@ -0,0 +1,157 @@
+package com.gihon.user.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.web.response.PageBean;
+import com.gihon.common.web.response.PageResponse;
+import com.gihon.common.web.response.Response;
+import com.gihon.common.web.response.ResponseStatus;
+import com.gihon.role.entity.Role;
+import com.gihon.security.encoder.MyPasswordEncoder;
+import com.gihon.user.mapper.UserMapper;
+import com.gihon.user.entity.User;
+import com.gihon.user.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+/**
+ * @program: common-parent
+ * @description:
+ * @author: dl
+ * @create: 02月20日 09时
+ **/
+@Service
+public class UserServiceImpl extends ServiceImpl<UserMapper,User>  implements UserService {
+    @Autowired
+    private UserService userService;
+    /**
+     * 主要功能：
+     * @description 根据用户主键查找 用户信息
+     * @author: dl
+     * @data 2021/2/20 11:43
+     * @param	id	 用户信息
+     * @return com.gihon.common.http.Response<com.gihon.user.entity.User>
+     */
+    public Response<User> getUserOne(Long id){
+        User user = baseMapper.selectById(id);
+        if (user==null){
+            return Response.error(ResponseStatus.MAPPER_ERROR,"未查找到此用户");
+        }
+        return Response.ok();
+    }
+    /**
+     * 主要功能：
+     * @description 分页查询用户信息
+     * @author: dl
+     * @data 2021/2/20 11:38
+     * @param    page
+     * @param    rows
+     * @return com.gihon.common.http.Response<com.gihon.user.entity.User>
+     */
+    @Override
+    public PageResponse<User> getByPage(int page, int rows) {
+
+
+
+        //分页配置
+        Page<User> itemParamPage = new Page<>(page, rows);
+        Page<User> userIPage = (Page<User>) this.page(itemParamPage);
+
+        //PageBean<User> pageBean = new PageBean<User>();
+        //BeanUtils.copyProperties(userIPage,pageBean);
+        PageBean<User> pageBean = PageBean.createSuccess(
+                userIPage.getRecords(),
+                userIPage.getTotal(),
+                userIPage.getSize(),
+                userIPage.getCurrent(),
+                userIPage.getPages());
+        return PageResponse.ok(pageBean);
+    }
+    /**
+     * 主要功能：
+     * @description 根据输入信息增加用户
+     * @author: dl
+     * @data 2021/2/20 11:39
+     * @param	user
+     * @return com.gihon.common.http.Response<com.gihon.user.entity.User>
+     */
+    @Override
+    public Response<User> addUser(User user) {
+        QueryWrapper<User> wrapper = new QueryWrapper<>(user);
+        //不允许增加重复用户
+        User user1 = this.getOne(wrapper,false);
+        if (user1 != null) {
+            return Response.error(ResponseStatus.MAPPER_ERROR,"用户已存在");
+        }
+        //密码加密
+        String passWord = new MyPasswordEncoder().encode(user.getPassword());
+        user.setPassword(passWord);
+        int i = baseMapper.insert(user);
+        //增加失败
+        if (i == 0) {
+            return Response.error(ResponseStatus.MAPPER_ERROR,"添加用户，访问数据库失败");
+        }
+        return Response.ok();
+    }
+
+    @Override
+    public List<String> findPermissionsByUserId(Long id) {
+        List<String> strings = baseMapper.selectPermissionsByUserId(id);
+        return strings;
+    }
+
+    @Override
+    public Response addRole4User(User user, Long[] roleIds) {
+
+        User one = this.getOne(new QueryWrapper<>(user), false);
+        Long userid = one.getId();
+
+
+        int i = baseMapper.insertRolestoUser(userid, roleIds);
+        if (i!=roleIds.length){
+            return Response.error(ResponseStatus.MAPPER_ERROR,"数据未全部增加");
+        }
+        return Response.ok();
+    }
+
+    /**
+     * 主要功能：
+     * @description 根据主键删除用户
+     * @author: dl
+     * @data 2021/2/20 11:41
+     * @param	id	 用户主键
+     * @return com.gihon.common.http.Response<com.gihon.user.entity.User>
+     */
+    //@PostMapping("/deleteByUserId")
+    public Response<User> deleteUser(Long id){
+        int i = baseMapper.deleteById(id);
+        if (i == 0) {
+            return Response.error(ResponseStatus.MAPPER_ERROR,"删除用户，访问数据库失败");
+        }
+        return Response.ok();
+    }
+    /**
+     * 主要功能：
+     * @description 根据
+     * 用户id   寻找用户信息
+     * 修改用户密码为并输入的密码
+     * @author: dl
+     * @data 2021/2/20 11:52
+     * @param	id
+     * @param	password
+     * @return com.gihon.common.http.Response<com.gihon.user.entity.User>
+     */
+    public Response<User> setPasswordByUserId(Long id,String password){
+        User user = User.builder()
+                .id(id)
+                .password(password)
+                .build();
+        int update = baseMapper.updateById(user);
+        if (update == 0) {
+            return Response.error(ResponseStatus.MAPPER_ERROR,"数据库 修改此用户失败");
+        }
+        return Response.ok();
+    }
+}

common-springboot/src/main/resources/application.yml

@@ -8,7 +8,11 @@ server:
     uri-encoding: UTF-8
     basedir: /data/tmp
     
-spring: 
+spring:
+  security:
+    user:
+      name: admin
+      password: admin
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss   

common-springboot/src/main/resources/mapper/RoleMapper.xml

@@ -1,8 +1,8 @@
 <?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.gihon.security.mapper.RoleMapper">
+<mapper namespace="com.gihon.role.mapper.RoleMapper">
 
-    <select id="selectPermissionByRoleId" resultType="com.gihon.security.pojo.Role">
+    <select id="selectPermissionByRoleId" resultType="com.gihon.role.entity.Role">
         select * from tb_permission where id in(select role_id from tb_role_perm where role_id =#{id})
     </select>
 </mapper>

common-springboot/src/main/resources/mapper/UserInfoMapper.xml

@@ -1,8 +1,15 @@
 <?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.gihon.security.mapper.UserMapper">
+<mapper namespace="com.gihon.user.mapper.UserMapper">
 
-	<!--<select id="selectByUsername" resultType="com.gihon.security.pojo.User">-->
+	<!--<select id="selectByUsername" resultType="com.gihon.user.entity.User">-->
 	<!--	select id, username, password from tb_user where username = #{username}-->
 	<!--</select>-->
+	<insert id="insertRolestoUser">
+		insert into tb_user_role(user_id,role_id) values
+		<!--item就是List里每一项的对象名，要用","分割每一条数据，最后要";"结尾-->
+		<foreach collection="roleIds" item="roleId" separator="," close=";">
+			(#{userid},#{roleId})
+		</foreach>
+	</insert>
 </mapper>

common-util/src/main/java/com/gihon/common/web/response/PageBean.java

@@ -9,8 +9,11 @@ public class PageBean<T> {
     private long size = 10L;
     private long pages = 0L;
     private long current = 1L;
-    
-    private PageBean(Collection<T> t, long total,long current,long size,long pages) {
+
+	public PageBean() {
+	}
+
+	private PageBean(Collection<T> t, long total, long current, long size, long pages) {
         this.records = t;
         this.total = total;
         this.current = current;

common-util/src/main/java/com/gihon/common/web/response/ResponseStatus.java

@@ -12,6 +12,7 @@ public enum ResponseStatus {
 	UNAUTHORIATION(401,"未登录"),
 	FORBIDDEN(403,"没有权限"),
 	ERROR(500,"服务器错误"),
+	MAPPER_ERROR(600,"数据库操作失败"),
 	;
 	
 	private String desc;