diff --git a/api/oms-api/libs/open-sdk-2.1.7.jar b/api/oms-api/libs/open-sdk-2.1.7.jar new file mode 100644 index 00000000..3f3cd358 Binary files /dev/null and b/api/oms-api/libs/open-sdk-2.1.7.jar differ diff --git a/api/oms-api/pom.xml b/api/oms-api/pom.xml index 731c8c07..9efb3e91 100644 --- a/api/oms-api/pom.xml +++ b/api/oms-api/pom.xml @@ -93,7 +93,7 @@ open-sdk 1.0 system - ${project.basedir}/libs/open-sdk-2.1.3.jar + ${project.basedir}/libs/open-sdk-2.1.7.jar @@ -107,18 +107,22 @@ 1.18.30 provided - + + cn.qihangerp.service + dou + 2.0.0 + cn.qihangerp.services jd-api 1.0.6 - - cn.qihangerp.services - dou-api - 1.0.6 - + + + + + cn.qihangerp.services tao-api diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiAutoConfiguration.java b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/DouApiAutoConfiguration.java similarity index 96% rename from microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiAutoConfiguration.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/dou/DouApiAutoConfiguration.java index bc87d179..eb17cab6 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiAutoConfiguration.java +++ b/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; diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiCommon.java b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/DouApiCommon.java similarity index 99% rename from microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiCommon.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/dou/DouApiCommon.java index 448496e1..0db854a1 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiCommon.java +++ b/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; diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouPullRequest.java b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/DouPullRequest.java similarity index 88% rename from microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouPullRequest.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/dou/DouPullRequest.java index 94b96e19..2469ceb5 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouPullRequest.java +++ b/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; diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouGoodsApiController.java similarity index 98% rename from microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsApiController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouGoodsApiController.java index 9311b3ab..4f8b0bd6 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsApiController.java +++ b/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; diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouGoodsController.java similarity index 98% rename from microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouGoodsController.java index f65e3653..62ef67c9 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsController.java +++ b/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.*; diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouOrderApiController.java similarity index 99% rename from microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouOrderApiController.java index 6f3260a2..e673febe 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java +++ b/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; diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderContoller.java b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouOrderContoller.java similarity index 98% rename from microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderContoller.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouOrderContoller.java index 7ca20d87..115a8c30 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderContoller.java +++ b/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; diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/feign/DouOrderFeignController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouOrderFeignController.java similarity index 94% rename from microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/feign/DouOrderFeignController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouOrderFeignController.java index cb6830b3..18e6c934 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/feign/DouOrderFeignController.java +++ b/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; diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouRefundApiController.java similarity index 98% rename from microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundApiController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouRefundApiController.java index c679a3eb..14730d4f 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundApiController.java +++ b/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; diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouRefundController.java similarity index 97% rename from microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouRefundController.java index a5871806..85592a9d 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundController.java +++ b/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; diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/feign/DouRefundFeignController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouRefundFeignController.java similarity index 94% rename from microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/feign/DouRefundFeignController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouRefundFeignController.java index 7c344958..a283f9ed 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/feign/DouRefundFeignController.java +++ b/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; diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouWaybillController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouWaybillController.java similarity index 95% rename from microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouWaybillController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouWaybillController.java index d4be706d..64a4f4c8 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouWaybillController.java +++ b/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; diff --git a/microservices/dou-api/src/main/resources/META-INF/spring.factories b/microservices/dou-api/src/main/resources/META-INF/spring.factories index 49077c15..9f90202d 100644 --- a/microservices/dou-api/src/main/resources/META-INF/spring.factories +++ b/microservices/dou-api/src/main/resources/META-INF/spring.factories @@ -1 +1 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.qihangerp.api.dou.DouApiAutoConfiguration \ No newline at end of file +org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.qihangerp.oms.dou.DouApiAutoConfiguration \ No newline at end of file diff --git a/microservices/pom.xml b/microservices/pom.xml index 3a5329f8..e1892485 100644 --- a/microservices/pom.xml +++ b/microservices/pom.xml @@ -19,7 +19,7 @@ goods-api order-api jd-api - dou-api + tao-api pdd-api wei-api