Merge branch 'master' of http://git.ydd100.cn/wangtao01/liebao-cloud

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

@@ -17,17 +17,15 @@ import java.util.Map;
 public interface EleRetailApi {
 
     @PostMapping(value = "/eleRetail/syncRiderPosition")
-    public ResObject syncRiderPosition(@RequestBody SyncRiderPositionStatusVo syncRiderPositionVo);
-
+    ResObject syncRiderPosition(@RequestBody SyncRiderPositionStatusVo syncRiderPositionVo);
     @GetMapping(value = "/eleRetail/getOrderList")
-    public ResObject<OrderEBaiList> getOrderList(@RequestParam("thirdShopId") String thirdShopId, @RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime, @RequestParam("status") String status);
-
+    ResObject<OrderEBaiList> getOrderList(@RequestParam("thirdShopId") String thirdShopId, @RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime, @RequestParam("status") String status);
     @GetMapping(value = "/eleRetail/getOrder")
-    public OrderGetResult getOrder(@RequestParam("orderId") String orderId);
+    OrderGetResult getOrder(@RequestParam("orderId") String orderId);
     @GetMapping(value = "/eleRetail/confirm")
-    public Boolean confirm(@RequestParam("orderId") String orderId);
+    Boolean confirm(@RequestParam("orderId") String orderId);
     @GetMapping(value = "/eleRetail/doStoreMap")
-    public ResObject<ElemeRetailMerchantResultVo> doStoreMap(@RequestParam Map<String, String> params);
+    ResObject<ElemeRetailMerchantResultVo> doStoreMap(@RequestParam Map<String, String> params);
     @GetMapping(value="/queryFoodList")
-    ResObject  queryFoodList(@RequestParam("code")String code, @RequestParam("pageNo") Integer pageNo,@RequestParam("pageSize")Integer pageSize);
+    ResObject queryFoodList(@RequestParam("code")String code, @RequestParam("pageNo") Integer pageNo,@RequestParam("pageSize")Integer pageSize);
 }

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

@@ -15,17 +15,17 @@ import org.springframework.web.bind.annotation.RequestParam;
 public interface ElemeApi {
 
     @PostMapping(value="/eleme/selfDeliveryLocationSync")
-    public ResObject selfDeliveryLocationSync(@RequestBody  SyncRiderPositionStatusVo syncRiderPositionVo);
+    ResObject selfDeliveryLocationSync(@RequestBody SyncRiderPositionStatusVo syncRiderPositionVo);
     @GetMapping(value="/eleme/getOAuthUrl")
-    public String getOAuthUrl(@RequestParam("shopCode")String shopCode);
+    String getOAuthUrl(@RequestParam("shopCode") String shopCode);
     @GetMapping(value="/eleme/getAllOrders")
-    public ResObject<OrderList> getAllOrders(@RequestParam("shopCode")String token, @RequestParam("shopId")Long shopId, @RequestParam("pageNo")Integer pageNo,@RequestParam("pageSize") Integer pageSize, @RequestParam("date")String date);
+    ResObject<OrderList> getAllOrders(@RequestParam("shopCode") String token, @RequestParam("shopId") Long shopId, @RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam("date") String date);
     @PostMapping(value="/eleme/confirmOrder")
-    public ResObject confirmOrder(@RequestBody ConfirmOrderVo confirmOrderVo);
+    ResObject confirmOrder(@RequestBody ConfirmOrderVo confirmOrderVo);
     @GetMapping(value="/eleme/doOAuthToken")
-    public ResObject doOAuthToken(@RequestParam("code")String code,@RequestParam("state") String state );
+    ResObject doOAuthToken(@RequestParam("code") String code, @RequestParam("state") String state);
     @PostMapping(value="/eleme/doOAuthToken")
-    public ResObject doOrder(@RequestBody(required = false) JSONObject jsonParams);
+    ResObject doOrder(@RequestBody(required = false) JSONObject jsonParams);
     @GetMapping(value="/queryItem")
-    ResObject  queryItem(@RequestParam("authToken")String authToken, @RequestParam("thirdShopId") Long thirdShopId);
+    ResObject queryItem(@RequestParam("authToken")String authToken, @RequestParam("thirdShopId") Long thirdShopId);
 }

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

