Merge branch 'release-法国宣传页' into test

src/main/java/com/fdkankan/scene/Interceptor/CheckPermitAspect.java

@@ -40,7 +40,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 @Order(101)
 public class CheckPermitAspect {
 
-	private static Set<String> demoAllowApis = new HashSet<>();
+	public static Set<String> demoAllowApis = new HashSet<>();
 
 	static {
 		demoAllowApis.add("/tag/list");

src/main/java/com/fdkankan/scene/config/InterceptorConfig.java

@@ -1,38 +1,40 @@
-package com.fdkankan.scene.config;
-
-import com.fdkankan.scene.Interceptor.TokenInterceptor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-
-@Configuration
-public class InterceptorConfig implements WebMvcConfigurer {
-
-	@Autowired
-	private TokenInterceptor tokenInterceptor;
-
+//package com.fdkankan.scene.config;
+//
+//import com.fdkankan.scene.Interceptor.TokenInterceptor;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.web.servlet.config.annotation.CorsRegistry;
+//import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+//import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+//
+//
+//@Configuration
+//public class InterceptorConfig implements WebMvcConfigurer {
+//
+//	@Autowired
+//	private TokenInterceptor tokenInterceptor;
+//
+////	@Override
+////	public void addCorsMappings(CorsRegistry registry) {
+////		registry.addMapping("/**").allowCredentials(true).allowedHeaders("*").allowedOrigins("*").allowedMethods("*");
+////
+////	}
+//
 //	@Override
-//	public void addCorsMappings(CorsRegistry registry) {
-//		registry.addMapping("/**").allowCredentials(true).allowedHeaders("*").allowedOrigins("*").allowedMethods("*");
+//	public void addInterceptors(InterceptorRegistry registry) {
+//		registry.addInterceptor(tokenInterceptor)
+//				.addPathPatterns("/service/scene/edit/**")
+//				.excludePathPatterns("/service/scene/edit/getServiceUpTip");
+////				.excludePathPatterns("/**/sso/**","/app/**","/test/**","/**/inner/**")
 //
+//		WebMvcConfigurer.super.addInterceptors(registry);
 //	}
-
-	@Override
-	public void addInterceptors(InterceptorRegistry registry) {
-		registry.addInterceptor(tokenInterceptor).addPathPatterns("/service/scene/edit/**");
-//				.excludePathPatterns("/**/sso/**","/app/**","/test/**","/**/inner/**")
-
-		WebMvcConfigurer.super.addInterceptors(registry);
-	}
-
-	@Override
-	public void addResourceHandlers(ResourceHandlerRegistry registry) {
-		WebMvcConfigurer.super.addResourceHandlers(registry);
-	}
-
-}
-
+//
+//	@Override
+//	public void addResourceHandlers(ResourceHandlerRegistry registry) {
+//		WebMvcConfigurer.super.addResourceHandlers(registry);
+//	}
+//
+//}
+//