优化精简项目结构

api/oms-api/pom.xml

@@ -112,33 +112,56 @@
             <artifactId>dou</artifactId>
             <version>2.0.0</version>
         </dependency>
-
         <dependency>
-            <groupId>cn.qihangerp.services</groupId>
+            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jd-api</artifactId>
+            <artifactId>jackson-mapper-asl</artifactId>
-            <version>1.0.6</version>
+            <version>1.9.13</version> <!-- jd-sdk依赖 -->
         </dependency>
+        <dependency>
+            <groupId>cn.qihangerp.service</groupId>
+            <artifactId>jd</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>cn.qihangerp.services</groupId>-->
+<!--            <artifactId>jd-api</artifactId>-->
+<!--            <version>1.0.6</version>-->
+<!--        </dependency>-->
 <!--        <dependency>-->
 <!--            <groupId>cn.qihangerp.services</groupId>-->
 <!--            <artifactId>dou-api</artifactId>-->
 <!--            <version>1.0.6</version>-->
 <!--        </dependency>-->
         <dependency>
-            <groupId>cn.qihangerp.services</groupId>
+            <groupId>cn.qihangerp.service</groupId>
-            <artifactId>tao-api</artifactId>
+            <artifactId>tao</artifactId>
-            <version>1.0.6</version>
+            <version>2.0.0</version>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>cn.qihangerp.services</groupId>-->
+<!--            <artifactId>tao-api</artifactId>-->
+<!--            <version>1.0.6</version>-->
+<!--        </dependency>-->
         <dependency>
-            <groupId>cn.qihangerp.services</groupId>
+            <groupId>cn.qihangerp.service</groupId>
-            <artifactId>pdd-api</artifactId>
+            <artifactId>pdd</artifactId>
-            <version>1.0.6</version>
+            <version>2.0.0</version>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>cn.qihangerp.services</groupId>-->
+<!--            <artifactId>pdd-api</artifactId>-->
+<!--            <version>1.0.6</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>cn.qihangerp.services</groupId>-->
+<!--            <artifactId>wei-api</artifactId>-->
+<!--            <version>1.0.6</version>-->
+<!--        </dependency>-->
         <dependency>
-            <groupId>cn.qihangerp.services</groupId>
+            <groupId>cn.qihangerp.service</groupId>
-            <artifactId>wei-api</artifactId>
+            <artifactId>wei</artifactId>
-            <version>1.0.6</version>
+            <version>2.0.0</version>
         </dependency>
-
     </dependencies>
     <dependencyManagement>
         <dependencies>

api/oms-api/src/main/java/cn/qihangerp/oms/jd/JdApiCommon.java

@@ -1,11 +1,10 @@
-package cn.qihangerp.api.jd;
+package cn.qihangerp.oms.jd;
 
 import cn.qihangerp.common.ResultVo;
 import cn.qihangerp.common.ResultVoEnum;
 import cn.qihangerp.common.api.ShopApiParams;
 import cn.qihangerp.common.enums.EnumShopType;
 import cn.qihangerp.common.enums.HttpStatus;
-import cn.qihangerp.model.entity.OShopPlatform;
 import cn.qihangerp.module.service.OShopService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;

api/oms-api/src/main/java/cn/qihangerp/oms/jd/JdPullRequest.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.jd;
+package cn.qihangerp.oms.jd;
 
 import lombok.Data;
 

api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdGoodsApiController.java

@@ -1,8 +1,5 @@
-package cn.qihangerp.api.jd.controller;
+package cn.qihangerp.oms.jd.controller;
 
-
-import cn.qihangerp.api.jd.JdApiCommon;
-import cn.qihangerp.api.jd.JdPullRequest;
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.enums.EnumShopType;
 import cn.qihangerp.common.enums.HttpStatus;
@@ -12,6 +9,8 @@ import cn.qihangerp.model.entity.JdGoodsSku;
 import cn.qihangerp.module.open.jd.service.JdGoodsService;
 import cn.qihangerp.module.service.OShopPullLasttimeService;
 import cn.qihangerp.module.service.OShopPullLogsService;
+import cn.qihangerp.oms.jd.JdApiCommon;
+import cn.qihangerp.oms.jd.JdPullRequest;
 import cn.qihangerp.open.common.ApiResultVo;
 import cn.qihangerp.open.jd.JdGoodsApiHelper;
 import cn.qihangerp.open.jd.response.JdGoodsSkuListResponse;

api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdGoodsController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.jd.controller;
+package cn.qihangerp.oms.jd.controller;
 
 
 import cn.qihangerp.common.*;

api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOAuthController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.jd.controller;
+package cn.qihangerp.oms.jd.controller;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.model.entity.OShopPlatform;

api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderAfterSaleApiController.java

@@ -1,7 +1,5 @@
-package cn.qihangerp.api.jd.controller;
+package cn.qihangerp.oms.jd.controller;
 
-import cn.qihangerp.api.jd.JdApiCommon;
-import cn.qihangerp.api.jd.JdPullRequest;
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.ResultVoEnum;
 import cn.qihangerp.common.enums.EnumShopType;
@@ -16,6 +14,8 @@ import cn.qihangerp.model.entity.JdRefund;
 import cn.qihangerp.module.open.jd.service.JdRefundService;
 import cn.qihangerp.module.service.OShopPullLasttimeService;
 import cn.qihangerp.module.service.OShopPullLogsService;
+import cn.qihangerp.oms.jd.JdApiCommon;
+import cn.qihangerp.oms.jd.JdPullRequest;
 import cn.qihangerp.open.common.ApiResultVo;
 import cn.qihangerp.open.jd.JdAfterSaleApiHelper;
 import cn.qihangerp.open.jd.model.AfterSale;

api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderAfterSaleController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.jd.controller;
+package cn.qihangerp.oms.jd.controller;
 
 
 import cn.qihangerp.common.AjaxResult;

