Merge remote-tracking branch 'origin/master'

huimv-cattle/src/main/java/com/huimv/cattle/config/CorsConfig.java

@@ -0,0 +1,25 @@
+package com.huimv.cattle.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.reactive.CorsWebFilter;
+import org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource;
+import org.springframework.web.util.pattern.PathPatternParser;
+
+@Configuration
+public class CorsConfig {
+
+
+    @Bean
+    public CorsWebFilter corsFilter() {
+        CorsConfiguration config = new CorsConfiguration();
+        config.addAllowedMethod("*");
+        config.addAllowedOrigin("*");
+        config.addAllowedHeader("*");
+        config.setMaxAge(18000L);// 预检请求的缓存时间（秒），即在这个时间内，对于相同的跨域请求不会再预检了
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(new PathPatternParser());
+        source.registerCorsConfiguration("/**", config);
+        return new CorsWebFilter(source);
+    }
+}

huimv-cattle/src/main/java/com/huimv/cattle/controller/OnlineServiceController.java

@@ -1,15 +1,10 @@
 package com.huimv.cattle.controller;
 
-
 import com.huimv.cattle.pojo.OnlineService;
 import com.huimv.cattle.service.OnlineServiceService;
 import com.huimv.common.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>

huimv-cattle/src/main/java/com/huimv/cattle/controller/SalesCountController.java

@@ -46,6 +46,5 @@ public class SalesCountController {
         }
         return new Result(ResultCode.SUCCESS,"删除成功");
     }
-
 }