Merge branch 'master' of https://gitee.com/zouxuan/mec

# Conflicts:
#	mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/dal/dao/SysUserRoleDao.java
#	mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/SysUserRoleService.java
#	mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysUserRoleServiceImpl.java

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/dal/dao/SysMenuDao.java

@@ -3,7 +3,22 @@ package com.ym.mec.auth.dal.dao;
 import com.ym.mec.auth.api.entity.SysMenu;
 import com.ym.mec.common.dal.BaseDAO;
 
+import java.util.List;
+
 public interface SysMenuDao extends BaseDAO<Integer, SysMenu> {
 
-	
+
+    /**
+     * 根据角色编号查询拥有的菜单列表
+     * @param roleId
+     * @return
+     */
+    List<SysMenu> getMenusByRoleId(Integer roleId);
+
+    /**
+     * 根据用户编号查询用户可访问菜单
+     * @param userId
+     * @return
+     */
+    List<SysMenu> findByUser(Integer userId);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/dal/dao/SysRoleDao.java

@@ -2,8 +2,14 @@ package com.ym.mec.auth.dal.dao;
 
 import com.ym.mec.auth.api.entity.SysRole;
 import com.ym.mec.common.dal.BaseDAO;
+import java.util.List;
 
 public interface SysRoleDao extends BaseDAO<Integer, SysRole> {
 
-	
+    /**
+     * 根据userId查询角色列表
+     * @param userId 用户编号
+     * @return
+     */
+    List<SysRole> findRoleByUserId(Integer userId);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/dal/dao/SysRoleMenuDao.java

@@ -9,8 +9,15 @@ public interface SysRoleMenuDao extends BaseDAO<Integer, SysRoleMenu> {
 
 	/**
 	 * 根据角色查询权限列表
-	 * @param roleIdList
+	 * @param roleId
 	 * @return
 	 */
 	List<String> queryPermissionsByRoleId(Integer roleId);
+
+	/**
+	 * 删除角色菜单权限
+	 * @param sysRoleMenu
+	 * @return
+	 */
+	int delete(SysRoleMenu sysRoleMenu);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/dal/dao/SysUserRoleDao.java

@@ -20,4 +20,12 @@ public interface SysUserRoleDao extends BaseDAO<Integer, SysUserRole> {
 	 * @return
 	 */
 	List<String> queryRoleCodeListByUserId(Integer userId);
+
+
+	/**
+	 * 删除用户角色
+	 * @param sysUserRole
+	 * @return
+	 */
+	int delete(SysUserRole sysUserRole);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/SysMenuService.java

@@ -3,6 +3,21 @@ package com.ym.mec.auth.service;
 import com.ym.mec.auth.api.entity.SysMenu;
 import com.ym.mec.common.service.BaseService;
 
+import java.util.List;
+
 public interface SysMenuService extends BaseService<Integer, SysMenu> {
 
+    /**
+     * 根据角色编号查询拥有的菜单列表
+     * @param roleId
+     * @return
+     */
+    List<SysMenu> getMenusByRoleId(Integer roleId);
+
+    /**
+     * 根据用户编号查询用户可访问菜单
+     * @param id
+     * @return
+     */
+    List<SysMenu> findByUser(Integer id);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/SysRoleMenuService.java

@@ -20,4 +20,20 @@ public interface SysRoleMenuService extends BaseService<Integer, SysRoleMenu> {
 	 * @return
 	 */
 	List<String> queryPermissionsByRoleIdList(List<Integer> roleIdList);
+
+	/**
+	 * 角色添加菜单访问权限
+	 * @param roleId
+	 * @param menuIds
+	 * @return
+	 */
+    boolean batchInsert(Integer roleId, String menuIds);
+
+	/**
+	 * 角色删除菜单访问权限
+	 * @param roleId
+	 * @param menuIds
+	 * @return
+	 */
+    boolean batchdel(Integer roleId, String menuIds);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/SysRoleService.java

@@ -3,6 +3,14 @@ package com.ym.mec.auth.service;
 import com.ym.mec.auth.api.entity.SysRole;
 import com.ym.mec.common.service.BaseService;
 
+import java.util.List;
+
 public interface SysRoleService extends BaseService<Integer, SysRole> {
 
+    /**
+     * 根据userId查询角色列表
+     * @param userId 用户编号
+     * @return
+     */
+    List<SysRole> findRoleByUserId(Integer userId);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/SysUserRoleService.java

@@ -20,4 +20,19 @@ public interface SysUserRoleService extends BaseService<Integer, SysUserRole> {
 	 * @return
 	 */
 	List<String> queryRoleCodeListByUserId(Integer userId);
+	/**
+	 * 新增用户角色(批量)
+	 * @param userId
+	 * @param roleIds
+	 * @return
+	 */
+	boolean batchInsert(Integer userId, String roleIds);
+
+	/**
+	 * 删除用户角色(批量)
+	 * @param userId
+	 * @param roleIds
+	 * @return
+	 */
+	boolean batchDel(Integer userId, String roleIds);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysMenuServiceImpl.java

@@ -9,6 +9,8 @@ import com.ym.mec.auth.service.SysMenuService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 
+import java.util.List;
+
 @Service
 public class SysMenuServiceImpl extends BaseServiceImpl<Integer, SysMenu>  implements SysMenuService {
 	
@@ -19,5 +21,14 @@ public class SysMenuServiceImpl extends BaseServiceImpl<Integer, SysMenu>  imple
 	public BaseDAO<Integer, SysMenu> getDAO() {
 		return sysMenuDao;
 	}
-	
+
+	@Override
+	public List<SysMenu> getMenusByRoleId(Integer roleId) {
+		return sysMenuDao.getMenusByRoleId(roleId);
+	}
+
+	@Override
+	public List<SysMenu> findByUser(Integer id) {
+		return sysMenuDao.findByUser(id);
+	}
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysRoleMenuServiceImpl.java

@@ -3,6 +3,7 @@ package com.ym.mec.auth.service.impl;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.ym.mec.auth.api.entity.SysUserRole;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -39,4 +40,28 @@ public class SysRoleMenuServiceImpl extends BaseServiceImpl<Integer, SysRoleMenu
 		return list;
 	}
 
+	@Override
+	public boolean batchInsert(Integer roleId, String menuIds) {
+		SysRoleMenu sysRoleMenu = new SysRoleMenu();
+		sysRoleMenu.setRoleId(roleId);
+		String[] split = menuIds.split(",");
+		for (String string:split) {
+			sysRoleMenu.setMenuId(Integer.parseInt(string));
+			sysRoleMenuDao.delete(sysRoleMenu);
+		}
+		return true;
+	}
+
+	@Override
+	public boolean batchdel(Integer roleId, String menuIds) {
+		SysRoleMenu sysRoleMenu = new SysRoleMenu();
+		sysRoleMenu.setRoleId(roleId);
+		String[] split = menuIds.split(",");
+		for (String string:split) {
+			sysRoleMenu.setMenuId(Integer.parseInt(string));
+			sysRoleMenuDao.insert(sysRoleMenu);
+		}
+		return true;
+	}
+
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysRoleServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ym.mec.auth.service.impl;
 
+import com.ym.mec.auth.api.entity.SysUserRole;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -9,6 +10,8 @@ import com.ym.mec.auth.service.SysRoleService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 
+import java.util.List;
+
 @Service
 public class SysRoleServiceImpl extends BaseServiceImpl<Integer, SysRole>  implements SysRoleService {
 	
@@ -19,5 +22,9 @@ public class SysRoleServiceImpl extends BaseServiceImpl<Integer, SysRole>  imple
 	public BaseDAO<Integer, SysRole> getDAO() {
 		return sysRoleDao;
 	}
-	
+
+	@Override
+	public List<SysRole> findRoleByUserId(Integer userId) {
+		return sysRoleDao.findRoleByUserId(userId);
+	}
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysUserRoleServiceImpl.java

@@ -26,10 +26,33 @@ public class SysUserRoleServiceImpl extends BaseServiceImpl<Integer, SysUserRole
 	public List<Integer> queryRoleIdListByUserId(Integer userId) {
 		return sysUserRoleDao.queryRoleIdListByUserId(userId);
 	}
-
 	@Override
 	public List<String> queryRoleCodeListByUserId(Integer userId) {
 		return sysUserRoleDao.queryRoleCodeListByUserId(userId);
 	}
-	
+
+	@Override
+	public boolean batchInsert(Integer userId, String roleIds) {
+		SysUserRole sysUserRole = new SysUserRole();
+		sysUserRole.setUserId(userId);
+		String[] split = roleIds.split(",");
+		for (String string:split) {
+			sysUserRole.setRoleId(Integer.parseInt(string));
+			sysUserRoleDao.insert(sysUserRole);
+		}
+		return true;
+	}
+
+	@Override
+	public boolean batchDel(Integer userId, String roleIds) {
+		SysUserRole sysUserRole = new SysUserRole();
+		sysUserRole.setUserId(userId);
+		String[] split = roleIds.split(",");
+		for (String string:split) {
+			sysUserRole.setRoleId(Integer.parseInt(string));
+			sysUserRoleDao.delete(sysUserRole);
+		}
+		return true;
+	}
+
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/MenuController.java

@@ -0,0 +1,59 @@
+package com.ym.mec.auth.web.controller;
+
+import com.ym.mec.auth.api.entity.SysMenu;
+import com.ym.mec.auth.service.SysMenuService;
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+
+@RestController()
+@RequestMapping("menu")
+@Api(description = "菜单服务")
+public class MenuController extends BaseController {
+
+    @Autowired
+    private SysMenuService sysMenuService;
+
+    @ApiOperation("新增菜单")
+    @PutMapping("/add")
+    public Object getMenu(SysMenu sysMenu) {
+        Date date = new Date();
+        sysMenu.setUpdateTime(date);
+        sysMenu.setCreateTime(date);
+        return succeed(sysMenuService.insert(sysMenu));
+    }
+
+    @ApiOperation("根据菜单id删除菜单")
+    @DeleteMapping("/del/{id}")
+    public Object delMenu(@ApiParam(value = "菜单编号", required = true) @PathVariable("id") Integer id) {
+        return succeed(sysMenuService.delete(id));
+    }
+
+    @ApiOperation("根据菜单id修改菜单")
+    @PutMapping("/update")
+    public Object updateMenu(SysMenu sysMenu) {
+        Date date = new Date();
+        sysMenu.setUpdateTime(date);
+        return succeed(sysMenuService.update(sysMenu));
+    }
+
+    @ApiOperation("根据菜单id查询菜单")
+    @GetMapping("/{id}")
+    public Object getMenu(@ApiParam(value = "菜单编号", required = true) @PathVariable("id") Integer id) {
+        return succeed(sysMenuService.get(id));
+    }
+
+    @ApiOperation("根据用户编号查询用户可访问菜单")
+    @GetMapping("/findByUser/{id}")
+    public Object findByUser(@ApiParam(value = "用户编号", required = true) @PathVariable("id") Integer id) {
+        return succeed(sysMenuService.findByUser(id));
+    }
+
+
+
+}

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/RoleController.java

@@ -0,0 +1,79 @@
+package com.ym.mec.auth.web.controller;
+
+import com.ym.mec.auth.api.entity.SysRole;
+import com.ym.mec.auth.service.SysMenuService;
+import com.ym.mec.auth.service.SysRoleMenuService;
+import com.ym.mec.auth.service.SysRoleService;
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import java.util.Date;
+
+@RestController()
+@RequestMapping("role")
+@Api(description = "角色服务")
+public class RoleController extends BaseController {
+
+    @Autowired
+    private SysRoleService sysRoleService;
+    @Autowired
+    private SysRoleMenuService sysRoleMenuService;
+    @Autowired
+    private SysMenuService sysMenuService;
+
+    @ApiOperation("根据权限id查询角色")
+    @GetMapping("/{id}")
+    public Object getRole(@ApiParam(value = "权限编号", required = true) @PathVariable("id") Integer id) {
+        return succeed(sysRoleService.get(id));
+    }
+
+    @ApiOperation("删除角色")
+    @DeleteMapping("/del/{id}")
+    public Object delRole(@ApiParam(value = "权限编号", required = true) @PathVariable("id") Integer id) {
+        return succeed(sysRoleService.delete(id));
+    }
+
+    @ApiOperation("修改角色")
+    @PutMapping("/update")
+    public Object updateRole(SysRole sysRole) {
+        sysRole.setUpdateTime(new Date());
+        sysRoleService.update(sysRole);
+        return succeed();
+    }
+
+    @ApiOperation("新增角色")
+    @PostMapping("/add")
+    public Object addRole(SysRole sysRole) {
+        Date date = new Date();
+        sysRole.setUpdateTime(date);
+        sysRole.setCreateTime(date);
+        sysRoleService.insert(sysRole);
+        return succeed();
+    }
+
+    @ApiOperation("角色新增菜单权限(批量)")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "roleId", value = "角色编号", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "menuIds", value = "菜单id,逗号分隔", required = true, dataType = "String") })
+    @PostMapping("/addRoleMenu")
+    public Object addRoleMenu(Integer roleId,String menuIds) {
+        sysRoleMenuService.batchInsert(roleId,menuIds);
+        return succeed();
+    }
+
+    @ApiOperation("角色删除菜单权限(批量)")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "roleId", value = "角色编号", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "menuIds", value = "菜单id,逗号分隔", required = true, dataType = "String") })
+    @DeleteMapping("/delRoleMenu")
+    public Object delRoleMenu(Integer roleId,String menuIds) {
+        sysRoleMenuService.batchdel(roleId,menuIds);
+        return succeed();
+    }
+
+    @ApiOperation("根据角色编号查询拥有的菜单列表")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "roleId", value = "角色编号", required = true, dataType = "Integer")})
+    @GetMapping("/getMenus")
+    public Object getMenus(Integer roleId) {
+        return succeed(sysMenuService.getMenusByRoleId(roleId));
+    }
+}

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -1,27 +1,17 @@
 package com.ym.mec.auth.web.controller;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
