去除无效代码

pull/1587/head
cntianxin@outlook.com 2024-08-21 19:01:16 +08:00
parent 46a6d7bc38
commit 3026102986
4 changed files with 0 additions and 60 deletions

View File

@ -44,23 +44,6 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
@Override @Override
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException { protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException {
// 忽略登录请求的token验证
// String requestURI = request.getRequestURI();
// if ((requestURI.startsWith("/doc.html") || requestURI.startsWith("/swagger-ui") ) && !userSetting.getDocEnable()) {
// response.setStatus(HttpServletResponse.SC_NOT_FOUND);
// return;
// }
// if (requestURI.equalsIgnoreCase("/api/user/login")) {
// chain.doFilter(request, response);
// return;
// }
//
// if (!userSetting.isInterfaceAuthentication()) {
// UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(null, null, new ArrayList<>() );
// SecurityContextHolder.getContext().setAuthentication(token);
// chain.doFilter(request, response);
// return;
// }
String jwt = request.getHeader(JwtUtils.getHeader()); String jwt = request.getHeader(JwtUtils.getHeader());
if(jwt != null) { if(jwt != null) {
JwtUser jwtUser = JwtUtils.verifyToken(jwt); JwtUser jwtUser = JwtUtils.verifyToken(jwt);

View File

@ -57,7 +57,6 @@ public class SecurityUtils {
if(principal!=null && !"anonymousUser".equals(principal.toString())){ if(principal!=null && !"anonymousUser".equals(principal.toString())){
return (LoginUser) principal; return (LoginUser) principal;
// return new LoginUser(user, LocalDateTime.now());
} }
} }
return null; return null;

View File

@ -134,42 +134,6 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
.logoutSuccessHandler(logoutHandler) .logoutSuccessHandler(logoutHandler)
; ;
http.addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class); http.addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
// ExpressionUrlAuthorizationConfigurer<HttpSecurity>.ExpressionInterceptUrlRegistry registry = http
// .authorizeRequests();
// //允许跨域请求的OPTIONS请求
// registry.antMatchers(HttpMethod.OPTIONS)
// .permitAll();
// registry.and()
// .authorizeRequests()
// .antMatchers(HttpMethod.GET,
// "/",
// "/swagger-ui/",
// "/doc.html")
// .permitAll()
// .antMatchers("/api/user/login", "/api/ptz/**", "/zlm/**", "/api/server/**","/index/hook/**","/index/hook/abl/**", "/swagger-ui/**", "/doc.html#/**")
// .permitAll()
// .anyRequest()
// .authenticated()
// // 关闭跨站请求防护及不使用session
// .and()
// .headers().contentTypeOptions().disable()
// .and()
// .cors().configurationSource(configurationSource())
// .and()
// .csrf()
// .disable()
// .sessionManagement()
// .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
// // 自定义权限拒绝处理类
// .and()
// .exceptionHandling()
// .authenticationEntryPoint(anonymousAuthenticationEntryPoint)
// .and().logout().logoutUrl("/api/user/logout").permitAll()
// .logoutSuccessHandler(logoutHandler)
// // 自定义权限拦截器JWT过滤器
// .and()
// .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
} }
CorsConfigurationSource configurationSource() { CorsConfigurationSource configurationSource() {

View File

@ -19,7 +19,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UserDetailsService;
@ -31,7 +30,6 @@ import javax.security.sasl.AuthenticationException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.security.Principal; import java.security.Principal;
import java.time.LocalDateTime;
import java.util.List; import java.util.List;
@Tag(name = "用户管理") @Tag(name = "用户管理")
@ -231,10 +229,6 @@ public class UserController {
if (userInfo == null) { if (userInfo == null) {
throw new ControllerException(ErrorCode.ERROR100); throw new ControllerException(ErrorCode.ERROR100);
} }
// User user = userService.getUser(userInfo.getUsername(), userInfo.getPassword());
// if (user == null) {
// throw new ControllerException(ErrorCode.ERROR100.getCode(), "用户不存在");
// }
return userInfo; return userInfo;
} }
} }