浏览代码

//bug

photo
xhxu 1年前
父节点
当前提交
d2ca97d7a1
共有 1 个文件被更改,包括 8 次插入6 次删除
  1. +8
    -6
      suimangCApi/src/main/java/com/iformall/controller/WxUserGrantController.java

+ 8
- 6
suimangCApi/src/main/java/com/iformall/controller/WxUserGrantController.java 查看文件

@@ -117,7 +117,7 @@ public class WxUserGrantController extends BaseController {
@AuthIgnore
@ApiOperation("验证码")
@GetMapping("/captcha.jpg")
public void captcha(HttpServletResponse response, HttpSession session) {
public void captcha(HttpServletRequest request, HttpServletResponse response) {
logger.debug("[" + getIpAddr() + "] WxUserGrantController::captcha");
response.setHeader("Cache-Control", "no-store, no-cache");
response.setContentType("image/jpeg");
@@ -131,7 +131,7 @@ public class WxUserGrantController extends BaseController {
// String ipAddr = getIpAddr();
// String key = Constant.captchaPrev + ":" + ipAddr;
// RedisCacheUtils.cache(redisTemplate, key, text, 60);
HttpSession session = request.getSession();
session.setAttribute(Constants.KAPTCHA_SESSION_KEY, text);

ServletOutputStream out = null;
@@ -156,7 +156,7 @@ public class WxUserGrantController extends BaseController {
@AuthIgnore
@PostMapping("/login")
@ApiOperation(value = "用户登录", notes = "{\"phone\":\"string\",\"password\":\"string\",\"code\":\"string\"}")
public ResultData loginByPhone(@RequestBody Map<String, String> map, HttpSession session) {
public ResultData loginByPhone(@RequestBody Map<String, String> map, HttpServletRequest request) {
String ipAddr = getIpAddr();
logger.debug("[" + ipAddr + "] WxUserGrantController::loginByPhone");
String code = map.get("code");
@@ -164,6 +164,7 @@ public class WxUserGrantController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "请输入验证码");
}

HttpSession session = request.getSession();
Object kaptcha = session.getAttribute(Constants.KAPTCHA_SESSION_KEY);
if(kaptcha == null){
return new ResultData(ErrorCode.KAPCHA_NOT_VALID);
@@ -219,13 +220,14 @@ public class WxUserGrantController extends BaseController {
@AuthIgnore
@PostMapping("/loginByEmail")
@ApiOperation(value = "用户登录", notes = "{\"email\":\"string\",\"password\":\"string\",\"code\":\"string\"}")
public ResultData loginByEmail(@RequestBody Map<String, String> map, HttpSession session) {
public ResultData loginByEmail(@RequestBody Map<String, String> map, HttpServletRequest request) {
String ipAddr = getIpAddr();
logger.debug("[" + ipAddr + "] WxUserGrantController::loginByEmail");
String code = map.get("code");
if (StringUtils.isBlank(code)) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "请输入验证码");
}
HttpSession session = request.getSession();
Object kaptcha = session.getAttribute(Constants.KAPTCHA_SESSION_KEY);
if(kaptcha == null){
return new ResultData(ErrorCode.KAPCHA_NOT_VALID);
@@ -359,7 +361,7 @@ public class WxUserGrantController extends BaseController {
@GetMapping("sendPhoneCode")
@ApiImplicitParams({
@ApiImplicitParam(name = "phone", value = "手机号", dataType = "String", paramType = "query", required = true)})
public ResultData sendPhoneCode(String phone, String code, HttpSession session) {
public ResultData sendPhoneCode(String phone, String code, HttpServletRequest request) {
String ipAddr = getIpAddr();
logger.debug("[" + ipAddr + "] WxUserGrantController::sendPhoneCode");
if (StringUtils.isBlank(phone)) {
@@ -368,7 +370,7 @@ public class WxUserGrantController extends BaseController {
if (StringUtils.isBlank(code)) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "请输入验证码");
}
HttpSession session = request.getSession();
Object kaptcha = session.getAttribute(Constants.KAPTCHA_SESSION_KEY);
if(kaptcha == null){
return new ResultData(ErrorCode.KAPCHA_NOT_VALID);


正在加载...
取消
保存