@@ -17,13 +17,13 @@ import java.util.List;
 public interface PrintApi {
 
     @PostMapping(value="/print/printOrder")
-    public ResObject printOrder(@RequestBody PrintDto PrintDto);
+    ResObject printOrder(@RequestBody PrintDto PrintDto);
     @PostMapping(value="/print/printTestOrder")
-    public ResObject printTestOrder(@RequestBody PrintDto PrintDto);
+    ResObject printTestOrder(@RequestBody PrintDto PrintDto);
     @PostMapping(value="/print/addPrintSn")
-    public String  addPrintSn(@RequestParam("type")Integer type, @RequestParam("deviceSn")String deviceSn, @RequestParam("deviceSecret")String deviceSecret, @RequestParam("name")String name);
+    String addPrintSn(@RequestParam("type") Integer type, @RequestParam("deviceSn") String deviceSn, @RequestParam("deviceSecret") String deviceSecret, @RequestParam("name") String name);
     @PostMapping(value="/print/printStatus")
-    public <T> T printStatus(@RequestParam("type")Integer type,  @RequestParam("deviceSn")String deviceSn, @RequestParam("deviceSecret")String deviceSecret);
+    <T> T printStatus(@RequestParam("type") Integer type, @RequestParam("deviceSn") String deviceSn, @RequestParam("deviceSecret") String deviceSecret);
     @GetMapping(value="/print/deleteSn")
-    public void  deleteSn( @RequestParam("deviceSn")String deviceSn,@RequestParam("type")Integer type);
+    void deleteSn(@RequestParam("deviceSn") String deviceSn, @RequestParam("type") Integer type);
 }

lb-gateway/pom.xml

@@ -26,12 +26,14 @@
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <version>2021.1</version>
         </dependency>
 
         <!-- SpringCloud Alibaba Nacos Config -->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+            <version>2021.1</version>
         </dependency>
 
         <!--&lt;!&ndash; SpringCloud Alibaba Sentinel &ndash;&gt;-->
@@ -50,6 +52,7 @@
         <dependency>
             <groupId>com.alibaba.csp</groupId>
             <artifactId>sentinel-datasource-nacos</artifactId>
+            <version>1.8.0</version>
         </dependency>
 
 

lb-third/lb-third-print/src/main/java/com/ydd/third/print/service/UnifiedPrintService.java

@@ -1,10 +1,7 @@
 package com.ydd.third.print.service;
 
-import com.ydd.common.core.redis.RedisCache;
-import com.ydd.common.utils.DateUtils;
 import com.ydd.ecloud.core.enums.StatusEnum;
 import com.ydd.third.print.enums.PrintDeviceType;
-import com.ydd.third.print.feie.resp.FeStatusResp;
 import com.ydd.third.print.feie.service.FePrintService;
 import com.ydd.third.print.jiaboyun.service.JBYPrintService;
 import com.ydd.third.print.request.PrintDeviceDto;
@@ -46,7 +43,6 @@ public class UnifiedPrintService {
 
     private final YSYPrintService ysyPrintService;
 
-    private final RedisCache redisCache;
     /**
      * 添加打印机
      *

lb-third/lb-third-print/src/main/java/com/ydd/third/print/yilian/service/YlyPrintService.java

@@ -1,10 +1,7 @@
 package com.ydd.third.print.yilian.service;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.google.gson.JsonObject;
 import com.ydd.common.core.redis.RedisCache;
-import com.ydd.third.common.exception.BusinessException;
 import com.ydd.third.print.config.PrintConfig;
 import com.ydd.third.print.feie.resp.FeStatusResp;
 import com.ydd.third.print.feie.utils.PrintUtil;
@@ -12,19 +9,16 @@ import com.ydd.third.print.request.PrintDeviceDto;
 import com.ydd.third.print.request.PrintOrderActDto;
 import com.ydd.third.print.request.PrintOrderDto;
 import com.ydd.third.print.request.PrintOrderGoodsDto;
-import com.ydd.third.print.yilian.LAVApi;
 import com.ydd.third.print.yilian.dto.Format;
 import com.ydd.third.print.yilian.tag.*;
 import com.ydd.third.print.yilian.utils.CloudPrintUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.List;
 
 /**
  * 易连云打印

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

@@ -18,7 +18,7 @@ project:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8083
+  port: 8085
   servlet:
     # 应用的访问路径
     context-path: /delivery