callback接口还原

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

@@ -220,7 +220,7 @@ public class AuthController {
      * @return
      */
     @GetMapping(value = "/sso/callback/{clientId}", produces = {"application/javascript"})
-    public String ssoCallback(HttpServletRequest request, HttpServletResponse response,
+    public void ssoCallback(HttpServletRequest request, HttpServletResponse response,
                             @PathVariable(required = false) String clientId, CookieInfo info, String callback) throws IOException{
         if (null != info && null != info.getMobile()) {
             AccountDTO accountDTO = null;
@@ -231,8 +231,8 @@ public class AuthController {
                     accountDTO = createAccountByCookieInfo(info);
                 } else {
                     logger.error(result.getMessage());
-                    //ServletUtils.writeJsonPMessage(response, callback, false);
-                    return "successCallback({success:'0'})";
+                    ServletUtils.writeJsonPMessage(response, callback, false);
+//                    return "successCallback({success:'0'})";
                 }
             } else {
                 accountDTO = result.getData();
@@ -242,8 +242,8 @@ public class AuthController {
                     Result updateResult = accountApi.update(BeanMapper.map(accountDTO, AccountUpdateDTO.class));
                     if (!updateResult.isSuccess()) {
                         logger.error(updateResult.getMessage());
-                        //ServletUtils.writeJsonPMessage(response, callback, false);
-                        return "successCallback({success:'0'})";
+                        ServletUtils.writeJsonPMessage(response, callback, false);
+//                        return "successCallback({success:'0'})";
                     }
                 }
             }
@@ -265,10 +265,10 @@ public class AuthController {
                 socketMessageApi.sendToClient(clientId, "/sso/callback",
                         JsonUtils.toJsonString(new AuthDTO(tokenDTO, accountDTO)));
             }
-            //ServletUtils.writeJsonPMessage(response, callback, true);
-            return "successCallback({success:'1'})";
+            ServletUtils.writeJsonPMessage(response, callback, true);
+//            return "successCallback({success:'1'})";
         }
-        return "successCallback({success:'0'})";
+//        return "successCallback({success:'0'})";
     }
 
     /**