Commit 042d7bfb by chentianzhong

提交代码

parent 4d3171b0
package com.zq.cas.controller; package com.zq.cas.controller;
import cn.hutool.crypto.digest.MD5; import cn.hutool.crypto.digest.MD5;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import com.zq.cas.entity.SysUser; import com.zq.cas.entity.SysUser;
import com.zq.cas.service.ISysUserService; import com.zq.cas.service.ISysUserService;
import com.zq.cas.util.MD5PasswordEncoderUtil; import com.zq.cas.util.MD5PasswordEncoderUtil;
import com.zq.cas.util.PasswordUtil;
import com.zq.cas.util.ResultVo; import com.zq.cas.util.ResultVo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
...@@ -14,8 +15,11 @@ import org.springframework.web.servlet.ModelAndView; ...@@ -14,8 +15,11 @@ import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.Map;
/** /**
*
*/ */
@Controller @Controller
...@@ -26,11 +30,11 @@ public class ViewController { ...@@ -26,11 +30,11 @@ public class ViewController {
private ISysUserService sysUserService; private ISysUserService sysUserService;
@RequestMapping(value = "/updatePasswd",method = RequestMethod.GET) @RequestMapping(value = "/updatePasswd", method = RequestMethod.GET)
public ModelAndView updatePasswd(HttpServletRequest request, public ModelAndView updatePasswd(HttpServletRequest request,
HttpServletResponse response, HttpServletResponse response,
@RequestParam("username")String username, @RequestParam("username") String username,
@RequestParam("useKey")String useKey) { @RequestParam("useKey") String useKey) {
ModelAndView mav = new ModelAndView(); ModelAndView mav = new ModelAndView();
mav.addObject("username", username); mav.addObject("username", username);
mav.addObject("useKey", useKey); mav.addObject("useKey", useKey);
...@@ -39,14 +43,13 @@ public class ViewController { ...@@ -39,14 +43,13 @@ public class ViewController {
} }
@RequestMapping(value = "/updatePasswd", method = RequestMethod.POST)
@RequestMapping(value = "/updatePasswd",method = RequestMethod.POST)
@ResponseBody @ResponseBody
public ResultVo updatePasswd(@RequestParam("useKey")String useKey, public ResultVo updatePasswd(@RequestParam("useKey") String useKey,
@RequestParam("username")String username, @RequestParam("username") String username,
@RequestParam("passwd")String passwd, @RequestParam("passwd") String passwd,
@RequestParam("newPasswd")String newPasswd, @RequestParam("newPasswd") String newPasswd,
@RequestParam("confirmPasswd")String confirmPasswd) { @RequestParam("confirmPasswd") String confirmPasswd) {
String errMsg = "更新用户密码失败"; String errMsg = "更新用户密码失败";
if (newPasswd.equals(confirmPasswd)) { if (newPasswd.equals(confirmPasswd)) {
...@@ -55,38 +58,53 @@ public class ViewController { ...@@ -55,38 +58,53 @@ public class ViewController {
String str = MD5.create().digestHex(sysUser.getUserId() + "|" + sysUser.getUsername() + "|" + sysUser.getPCode() + "|" + sysUser.getPassword()); String str = MD5.create().digestHex(sysUser.getUserId() + "|" + sysUser.getUsername() + "|" + sysUser.getPCode() + "|" + sysUser.getPassword());
if (str.equals(useKey)) { if (str.equals(useKey)) {
if (MD5PasswordEncoderUtil.encode(passwd).equals(sysUser.getPassword())) { if (MD5PasswordEncoderUtil.encode(passwd).equals(sysUser.getPassword())) {
boolean update = this.sysUserService.lambdaUpdate().eq(SysUser::getUsername, username).set(SysUser::getPassword, MD5PasswordEncoderUtil.encode(newPasswd)).update(); //修改mysql密码
if (update){ final String url = "http://147.1.4.53:8888/user/updatePwdByXC";
return ResultVo.success("修改密码成功");
Map<String, Object> paramsForRemote = new HashMap<>();
paramsForRemote.put("password", passwd);
paramsForRemote.put("newPassword", newPasswd);
paramsForRemote.put("finalPassword", confirmPasswd);
paramsForRemote.put("email", username);
HttpRequest request = HttpRequest.get(url).contentType("application/x-www-form-urlencoded").form(paramsForRemote);
HttpResponse execute = request.execute();
String body = execute.body();
log.info("修改密码4.53响应=> " + body);
if (execute.getStatus() == 200) {
boolean update = this.sysUserService.lambdaUpdate().eq(SysUser::getUsername, username).set(SysUser::getPassword, MD5PasswordEncoderUtil.encode(newPasswd)).update();
if (update) {
return ResultVo.success("修改密码成功");
}
}else {
errMsg = "用户机构管理异常";
} }
}else{
} else {
errMsg = "旧密码不正确"; errMsg = "旧密码不正确";
} }
}else { } else {
errMsg = "秘钥校验失败"; errMsg = "秘钥校验失败";
} }
}else{ }else {
errMsg = "用户名无效"; errMsg = "用户名无效";
} }
}else{ } else {
errMsg = "两次输入新密码不一致"; errMsg = "两次输入新密码不一致";
} }
return ResultVo.fail(500, errMsg); return ResultVo.fail(500, errMsg);
} }
@RequestMapping(value = "/searchUser", method = RequestMethod.GET)
@RequestMapping(value = "/searchUser",method = RequestMethod.GET)
public ModelAndView searchUser(HttpServletRequest request, public ModelAndView searchUser(HttpServletRequest request,
HttpServletResponse response) { HttpServletResponse response) {
ModelAndView mav = new ModelAndView(); ModelAndView mav = new ModelAndView();
mav.setViewName("/app/searchUser"); mav.setViewName("/app/searchUser");
return mav; return mav;
} }
@RequestMapping(value = "/findUserByPhone", method = RequestMethod.POST)
@RequestMapping(value = "/findUserByPhone",method = RequestMethod.POST)
@ResponseBody @ResponseBody
public ResultVo findUserByPhone(HttpServletRequest request, public ResultVo findUserByPhone(HttpServletRequest request,
HttpServletResponse response, HttpServletResponse response,
...@@ -95,8 +113,4 @@ public class ViewController { ...@@ -95,8 +113,4 @@ public class ViewController {
} }
} }
\ No newline at end of file
...@@ -99,6 +99,7 @@ public class MyAuthenticationHandler extends AbstractPreAndPostProcessingAuthent ...@@ -99,6 +99,7 @@ public class MyAuthenticationHandler extends AbstractPreAndPostProcessingAuthent
//自定义返回信息 //自定义返回信息
Map<String, Object> message = new LinkedHashMap<>(); Map<String, Object> message = new LinkedHashMap<>();
message.put("loginId", sysUser.getUsername()); message.put("loginId", sysUser.getUsername());
message.put("nickname", sysUser.getNickName());
message.put("rybs", sysUser.getPCode()); message.put("rybs", sysUser.getPCode());
message.put("fybm", sysUser.getCourtCode()); message.put("fybm", sysUser.getCourtCode());
message.put("jgbs", sysUser.getOrgCode()); message.put("jgbs", sysUser.getOrgCode());
......
...@@ -129,7 +129,8 @@ cas.serviceRegistry.json.location=classpath:/services ...@@ -129,7 +129,8 @@ cas.serviceRegistry.json.location=classpath:/services
##开启rest认证 ##开启rest认证
#cas.authn.rest.uri=http://localhost:8080/cas/login cas.authn.rest.uri=http://localhost:8080/cas/restLogin
cas.authn.rest.name=
##如果密码有加密,打开下面配置,我的是明文 ##如果密码有加密,打开下面配置,我的是明文
#cas.authn.rest.passwordEncoder.type=DEFAULT #cas.authn.rest.passwordEncoder.type=DEFAULT
#cas.authn.rest.passwordEncoder.characterEncoding=UTF-8 #cas.authn.rest.passwordEncoder.characterEncoding=UTF-8
......
...@@ -8,6 +8,6 @@ ...@@ -8,6 +8,6 @@
"theme" : "app", "theme" : "app",
"attributeReleasePolicy" : { "attributeReleasePolicy" : {
"@class" : "org.apereo.cas.services.ReturnAllAttributeReleasePolicy", "@class" : "org.apereo.cas.services.ReturnAllAttributeReleasePolicy",
"allowedAttributes" : [ "java.util.ArrayList", ["userId","rybs","fybm","loginId"] ] "allowedAttributes" : [ "java.util.ArrayList", ["userId","rybs","fybm","loginId","nickname"] ]
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment