合并开源主线

648540858

2023-04-04 b4048fbe80dba8e7756ae557a15ab60b4f80a44b

 src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java

@@ -73,23 +73,21 @@
    @Override
    public void configure(WebSecurity web) {

        if (!userSetting.isInterfaceAuthentication()) {
            web.ignoring().antMatchers("**");
        }else {
            ArrayList<String> matchers = new ArrayList<>();
            matchers.add("/");
            matchers.add("/#/**");
            matchers.add("/static/**");
            matchers.add("/index.html");
            matchers.add("/doc.html");
            matchers.add("/webjars/**");
            matchers.add("/swagger-resources/**");
            matchers.add("/v3/api-docs/**");
            matchers.add("/js/**");
            matchers.addAll(userSetting.getInterfaceAuthenticationExcludes());
            // 可以直接访问的静态数据
            web.ignoring().antMatchers(matchers.toArray(new String[0]));
        }
        ArrayList<String> matchers = new ArrayList<>();
        matchers.add("/");
        matchers.add("/#/**");
        matchers.add("/static/**");
        matchers.add("/index.html");
        matchers.add("/doc.html");
        matchers.add("/webjars/**");
        matchers.add("/swagger-resources/**");
        matchers.add("/v3/api-docs/**");
        matchers.add("/js/**");
        matchers.add("/api/device/query/snap/**");
        matchers.add("/record_proxy/*/**");
        matchers.addAll(userSetting.getInterfaceAuthenticationExcludes());
        // 可以直接访问的静态数据
        web.ignoring().antMatchers(matchers.toArray(new String[0]));
    }

    /**
@@ -122,7 +120,7 @@
                .authorizeRequests()
                .requestMatchers(CorsUtils::isPreFlightRequest).permitAll()
                .antMatchers(userSetting.getInterfaceAuthenticationExcludes().toArray(new String[0])).permitAll()
                .antMatchers("/api/user/login","/index/hook/**").permitAll()
                .antMatchers("/api/user/login","/index/hook/**","/zlm_Proxy/FhTuMYqB2HeCuNOb/record/t/1/2023-03-25/16:35:07-16:35:16-9353.mp4").permitAll()
                .anyRequest().authenticated()
                // 异常处理器
                .and()