|
|
@@ -2,9 +2,6 @@ package com.zheng.upms.admin.controller;
|
|
|
|
|
|
import com.zheng.common.util.CookieUtil;
|
|
|
import com.zheng.common.util.RedisUtil;
|
|
|
-import com.zheng.common.util.SpringContextUtil;
|
|
|
-import com.zheng.upms.dao.mapper.UpmsSystemMapper;
|
|
|
-import com.zheng.upms.dao.model.UpmsSystem;
|
|
|
import com.zheng.upms.dao.model.UpmsSystemExample;
|
|
|
import com.zheng.upms.rpc.api.UpmsSystemService;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
@@ -20,10 +17,11 @@ import redis.clients.jedis.Jedis;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
-import javax.servlet.http.HttpSession;
|
|
|
-import java.lang.reflect.Method;
|
|
|
import java.net.URLEncoder;
|
|
|
-import java.util.*;
|
|
|
+import java.util.HashMap;
|
|
|
+import java.util.Map;
|
|
|
+import java.util.Set;
|
|
|
+import java.util.UUID;
|
|
|
|
|
|
/**
|
|
|
* 单点登录管理
|
|
|
@@ -116,17 +114,27 @@ public class SSOController {
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/login", method = RequestMethod.POST)
|
|
|
- public String login(HttpServletRequest request, HttpServletResponse response, ModelMap modelMap) {
|
|
|
+ @ResponseBody
|
|
|
+ public Object login(HttpServletRequest request, HttpServletResponse response, ModelMap modelMap) {
|
|
|
String backurl = request.getParameter("backurl");
|
|
|
String username = request.getParameter("username");
|
|
|
String password = request.getParameter("password");
|
|
|
+
|
|
|
+ Map result = new HashMap<>();
|
|
|
+ String data = "";
|
|
|
if (StringUtils.isEmpty(username)) {
|
|
|
- _log.info("帐号不能为空！");
|
|
|
- return "/404";
|
|
|
+ data = "帐号不能为空！";
|
|
|
+ _log.info("{}", data);
|
|
|
+ result.put("result", false);
|
|
|
+ result.put("data", data);
|
|
|
+ return result;
|
|
|
}
|
|
|
if (StringUtils.isEmpty(password)) {
|
|
|
- _log.info("密码不能为空！");
|
|
|
- return "/404";
|
|
|
+ data = "密码不能为空！";
|
|
|
+ _log.info("{}", data);
|
|
|
+ result.put("result", false);
|
|
|
+ result.put("data", data);
|
|
|
+ return result;
|
|
|
}
|
|
|
// 分配单点登录sessionId，不使用session获取会话id，改为cookie，防止session丢失
|
|
|
String sessionId = CookieUtil.getCookie(request, ZHENG_UPMS_SSO_SERVER_SESSION_ID);
|
|
|
@@ -148,7 +156,9 @@ public class SSOController {
|
|
|
redirectUrl += "?token=" + token;
|
|
|
}
|
|
|
_log.info("认证中心帐号通过，带token回跳：{}", redirectUrl);
|
|
|
- return "redirect:" + redirectUrl;
|
|
|
+ result.put("result", true);
|
|
|
+ result.put("data", redirectUrl);
|
|
|
+ return result;
|
|
|
}
|
|
|
|
|
|
/**
|
shuzheng