Merge remote-tracking branch 'origin2/dev' into origin2-dev

src/main/java/platform/common/util/JWTUtil.java

@@ -1,7 +1,8 @@
 package platform.common.util;
 
 import io.jsonwebtoken.*;
-import org.apache.tomcat.util.codec.binary.Base64;
+
+import org.apache.commons.codec.binary.Base64;
 import platform.common.Constant;
 import platform.common.base.model.CheckResult;
 

src/main/java/platform/modules/oauth/LoginCallback.java

@@ -47,25 +47,36 @@ public class LoginCallback extends BaseController {
 
     @PostMapping(value = "")
     public String validateLogin(String SAMLResponse) {
+        log.info("======================log leeking begin========================");
         log.info("! SAMLResponse = {}", SAMLResponse);
-        System.out.println("===============");
+        //System.out.println("===============");
         User user = ShiroUtils.getCurrentUser();
+        log.info("======================LoginCallback.validateLogin.step1========================");
         User existUser = userDao.findByNickName(user.getNick_name(), Constant.UserType.GOVERNMENT);
         if (null == existUser) {
             user.setUser_type(Constant.UserType.GOVERNMENT);
             user.setPassword(SecureUtil.md5().digestHex(resetPassword));
             userService.saveSelectiveSso(user);
         }
+
+        log.info("======================LoginCallback.validateLogin.step2========================");
         UsernamePasswordToken token = new UsernamePasswordToken();
         token.setUsername(user.getNick_name());
+        log.info("======================LoginCallback.validateLogin.step3========================");
         //token.setPassword(resetPassword.toCharArray());
         token.setSSO(true);
+        log.info("======================LoginCallback.validateLogin.step4========================");
         SecurityUtils.getSubject().login(token);
+
+        log.info("======================LoginCallback.validateLogin.step5========================");
         // 注入token到cookie
         String tokenString = userService.createToken();
         tokenString = tokenString.replace("Bearer ", "");
         log.info("tokenstring: {}", tokenString);
+        log.info("======================LoginCallback.validateLogin.step6========================");
         CookieUtil.createWebCookie(response, "token", tokenString, 7200);
+        log.info("======================LoginCallback.validateLogin.step7========================");
+        log.info("======================log leeking end========================");
         return "redirect:/admin/home";
 
 }