diff --git a/api/oms-api/libs/open-sdk-2.1.3.jar b/api/oms-api/libs/open-sdk-2.1.3.jar deleted file mode 100644 index 425abffe..00000000 Binary files a/api/oms-api/libs/open-sdk-2.1.3.jar and /dev/null differ diff --git a/api/oms-api/pom.xml b/api/oms-api/pom.xml index 9efb3e91..342929c0 100644 --- a/api/oms-api/pom.xml +++ b/api/oms-api/pom.xml @@ -112,33 +112,56 @@ dou 2.0.0 - - cn.qihangerp.services - jd-api - 1.0.6 + org.codehaus.jackson + jackson-mapper-asl + 1.9.13 + + cn.qihangerp.service + jd + 2.0.0 + + + + + + - cn.qihangerp.services - tao-api - 1.0.6 + cn.qihangerp.service + tao + 2.0.0 + + + + + - cn.qihangerp.services - pdd-api - 1.0.6 + cn.qihangerp.service + pdd + 2.0.0 + + + + + + + + + + - cn.qihangerp.services - wei-api - 1.0.6 + cn.qihangerp.service + wei + 2.0.0 - diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/JdApiCommon.java b/api/oms-api/src/main/java/cn/qihangerp/oms/jd/JdApiCommon.java similarity index 97% rename from microservices/jd-api/src/main/java/cn/qihangerp/api/jd/JdApiCommon.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/jd/JdApiCommon.java index e5c9f827..d06a2436 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/JdApiCommon.java +++ b/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; diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/JdPullRequest.java b/api/oms-api/src/main/java/cn/qihangerp/oms/jd/JdPullRequest.java similarity index 88% rename from microservices/jd-api/src/main/java/cn/qihangerp/api/jd/JdPullRequest.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/jd/JdPullRequest.java index 4585ea93..81c24aa3 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/JdPullRequest.java +++ b/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; diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdGoodsApiController.java similarity index 97% rename from microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsApiController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdGoodsApiController.java index 249f5150..fb4f2fae 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsApiController.java +++ b/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; diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdGoodsController.java similarity index 98% rename from microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdGoodsController.java index dc2f99e5..6667d7e2 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsController.java +++ b/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.*; diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOAuthController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOAuthController.java similarity index 98% rename from microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOAuthController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOAuthController.java index 01f52db8..cd86abe4 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOAuthController.java +++ b/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; diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderAfterSaleApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderAfterSaleApiController.java similarity index 98% rename from microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderAfterSaleApiController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderAfterSaleApiController.java index eb6e6cbf..8ebb16d3 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderAfterSaleApiController.java +++ b/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; diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderAfterSaleController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderAfterSaleController.java similarity index 97% rename from microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderAfterSaleController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderAfterSaleController.java index e484e51a..975fc172 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderAfterSaleController.java +++ b/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; diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderApiController.java similarity index 98% rename from microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderApiController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderApiController.java index babf26de..5e381c8c 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderApiController.java +++ b/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; diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderController.java similarity index 97% rename from microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderController.java index fba63db2..fe5cf372 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderController.java +++ b/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; diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/feign/JdOrderFeignController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderFeignController.java similarity index 94% rename from microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/feign/JdOrderFeignController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderFeignController.java index 83f08c96..7e9d9f7c 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/feign/JdOrderFeignController.java +++ b/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; diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/feign/JdRefundFeignController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdRefundFeignController.java similarity index 95% rename from microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/feign/JdRefundFeignController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdRefundFeignController.java index d7f047fe..160ee524 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/feign/JdRefundFeignController.java +++ b/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; diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdWaybillController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdWaybillController.java similarity index 97% rename from microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdWaybillController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdWaybillController.java index 2f83b1ef..3cf55892 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdWaybillController.java +++ b/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; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiCommon.java b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/PddApiCommon.java similarity index 99% rename from microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiCommon.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/pdd/PddApiCommon.java index 0b7f3f7e..9bec5d97 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiCommon.java +++ b/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; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddOrderApiService.java b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/PddOrderApiService.java similarity index 99% rename from microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddOrderApiService.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/pdd/PddOrderApiService.java index c472adb9..136943e1 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddOrderApiService.java +++ b/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; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddPullRequest.java b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/PddPullRequest.java similarity index 90% rename from microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddPullRequest.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/pdd/PddPullRequest.java index 88e5f935..ca313714 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddPullRequest.java +++ b/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; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddTokenCreateBo.java b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/PddTokenCreateBo.java similarity index 82% rename from microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddTokenCreateBo.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/pdd/PddTokenCreateBo.java index 6c7128b9..280f9ecb 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddTokenCreateBo.java +++ b/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; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/feign/OrderFeignController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/OrderFeignController.java similarity index 94% rename from microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/feign/OrderFeignController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/OrderFeignController.java index 2f47a8f0..554c0478 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/feign/OrderFeignController.java +++ b/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; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddGoodsApiController.java similarity index 98% rename from microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsApiController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddGoodsApiController.java index 286d7a80..d65371f1 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsApiController.java +++ b/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; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddGoodsController.java similarity index 98% rename from microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddGoodsController.java index 01d5695c..47cbfa8c 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsController.java +++ b/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.*; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOAuthController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddOAuthController.java similarity index 97% rename from microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOAuthController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddOAuthController.java index 1adbc351..5a02216c 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOAuthController.java +++ b/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; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddOrderApiController.java similarity index 98% rename from microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderApiController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddOrderApiController.java index cdf69755..c5592134 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderApiController.java +++ b/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; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddOrderController.java similarity index 98% rename from microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddOrderController.java index f3e7f387..eda20631 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderController.java +++ b/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; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddRefundApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddRefundApiController.java similarity index 98% rename from microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddRefundApiController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddRefundApiController.java index cdd05141..aaa8e448 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddRefundApiController.java +++ b/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; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddRefundController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddRefundController.java similarity index 97% rename from microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddRefundController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddRefundController.java index 227797e7..43abc68a 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddRefundController.java +++ b/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; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddWaybillController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddWaybillController.java similarity index 97% rename from microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddWaybillController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddWaybillController.java index 7ec53a46..4b4f4aae 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddWaybillController.java +++ b/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; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/feign/RefundFeignController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/RefundFeignController.java similarity index 94% rename from microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/feign/RefundFeignController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/RefundFeignController.java index 046a0361..27bbc25d 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/feign/RefundFeignController.java +++ b/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; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/OrderAssembleHelper.java b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/OrderAssembleHelper.java similarity index 99% rename from microservices/tao-api/src/main/java/cn/qihangerp/api/tao/OrderAssembleHelper.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/tao/OrderAssembleHelper.java index a546b35d..e99f22ec 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/OrderAssembleHelper.java +++ b/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; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoApiCommon.java b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/TaoApiCommon.java similarity index 99% rename from microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoApiCommon.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/tao/TaoApiCommon.java index 313be56e..5e37a542 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoApiCommon.java +++ b/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; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoRequest.java b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/TaoRequest.java similarity index 97% rename from microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoRequest.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/tao/TaoRequest.java index ceb1fa40..0229ca9f 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoRequest.java +++ b/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 diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoGoodsApiController.java similarity index 98% rename from microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsApiController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoGoodsApiController.java index 37f2da84..95e0be2d 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsApiController.java +++ b/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; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoGoodsController.java similarity index 98% rename from microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoGoodsController.java index 65a48c91..cedbc9b6 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsController.java +++ b/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.*; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOAuthController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOAuthController.java similarity index 98% rename from microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOAuthController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOAuthController.java index 02ced4e0..32ce7ae0 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOAuthController.java +++ b/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; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderApiController.java similarity index 98% rename from microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderApiController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderApiController.java index 181e504d..689dc0b9 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderApiController.java +++ b/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; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderController.java similarity index 98% rename from microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderController.java index fd3bfa56..e19fbb92 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderController.java +++ b/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; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/feign/TaoOrderFeignController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderFeignController.java similarity index 94% rename from microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/feign/TaoOrderFeignController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderFeignController.java index 83d6be02..0b65cbf7 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/feign/TaoOrderFeignController.java +++ b/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; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoRefundApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoRefundApiController.java similarity index 98% rename from microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoRefundApiController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoRefundApiController.java index 1c9d54bc..fafa3f0c 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoRefundApiController.java +++ b/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; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoRefundController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoRefundController.java similarity index 97% rename from microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoRefundController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoRefundController.java index 31baee7b..e489f92d 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoRefundController.java +++ b/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; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/feign/TaoRefundFeignController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoRefundFeignController.java similarity index 95% rename from microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/feign/TaoRefundFeignController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoRefundFeignController.java index fbf575ad..df0211ed 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/feign/TaoRefundFeignController.java +++ b/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; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoShipController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoShipController.java similarity index 93% rename from microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoShipController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoShipController.java index df600b50..6d66a9e5 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoShipController.java +++ b/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; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoWaybillController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoWaybillController.java similarity index 97% rename from microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoWaybillController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoWaybillController.java index f1e86bd2..1ef19214 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoWaybillController.java +++ b/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; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/task/PddOrderPullTask.java b/api/oms-api/src/main/java/cn/qihangerp/oms/task/PddOrderPullTask.java similarity index 97% rename from microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/task/PddOrderPullTask.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/task/PddOrderPullTask.java index 72d7eced..c2e93197 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/task/PddOrderPullTask.java +++ b/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; diff --git a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/PullRequest.java b/api/oms-api/src/main/java/cn/qihangerp/oms/wei/PullRequest.java similarity index 84% rename from microservices/wei-api/src/main/java/cn/qihangerp/api/wei/PullRequest.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/wei/PullRequest.java index d0d3e0e2..d12f2956 100644 --- a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/PullRequest.java +++ b/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; diff --git a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/WeiApiCommon.java b/api/oms-api/src/main/java/cn/qihangerp/oms/wei/WeiApiCommon.java similarity index 99% rename from microservices/wei-api/src/main/java/cn/qihangerp/api/wei/WeiApiCommon.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/wei/WeiApiCommon.java index e73be38e..0c9f9131 100644 --- a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/WeiApiCommon.java +++ b/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; diff --git a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/GoodsApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/GoodsApiController.java similarity index 97% rename from microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/GoodsApiController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/GoodsApiController.java index 9000a029..f108b834 100644 --- a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/GoodsApiController.java +++ b/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; diff --git a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiGoodsController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiGoodsController.java similarity index 98% rename from microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiGoodsController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiGoodsController.java index f2dbf052..804ad88d 100644 --- a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiGoodsController.java +++ b/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.*; diff --git a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiOrderApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiOrderApiController.java similarity index 99% rename from microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiOrderApiController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiOrderApiController.java index fb242c4b..8d1cb541 100644 --- a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiOrderApiController.java +++ b/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; diff --git a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiOrderController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiOrderController.java similarity index 98% rename from microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiOrderController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiOrderController.java index 7263c0ee..665a274a 100644 --- a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiOrderController.java +++ b/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; diff --git a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/feign/WeiOrderFeignController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiOrderFeignController.java similarity index 94% rename from microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/feign/WeiOrderFeignController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiOrderFeignController.java index 8314c6cf..84af4dc3 100644 --- a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/feign/WeiOrderFeignController.java +++ b/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; diff --git a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiRefundApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiRefundApiController.java similarity index 93% rename from microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiRefundApiController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiRefundApiController.java index a1a4fa75..2a35a1f7 100644 --- a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiRefundApiController.java +++ b/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.setSkuId(refundInfo.getProduct_info().getString("sku_id")); - refund.setCount(refundInfo.getProduct_info().getInteger("count")); - refund.setFastRefund(refundInfo.getProduct_info().getString("fast_refund")); + refund.setProductId(refundInfo.getProduct_info().getProduct_id()); + refund.setSkuId(refundInfo.getProduct_info().getSku_id()); + refund.setCount(refundInfo.getProduct_info().getCount()); + 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.setReturnDeliveryName(refundInfo.getReturn_info().getString("delivery_name")); - refund.setReturnDeliveryId(refundInfo.getReturn_info().getString("delivery_id")); + refund.setReturnWaybillId(refundInfo.getReturn_info().getWaybill_id()); + refund.setReturnDeliveryName(refundInfo.getReturn_info().getDelivery_name()); + 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()); diff --git a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiRefundController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiRefundController.java similarity index 97% rename from microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiRefundController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiRefundController.java index 6c962d5d..43efc532 100644 --- a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiRefundController.java +++ b/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; diff --git a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/feign/WeiRefundFeignController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiRefundFeignController.java similarity index 95% rename from microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/feign/WeiRefundFeignController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiRefundFeignController.java index b943d625..bec37cd2 100644 --- a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/feign/WeiRefundFeignController.java +++ b/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; diff --git a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiWaybillController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiWaybillController.java similarity index 97% rename from microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiWaybillController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiWaybillController.java index edc95c4a..95f0aa70 100644 --- a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiWaybillController.java +++ b/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; diff --git a/microservices/dou-api/libs/open-sdk-2.1.3.jar b/microservices/dou-api/libs/open-sdk-2.1.3.jar deleted file mode 100644 index 425abffe..00000000 Binary files a/microservices/dou-api/libs/open-sdk-2.1.3.jar and /dev/null differ diff --git a/microservices/dou-api/pom.xml b/microservices/dou-api/pom.xml deleted file mode 100644 index 6dfd9c6a..00000000 --- a/microservices/dou-api/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - 4.0.0 - - cn.qihangerp.services - microservices - 1.0.6 - - - dou-api - jar - - dou-api - http://maven.apache.org - - - UTF-8 - - - - - cn.qihangerp.open - open-sdk - 1.0 - system - ${project.basedir}/libs/open-sdk-2.1.3.jar - - - cn.qihangerp.service - dou - 2.0.0 - - - diff --git a/microservices/dou-api/src/main/resources/META-INF/spring.factories b/microservices/dou-api/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 9f90202d..00000000 --- a/microservices/dou-api/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.qihangerp.oms.dou.DouApiAutoConfiguration \ No newline at end of file diff --git a/microservices/dou-api/src/main/resources/application.yml b/microservices/dou-api/src/main/resources/application.yml deleted file mode 100644 index 35bc8f62..00000000 --- a/microservices/dou-api/src/main/resources/application.yml +++ /dev/null @@ -1,4 +0,0 @@ -qihangerp: - name: 启航电商ERP - goods: - version: 2.4.21 \ No newline at end of file diff --git a/microservices/dou-api/src/main/resources/banner.txt b/microservices/dou-api/src/main/resources/banner.txt deleted file mode 100644 index b2d3f138..00000000 --- a/microservices/dou-api/src/main/resources/banner.txt +++ /dev/null @@ -1,10 +0,0 @@ -Application Version: 2.4.21 -Spring Boot Version: ${spring-boot.version} - _______ _________ _______ _ _______ _______ _______ _______ -( ___ )\__ __/|\ /|( ___ )( ( /|( ____ \( ____ \( ____ )( ____ ) -| ( ) | ) ( | ) ( || ( ) || \ ( || ( \/| ( \/| ( )|| ( )| -| | | | | | | (___) || (___) || \ | || | | (__ | (____)|| (____)| -| | | | | | | ___ || ___ || (\ \) || | ____ | __) | __)| _____) -| | /\| | | | | ( ) || ( ) || | \ || | \_ )| ( | (\ ( | ( -| (_\ \ |___) (___| ) ( || ) ( || ) \ || (___) || (____/\| ) \ \__| ) -(____\/_)\_______/|/ \||/ \||/ )_)(_______)(_______/|/ \__/|/ diff --git a/microservices/goods-api/pom.xml b/microservices/goods-api/pom.xml deleted file mode 100644 index 4e7e46d9..00000000 --- a/microservices/goods-api/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - 4.0.0 - - cn.qihangerp.services - microservices - 1.0.6 - - - goods-api - jar - - goods-api - http://maven.apache.org - - - UTF-8 - 1.1.1 - - - - - cn.qihangerp.service - goods - 2.0.0 - - - diff --git a/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/GoodsApiAutoConfiguration.java b/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/GoodsApiAutoConfiguration.java deleted file mode 100644 index f90d3354..00000000 --- a/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/GoodsApiAutoConfiguration.java +++ /dev/null @@ -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 { -} diff --git a/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/config/GoodsApiMybatisPlusConfig.java b/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/config/GoodsApiMybatisPlusConfig.java deleted file mode 100644 index 32588539..00000000 --- a/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/config/GoodsApiMybatisPlusConfig.java +++ /dev/null @@ -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; -// } -} diff --git a/microservices/goods-api/src/main/resources/META-INF/spring.factories b/microservices/goods-api/src/main/resources/META-INF/spring.factories deleted file mode 100644 index ad191ba7..00000000 --- a/microservices/goods-api/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.qihangerp.api.goods.GoodsApiAutoConfiguration \ No newline at end of file diff --git a/microservices/goods-api/src/main/resources/application.yml b/microservices/goods-api/src/main/resources/application.yml deleted file mode 100644 index 35bc8f62..00000000 --- a/microservices/goods-api/src/main/resources/application.yml +++ /dev/null @@ -1,4 +0,0 @@ -qihangerp: - name: 启航电商ERP - goods: - version: 2.4.21 \ No newline at end of file diff --git a/microservices/goods-api/src/main/resources/banner.txt b/microservices/goods-api/src/main/resources/banner.txt deleted file mode 100644 index b2d3f138..00000000 --- a/microservices/goods-api/src/main/resources/banner.txt +++ /dev/null @@ -1,10 +0,0 @@ -Application Version: 2.4.21 -Spring Boot Version: ${spring-boot.version} - _______ _________ _______ _ _______ _______ _______ _______ -( ___ )\__ __/|\ /|( ___ )( ( /|( ____ \( ____ \( ____ )( ____ ) -| ( ) | ) ( | ) ( || ( ) || \ ( || ( \/| ( \/| ( )|| ( )| -| | | | | | | (___) || (___) || \ | || | | (__ | (____)|| (____)| -| | | | | | | ___ || ___ || (\ \) || | ____ | __) | __)| _____) -| | /\| | | | | ( ) || ( ) || | \ || | \_ )| ( | (\ ( | ( -| (_\ \ |___) (___| ) ( || ) ( || ) \ || (___) || (____/\| ) \ \__| ) -(____\/_)\_______/|/ \||/ \||/ )_)(_______)(_______/|/ \__/|/ diff --git a/microservices/jd-api/libs/open-sdk-2.1.3.jar b/microservices/jd-api/libs/open-sdk-2.1.3.jar deleted file mode 100644 index 425abffe..00000000 Binary files a/microservices/jd-api/libs/open-sdk-2.1.3.jar and /dev/null differ diff --git a/microservices/jd-api/pom.xml b/microservices/jd-api/pom.xml deleted file mode 100644 index 583ae878..00000000 --- a/microservices/jd-api/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - 4.0.0 - - cn.qihangerp.services - microservices - 1.0.6 - - - jd-api - jar - - jd-api - http://maven.apache.org - - - UTF-8 - - - - - cn.qihangerp.open - open-sdk - 1.0.2 - system - ${project.basedir}/libs/open-sdk-2.1.3.jar - - - org.codehaus.jackson - jackson-mapper-asl - 1.9.13 - - - cn.qihangerp.service - jd - 2.0.0 - - - diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/JdApiAutoConfiguration.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/JdApiAutoConfiguration.java deleted file mode 100644 index 2b9eb13b..00000000 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/JdApiAutoConfiguration.java +++ /dev/null @@ -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 { -} diff --git a/microservices/jd-api/src/main/resources/META-INF/spring.factories b/microservices/jd-api/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 818dc946..00000000 --- a/microservices/jd-api/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.qihangerp.api.jd.JdApiAutoConfiguration \ No newline at end of file diff --git a/microservices/jd-api/src/main/resources/application.yml b/microservices/jd-api/src/main/resources/application.yml deleted file mode 100644 index 35bc8f62..00000000 --- a/microservices/jd-api/src/main/resources/application.yml +++ /dev/null @@ -1,4 +0,0 @@ -qihangerp: - name: 启航电商ERP - goods: - version: 2.4.21 \ No newline at end of file diff --git a/microservices/jd-api/src/main/resources/banner.txt b/microservices/jd-api/src/main/resources/banner.txt deleted file mode 100644 index b2d3f138..00000000 --- a/microservices/jd-api/src/main/resources/banner.txt +++ /dev/null @@ -1,10 +0,0 @@ -Application Version: 2.4.21 -Spring Boot Version: ${spring-boot.version} - _______ _________ _______ _ _______ _______ _______ _______ -( ___ )\__ __/|\ /|( ___ )( ( /|( ____ \( ____ \( ____ )( ____ ) -| ( ) | ) ( | ) ( || ( ) || \ ( || ( \/| ( \/| ( )|| ( )| -| | | | | | | (___) || (___) || \ | || | | (__ | (____)|| (____)| -| | | | | | | ___ || ___ || (\ \) || | ____ | __) | __)| _____) -| | /\| | | | | ( ) || ( ) || | \ || | \_ )| ( | (\ ( | ( -| (_\ \ |___) (___| ) ( || ) ( || ) \ || (___) || (____/\| ) \ \__| ) -(____\/_)\_______/|/ \||/ \||/ )_)(_______)(_______/|/ \__/|/ diff --git a/microservices/order-api/pom.xml b/microservices/order-api/pom.xml deleted file mode 100644 index fdc5a491..00000000 --- a/microservices/order-api/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - 4.0.0 - - cn.qihangerp.services - microservices - 1.0.6 - - - order-api - jar - - order-api - http://maven.apache.org - - - UTF-8 - - - - - cn.qihangerp.service - order - 2.0.0 - - - diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/OrderApiAutoConfiguration.java b/microservices/order-api/src/main/java/cn/qihangerp/api/order/OrderApiAutoConfiguration.java deleted file mode 100644 index 04ed9da0..00000000 --- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/OrderApiAutoConfiguration.java +++ /dev/null @@ -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 { -} diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/config/OrderApiMybatisPlusConfig.java b/microservices/order-api/src/main/java/cn/qihangerp/api/order/config/OrderApiMybatisPlusConfig.java deleted file mode 100644 index 8124bcd7..00000000 --- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/config/OrderApiMybatisPlusConfig.java +++ /dev/null @@ -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; -// } -} diff --git a/microservices/order-api/src/main/resources/META-INF/spring.factories b/microservices/order-api/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 592be92e..00000000 --- a/microservices/order-api/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.qihangerp.api.order.OrderApiAutoConfiguration \ No newline at end of file diff --git a/microservices/order-api/src/main/resources/application.yml b/microservices/order-api/src/main/resources/application.yml deleted file mode 100644 index d66feddd..00000000 --- a/microservices/order-api/src/main/resources/application.yml +++ /dev/null @@ -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日志 \ No newline at end of file diff --git a/microservices/order-api/src/main/resources/banner.txt b/microservices/order-api/src/main/resources/banner.txt deleted file mode 100644 index b2d3f138..00000000 --- a/microservices/order-api/src/main/resources/banner.txt +++ /dev/null @@ -1,10 +0,0 @@ -Application Version: 2.4.21 -Spring Boot Version: ${spring-boot.version} - _______ _________ _______ _ _______ _______ _______ _______ -( ___ )\__ __/|\ /|( ___ )( ( /|( ____ \( ____ \( ____ )( ____ ) -| ( ) | ) ( | ) ( || ( ) || \ ( || ( \/| ( \/| ( )|| ( )| -| | | | | | | (___) || (___) || \ | || | | (__ | (____)|| (____)| -| | | | | | | ___ || ___ || (\ \) || | ____ | __) | __)| _____) -| | /\| | | | | ( ) || ( ) || | \ || | \_ )| ( | (\ ( | ( -| (_\ \ |___) (___| ) ( || ) ( || ) \ || (___) || (____/\| ) \ \__| ) -(____\/_)\_______/|/ \||/ \||/ )_)(_______)(_______/|/ \__/|/ diff --git a/microservices/pdd-api/libs/open-sdk-2.1.3.jar b/microservices/pdd-api/libs/open-sdk-2.1.3.jar deleted file mode 100644 index 425abffe..00000000 Binary files a/microservices/pdd-api/libs/open-sdk-2.1.3.jar and /dev/null differ diff --git a/microservices/pdd-api/pom.xml b/microservices/pdd-api/pom.xml deleted file mode 100644 index d586e471..00000000 --- a/microservices/pdd-api/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - 4.0.0 - - cn.qihangerp.services - microservices - 1.0.6 - - - pdd-api - jar - - pdd-api - http://maven.apache.org - - - UTF-8 - - - - - cn.qihangerp.open - open-sdk - 1.0.2 - system - ${project.basedir}/libs/open-sdk-2.1.3.jar - - - cn.qihangerp.service - pdd - 2.0.0 - - - diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiAutoConfiguration.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiAutoConfiguration.java deleted file mode 100644 index 8919b857..00000000 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiAutoConfiguration.java +++ /dev/null @@ -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 { -} diff --git a/microservices/pdd-api/src/main/resources/META-INF/spring.factories b/microservices/pdd-api/src/main/resources/META-INF/spring.factories deleted file mode 100644 index c4809a9a..00000000 --- a/microservices/pdd-api/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.qihangerp.api.pdd.PddApiAutoConfiguration \ No newline at end of file diff --git a/microservices/pdd-api/src/main/resources/application.yml b/microservices/pdd-api/src/main/resources/application.yml deleted file mode 100644 index 9bce237d..00000000 --- a/microservices/pdd-api/src/main/resources/application.yml +++ /dev/null @@ -1,5 +0,0 @@ -qihangerp: - name: 启航电商ERP - goods: - version: 2.4.21 - auth-redirect-url: http://erp.qihangerp.cn:88 \ No newline at end of file diff --git a/microservices/pdd-api/src/main/resources/banner.txt b/microservices/pdd-api/src/main/resources/banner.txt deleted file mode 100644 index b2d3f138..00000000 --- a/microservices/pdd-api/src/main/resources/banner.txt +++ /dev/null @@ -1,10 +0,0 @@ -Application Version: 2.4.21 -Spring Boot Version: ${spring-boot.version} - _______ _________ _______ _ _______ _______ _______ _______ -( ___ )\__ __/|\ /|( ___ )( ( /|( ____ \( ____ \( ____ )( ____ ) -| ( ) | ) ( | ) ( || ( ) || \ ( || ( \/| ( \/| ( )|| ( )| -| | | | | | | (___) || (___) || \ | || | | (__ | (____)|| (____)| -| | | | | | | ___ || ___ || (\ \) || | ____ | __) | __)| _____) -| | /\| | | | | ( ) || ( ) || | \ || | \_ )| ( | (\ ( | ( -| (_\ \ |___) (___| ) ( || ) ( || ) \ || (___) || (____/\| ) \ \__| ) -(____\/_)\_______/|/ \||/ \||/ )_)(_______)(_______/|/ \__/|/ diff --git a/microservices/pom.xml b/microservices/pom.xml deleted file mode 100644 index bd71986e..00000000 --- a/microservices/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 3.0.2 - - - - cn.qihangerp.services - microservices - 1.0.6 - pom - - microservices - http://maven.apache.org - - - - jd-api - - tao-api - pdd-api - wei-api - - - - 17 - UTF-8 - UTF-8 - 3.0.2 - 2022.0.0.0 - 0.11.5 - - - - - org.springframework.boot - spring-boot-starter - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-tomcat - - - - - org.springframework.boot - spring-boot-starter-undertow - - - mysql - mysql-connector-java - 8.0.33 - - - com.baomidou - mybatis-plus-boot-starter - 3.5.5 - - - cn.qihangerp.core - security - 1.0 - - - - org.projectlombok - lombok - 1.18.30 - provided - - - diff --git a/microservices/tao-api/libs/open-sdk-2.1.3.jar b/microservices/tao-api/libs/open-sdk-2.1.3.jar deleted file mode 100644 index 425abffe..00000000 Binary files a/microservices/tao-api/libs/open-sdk-2.1.3.jar and /dev/null differ diff --git a/microservices/tao-api/pom.xml b/microservices/tao-api/pom.xml deleted file mode 100644 index 6d440afe..00000000 --- a/microservices/tao-api/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - 4.0.0 - - cn.qihangerp.services - microservices - 1.0.6 - - - tao-api - jar - - tao-api - http://maven.apache.org - - - UTF-8 - - - - - cn.qihangerp.open - open-sdk - 1.0.2 - system - ${project.basedir}/libs/open-sdk-2.1.3.jar - - - com.squareup.okhttp3 - okhttp - 4.12.0 - - - cn.qihangerp.service - tao - 2.0.0 - - - cn.qihangerp.service - shop - 2.0.0 - - - diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoApiAutoConfiguration.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoApiAutoConfiguration.java deleted file mode 100644 index cda4b9c9..00000000 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoApiAutoConfiguration.java +++ /dev/null @@ -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 { -} diff --git a/microservices/tao-api/src/main/resources/META-INF/spring.factories b/microservices/tao-api/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 72808a8d..00000000 --- a/microservices/tao-api/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.qihangerp.api.tao.TaoApiAutoConfiguration \ No newline at end of file diff --git a/microservices/tao-api/src/main/resources/application.yml b/microservices/tao-api/src/main/resources/application.yml deleted file mode 100644 index 35bc8f62..00000000 --- a/microservices/tao-api/src/main/resources/application.yml +++ /dev/null @@ -1,4 +0,0 @@ -qihangerp: - name: 启航电商ERP - goods: - version: 2.4.21 \ No newline at end of file diff --git a/microservices/tao-api/src/main/resources/banner.txt b/microservices/tao-api/src/main/resources/banner.txt deleted file mode 100644 index b2d3f138..00000000 --- a/microservices/tao-api/src/main/resources/banner.txt +++ /dev/null @@ -1,10 +0,0 @@ -Application Version: 2.4.21 -Spring Boot Version: ${spring-boot.version} - _______ _________ _______ _ _______ _______ _______ _______ -( ___ )\__ __/|\ /|( ___ )( ( /|( ____ \( ____ \( ____ )( ____ ) -| ( ) | ) ( | ) ( || ( ) || \ ( || ( \/| ( \/| ( )|| ( )| -| | | | | | | (___) || (___) || \ | || | | (__ | (____)|| (____)| -| | | | | | | ___ || ___ || (\ \) || | ____ | __) | __)| _____) -| | /\| | | | | ( ) || ( ) || | \ || | \_ )| ( | (\ ( | ( -| (_\ \ |___) (___| ) ( || ) ( || ) \ || (___) || (____/\| ) \ \__| ) -(____\/_)\_______/|/ \||/ \||/ )_)(_______)(_______/|/ \__/|/ diff --git a/microservices/wei-api/libs/open-sdk-2.1.3.jar b/microservices/wei-api/libs/open-sdk-2.1.3.jar deleted file mode 100644 index 425abffe..00000000 Binary files a/microservices/wei-api/libs/open-sdk-2.1.3.jar and /dev/null differ diff --git a/microservices/wei-api/pom.xml b/microservices/wei-api/pom.xml deleted file mode 100644 index 32cd3a44..00000000 --- a/microservices/wei-api/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - 4.0.0 - - cn.qihangerp.services - microservices - 1.0.6 - - - wei-api - jar - - wei-api - http://maven.apache.org - - - UTF-8 - - - - - cn.qihangerp.open - open-sdk - 1.0.2 - system - ${project.basedir}/libs/open-sdk-2.1.3.jar - - - cn.qihangerp.service - wei - 2.0.0 - - - diff --git a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/WeiApiAutoConfiguration.java b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/WeiApiAutoConfiguration.java deleted file mode 100644 index 64be31be..00000000 --- a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/WeiApiAutoConfiguration.java +++ /dev/null @@ -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 { -} diff --git a/microservices/wei-api/src/main/resources/META-INF/spring.factories b/microservices/wei-api/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 8756d8f6..00000000 --- a/microservices/wei-api/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.qihangerp.api.wei.WeiApiAutoConfiguration \ No newline at end of file diff --git a/microservices/wei-api/src/main/resources/application.yml b/microservices/wei-api/src/main/resources/application.yml deleted file mode 100644 index 35bc8f62..00000000 --- a/microservices/wei-api/src/main/resources/application.yml +++ /dev/null @@ -1,4 +0,0 @@ -qihangerp: - name: 启航电商ERP - goods: - version: 2.4.21 \ No newline at end of file diff --git a/microservices/wei-api/src/main/resources/banner.txt b/microservices/wei-api/src/main/resources/banner.txt deleted file mode 100644 index b2d3f138..00000000 --- a/microservices/wei-api/src/main/resources/banner.txt +++ /dev/null @@ -1,10 +0,0 @@ -Application Version: 2.4.21 -Spring Boot Version: ${spring-boot.version} - _______ _________ _______ _ _______ _______ _______ _______ -( ___ )\__ __/|\ /|( ___ )( ( /|( ____ \( ____ \( ____ )( ____ ) -| ( ) | ) ( | ) ( || ( ) || \ ( || ( \/| ( \/| ( )|| ( )| -| | | | | | | (___) || (___) || \ | || | | (__ | (____)|| (____)| -| | | | | | | ___ || ___ || (\ \) || | ____ | __) | __)| _____) -| | /\| | | | | ( ) || ( ) || | \ || | \_ )| ( | (\ ( | ( -| (_\ \ |___) (___| ) ( || ) ( || ) \ || (___) || (____/\| ) \ \__| ) -(____\/_)\_______/|/ \||/ \||/ )_)(_______)(_______/|/ \__/|/ diff --git a/pom.xml b/pom.xml index 6e565133..54deaa68 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ api core serviceImpl - microservices +