Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

8 天以前 408bab8b1c0c10514b8395cff92e47751e4dcdcd

 src/main/java/com/ruoyi/framework/config/ResourcesConfig.java

@@ -35,7 +35,7 @@
        /** swagger配置 */

        registry.addResourceHandler("/swagger-ui/**")

                .addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/")

                .setCacheControl(CacheControl.maxAge(5, TimeUnit.HOURS).cachePublic());;

                .setCacheControl(CacheControl.maxAge(5, TimeUnit.HOURS).cachePublic());

    }



    /**

@@ -69,4 +69,5 @@
        // 返回新的CorsFilter

        return new CorsFilter(source);

    }



}