|
@@ -7,7 +7,6 @@ import cn.dev33.satoken.interceptor.SaInterceptor;
|
|
|
import cn.dev33.satoken.router.SaRouter;
|
|
import cn.dev33.satoken.router.SaRouter;
|
|
|
import cn.dev33.satoken.stp.StpUtil;
|
|
import cn.dev33.satoken.stp.StpUtil;
|
|
|
import cn.dev33.satoken.util.SaResult;
|
|
import cn.dev33.satoken.util.SaResult;
|
|
|
-import cn.dev33.satoken.util.SaTokenConsts;
|
|
|
|
|
import com.vber.common.core.constant.HttpStatus;
|
|
import com.vber.common.core.constant.HttpStatus;
|
|
|
import com.vber.common.core.exception.SseException;
|
|
import com.vber.common.core.exception.SseException;
|
|
|
import com.vber.common.core.utils.ServletUtils;
|
|
import com.vber.common.core.utils.ServletUtils;
|
|
@@ -17,7 +16,6 @@ import com.vber.common.satoken.utils.LoginHelper;
|
|
|
import com.vber.common.security.config.properties.SecurityProperties;
|
|
import com.vber.common.security.config.properties.SecurityProperties;
|
|
|
import com.vber.common.security.handler.AllUrlHandler;
|
|
import com.vber.common.security.handler.AllUrlHandler;
|
|
|
import jakarta.servlet.http.HttpServletRequest;
|
|
import jakarta.servlet.http.HttpServletRequest;
|
|
|
-import jakarta.servlet.http.HttpServletResponse;
|
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
|
import org.springframework.boot.autoconfigure.AutoConfiguration;
|
|
@@ -57,8 +55,8 @@ public class SecurityConfig implements WebMvcConfigurer {
|
|
|
// 对未排除的路径进行检查
|
|
// 对未排除的路径进行检查
|
|
|
.check(() -> {
|
|
.check(() -> {
|
|
|
HttpServletRequest request = ServletUtils.getRequest();
|
|
HttpServletRequest request = ServletUtils.getRequest();
|
|
|
- HttpServletResponse response = ServletUtils.getResponse();
|
|
|
|
|
- response.setContentType(SaTokenConsts.CONTENT_TYPE_APPLICATION_JSON);
|
|
|
|
|
|
|
+// HttpServletResponse response = ServletUtils.getResponse();
|
|
|
|
|
+// response.setContentType(SaTokenConsts.CONTENT_TYPE_APPLICATION_JSON);
|
|
|
try {
|
|
try {
|
|
|
// 检查是否登录 是否有token
|
|
// 检查是否登录 是否有token
|
|
|
StpUtil.checkLogin();
|
|
StpUtil.checkLogin();
|
|
@@ -101,10 +99,11 @@ public class SecurityConfig implements WebMvcConfigurer {
|
|
|
.setAuth(obj -> {
|
|
.setAuth(obj -> {
|
|
|
SaHttpBasicUtil.check(username + ":" + password);
|
|
SaHttpBasicUtil.check(username + ":" + password);
|
|
|
})
|
|
})
|
|
|
- .setError(e -> {
|
|
|
|
|
- HttpServletResponse response = ServletUtils.getResponse();
|
|
|
|
|
- response.setContentType(SaTokenConsts.CONTENT_TYPE_APPLICATION_JSON);
|
|
|
|
|
- return SaResult.error(e.getMessage()).setCode(HttpStatus.UNAUTHORIZED);
|
|
|
|
|
- });
|
|
|
|
|
|
|
+ .setError(e -> SaResult.error(e.getMessage()).setCode(HttpStatus.UNAUTHORIZED));
|
|
|
|
|
+// .setError(e -> {
|
|
|
|
|
+// HttpServletResponse response = ServletUtils.getResponse();
|
|
|
|
|
+// response.setContentType(SaTokenConsts.CONTENT_TYPE_APPLICATION_JSON);
|
|
|
|
|
+// return SaResult.error(e.getMessage()).setCode(HttpStatus.UNAUTHORIZED);
|
|
|
|
|
+// });
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|