merge

lb-common/pom.xml

@@ -192,11 +192,11 @@
             <version>1.11.0</version>
         </dependency>
         <!--  mvn install:install-file -DgroupId=shangou_platform -DartifactId=open_sdk -Dversion=1.0.19.1-SNAPSHOT -Dpackaging=jar -Dfile=shangou_platform_open_sdk-1.0.19.1-SNAPSHOT.jar-->
-<!--        <dependency>-->
-<!--            <groupId>shangou_platform</groupId>-->
-<!--            <artifactId>open_sdk</artifactId>-->
-<!--            <version>1.0.19.1-SNAPSHOT</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>shangou_platform</groupId>
+            <artifactId>open_sdk</artifactId>
+            <version>1.0.19.1-SNAPSHOT</version>
+        </dependency>
 
         <dependency>
             <groupId>com.google.guava</groupId>

lb-gateway/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 8080
+  port: 8087
 
 # Spring
 spring:

lb-module/src/main/java/com/ydd/module/service/impl/ShopDeliveryServiceImpl.java

@@ -42,7 +42,6 @@ import java.util.stream.Collectors;
  * @date 2021-03-02
  */
 @Service
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
 public class ShopDeliveryServiceImpl extends ServiceImpl<ShopDeliveryMapper, ShopDelivery> implements IShopDeliveryService {
 
     @Resource

lb-task/src/main/java/com/ydd/service/DspDeliveryServiceImpl.java

@@ -20,14 +20,12 @@ import java.util.List;
  * @date 2021-02-01
  */
 @Service
-public class DspDeliveryServiceImpl extends ServiceImpl<DspDeliveryMapper, DspDelivery> implements IDspDeliveryService {
+public class DspDeliveryServiceImpl extends ServiceImpl<DspDeliveryMapper, DspDelivery> {
 
 
     @Resource
     private DeliveryService fengniaoClient;
 
-
-    @Override
     public void fengNiaoTask() {
         try {
             List<DspDelivery> deliverys = baseMapper.selectDspDeliverysByTime();

lb-task/src/main/java/com/ydd/service/ShopWaimaiServiceImpl.java

@@ -28,14 +28,13 @@ import java.util.List;
  * @date 2021-02-01
  */
 @Service
-public class ShopWaimaiServiceImpl extends ServiceImpl<ShopWaimaiMapper, ShopWaimai> implements IShopWaimaiService {
+public class ShopWaimaiServiceImpl extends ServiceImpl<ShopWaimaiMapper, ShopWaimai> {
 
     @Resource
     private ElemeApi elemeAuthClient;
     @Resource
     private WaimaiConfig waimaiConfig;
 
-    @Override
     public void elemeTask() {
         try {
             log.debug("饿了么刷新token任务执行");
@@ -60,7 +59,6 @@ public class ShopWaimaiServiceImpl extends ServiceImpl<ShopWaimaiMapper, ShopWai
 
 
     @SneakyThrows
-    @Override
     public void refreshSgToken() {
        List<ShopWaimai> list = baseMapper.selectList(new QueryWrapper<ShopWaimai>()
                 .eq("waimai_id", 14)

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

@@ -8,14 +8,14 @@ spring:
     nacos:
       discovery:
       # 服务注册地址
-        server-addr: 153.37.175.42:8848
+        server-addr: 153.37.175.42:28848
       config:
        # 配置中心地址
-        server-addr: 153.37.175.42:8848
-        file-extension: yml         # 配置文件格式
+        server-addr: 153.37.175.42:28848
+        file-extension: yaml         # 配置文件格式
         # 共享配置
         shared-configs[0]:
-          data-id: application-dev.yaml
+          data-id: lb_application-dev.yaml
           refresh: false
 #        shared-configs:
 #          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

lb-web/src/main/java/com/ydd/web/config/WebMvcConfig.java

@@ -1,5 +1,6 @@
 package com.ydd.web.config;
 
+import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A;
 import com.ydd.web.interceptor.BindAgentInterceptor;
 import com.ydd.web.interceptor.DomainInterceptor;
 import lombok.RequiredArgsConstructor;
@@ -14,12 +15,13 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
  * @date 2022/03/16 10:06
  */
 @Configuration
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
 public class WebMvcConfig implements WebMvcConfigurer {
 
-    private final BindAgentInterceptor bindAgentInterceptor;
+    @Autowired
+    private BindAgentInterceptor bindAgentInterceptor;
 
-    private final DomainInterceptor domainInterceptor;
+    @Autowired
+    private DomainInterceptor domainInterceptor;
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {

lb-web/src/main/resources/bootstrap.yml

@@ -8,14 +8,14 @@ spring:
     nacos:
       discovery:
       # 服务注册地址
-        server-addr: 153.37.175.42:8848
+        server-addr: 153.37.175.42:28848
       config:
        # 配置中心地址
-        server-addr: 153.37.175.42:8848
-        file-extension: yml         # 配置文件格式
+        server-addr: 153.37.175.42:28848
+        file-extension: yaml         # 配置文件格式
         # 共享配置
         shared-configs[0]:
-          data-id: application-dev.yaml
+          data-id: lb_application-dev.yaml
           refresh: false
 #        shared-configs:
 #          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}