api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderApiController.java

@@ -1,7 +1,5 @@
-package cn.qihangerp.api.jd.controller;
+package cn.qihangerp.oms.jd.controller;
 
-import cn.qihangerp.api.jd.JdApiCommon;
-import cn.qihangerp.api.jd.JdPullRequest;
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.ResultVoEnum;
 import cn.qihangerp.common.enums.EnumShopType;
@@ -16,6 +14,8 @@ import cn.qihangerp.model.entity.JdOrderItem;
 import cn.qihangerp.module.open.jd.service.JdOrderService;
 import cn.qihangerp.module.service.OShopPullLasttimeService;
 import cn.qihangerp.module.service.OShopPullLogsService;
+import cn.qihangerp.oms.jd.JdApiCommon;
+import cn.qihangerp.oms.jd.JdPullRequest;
 import cn.qihangerp.open.common.ApiResultVo;
 import cn.qihangerp.open.jd.JdOrderApiHelper;
 import cn.qihangerp.open.jd.response.JdOrderDetailResponse;

api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.jd.controller;
+package cn.qihangerp.oms.jd.controller;
 
 
 import cn.qihangerp.common.AjaxResult;

api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderFeignController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.jd.controller.feign;
+package cn.qihangerp.oms.jd.controller;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.model.entity.JdOrder;

api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdRefundFeignController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.jd.controller.feign;
+package cn.qihangerp.oms.jd.controller;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.model.entity.JdRefund;

api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdWaybillController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.jd.controller;
+package cn.qihangerp.oms.jd.controller;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.open.dou.DouRequest;

api/oms-api/src/main/java/cn/qihangerp/oms/pdd/PddApiCommon.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.pdd;
+package cn.qihangerp.oms.pdd;
 
 import cn.qihangerp.common.ResultVo;
 import cn.qihangerp.common.ResultVoEnum;

api/oms-api/src/main/java/cn/qihangerp/oms/pdd/PddOrderApiService.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.pdd;
+package cn.qihangerp.oms.pdd;
 
 import cn.qihangerp.common.ResultVoEnum;
 import cn.qihangerp.common.enums.EnumShopType;

api/oms-api/src/main/java/cn/qihangerp/oms/pdd/PddPullRequest.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.pdd;
+package cn.qihangerp.oms.pdd;
 
 import lombok.Data;
 

api/oms-api/src/main/java/cn/qihangerp/oms/pdd/PddTokenCreateBo.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.pdd;
+package cn.qihangerp.oms.pdd;
 
 import lombok.Data;
 

api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/OrderFeignController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.pdd.controller.feign;
+package cn.qihangerp.oms.pdd.controller;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.model.entity.PddOrder;

api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddGoodsApiController.java

@@ -1,7 +1,5 @@
-package cn.qihangerp.api.pdd.controller;
+package cn.qihangerp.oms.pdd.controller;
 
-import cn.qihangerp.api.pdd.PddApiCommon;
-import cn.qihangerp.api.pdd.PddPullRequest;
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.enums.EnumShopType;
 import cn.qihangerp.common.enums.HttpStatus;
@@ -12,6 +10,8 @@ import cn.qihangerp.model.entity.PddGoodsSku;
 import cn.qihangerp.module.open.pdd.service.PddGoodsService;
 import cn.qihangerp.module.service.OShopPullLasttimeService;
 import cn.qihangerp.module.service.OShopPullLogsService;
+import cn.qihangerp.oms.pdd.PddApiCommon;
+import cn.qihangerp.oms.pdd.PddPullRequest;
 import cn.qihangerp.open.common.ApiResultVo;
 import cn.qihangerp.open.pdd.PddGoodsApiHelper;
 import cn.qihangerp.open.pdd.model.GoodsResultVo;

api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddGoodsController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.pdd.controller;
+package cn.qihangerp.oms.pdd.controller;
 
 
 import cn.qihangerp.common.*;

api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddOAuthController.java

@@ -1,12 +1,12 @@
-package cn.qihangerp.api.pdd.controller;
+package cn.qihangerp.oms.pdd.controller;
 
-import cn.qihangerp.api.pdd.PddTokenCreateBo;
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.enums.EnumShopType;
 import cn.qihangerp.model.entity.OShop;
 import cn.qihangerp.model.entity.OShopPlatform;
 import cn.qihangerp.module.service.OShopPlatformService;
 import cn.qihangerp.module.service.OShopService;
+import cn.qihangerp.oms.pdd.PddTokenCreateBo;
 import cn.qihangerp.open.common.ApiResultVo;
 import cn.qihangerp.open.pdd.PddTokenApiHelper;
 
@@ -14,10 +14,7 @@ import cn.qihangerp.open.pdd.model.Token;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.StringUtils;

api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddOrderApiController.java

@@ -1,7 +1,5 @@
-package cn.qihangerp.api.pdd.controller;
+package cn.qihangerp.oms.pdd.controller;
 
-import cn.qihangerp.api.pdd.PddApiCommon;
-import cn.qihangerp.api.pdd.PddPullRequest;
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.ResultVoEnum;
 import cn.qihangerp.common.enums.EnumShopType;
@@ -15,6 +13,8 @@ import cn.qihangerp.model.entity.PddOrderItem;
 import cn.qihangerp.module.open.pdd.service.PddOrderService;
 import cn.qihangerp.module.service.OShopPullLasttimeService;
 import cn.qihangerp.module.service.OShopPullLogsService;
+import cn.qihangerp.oms.pdd.PddApiCommon;
+import cn.qihangerp.oms.pdd.PddPullRequest;
 import cn.qihangerp.open.common.ApiResultVo;
 import cn.qihangerp.open.pdd.PddOrderApiHelper;
 import cn.qihangerp.open.pdd.model.OrderListResultVo;

