Merge remote-tracking branch 'origin/master'

src/main/java/com/pipihelper/project/configurer/WebMvcConfigurer.java

@@ -98,12 +98,18 @@ public class WebMvcConfigurer extends WebMvcConfigurerAdapter {
         });
     }
 
-    //解决跨域问题
     @Override
     public void addCorsMappings(CorsRegistry registry) {
-        //registry.addMapping("/**");
+        registry.addMapping("/**")
+                .allowedOrigins("*")
+                .allowedMethods("POST", "GET", "PUT", "OPTIONS", "DELETE")
+                .allowCredentials(true)
+                .allowedHeaders("*")
+                .maxAge(3600);
+        WebMvcConfigurer.super.addCorsMappings(registry);
     }
 
+
     //添加拦截器
     @Override
     public void addInterceptors(InterceptorRegistry registry) {