|
|
@@ -17,8 +17,6 @@ import org.springframework.ui.Model;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
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;
|
|
|
@@ -55,16 +53,29 @@ public class UserLoginController extends BaseController {
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
- @RequestMapping(value = "/login", method = RequestMethod.POST)
|
|
|
- public ModelAndView doLogin(User user, Boolean rememberMe, HttpServletRequest request, ModelAndView modelview) {
|
|
|
- TokenManager.login(user, rememberMe);
|
|
|
- RedirectView rv = new RedirectView();
|
|
|
- rv.setUrl(request.getContextPath() + "/index");
|
|
|
- rv.setExposeModelAttributes(false);
|
|
|
- modelview.setView(rv);
|
|
|
- return modelview;
|
|
|
+ /**
|
|
|
+ * 用户登录
|
|
|
+ *
|
|
|
+ * @param user
|
|
|
+ * @param remember
|
|
|
+ * @param request
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/signin", method = RequestMethod.POST)
|
|
|
+ @ResponseBody
|
|
|
+ public Result signin(User user, Boolean remember, HttpServletRequest request) {
|
|
|
+ Result res = new Result();
|
|
|
+ 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.setToken(SecurityUtils.getSubject().getSession().getId());
|
|
|
+ return res;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
/**
|
|
|
* 用户登录
|
|
|
*
|
|
|
@@ -73,17 +84,13 @@ public class UserLoginController extends BaseController {
|
|
|
* @param request
|
|
|
* @return
|
|
|
*/
|
|
|
- @RequestMapping(value = "/mLogin", method = RequestMethod.POST)
|
|
|
+ @RequestMapping(value = "/mlogin", method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
|
public Result mLogin(User user, Boolean remember, HttpServletRequest request) {
|
|
|
Result res = new Result();
|
|
|
JSONObject jo = (JSONObject) JSON.toJSON(TokenManager.login(user, remember));
|
|
|
+
|
|
|
UserBasicInfo ubi=userService.selectBaseInfo();
|
|
|
- /*SavedRequest sr = WebUtils.getAndClearSavedRequest(request);
|
|
|
- if (sr != null) {
|
|
|
- jo.put("requestURI", sr.getRequestURI());
|
|
|
- jo.put("queryString", sr.getQueryString());
|
|
|
- }*/
|
|
|
jo.put("easemobName",ubi.getEasemobName());
|
|
|
jo.put("easemobPass",ubi.getEasemobPass());
|
|
|
res.setToken(SecurityUtils.getSubject().getSession().getId());
|