api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddOrderController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.pdd.controller;
+package cn.qihangerp.oms.pdd.controller;
 
 
 import cn.qihangerp.common.AjaxResult;

api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddRefundApiController.java

@@ -1,7 +1,5 @@
-package cn.qihangerp.api.pdd.controller;
+package cn.qihangerp.oms.pdd.controller;
 
-import cn.qihangerp.api.pdd.PddApiCommon;
-import cn.qihangerp.api.pdd.PddPullRequest;
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.ResultVoEnum;
 import cn.qihangerp.common.enums.EnumShopType;
@@ -15,6 +13,8 @@ import cn.qihangerp.model.entity.PddRefund;
 import cn.qihangerp.module.open.pdd.service.PddRefundService;
 import cn.qihangerp.module.service.OShopPullLasttimeService;
 import cn.qihangerp.module.service.OShopPullLogsService;
+import cn.qihangerp.oms.pdd.PddApiCommon;
+import cn.qihangerp.oms.pdd.PddPullRequest;
 import cn.qihangerp.open.common.ApiResultVo;
 import cn.qihangerp.open.pdd.PddRefundApiHelper;
 import cn.qihangerp.open.pdd.model.AfterSale;

api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddRefundController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.pdd.controller;
+package cn.qihangerp.oms.pdd.controller;
 
 
 import cn.qihangerp.common.AjaxResult;

api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddWaybillController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.pdd.controller;
+package cn.qihangerp.oms.pdd.controller;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.open.dou.DouRequest;

api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/RefundFeignController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.pdd.controller.feign;
+package cn.qihangerp.oms.pdd.controller;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.model.entity.PddRefund;

api/oms-api/src/main/java/cn/qihangerp/oms/tao/OrderAssembleHelper.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.tao;
+package cn.qihangerp.oms.tao;
 
 
 import cn.qihangerp.model.entity.TaoOrder;

api/oms-api/src/main/java/cn/qihangerp/oms/tao/TaoApiCommon.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.tao;
+package cn.qihangerp.oms.tao;
 
 import cn.qihangerp.common.ResultVo;
 import cn.qihangerp.common.ResultVoEnum;

