瀏覽代碼

脚本上传下载

dengsixing 2 年之前
父節點
當前提交
c1812872e8

+ 1 - 1
4dkankan-common-web/src/main/java/com/fdkankan/web/controller/BaseController.java

@@ -49,7 +49,7 @@ public class BaseController {
         return ssoLoginHelper.getSsoUser(request.getHeader("token"));
     }
 
-    protected com.fdkankan.web.model.SSOUser getSsoUserV3(){
+    protected SSOUser getSsoUserV3(){
         return ssoLoginHelper.loginCheckV3(request.getHeader("token"));
     }
 

+ 1 - 1
4dkankan-common-web/src/main/java/com/fdkankan/web/response/BaseResponseAdvice.java

@@ -13,7 +13,7 @@ import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
 
-@ConditionalOnMissingBean(ResponseBodyAdvice.class)
+@ConditionalOnMissingBean(name = "customResponseAdvice")
 @RestControllerAdvice
 @Slf4j
 public class BaseResponseAdvice implements ResponseBodyAdvice<Object> {

+ 2 - 2
4dkankan-common-web/src/main/java/com/fdkankan/web/user/SSOLoginHelper.java

@@ -31,9 +31,9 @@ public class SSOLoginHelper {
         return null;
     }
 
-    public com.fdkankan.web.model.SSOUser loginCheckV3(String token) {
+    public SSOUser loginCheckV3(String token) {
         if (token != null && token.trim().length() > 0) {
-            com.fdkankan.web.model.SSOUser ssoUser = ssoLoginStore.getV3(token);
+            SSOUser ssoUser = ssoLoginStore.getSsoUser(token);
             if (ssoUser != null) {
                 return ssoUser;
             }