跨域

lb-app/src/main/java/com/ydd/AppApplication.java

@@ -3,6 +3,7 @@ package com.ydd;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -13,7 +14,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  * 
  * @author douya
  */
-@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, SecurityAutoConfiguration.class })
 @EnableScheduling
 @EnableAsync
 @EnableFeignClients

lb-app/src/main/java/com/ydd/app/callback/controller/ElemeWaiMaiCallback.java

@@ -79,6 +79,7 @@ public class ElemeWaiMaiCallback {
 
     @RequestMapping("/doOrder")
     public String doOrder(@RequestBody(required = false) JSONObject jsonParams) {
+        log.info("饿了么订单：");
         if (null == jsonParams) {
             return "{\"message\":\"ok\"}";
         }

lb-app/src/main/java/com/ydd/app/config/AppMvcConfig.java

@@ -6,15 +6,22 @@ import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.format.FormatterRegistry;
 import org.springframework.lang.Nullable;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * app全局配置
@@ -56,4 +63,5 @@ public class AppMvcConfig implements WebMvcConfigurer {
         });
     }
 
+
 }

lb-app/src/main/java/com/ydd/app/service/impl/ApiCallBackKF.java

@@ -80,6 +80,12 @@ public class ApiCallBackKF extends ApiCallBack {
                 dto.setOrderEleRetaiStatus("10");
                 dto.setCancelReason(kfCallbackOrderVo.getActionCode());
                 break;
+            case 15:
+                dto.setOrderStatus(OrderStatusEnum.TO_BE_DELIVERED.status);
+                dto.setOrderMtStatus(15);
+                dto.setOrderEleStatus("DELIVERY_KNIGHT_REACH_SHOP");
+                dto.setOrderEleRetaiStatus("10");
+                break;
             default:
         }
         return dto;

lb-core/src/main/java/com/ydd/ecloud/core/config/CorsConfig.java

@@ -7,12 +7,26 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 @Configuration
 public class CorsConfig implements WebMvcConfigurer {
 
+//    @Override
+//    public void addCorsMappings(CorsRegistry registry) {
+//        registry.addMapping("/**")
+//            .allowedOrigins("*")
+//            .allowCredentials(true)
+//            .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
+//            .maxAge(3600);
+//    }
+
     @Override
     public void addCorsMappings(CorsRegistry registry) {
+        // 设置允许跨域的路由
         registry.addMapping("/**")
-            .allowedOrigins("*")
-            .allowCredentials(true)
-            .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
-            .maxAge(3600);
+                // 设置允许跨域请求的域名
+                .allowedOriginPatterns("*")    // 注意此处
+                // 是否允许证书（cookies）
+                .allowCredentials(true)
+                // 设置允许的方法
+                .allowedMethods("*")
+                // 跨域允许时间
+                .maxAge(3600);
     }
 }

lb-framework/src/main/java/com/ydd/framework/config/ResourcesConfig.java

@@ -47,20 +47,20 @@ public class ResourcesConfig implements WebMvcConfigurer
     /**
      * 跨域配置
      */
-//    @Bean
-//    public CorsFilter corsFilter()
-//    {
-//        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-//        CorsConfiguration config = new CorsConfiguration();
-//        config.setAllowCredentials(true);
-//        // 设置访问源地址
-//        config.addAllowedOrigin("*");
-//        // 设置访问源请求头
-//        config.addAllowedHeader("*");
-//        // 设置访问源请求方法
-//        config.addAllowedMethod("*");
-//        // 对接口配置跨域设置
-//        source.registerCorsConfiguration("/**", config);
-//        return new CorsFilter(source);
-//    }
+    @Bean
+    public CorsFilter corsFilter()
+    {
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        CorsConfiguration config = new CorsConfiguration();
+        config.setAllowCredentials(true);
+        // 设置访问源地址
+        config.addAllowedOrigin("*");
+        // 设置访问源请求头
+        config.addAllowedHeader("*");
+        // 设置访问源请求方法
+        config.addAllowedMethod("*");
+        // 对接口配置跨域设置
+        source.registerCorsConfiguration("/**", config);
+        return new CorsFilter(source);
+    }
 }

pom.xml

@@ -44,7 +44,7 @@
         <mybatis-plus.version>3.4.2</mybatis-plus.version>
         <hutool.version>5.4.0</hutool.version>
         <alipay-easysdk.version>2.1.0</alipay-easysdk.version>
-        <spring-boot.version>2.5.5</spring-boot.version>
+        <spring-boot.version>2.5.11</spring-boot.version>
         <spring-cloud.version>2020.0.4</spring-cloud.version>
         <spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
         <alibaba.nacos.version>2.0.3</alibaba.nacos.version>