api/oms-api/src/main/java/cn/qihangerp/oms/tao/TaoRequest.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.tao;
+package cn.qihangerp.oms.tao;
 
 public class TaoRequest {
     private Long shopId;//店铺Id

api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoGoodsApiController.java

@@ -1,8 +1,5 @@
-package cn.qihangerp.api.tao.controller;
+package cn.qihangerp.oms.tao.controller;
 
-
-import cn.qihangerp.api.tao.TaoApiCommon;
-import cn.qihangerp.api.tao.TaoRequest;
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.ResultVoEnum;
 import cn.qihangerp.common.api.ShopApiParams;
@@ -18,6 +15,8 @@ import cn.qihangerp.module.open.tao.service.TaoGoodsService;
 
 import cn.qihangerp.module.service.OShopPullLasttimeService;
 import cn.qihangerp.module.service.OShopPullLogsService;
+import cn.qihangerp.oms.tao.TaoApiCommon;
+import cn.qihangerp.oms.tao.TaoRequest;
 import cn.qihangerp.open.common.ApiResultVo;
 
 import cn.qihangerp.open.tao.TaoGoodsApiHelper;

api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoGoodsController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.tao.controller;
+package cn.qihangerp.oms.tao.controller;
 
 
 import cn.qihangerp.common.*;

api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOAuthController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.tao.controller;
+package cn.qihangerp.oms.tao.controller;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.utils.StringUtils;

api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderApiController.java

@@ -1,9 +1,5 @@
-package cn.qihangerp.api.tao.controller;
+package cn.qihangerp.oms.tao.controller;
 
-
-import cn.qihangerp.api.tao.OrderAssembleHelper;
-import cn.qihangerp.api.tao.TaoApiCommon;
-import cn.qihangerp.api.tao.TaoRequest;
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.ResultVoEnum;
 import cn.qihangerp.common.enums.EnumShopType;
@@ -17,6 +13,9 @@ import cn.qihangerp.model.entity.TaoOrder;
 import cn.qihangerp.module.open.tao.service.TaoOrderService;
 import cn.qihangerp.module.service.OShopPullLasttimeService;
 import cn.qihangerp.module.service.OShopPullLogsService;
+import cn.qihangerp.oms.tao.OrderAssembleHelper;
+import cn.qihangerp.oms.tao.TaoApiCommon;
+import cn.qihangerp.oms.tao.TaoRequest;
 import cn.qihangerp.open.common.ApiResultVo;
 
 import cn.qihangerp.open.tao.TaoOrderApiHelper;

api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.tao.controller;
+package cn.qihangerp.oms.tao.controller;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.PageQuery;

api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderFeignController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.tao.controller.feign;
+package cn.qihangerp.oms.tao.controller;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.model.entity.TaoOrder;

api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoRefundApiController.java

@@ -1,8 +1,5 @@
-package cn.qihangerp.api.tao.controller;
+package cn.qihangerp.oms.tao.controller;
 
-
-import cn.qihangerp.api.tao.TaoApiCommon;
-import cn.qihangerp.api.tao.TaoRequest;
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.ResultVoEnum;
 import cn.qihangerp.common.enums.EnumShopType;
@@ -16,6 +13,8 @@ import cn.qihangerp.model.entity.TaoRefund;
 import cn.qihangerp.module.open.tao.service.TaoRefundService;
 import cn.qihangerp.module.service.OShopPullLasttimeService;
 import cn.qihangerp.module.service.OShopPullLogsService;
+import cn.qihangerp.oms.tao.TaoApiCommon;
+import cn.qihangerp.oms.tao.TaoRequest;
 import cn.qihangerp.open.common.ApiResultVo;
 
 import cn.qihangerp.open.tao.TaoRefundApiHelper;

api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoRefundController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.tao.controller;
+package cn.qihangerp.oms.tao.controller;
 
 
 import cn.qihangerp.common.AjaxResult;

api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoRefundFeignController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.tao.controller.feign;
+package cn.qihangerp.oms.tao.controller;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.model.entity.TaoRefund;

api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoShipController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.tao.controller;
+package cn.qihangerp.oms.tao.controller;
 
 
 import cn.qihangerp.common.AjaxResult;

api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoWaybillController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.tao.controller;
+package cn.qihangerp.oms.tao.controller;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.open.dou.DouRequest;

api/oms-api/src/main/java/cn/qihangerp/oms/task/PddOrderPullTask.java

@@ -1,6 +1,5 @@
-package cn.qihangerp.api.pdd.task;
+package cn.qihangerp.oms.task;
 
-import cn.qihangerp.api.pdd.PddOrderApiService;
 import cn.qihangerp.common.enums.EnumShopType;
 import cn.qihangerp.common.task.IPollableService;
 import cn.qihangerp.model.entity.OShop;
@@ -10,6 +9,7 @@ import cn.qihangerp.module.service.OShopPlatformService;
 import cn.qihangerp.module.service.OShopPullLogsService;
 import cn.qihangerp.module.service.OShopService;
 import cn.qihangerp.module.service.SysTaskService;
+import cn.qihangerp.oms.pdd.PddOrderApiService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

api/oms-api/src/main/java/cn/qihangerp/oms/wei/PullRequest.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.wei;
+package cn.qihangerp.oms.wei;
 
 import lombok.Data;
 

api/oms-api/src/main/java/cn/qihangerp/oms/wei/WeiApiCommon.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.wei;
+package cn.qihangerp.oms.wei;
 
 import cn.qihangerp.common.ResultVo;
 import cn.qihangerp.common.api.ShopApiParams;

api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/GoodsApiController.java

@@ -1,8 +1,5 @@
-package cn.qihangerp.api.wei.controller;
+package cn.qihangerp.oms.wei.controller;
 
-
-import cn.qihangerp.api.wei.PullRequest;
-import cn.qihangerp.api.wei.WeiApiCommon;
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.ResultVoEnum;
 import cn.qihangerp.common.enums.HttpStatus;
@@ -10,6 +7,8 @@ import cn.qihangerp.common.enums.HttpStatus;
 import cn.qihangerp.model.entity.WeiGoods;
 import cn.qihangerp.model.entity.WeiGoodsSku;
 import cn.qihangerp.module.open.wei.service.WeiGoodsService;
+import cn.qihangerp.oms.wei.PullRequest;
+import cn.qihangerp.oms.wei.WeiApiCommon;
 import cn.qihangerp.open.common.ApiResultVo;
 
 import cn.qihangerp.open.wei.WeiGoodsApiService;

api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiGoodsController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.wei.controller;
+package cn.qihangerp.oms.wei.controller;
 
 
 import cn.qihangerp.common.*;

api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiOrderApiController.java

@@ -1,9 +1,5 @@
-package cn.qihangerp.api.wei.controller;
+package cn.qihangerp.oms.wei.controller;
 
-
-
-import cn.qihangerp.api.wei.PullRequest;
-import cn.qihangerp.api.wei.WeiApiCommon;
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.ResultVoEnum;
 import cn.qihangerp.common.enums.HttpStatus;
@@ -11,6 +7,8 @@ import cn.qihangerp.model.entity.WeiOrder;
 import cn.qihangerp.model.entity.WeiOrderItem;
 import cn.qihangerp.module.open.wei.service.WeiOrderService;
 
+import cn.qihangerp.oms.wei.PullRequest;
+import cn.qihangerp.oms.wei.WeiApiCommon;
 import cn.qihangerp.open.common.ApiResultVo;
 
 import cn.qihangerp.open.wei.WeiOrderApiHelper;

api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiOrderController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.wei.controller;
+package cn.qihangerp.oms.wei.controller;
 
 
 import cn.qihangerp.common.AjaxResult;

api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiOrderFeignController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.wei.controller.feign;
+package cn.qihangerp.oms.wei.controller;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.model.entity.WeiOrder;

api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiRefundApiController.java

@@ -1,14 +1,13 @@
-package cn.qihangerp.api.wei.controller;
+package cn.qihangerp.oms.wei.controller;
 
-
-import cn.qihangerp.api.wei.PullRequest;
-import cn.qihangerp.api.wei.WeiApiCommon;
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.ResultVoEnum;
 import cn.qihangerp.common.enums.HttpStatus;
 import cn.qihangerp.model.entity.WeiRefund;
 import cn.qihangerp.module.open.wei.service.WeiRefundService;
 
+import cn.qihangerp.oms.wei.PullRequest;
+import cn.qihangerp.oms.wei.WeiApiCommon;
 import cn.qihangerp.open.common.ApiResultVo;
 
 import cn.qihangerp.open.wei.WeiRefundApiHelper;
@@ -71,15 +70,15 @@ public class WeiRefundApiController extends BaseController {
                     refund.setStatus(refundInfo.getStatus());
                     refund.setOpenid(refundInfo.getOpenid());
                     refund.setUnionid(refundInfo.getUnionid());
-                    refund.setProductId(refundInfo.getProduct_info().getString("product_id"));
+                    refund.setProductId(refundInfo.getProduct_info().getProduct_id());
-                    refund.setSkuId(refundInfo.getProduct_info().getString("sku_id"));
+                    refund.setSkuId(refundInfo.getProduct_info().getSku_id());
-                    refund.setCount(refundInfo.getProduct_info().getInteger("count"));
+                    refund.setCount(refundInfo.getProduct_info().getCount());
-                    refund.setFastRefund(refundInfo.getProduct_info().getString("fast_refund"));
+                    refund.setFastRefund(refundInfo.getProduct_info().getFast_refund().toString());
                     refund.setRefundAmount(refundInfo.getRefund_info().getInteger("amount"));
                     refund.setRefundReason(refundInfo.getRefund_info().getInteger("refund_reason"));
-                    refund.setReturnWaybillId(refundInfo.getReturn_info().getString("waybill_id"));
+                    refund.setReturnWaybillId(refundInfo.getReturn_info().getWaybill_id());
-                    refund.setReturnDeliveryName(refundInfo.getReturn_info().getString("delivery_name"));
+                    refund.setReturnDeliveryName(refundInfo.getReturn_info().getDelivery_name());
-                    refund.setReturnDeliveryId(refundInfo.getReturn_info().getString("delivery_id"));
+                    refund.setReturnDeliveryId(refundInfo.getReturn_info().getDelivery_id());
                     refund.setMerchantUploadInfo(JSONObject.toJSONString(refundInfo.getMerchant_upload_info()));
                     refund.setCreateTime(refundInfo.getCreate_time());
                     refund.setUpdateTime(refundInfo.getUpdate_time());

api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiRefundController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.wei.controller;
+package cn.qihangerp.oms.wei.controller;
 
 
 

api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiRefundFeignController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.wei.controller.feign;
+package cn.qihangerp.oms.wei.controller;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.model.entity.WeiRefund;

api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiWaybillController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.wei.controller;
+package cn.qihangerp.oms.wei.controller;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.open.dou.DouRequest;

microservices/dou-api/pom.xml

@@ -1,34 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>cn.qihangerp.services</groupId>
-        <artifactId>microservices</artifactId>
-        <version>1.0.6</version>
-    </parent>
-
-    <artifactId>dou-api</artifactId>
-    <packaging>jar</packaging>
-
-    <name>dou-api</name>
-    <url>http://maven.apache.org</url>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>cn.qihangerp.open</groupId>
-            <artifactId>open-sdk</artifactId>
-            <version>1.0</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/libs/open-sdk-2.1.3.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>cn.qihangerp.service</groupId>
-            <artifactId>dou</artifactId>
-            <version>2.0.0</version>
-        </dependency>
-    </dependencies>
-</project>

microservices/dou-api/src/main/resources/META-INF/spring.factories

@@ -1 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.qihangerp.oms.dou.DouApiAutoConfiguration

microservices/dou-api/src/main/resources/application.yml

@@ -1,4 +0,0 @@
-qihangerp:
-  name: 启航电商ERP
-  goods:
-    version: 2.4.21

microservices/dou-api/src/main/resources/banner.txt

@@ -1,10 +0,0 @@
-Application Version: 2.4.21
-Spring Boot Version: ${spring-boot.version}
- _______ _________          _______  _        _______  _______  _______  _______
-(  ___  )\__   __/|\     /|(  ___  )( (    /|(  ____ \(  ____ \(  ____ )(  ____ )
-| (   ) |   ) (   | )   ( || (   ) ||  \  ( || (    \/| (    \/| (    )|| (    )|
-| |   | |   | |   | (___) || (___) ||   \ | || |      | (__    | (____)|| (____)|
-| |   | |   | |   |  ___  ||  ___  || (\ \) || | ____ |  __)   |     __)|  _____)
-| | /\| |   | |   | (   ) || (   ) || | \   || | \_  )| (      | (\ (   | (
-| (_\ \ |___) (___| )   ( || )   ( || )  \  || (___) || (____/\| ) \ \__| )
-(____\/_)\_______/|/     \||/     \||/    )_)(_______)(_______/|/   \__/|/

microservices/goods-api/pom.xml

@@ -1,28 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>cn.qihangerp.services</groupId>
-        <artifactId>microservices</artifactId>
-        <version>1.0.6</version>
-    </parent>
-
-    <artifactId>goods-api</artifactId>
-    <packaging>jar</packaging>
-
-    <name>goods-api</name>
-    <url>http://maven.apache.org</url>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <goods-api.version>1.1.1</goods-api.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>cn.qihangerp.service</groupId>
-            <artifactId>goods</artifactId>
-            <version>2.0.0</version>
-        </dependency>
-    </dependencies>
-</project>

microservices/goods-api/src/main/java/cn/qihangerp/api/goods/GoodsApiAutoConfiguration.java

@@ -1,18 +0,0 @@
-package cn.qihangerp.api.goods;
-
-//import org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.FilterType;
-
-
-//@EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class ,MybatisAutoConfiguration.class})
-//@ComponentScan
-//@Configuration
-//@EnableAutoConfiguration
-@Configuration
-//@EnableAutoConfiguration(exclude = MybatisAutoConfiguration.class)
-@ComponentScan(basePackages = "cn.qihangerp.api.goods",
-        excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = GoodsApiAutoConfiguration.class))
-public class GoodsApiAutoConfiguration {
-}

microservices/goods-api/src/main/java/cn/qihangerp/api/goods/config/GoodsApiMybatisPlusConfig.java

@@ -1,20 +0,0 @@
-package cn.qihangerp.api.goods.config;
-
-import com.baomidou.mybatisplus.annotation.DbType;
-import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@MapperScan({"cn.qihangerp.module.*.mapper"})
-public class GoodsApiMybatisPlusConfig {
-
-//    @Bean(name = "mybatisPlusInterceptorGoodsApi")
-//    public MybatisPlusInterceptor mybatisPlusInterceptor() {
-//        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-//        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); //注意使用哪种数据库
-//        return interceptor;
-//    }
-}

microservices/goods-api/src/main/resources/META-INF/spring.factories

@@ -1 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.qihangerp.api.goods.GoodsApiAutoConfiguration

microservices/goods-api/src/main/resources/application.yml

@@ -1,4 +0,0 @@
-qihangerp:
-  name: 启航电商ERP
-  goods:
-    version: 2.4.21

microservices/goods-api/src/main/resources/banner.txt

@@ -1,10 +0,0 @@
-Application Version: 2.4.21
-Spring Boot Version: ${spring-boot.version}
- _______ _________          _______  _        _______  _______  _______  _______
-(  ___  )\__   __/|\     /|(  ___  )( (    /|(  ____ \(  ____ \(  ____ )(  ____ )
-| (   ) |   ) (   | )   ( || (   ) ||  \  ( || (    \/| (    \/| (    )|| (    )|
-| |   | |   | |   | (___) || (___) ||   \ | || |      | (__    | (____)|| (____)|
-| |   | |   | |   |  ___  ||  ___  || (\ \) || | ____ |  __)   |     __)|  _____)
-| | /\| |   | |   | (   ) || (   ) || | \   || | \_  )| (      | (\ (   | (
-| (_\ \ |___) (___| )   ( || )   ( || )  \  || (___) || (____/\| ) \ \__| )
-(____\/_)\_______/|/     \||/     \||/    )_)(_______)(_______/|/   \__/|/

microservices/jd-api/pom.xml

@@ -1,39 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>cn.qihangerp.services</groupId>
-        <artifactId>microservices</artifactId>
-        <version>1.0.6</version>
-    </parent>
-
-    <artifactId>jd-api</artifactId>
-    <packaging>jar</packaging>
-
-    <name>jd-api</name>
-    <url>http://maven.apache.org</url>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>cn.qihangerp.open</groupId>
-            <artifactId>open-sdk</artifactId>
-            <version>1.0.2</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/libs/open-sdk-2.1.3.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
-            <version>1.9.13</version> <!-- jd-sdk依赖 -->
-        </dependency>
-        <dependency>
-            <groupId>cn.qihangerp.service</groupId>
-            <artifactId>jd</artifactId>
-            <version>2.0.0</version>
-        </dependency>
-    </dependencies>
-</project>

microservices/jd-api/src/main/java/cn/qihangerp/api/jd/JdApiAutoConfiguration.java

@@ -1,18 +0,0 @@
-package cn.qihangerp.api.jd;
-
-//import org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.FilterType;
-
-
-//@EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class ,MybatisAutoConfiguration.class})
-//@ComponentScan
-//@Configuration
-//@EnableAutoConfiguration
-@Configuration
-//@EnableAutoConfiguration(exclude = MybatisAutoConfiguration.class)
-@ComponentScan(basePackages = "cn.qihangerp.api.jd",
-        excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = JdApiAutoConfiguration.class))
-public class JdApiAutoConfiguration {
-}

microservices/jd-api/src/main/resources/META-INF/spring.factories

@@ -1 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.qihangerp.api.jd.JdApiAutoConfiguration

microservices/jd-api/src/main/resources/application.yml

@@ -1,4 +0,0 @@
-qihangerp:
-  name: 启航电商ERP
-  goods:
-    version: 2.4.21

microservices/jd-api/src/main/resources/banner.txt

@@ -1,10 +0,0 @@
-Application Version: 2.4.21
-Spring Boot Version: ${spring-boot.version}
- _______ _________          _______  _        _______  _______  _______  _______
-(  ___  )\__   __/|\     /|(  ___  )( (    /|(  ____ \(  ____ \(  ____ )(  ____ )
-| (   ) |   ) (   | )   ( || (   ) ||  \  ( || (    \/| (    \/| (    )|| (    )|
-| |   | |   | |   | (___) || (___) ||   \ | || |      | (__    | (____)|| (____)|
-| |   | |   | |   |  ___  ||  ___  || (\ \) || | ____ |  __)   |     __)|  _____)
-| | /\| |   | |   | (   ) || (   ) || | \   || | \_  )| (      | (\ (   | (
-| (_\ \ |___) (___| )   ( || )   ( || )  \  || (___) || (____/\| ) \ \__| )
-(____\/_)\_______/|/     \||/     \||/    )_)(_______)(_______/|/   \__/|/

microservices/order-api/pom.xml

@@ -1,27 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>cn.qihangerp.services</groupId>
-        <artifactId>microservices</artifactId>
-        <version>1.0.6</version>
-    </parent>
-
-    <artifactId>order-api</artifactId>
-    <packaging>jar</packaging>
-
-    <name>order-api</name>
-    <url>http://maven.apache.org</url>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>cn.qihangerp.service</groupId>
-            <artifactId>order</artifactId>
-            <version>2.0.0</version>
-        </dependency>
-    </dependencies>
-</project>

microservices/order-api/src/main/java/cn/qihangerp/api/order/OrderApiAutoConfiguration.java

@@ -1,18 +0,0 @@
-package cn.qihangerp.api.order;
-
-//import org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.FilterType;
-
-
-//@EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class ,MybatisAutoConfiguration.class})
-//@ComponentScan
-//@Configuration
-//@EnableAutoConfiguration
-@Configuration
-//@EnableAutoConfiguration(exclude = MybatisAutoConfiguration.class)
-@ComponentScan(basePackages = "cn.qihangerp.api.order",
-        excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = OrderApiAutoConfiguration.class))
-public class OrderApiAutoConfiguration {
-}

microservices/order-api/src/main/java/cn/qihangerp/api/order/config/OrderApiMybatisPlusConfig.java

@@ -1,16 +0,0 @@
-package cn.qihangerp.api.order.config;
-
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@MapperScan({"cn.qihangerp.module.*.mapper"})
-public class OrderApiMybatisPlusConfig {
-
-//    @Bean(name = "mybatisPlusInterceptorGoodsApi")
-//    public MybatisPlusInterceptor mybatisPlusInterceptor() {
-//        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-//        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); //注意使用哪种数据库
-//        return interceptor;
-//    }
-}

microservices/order-api/src/main/resources/META-INF/spring.factories

@@ -1 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.qihangerp.api.order.OrderApiAutoConfiguration

microservices/order-api/src/main/resources/application.yml

@@ -1,10 +0,0 @@
-qihangerp:
-  name: 启航电商ERP
-  order:
-    version: 2.4.21
-
-#mybatis-plus:
-#  mapper-locations: classpath*:mapper/**/*Mapper.xml
-#  type-aliases-package: cn.qihangerp.oms.domain;cn.qihangerp.module.domain;
-#  configuration:
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 开启sql日志

microservices/order-api/src/main/resources/banner.txt

@@ -1,10 +0,0 @@
-Application Version: 2.4.21
-Spring Boot Version: ${spring-boot.version}
- _______ _________          _______  _        _______  _______  _______  _______
-(  ___  )\__   __/|\     /|(  ___  )( (    /|(  ____ \(  ____ \(  ____ )(  ____ )
-| (   ) |   ) (   | )   ( || (   ) ||  \  ( || (    \/| (    \/| (    )|| (    )|
-| |   | |   | |   | (___) || (___) ||   \ | || |      | (__    | (____)|| (____)|
-| |   | |   | |   |  ___  ||  ___  || (\ \) || | ____ |  __)   |     __)|  _____)
-| | /\| |   | |   | (   ) || (   ) || | \   || | \_  )| (      | (\ (   | (
-| (_\ \ |___) (___| )   ( || )   ( || )  \  || (___) || (____/\| ) \ \__| )
-(____\/_)\_______/|/     \||/     \||/    )_)(_______)(_______/|/   \__/|/

microservices/pdd-api/pom.xml

@@ -1,34 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>cn.qihangerp.services</groupId>
-        <artifactId>microservices</artifactId>
-        <version>1.0.6</version>
-    </parent>
-
-    <artifactId>pdd-api</artifactId>
-    <packaging>jar</packaging>
-
-    <name>pdd-api</name>
-    <url>http://maven.apache.org</url>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>cn.qihangerp.open</groupId>
-            <artifactId>open-sdk</artifactId>
-            <version>1.0.2</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/libs/open-sdk-2.1.3.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>cn.qihangerp.service</groupId>
-            <artifactId>pdd</artifactId>
-            <version>2.0.0</version>
-        </dependency>
-    </dependencies>
-</project>

microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiAutoConfiguration.java

@@ -1,18 +0,0 @@
-package cn.qihangerp.api.pdd;
-
-//import org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.FilterType;
-
-
-//@EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class ,MybatisAutoConfiguration.class})
-//@ComponentScan
-//@Configuration
-//@EnableAutoConfiguration
-@Configuration
-//@EnableAutoConfiguration(exclude = MybatisAutoConfiguration.class)
-@ComponentScan(basePackages = "cn.qihangerp.api.dou",
-        excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = PddApiAutoConfiguration.class))
-public class PddApiAutoConfiguration {
-}

microservices/pdd-api/src/main/resources/META-INF/spring.factories

@@ -1 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.qihangerp.api.pdd.PddApiAutoConfiguration

microservices/pdd-api/src/main/resources/application.yml

@@ -1,5 +0,0 @@
-qihangerp:
-  name: 启航电商ERP
-  goods:
-    version: 2.4.21
-  auth-redirect-url: http://erp.qihangerp.cn:88

microservices/pdd-api/src/main/resources/banner.txt

@@ -1,10 +0,0 @@
-Application Version: 2.4.21
-Spring Boot Version: ${spring-boot.version}
- _______ _________          _______  _        _______  _______  _______  _______
-(  ___  )\__   __/|\     /|(  ___  )( (    /|(  ____ \(  ____ \(  ____ )(  ____ )
-| (   ) |   ) (   | )   ( || (   ) ||  \  ( || (    \/| (    \/| (    )|| (    )|
-| |   | |   | |   | (___) || (___) ||   \ | || |      | (__    | (____)|| (____)|
-| |   | |   | |   |  ___  ||  ___  || (\ \) || | ____ |  __)   |     __)|  _____)
-| | /\| |   | |   | (   ) || (   ) || | \   || | \_  )| (      | (\ (   | (
-| (_\ \ |___) (___| )   ( || )   ( || )  \  || (___) || (____/\| ) \ \__| )
-(____\/_)\_______/|/     \||/     \||/    )_)(_______)(_______/|/   \__/|/

microservices/pom.xml

@@ -1,79 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.2</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>cn.qihangerp.services</groupId>
-    <artifactId>microservices</artifactId>
-    <version>1.0.6</version>
-    <packaging>pom</packaging>
-
-    <name>microservices</name>
-    <url>http://maven.apache.org</url>
-    <modules>
-<!--        <module>goods-api</module>-->
-<!--        <module>order-api</module>-->
-        <module>jd-api</module>
-<!--        <module>dou-api</module>-->
-        <module>tao-api</module>
-        <module>pdd-api</module>
-        <module>wei-api</module>
-    </modules>
-
-    <properties>
-        <java.version>17</java.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <spring-boot.version>3.0.2</spring-boot.version>
-        <spring-cloud-alibaba.version>2022.0.0.0</spring-cloud-alibaba.version>
-        <jwt.version>0.11.5</jwt.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-undertow</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.33</version>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.5.5</version>
-        </dependency>
-        <dependency>
-            <groupId>cn.qihangerp.core</groupId>
-            <artifactId>security</artifactId>
-            <version>1.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.30</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-</project>

microservices/tao-api/pom.xml

@@ -1,44 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>cn.qihangerp.services</groupId>
-        <artifactId>microservices</artifactId>
-        <version>1.0.6</version>
-    </parent>
-
-    <artifactId>tao-api</artifactId>
-    <packaging>jar</packaging>
-
-    <name>tao-api</name>
-    <url>http://maven.apache.org</url>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>cn.qihangerp.open</groupId>
-            <artifactId>open-sdk</artifactId>
-            <version>1.0.2</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/libs/open-sdk-2.1.3.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>4.12.0</version>
-        </dependency>
-        <dependency>
-            <groupId>cn.qihangerp.service</groupId>
-            <artifactId>tao</artifactId>
-            <version>2.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>cn.qihangerp.service</groupId>
-            <artifactId>shop</artifactId>
-            <version>2.0.0</version>
-        </dependency>
-    </dependencies>
-</project>

microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoApiAutoConfiguration.java

@@ -1,18 +0,0 @@
-package cn.qihangerp.api.tao;
-
-//import org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.FilterType;
-
-
-//@EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class ,MybatisAutoConfiguration.class})
-//@ComponentScan
-//@Configuration
-//@EnableAutoConfiguration
-@Configuration
-//@EnableAutoConfiguration(exclude = MybatisAutoConfiguration.class)
-@ComponentScan(basePackages = "cn.qihangerp.api.tao",
-        excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = TaoApiAutoConfiguration.class))
-public class TaoApiAutoConfiguration {
-}

microservices/tao-api/src/main/resources/META-INF/spring.factories

@@ -1 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.qihangerp.api.tao.TaoApiAutoConfiguration

microservices/tao-api/src/main/resources/application.yml

@@ -1,4 +0,0 @@
-qihangerp:
-  name: 启航电商ERP
-  goods:
-    version: 2.4.21

microservices/tao-api/src/main/resources/banner.txt

@@ -1,10 +0,0 @@
-Application Version: 2.4.21
-Spring Boot Version: ${spring-boot.version}
- _______ _________          _______  _        _______  _______  _______  _______
-(  ___  )\__   __/|\     /|(  ___  )( (    /|(  ____ \(  ____ \(  ____ )(  ____ )
-| (   ) |   ) (   | )   ( || (   ) ||  \  ( || (    \/| (    \/| (    )|| (    )|
-| |   | |   | |   | (___) || (___) ||   \ | || |      | (__    | (____)|| (____)|
-| |   | |   | |   |  ___  ||  ___  || (\ \) || | ____ |  __)   |     __)|  _____)
-| | /\| |   | |   | (   ) || (   ) || | \   || | \_  )| (      | (\ (   | (
-| (_\ \ |___) (___| )   ( || )   ( || )  \  || (___) || (____/\| ) \ \__| )
-(____\/_)\_______/|/     \||/     \||/    )_)(_______)(_______/|/   \__/|/

microservices/wei-api/pom.xml

@@ -1,34 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>cn.qihangerp.services</groupId>
-        <artifactId>microservices</artifactId>
-        <version>1.0.6</version>
-    </parent>
-
-    <artifactId>wei-api</artifactId>
-    <packaging>jar</packaging>
-
-    <name>wei-api</name>
-    <url>http://maven.apache.org</url>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>cn.qihangerp.open</groupId>
-            <artifactId>open-sdk</artifactId>
-            <version>1.0.2</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/libs/open-sdk-2.1.3.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>cn.qihangerp.service</groupId>
-            <artifactId>wei</artifactId>
-            <version>2.0.0</version>
-        </dependency>
-    </dependencies>
-</project>

microservices/wei-api/src/main/java/cn/qihangerp/api/wei/WeiApiAutoConfiguration.java

@@ -1,18 +0,0 @@
-package cn.qihangerp.api.wei;
-
-//import org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.FilterType;
-
-
-//@EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class ,MybatisAutoConfiguration.class})
-//@ComponentScan
-//@Configuration
-//@EnableAutoConfiguration
-@Configuration
-//@EnableAutoConfiguration(exclude = MybatisAutoConfiguration.class)
-@ComponentScan(basePackages = "cn.qihangerp.api.wei",
-        excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = WeiApiAutoConfiguration.class))
-public class WeiApiAutoConfiguration {
-}

microservices/wei-api/src/main/resources/META-INF/spring.factories

@@ -1 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.qihangerp.api.wei.WeiApiAutoConfiguration

microservices/wei-api/src/main/resources/application.yml

@@ -1,4 +0,0 @@
-qihangerp:
-  name: 启航电商ERP
-  goods:
-    version: 2.4.21

microservices/wei-api/src/main/resources/banner.txt

@@ -1,10 +0,0 @@
-Application Version: 2.4.21
-Spring Boot Version: ${spring-boot.version}
- _______ _________          _______  _        _______  _______  _______  _______
-(  ___  )\__   __/|\     /|(  ___  )( (    /|(  ____ \(  ____ \(  ____ )(  ____ )
-| (   ) |   ) (   | )   ( || (   ) ||  \  ( || (    \/| (    \/| (    )|| (    )|
-| |   | |   | |   | (___) || (___) ||   \ | || |      | (__    | (____)|| (____)|
-| |   | |   | |   |  ___  ||  ___  || (\ \) || | ____ |  __)   |     __)|  _____)
-| | /\| |   | |   | (   ) || (   ) || | \   || | \_  )| (      | (\ (   | (
-| (_\ \ |___) (___| )   ( || )   ( || )  \  || (___) || (____/\| ) \ \__| )
-(____\/_)\_______/|/     \||/     \||/    )_)(_______)(_______/|/   \__/|/

pom.xml

@@ -13,7 +13,7 @@
     <module>api</module>
     <module>core</module>
     <module>serviceImpl</module>
-    <module>microservices</module>
+<!--    <module>microservices</module>-->
   </modules>
 
   <properties>