add:修改授权码

2021-12-16 18:13:56 +08:00
parent bf0738493f
commit b243f56e76
10 changed files with 171 additions and 39 deletions
@@ -6,8 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.aliyuncs.exceptions.ClientException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.common.exception.JeroBootException;
-import com.jero.modules.system.entity.SysRole;
-import com.jero.modules.system.entity.SysUserRole;
+import com.jero.modules.system.entity.*;
 import com.jero.modules.system.model.SysLoginVO;
 import com.jero.modules.system.service.*;
 import io.swagger.annotations.Api;
@@ -24,8 +23,6 @@ import com.jero.common.system.util.JwtUtil;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.*;
 import com.jero.common.util.encryption.EncryptedString;
-import com.jero.modules.system.entity.SysDepart;
-import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.model.SysLoginModel;
 import com.jero.modules.system.util.RandImageUtil;
 import org.springframework.beans.BeanUtils;
@@ -36,6 +33,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import java.util.*;
 import java.util.stream.Collectors;

@@ -459,6 +457,7 @@ public class LoginController {
            obj.put("multi_depart", 2);
        }
        sysUser.setPhone(PasswordUtil.decrypt(sysUser.getPhone()));
+        sysUser.setEmail(PasswordUtil.decrypt(sysUser.getEmail()));
        obj.put("token", token);
        obj.put("userInfo", sysUser);
        obj.put("sysAllDictItems", sysDictService.queryAllDictItems());
@@ -628,6 +627,7 @@ public class LoginController {
        return Result.OK("修改密码成功");
    }

+
    @ApiOperation(value = "发送手机号验证码")
    @GetMapping(value = "/sendVerificationCode")
    public Result<?> sendVerificationCode(@RequestParam(name="phone") String phone,
@@ -643,4 +643,4 @@ public class LoginController {
        String string = redisUtil.get("_verification:_phone:" + phone).toString();
        return Result.OK(string);
    }
-}
+}
@@ -62,17 +62,17 @@ public interface ISysUserService extends IService<SysUser> {
 	 * @return
 	 */
 	public boolean deleteBatchUsers(String userIds);
-	
+
 	public SysUser getUserByName(String username);
-	
+
 	/**
 	 * 添加用户和用户角色关系
 	 * @param user
 	 * @param roles
 	 */
 	public void addUserWithRole(SysUser user,String roles);
-	
-	
+
+
 	/**
 	 * 修改用户和用户角色关系
 	 * @param user
@@ -86,7 +86,7 @@ public interface ISysUserService extends IService<SysUser> {
 	 * @return
 	 */
 	public List<String> getRole(String username);
-	
+
 	/**
 	  * 查询用户信息包括 部门信息
 	 * @param username
@@ -157,14 +157,14 @@ public interface ISysUserService extends IService<SysUser> {
 	 * @return 权限集合
 	 */
 	Set<String> getUserPermissionsSet(String username);
-	
+
 	/**
 	 * 根据用户名设置部门ID
 	 * @param username
 	 * @param orgCode
 	 */
 	void updateUserDepart(String username,String orgCode);
-	
+
 	/**
 	 * 根据手机号获取用户名和密码
 	 */
@@ -190,7 +190,7 @@ public interface ISysUserService extends IService<SysUser> {
 	 * @param departs
 	 */
 	void editUserWithDepart(SysUser user, String departs);
-	
+
 	/**
 	   * 校验用户是否有效
 	 * @param sysUser
@@ -259,4 +259,7 @@ public interface ISysUserService extends IService<SysUser> {
 	 * @return PayContactsManagement
 	 */
    PayContactsManagement getPayContactsManagementByPhone(String phone);
+
+
+
 }
@@ -47,24 +47,24 @@ import java.util.stream.Collectors;
@Service
@Slf4j
 public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
-	
-	@Autowired
+
+	@Resource
 	private SysUserMapper userMapper;
-	@Autowired
+	@Resource
 	private SysPermissionMapper sysPermissionMapper;
-	@Autowired
+	@Resource
 	private SysUserRoleMapper sysUserRoleMapper;
-	@Autowired
+	@Resource
 	private SysUserDepartMapper sysUserDepartMapper;
-	@Autowired
+	@Resource
 	private ISysBaseAPI sysBaseAPI;
-	@Autowired
+	@Resource
 	private SysDepartMapper sysDepartMapper;
-	@Autowired
+	@Resource
 	private SysRoleMapper sysRoleMapper;
-	@Autowired
+	@Resource
 	private SysDepartRoleUserMapper departRoleUserMapper;
-	@Autowired
+	@Resource
 	private SysDepartRoleMapper sysDepartRoleMapper;
 	@Resource
 	private BaseCommonService baseCommonService;
@@ -126,8 +126,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 	public SysUser getUserByName(String username) {
 		return userMapper.getUserByName(username);
 	}
-	
-	
+
+
 	@Override
 	@Transactional
 	public void addUserWithRole(SysUser user, String roles) {
@@ -162,7 +162,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 	public List<String> getRole(String username) {
 		return sysUserRoleMapper.getRoleByUserName(username);
 	}
-	
+
 	/**
 	 * 通过用户名获取用户角色集合
 	 * @param username 用户名
@@ -206,7 +206,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 //		SysUser user = userMapper.getUserByName(username);
 //		info.setSysUserCode(user.getUsername());
 //		info.setSysUserName(user.getRealname());
-		
+

 		LoginUser user = sysBaseAPI.getUserByName(username);
 		if(user!=null) {
@@ -214,7 +214,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			info.setSysUserName(user.getRealname());
 			info.setSysOrgCode(user.getOrgCode());
 		}
-		
+
 		//多部门支持in查询
 		List<SysDepart> list = sysDepartMapper.queryUserDeparts(user.getId());
 		List<String> sysMultiOrgCode = new ArrayList<String>();
@@ -230,7 +230,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			}
 		}
 		info.setSysMultiOrgCode(sysMultiOrgCode);
-		
+
 		return info;
 	}

@@ -564,6 +564,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		return userMapper.getPayContactsManagementByPhone(phone);
 	}

+
+
 	/**
 	 * 忘记密码校验
 	 * @param user