|
|
@ -1,9 +1,9 @@ |
|
|
|
package com.yxt.anrui.portal.biz.sysuser; |
|
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil; |
|
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
|
import com.yxt.anrui.portal.api.sysorganization.SysOrganization; |
|
|
|
import com.yxt.anrui.portal.api.syspost.SysPost; |
|
|
|
import com.yxt.anrui.portal.api.sysrole.SysRole; |
|
|
|
import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo; |
|
|
|
import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo; |
|
|
|
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; |
|
|
@ -30,9 +30,7 @@ import org.springframework.web.bind.annotation.RequestMapping; |
|
|
|
import org.springframework.web.bind.annotation.RestController; |
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
|
import java.util.Date; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.*; |
|
|
|
|
|
|
|
/** |
|
|
|
* Project: anrui_portal(门户建设) <br/> |
|
|
@ -237,7 +235,7 @@ public class SysUserRest implements SysUserFeign { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public ResultBean updatePassword(String original, String password, String confirmPassword, String userSid,HttpServletRequest httpServletRequest) { |
|
|
|
public ResultBean updatePassword(String original, String password, String confirmPassword, String userSid, HttpServletRequest httpServletRequest) { |
|
|
|
String token = httpServletRequest.getHeader("token"); |
|
|
|
// 根据redisToken查询用户信息
|
|
|
|
SysUser user = sysUserService.fetchBySid(userSid); |
|
|
@ -301,7 +299,7 @@ public class SysUserRest implements SysUserFeign { |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultBean reGetPwd(String userName, String userPhone) { |
|
|
|
return sysUserService.reGetPwd(userName,userPhone); |
|
|
|
return sysUserService.reGetPwd(userName, userPhone); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
@ -321,9 +319,9 @@ public class SysUserRest implements SysUserFeign { |
|
|
|
String verifyCode = userQuery.getVerifyCode(); |
|
|
|
String uuid = userQuery.getUuid(); |
|
|
|
String captcha = redisUtil.get(uuid); |
|
|
|
/* List<Map> list = JSONObject.parseArray(captcha, Map.class); |
|
|
|
List<Map> list = JSONObject.parseArray(captcha, Map.class); |
|
|
|
|
|
|
|
/* if (StringUtils.isEmpty(verifyCode)) { |
|
|
|
if (StringUtils.isEmpty(verifyCode)) { |
|
|
|
return new ResultBean<SysUserVo>().fail().setMsg("验证码不能为空"); |
|
|
|
} |
|
|
|
|
|
|
@ -388,7 +386,7 @@ public class SysUserRest implements SysUserFeign { |
|
|
|
isCorrect = true; |
|
|
|
} else { |
|
|
|
return new ResultBean<SysUserVo>().fail().setMsg("验证码错误"); |
|
|
|
}*/ |
|
|
|
} |
|
|
|
|
|
|
|
if (StringUtils.isBlank(userName)) { |
|
|
|
return new ResultBean<SysUserVo>().fail().setMsg("用户名不能为空"); |
|
|
|