优化精简项目结构

api/oms-api/pom.xml

@@ -93,7 +93,7 @@
             <artifactId>open-sdk</artifactId>
             <version>1.0</version>
             <scope>system</scope>
-            <systemPath>${project.basedir}/libs/open-sdk-2.1.3.jar</systemPath>
+            <systemPath>${project.basedir}/libs/open-sdk-2.1.7.jar</systemPath>
         </dependency>
 
         <dependency>
@@ -107,18 +107,22 @@
             <version>1.18.30</version>
             <scope>provided</scope>
         </dependency>
-
+        <dependency>
+            <groupId>cn.qihangerp.service</groupId>
+            <artifactId>dou</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>-->
+<!--            <artifactId>dou-api</artifactId>-->
+<!--            <version>1.0.6</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>cn.qihangerp.services</groupId>
             <artifactId>tao-api</artifactId>

api/oms-api/src/main/java/cn/qihangerp/oms/dou/DouApiAutoConfiguration.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.dou;
+package cn.qihangerp.oms.dou;
 
 //import org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;

api/oms-api/src/main/java/cn/qihangerp/oms/dou/DouApiCommon.java

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

api/oms-api/src/main/java/cn/qihangerp/oms/dou/DouPullRequest.java

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

api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouGoodsApiController.java

@@ -1,7 +1,5 @@
-package cn.qihangerp.api.dou.controller;
+package cn.qihangerp.oms.dou.controller;
 
-import cn.qihangerp.api.dou.DouApiCommon;
-import cn.qihangerp.api.dou.DouPullRequest;
 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.DouGoodsSku;
 import cn.qihangerp.module.open.dou.service.DouGoodsService;
 import cn.qihangerp.module.service.OShopPullLasttimeService;
 import cn.qihangerp.module.service.OShopPullLogsService;
+import cn.qihangerp.oms.dou.DouApiCommon;
+import cn.qihangerp.oms.dou.DouPullRequest;
 import cn.qihangerp.open.common.ApiResultVo;
 import cn.qihangerp.open.dou.DouGoodsApiHelper;
 import cn.qihangerp.open.dou.model.GoodsListResultVo;

api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouGoodsController.java

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

api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouOrderApiController.java

@@ -1,7 +1,5 @@
-package cn.qihangerp.api.dou.controller;
+package cn.qihangerp.oms.dou.controller;
 
-import cn.qihangerp.api.dou.DouApiCommon;
-import cn.qihangerp.api.dou.DouPullRequest;
 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.DouOrderItem;
 import cn.qihangerp.module.open.dou.service.DouOrderService;
 import cn.qihangerp.module.service.OShopPullLasttimeService;
 import cn.qihangerp.module.service.OShopPullLogsService;
+import cn.qihangerp.oms.dou.DouApiCommon;
+import cn.qihangerp.oms.dou.DouPullRequest;
 import cn.qihangerp.open.common.ApiResultVo;
 import cn.qihangerp.open.dou.DouOrderApiHelper;
 import cn.qihangerp.open.dou.model.order.Order;

api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouOrderContoller.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.api.dou.controller;
+package cn.qihangerp.oms.dou.controller;
 
 
 import cn.qihangerp.model.bo.DouOrderConfirmBo;

api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouOrderFeignController.java

@@ -1,7 +1,8 @@
-package cn.qihangerp.api.dou.controller.feign;
+package cn.qihangerp.oms.dou.controller;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.model.entity.DouOrder;
+
 import cn.qihangerp.module.open.dou.service.DouOrderService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;

api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouRefundApiController.java

@@ -1,7 +1,5 @@
-package cn.qihangerp.api.dou.controller;
+package cn.qihangerp.oms.dou.controller;
 
-import cn.qihangerp.api.dou.DouApiCommon;
-import cn.qihangerp.api.dou.DouPullRequest;
 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.DouRefund;
 import cn.qihangerp.module.open.dou.service.DouRefundService;
 import cn.qihangerp.module.service.OShopPullLasttimeService;
 import cn.qihangerp.module.service.OShopPullLogsService;
+import cn.qihangerp.oms.dou.DouApiCommon;
+import cn.qihangerp.oms.dou.DouPullRequest;
 import cn.qihangerp.open.common.ApiResultVo;
 import cn.qihangerp.open.dou.DouRefundApiHelper;
 import cn.qihangerp.open.dou.model.after.AfterSale;

api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouRefundController.java

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

api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouRefundFeignController.java

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

api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouWaybillController.java

@@ -1,8 +1,8 @@
-package cn.qihangerp.api.dou.controller;
+package cn.qihangerp.oms.dou.controller;
 
-import cn.qihangerp.api.dou.DouApiCommon;
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.module.open.dou.service.DouOrderService;
+import cn.qihangerp.oms.dou.DouApiCommon;
 import cn.qihangerp.open.dou.DouRequest;
 import cn.qihangerp.security.common.BaseController;
 import lombok.AllArgsConstructor;

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

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

microservices/pom.xml

@@ -19,7 +19,7 @@
         <module>goods-api</module>
         <module>order-api</module>
         <module>jd-api</module>
-        <module>dou-api</module>
+<!--        <module>dou-api</module>-->
         <module>tao-api</module>
         <module>pdd-api</module>
         <module>wei-api</module>