版本回退至11/30

base-servers/auth/auth-server/src/main/java/com/usoftchina/saas/auth/controller/AuthController.java

@@ -33,7 +33,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -219,7 +218,7 @@ public class AuthController {
      * @param info
      * @return
      */
-    @GetMapping(value = "/sso/callback/{clientId}")
+    @GetMapping("/sso/callback/{clientId}")
     public void ssoCallback(HttpServletRequest request, HttpServletResponse response,
                             @PathVariable(required = false) String clientId, CookieInfo info, String callback) throws IOException{
         if (null != info && null != info.getMobile()) {
@@ -232,7 +231,7 @@ public class AuthController {
                 } else {
                     logger.error(result.getMessage());
                     ServletUtils.writeJsonPMessage(response, callback, false);
-//                    return "successCallback({success:'0'})";
+                    return;
                 }
             } else {
                 accountDTO = result.getData();
@@ -243,7 +242,7 @@ public class AuthController {
                     if (!updateResult.isSuccess()) {
                         logger.error(updateResult.getMessage());
                         ServletUtils.writeJsonPMessage(response, callback, false);
-//                        return "successCallback({success:'0'})";
+                        return;
                     }
                 }
             }
@@ -266,9 +265,7 @@ public class AuthController {
                         JsonUtils.toJsonString(new AuthDTO(tokenDTO, accountDTO)));
             }
             ServletUtils.writeJsonPMessage(response, callback, true);
-//            return "successCallback({success:'1'})";
         }
-//        return "successCallback({success:'0'})";
     }
 
     /**