llt

sh-authcenter-agent/src/main/java/com/chineseall/authcenter/agent/controller/AuthController.java

@@ -59,6 +59,7 @@ public class AuthController {
         try {
             String clientId = request.getParameter("client_id");
             String returnUrl = request.getParameter("redirect_uri");
+            System.out.println("redirect_uri1111111111111====="+returnUrl);
             String authSource = request.getParameter("auth_source");
             ClientItem clientItem = clientItemMap.get(clientId);
             if (null == clientItem) {
@@ -99,6 +100,7 @@ public class AuthController {
             authLog.setClientName(clientItemMap.get(clientId).getClientName());
             authLogService.save(authLog);
             CookiesUtil.setCookie(response, null, COOKIE_LOG_ID, authLog.getId(), 1);
+            CookiesUtil.setCookie(response, null, "return_url", returnUrl, 1);
             Map<String, String> params = new HashMap<>();
             params.put("redirect_uri", returnUrl);
             params.put("auth_log_id", authLog.getId());
@@ -133,6 +135,7 @@ public class AuthController {
     public ModelAndView toLogin(HttpServletRequest request, HttpServletResponse response) {
         ModelAndView modelAndView = new ModelAndView();
         String loginUrl = request.getParameter("loginUrl");
+        System.out.println("loginUrl222222222222222====="+loginUrl);
         String idp = request.getParameter("idp");
         try {
             String authLogId = CookiesUtil.getCookie(request, COOKIE_LOG_ID);
@@ -163,6 +166,11 @@ public class AuthController {
     public ModelAndView loginsuccess(HttpServletRequest request, HttpServletResponse response, ModelAndView modelAndView) throws IOException {
         modelAndView.setViewName("loginsuccess");
         String returnUrl = request.getParameter("redirect_uri");
+        String cookieReturnUrl = CookiesUtil.getCookie(request, "return_url");
+        if(cookieReturnUrl!=null){
+            returnUrl = cookieReturnUrl;
+        }
+        System.out.println("redirect_uri33333333333333333====="+returnUrl);
         String authLogId = request.getParameter("auth_log_id");
         ClientDataInfo clientDataInfo = getUserInfoData(request);
         AuthLog authLog = authLogService.getById(authLogId);