-import java.util.Date;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.auth.service.SysRoleService;
+import com.ym.mec.auth.service.SysUserRoleService;
 import com.ym.mec.auth.service.SysUserService;
 import com.ym.mec.auth.web.controller.queryInfo.SysUserQueryInfo;
 import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
 
 @RestController()
 @RequestMapping("user")
@@ -30,12 +20,16 @@ public class UserController extends BaseController {
 
 	@Autowired
 	private SysUserService sysUserService;
+	@Autowired
+	private SysRoleService sysRoleService;
+	@Autowired
+	private SysUserRoleService sysUserRoleService;
 
 	@ApiOperation("根据用户名查询用户信息接口")
 	@ApiImplicitParam(name = "username", value = "用户名", required = true, dataType = "String", paramType = "path")
 	@GetMapping("/{username}")
 	public Object getUser(@PathVariable("username") String username) {
-		return sysUserService.queryUserInfoByUsername(username);
+		return succeed(sysUserService.queryUserInfoByUsername(username));
 	}
 
 	@ApiOperation(value = "分页查询用户信息")
@@ -79,4 +73,28 @@ public class UserController extends BaseController {
 		sysUserService.update(sysUser);
 		return succeed();
 	}
+
+	@ApiOperation(value = "获取用户角色列表")
+	@GetMapping("/getRole/{id}")
+	public Object getRole(@ApiParam(value = "用户编号", required = true) @PathVariable("id") Integer id) {
+		return succeed(sysRoleService.findRoleByUserId(id));
+	}
+
+	@ApiOperation(value = "用户角色新增")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "userId", value = "用户编号", required = true, dataType = "Integer"),
+			@ApiImplicitParam(name = "roleIds", value = "角色id,逗号分隔", required = true, dataType = "String") })
+	@PostMapping("/addRole")
+	public Object getRole(Integer userId,String roleIds) {
+		sysUserRoleService.batchInsert(userId,roleIds);
+		return succeed();
+	}
+
+	@ApiOperation(value = "用户角色删除")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "userId", value = "用户编号", required = true, dataType = "Integer"),
+			@ApiImplicitParam(name = "roleIds", value = "角色id,逗号分隔", required = true, dataType = "String") })
+	@DeleteMapping("/delRole")
+	public Object delRole(Integer userId,String roleIds) {
+		sysUserRoleService.batchDel(userId,roleIds);
+		return succeed();
+	}
 }

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysMenuMapper.xml

