From ecff6c40a1728c61c6a9a713df721b0eb31a616c Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 23 Aug 2023 13:12:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/config/Interceptor/WebAppConfiguration.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/config/Interceptor/WebAppConfiguration.java b/screen-api/src/main/java/com/moral/api/config/Interceptor/WebAppConfiguration.java
index dec9b13..ee0343b 100644
--- a/screen-api/src/main/java/com/moral/api/config/Interceptor/WebAppConfiguration.java
+++ b/screen-api/src/main/java/com/moral/api/config/Interceptor/WebAppConfiguration.java
@@ -1,11 +1,10 @@
package com.moral.api.config.Interceptor;
import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.system.ApplicationHome;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.config.annotation.*;
import java.util.ArrayList;
@@ -17,7 +16,7 @@
//������������������������
@Bean
@ConfigurationProperties("mvc.interceptor.exclude")
- public ArrayList<String> getExcludePath(){
+ public ArrayList<String> getExcludePath() {
return new ArrayList<>();
}
@@ -28,4 +27,34 @@
regisration.addPathPatterns("/**/**");//������������������
regisration.excludePathPatterns(excludePath);//���������������������
}
+
+ @Override
+ public void addCorsMappings(CorsRegistry registry) {
+ registry.addMapping("/**")
+ //������������Cookie
+ .allowCredentials(true)
+ //���������������������
+ .allowedOrigins("*")
+ .allowedMethods(new String[]{"GET", "POST", "PUT", "DELETE"})
+ .allowedHeaders("*")
+ .exposedHeaders("*");
+ }
+
+ /**
+ * ���������������������������������������������������������
+ *
+ * @param registry
+ */
+ @Override
+ public void addResourceHandlers(ResourceHandlerRegistry registry) {
+ try {
+ ApplicationHome h = new ApplicationHome(getClass());
+ //���jar������������������������������upload������������������������������������
+ String path = h.getSource().getParentFile().toString() + "/static/";
+ registry.addResourceHandler("/static/**").addResourceLocations("file:" + path);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ }
}
--
Gitblit v1.8.0