跨域

lb-app/pom.xml

@@ -28,7 +28,6 @@
             <artifactId>spring-boot-devtools</artifactId>
             <optional>true</optional> <!-- 表示依赖不会传递 -->
         </dependency>
-
         <!-- swagger2-->
         <dependency>
             <groupId>io.springfox</groupId>
@@ -133,6 +132,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
     </dependencies>
 
     <build>

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

@@ -9,8 +9,7 @@ public class CorsConfig implements WebMvcConfigurer {
 
 //    @Override
 //    public void addCorsMappings(CorsRegistry registry) {
-//        registry.addMapping("/**")
-//            .allowedOrigins("*")
+//        registry.addMapping("/**")//            .ok("*")
 //            .allowCredentials(true)
 //            .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
 //            .maxAge(3600);

lb-feginclient/src/main/java/com/ydd/api/DeliveryService.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-@FeignClient(name = "lb-delivery", url = "http://127.0.0.1:8083/delivery")
+@FeignClient(name = "lb-delivery")
 public interface DeliveryService {
 
     @PostMapping(value = "/queryOrderInfo")

lb-feginclient/src/main/java/com/ydd/api/EleRetailApi.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.Map;
 
-@FeignClient(name = "lb-waimai", url = "http://127.0.0.1:8085/waimai")
+@FeignClient(name = "lb-waimai" )
 public interface EleRetailApi {
 
     @PostMapping(value = "/eleRetail/syncRiderPosition")

lb-feginclient/src/main/java/com/ydd/api/ElemeApi.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
-@FeignClient(name = "lb-waimai", url = "http://127.0.0.1:8085/waimai")
+@FeignClient(name = "lb-waimai" )
 public interface ElemeApi {
 
     @PostMapping(value = "/eleme/selfDeliveryLocationSync")

lb-feginclient/src/main/java/com/ydd/api/JdHomeApi.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import java.util.List;
 import java.util.Map;
 
-@FeignClient(name = "lb-waimai",url = "http://127.0.0.1:8085/waimai")
+@FeignClient(name = "lb-waimai" )
 public interface JdHomeApi {
 
     @PostMapping(value="/jd/selectJdHomeOrder")

lb-feginclient/src/main/java/com/ydd/api/MeiTuanApi.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.Map;
 
-@FeignClient(name = "lb-waimai", url = "http://127.0.0.1:8085/waimai")
+@FeignClient(name = "lb-waimai" )
 public interface MeiTuanApi {
 
     @PostMapping(value = "/meituan/syncRiderPosition")

lb-feginclient/src/main/java/com/ydd/api/MeiTuanSgApi.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.Map;
 
-@FeignClient(name = "lb-waimai",url = "http://127.0.0.1:8085/waimai")
+@FeignClient(name = "lb-waimai" )
 public interface MeiTuanSgApi {
 
 

lb-feginclient/src/main/java/com/ydd/api/PrintApi.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
-@FeignClient(name = "lb-waimai",url = "http://127.0.0.1:8085/waimai")
+@FeignClient(name = "lb-waimai" )
 public interface PrintApi {
 
     @PostMapping(value="/print/printOrder")

lb-feginclient/src/main/java/com/ydd/api/WaimaiApi.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @date 2021/11/10 11:59
  */
 
-@FeignClient(name = "lb-waimai", url = "http://127.0.0.1:8085/waimai")
+@FeignClient(name = "lb-waimai")
 public interface WaimaiApi {
 
     /**

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

@@ -13,6 +13,9 @@ import com.ydd.common.config.ProjectConfig;
 import com.ydd.common.constant.Constants;
 import com.ydd.framework.interceptor.RepeatSubmitInterceptor;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 通用配置
  * 
@@ -50,11 +53,20 @@ public class ResourcesConfig implements WebMvcConfigurer
     @Bean
     public CorsFilter corsFilter()
     {
+
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
         CorsConfiguration config = new CorsConfiguration();
+        // 是否允许请求带有验证信息
         config.setAllowCredentials(true);
+
+        // 允许访问的客户端域名
+        // (springboot2.4以上的加入这一段可解决 allowedOrigins cannot contain the special value "*"问题)
+        List<String> allowedOriginPatterns = new ArrayList<>();
+        allowedOriginPatterns.add("*");
+        config.setAllowedOriginPatterns(allowedOriginPatterns);
+
         // 设置访问源地址
-        config.addAllowedOrigin("*");
+        // config.addAllowedOrigin("*");
         // 设置访问源请求头
         config.addAllowedHeader("*");
         // 设置访问源请求方法

lb-third/lb-third-common/pom.xml

@@ -136,8 +136,17 @@
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.netflix.ribbon</groupId>
+                    <artifactId>ribbon</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-loadbalancer</artifactId>
         </dependency>
-
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>

lb-third/lb-third-delivery/src/main/resources/application.yml

@@ -4,7 +4,7 @@ server:
   port: 8083
   servlet:
     # 应用的访问路径
-    context-path: /delivery
+    context-path: /
   # undertow 配置
   undertow:
     # HTTP post内容的最大大小。当值为-1时，默认值为大小是无限的

lb-third/lb-third-waimai/pom.xml

@@ -51,6 +51,62 @@
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.1.1.RELEASE</version>
+                <configuration>
+                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                    <warName>${project.artifactId}</warName>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <testFailureIgnore>true</testFailureIgnore>
+                </configuration>
+            </plugin>
+        </plugins>
+        <finalName>${project.artifactId}</finalName>
+    </build>
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <!-- 环境标识，需要与配置文件的名称相对应 -->
+                <profiles.active>dev</profiles.active>
+                <logging.level>debug</logging.level>
+            </properties>
+            <activation>
+                <!-- 默认环境 -->
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <profiles.active>prod</profiles.active>
+                <logging.level>info</logging.level>
+            </properties>
+        </profile>
+    </profiles>
 
 </project>

lb-third/lb-third-waimai/src/main/resources/application.yml

@@ -4,7 +4,7 @@ server:
   port: 8085
   servlet:
     # 应用的访问路径
-    context-path: /waimai
+    context-path: /
   # undertow 配置
   undertow:
     # HTTP post内容的最大大小。当值为-1时，默认值为大小是无限的