@@ -61,4 +61,16 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM sys_menu
 	</select>
+
+    <select id="getMenusByRoleId" resultType="com.ym.mec.auth.api.entity.SysMenu">
+		SELECT sm.* FROM sys_role_menu srm LEFT JOIN sys_menu sm ON srm.menu_id = sm.menu_id WHERE srm.role_id = 1 AND sm.del_flag = 0
+	</select>
+
+	<select id="findByUser" resultType="com.ym.mec.auth.api.entity.SysMenu">
+		SELECT sm.* FROM sys_user_role sur
+		LEFT JOIN sys_role sr ON sur.role_id = sr.role_id
+		LEFT JOIN sys_role_menu srm ON sr.role_id = srm.role_id
+		LEFT JOIN sys_menu sm ON srm.menu_id = sm.menu_id
+		WHERE sur.user_id = #{userId} AND sr.del_flag = 0 AND sm.del_flag = 0
+	</select>
 </mapper>

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysRoleMapper.xml

@@ -55,4 +55,8 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM sys_role
 	</select>
+
+    <select id="findRoleByUserId" resultType="com.ym.mec.auth.api.entity.SysRole">
+		SELECT sr.* FROM sys_user_role sur LEFT JOIN sys_role sr ON sur.role_id = sr.role_id WHERE sur.user_id = #{userId} AND sr.del_flag = 0
+	</select>
 </mapper>

mec-common/src/main/java/com/ym/mec/common/validcode/impl/SmsCodeServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ym.mec.common.validcode.impl;
 
 import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,10 @@ public class SmsCodeServiceImpl implements SmsCodeService {
 
 	@Override
 	public boolean verifyValidCode(String mobile, String authCode) {
+		Object verifyCode = redisCache.get(loginVerifyCodeKey + mobile);
+		if(verifyCode != null && StringUtils.equalsIgnoreCase(verifyCode.toString(),authCode)){
+			return true;
+		}
 		return true;
 	}