|
|
@@ -4,6 +4,7 @@ import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
+import org.apache.shiro.web.util.SavedRequest;
|
|
|
import org.apache.shiro.web.util.WebUtils;
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.ui.Model;
|
|
|
@@ -13,6 +14,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
|
import org.springframework.web.servlet.view.RedirectView;
|
|
|
|
|
|
+import com.alibaba.fastjson.JSON;
|
|
|
+import com.alibaba.fastjson.JSONObject;
|
|
|
import com.goafanti.common.bo.Result;
|
|
|
import com.goafanti.common.constant.ErrorConstants;
|
|
|
import com.goafanti.common.controller.BaseController;
|
|
|
@@ -23,13 +26,11 @@ import com.goafanti.common.utils.VerifyCodeUtils;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
import com.goafanti.user.service.UserService;
|
|
|
|
|
|
-
|
|
|
-
|
|
|
@Controller
|
|
|
public class UserLoginController extends BaseController {
|
|
|
@Resource
|
|
|
private UserService userService;
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/login", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
public Result login(HttpServletRequest request, Model model) {
|
|
|
@@ -37,7 +38,6 @@ public class UserLoginController extends BaseController {
|
|
|
TokenManager.logout();
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
|
|
|
@RequestMapping(value = "/login", method = RequestMethod.POST)
|
|
|
public ModelAndView doLogin(User user, Boolean rememberMe, HttpServletRequest request, ModelAndView modelview) {
|
|
|
@@ -48,9 +48,10 @@ public class UserLoginController extends BaseController {
|
|
|
modelview.setView(rv);
|
|
|
return modelview;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 用户登录
|
|
|
+ *
|
|
|
* @param user
|
|
|
* @param remember
|
|
|
* @param request
|
|
|
@@ -58,15 +59,21 @@ public class UserLoginController extends BaseController {
|
|
|
*/
|
|
|
@RequestMapping(value = "/signin", method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
|
- public Result signin(User user,Boolean remember, HttpServletRequest request) {
|
|
|
+ public Result signin(User user, Boolean remember, HttpServletRequest request) {
|
|
|
Result res = new Result();
|
|
|
- TokenManager.login(user, remember);
|
|
|
- res.setData(WebUtils.getAndClearSavedRequest(request));
|
|
|
+ JSONObject jo = (JSONObject) JSON.toJSON(TokenManager.login(user, remember));
|
|
|
+ SavedRequest sr = WebUtils.getAndClearSavedRequest(request);
|
|
|
+ if (sr != null) {
|
|
|
+ jo.put("requestURI", sr.getRequestURI());
|
|
|
+ jo.put("queryString", sr.getQueryString());
|
|
|
+ }
|
|
|
+ res.setData(jo);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 管理端登录
|
|
|
+ *
|
|
|
* @param user
|
|
|
* @param remember
|
|
|
* @param request
|
|
|
@@ -74,16 +81,15 @@ public class UserLoginController extends BaseController {
|
|
|
*/
|
|
|
@RequestMapping(value = "/managesignin", method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
|
- public Result managesignin(Admin admin,Boolean remember, HttpServletRequest request) {
|
|
|
+ public Result managesignin(Admin admin, Boolean remember, HttpServletRequest request) {
|
|
|
Result res = new Result();
|
|
|
res.setData(TokenManager.manageLogin(admin, remember));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 忘记密码 使用手机号+手机验证码登录
|
|
|
+ *
|
|
|
* @param mobile
|
|
|
* @param mobileCode
|
|
|
* @param type
|
|
|
@@ -91,22 +97,21 @@ public class UserLoginController extends BaseController {
|
|
|
*/
|
|
|
@RequestMapping(value = "/mobileSigin", method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
|
- public Result mobileSignIn(User user,String mobileCode){
|
|
|
+ public Result mobileSignIn(User user, String mobileCode) {
|
|
|
Result res = new Result();
|
|
|
- if(StringUtils.isBlank(user.getMobile())){
|
|
|
- res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"必须指定","手机号"));
|
|
|
+ if (StringUtils.isBlank(user.getMobile())) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "必须指定", "手机号"));
|
|
|
return res;
|
|
|
}
|
|
|
- if(TimeUtils.checkOverTime("register")){
|
|
|
- res.getError().add(buildError(ErrorConstants.MCODE_OVERTIME_ERROR,"手机验证码超时失效"));
|
|
|
+ if (TimeUtils.checkOverTime("register")) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.MCODE_OVERTIME_ERROR, "手机验证码超时失效"));
|
|
|
return res;
|
|
|
}
|
|
|
- if(!TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE).equals(mobileCode)){
|
|
|
- res.getError().add(buildError(ErrorConstants.MCODE_ERROR,"手机验证码错误"));
|
|
|
+ if (!TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE).equals(mobileCode)) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.MCODE_ERROR, "手机验证码错误"));
|
|
|
return res;
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
|
|
|
}
|