白名单更新

jwtech-pc/src/main/java/com/kms/web/controller/system/SysLoginController.java

@@ -2,7 +2,6 @@ package com.kms.web.controller.system;
 
 
 import cn.dev33.satoken.stp.StpUtil;
-import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -37,7 +36,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.view.RedirectView;
 
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -163,12 +161,12 @@ public class SysLoginController extends BaseController {
 
 	/**
 	 * 门户单点认证登录
+	 *
 	 * @return
 	 */
-	@GetMapping("/signOnLogin")
-	public ModelAndView signOnLogin(HttpServletRequest request,
-								  HttpServletResponse response,
-								  @RequestParam(name = "token")String token) throws IOException {
+	@GetMapping("/returnToken")
+	public AjaxResult returnToken(
+			@RequestParam(name = "token")String token){
 		WaterResult waterResult = waterRequestUtil.authUser(token);
 		JSONObject jsonObject = JSONObject.parseObject(waterResult.getData());
 		String user = jsonObject.getString("user");
@@ -178,35 +176,32 @@ public class SysLoginController extends BaseController {
 		query.eq("single_user_id",uid);
 		List<SysUser> list = userService.list(query);
 		if(list.isEmpty()){
-			throw new CustomException("登录用户不存在，请同步用户");
+			return AjaxResult.error("登录用户不存在，请同步用户");
 		}
 		AjaxResult ajax = AjaxResult.success();
 		SysUser sysUser = list.get(0);
 		if (UserStatus.DELETED.getCode().equals(sysUser.getDelFlag())) {
 			log.info(" ：{} 已被删除.", sysUser.getUserName());
 			AsyncManager.me().execute(AsyncFactory.recordLogininfor(sysUser.getUserName(), Constants.LOGIN_FAIL, "账户已删除"));
-			throw new BaseException("对不起，您的账号：" + sysUser.getUserName() + " 已被删除");
+			return  AjaxResult.error("对不起，您的账号：" + sysUser.getUserName() + " 已被删除");
 		} else if (UserStatus.DISABLE.getCode().equals(sysUser.getStatus())) {
 			log.info("登录用户：{} 已被停用.", sysUser.getUserName());
 			AsyncManager.me().execute(AsyncFactory.recordLogininfor(sysUser.getUserName(), Constants.LOGIN_FAIL, "账户已停用"));
-			throw new BaseException("对不起，您的账号：" + sysUser.getUserName() + " 已停用");
+			return  AjaxResult.error("对不起，您的账号：" + sysUser.getUserName() + " 已停用");
 		}
 		AsyncManager.me().execute(AsyncFactory.recordLogininfor(sysUser.getUserName(), Constants.LOGIN_SUCCESS, "登录成功"));
 		StpUtil.login(sysUser.getId());
 		StpUtil.getSession().set("jianwei-user",user);
 		String tokenValue = StpUtil.getTokenValue();
 		ajax.put("token",tokenValue);
-		RedirectView redirectView = new RedirectView(redirect+"?token="+tokenValue);
-		ModelAndView modelAndView = new ModelAndView(redirectView);
-		return modelAndView;
+		return ajax;
 	}
 
 
 	@GetMapping("/signOnLogin")
 	public ModelAndView signOnLogin(HttpServletRequest request,
-									HttpServletResponse response,
-									@RequestParam(name ="page",required = false) String page,
-									@RequestParam(name = "token")String token) throws IOException {
+								  HttpServletResponse response,
+								  @RequestParam(name = "token")String token) throws IOException {
 		WaterResult waterResult = waterRequestUtil.authUser(token);
 		JSONObject jsonObject = JSONObject.parseObject(waterResult.getData());
 		String user = jsonObject.getString("user");
@@ -234,14 +229,14 @@ public class SysLoginController extends BaseController {
 		StpUtil.getSession().set("jianwei-user",user);
 		String tokenValue = StpUtil.getTokenValue();
 		ajax.put("token",tokenValue);
-		RedirectView redirectView = new RedirectView(redirect+"?token="+tokenValue+"&page="+page);
+		RedirectView redirectView = new RedirectView(redirect+"?token="+tokenValue);
 		ModelAndView modelAndView = new ModelAndView(redirectView);
 		return modelAndView;
 	}
 
 
-	@GetMapping("/returnToken")
-	public String returnToken(HttpServletRequest request,
+	@GetMapping("/signOnLogin")
+	public ModelAndView signOnLogin(HttpServletRequest request,
 									HttpServletResponse response,
 									@RequestParam(name ="page",required = false) String page,
 									@RequestParam(name = "token")String token) throws IOException {
@@ -274,8 +269,9 @@ public class SysLoginController extends BaseController {
 		ajax.put("token",tokenValue);
 		RedirectView redirectView = new RedirectView(redirect+"?token="+tokenValue+"&page="+page);
 		ModelAndView modelAndView = new ModelAndView(redirectView);
-		return tokenValue;
+		return modelAndView;
 	}
 
 
+
 }