分离wei-api

api/open-api/pom.xml

@@ -119,7 +119,11 @@
             <artifactId>pdd-api</artifactId>
             <version>1.0.6</version>
         </dependency>
-
+        <dependency>
+            <groupId>cn.qihangerp.services</groupId>
+            <artifactId>wei-api</artifactId>
+            <version>1.0.6</version>
+        </dependency>
 
 
 
@@ -127,7 +131,7 @@
 
         <dependency>
             <groupId>cn.qihangerp.module</groupId>
-            <artifactId>open</artifactId>
+            <artifactId>wei</artifactId>
             <version>1.0</version>
         </dependency>
     </dependencies>

microservices/pom.xml

@@ -22,6 +22,7 @@
         <module>dou-api</module>
         <module>tao-api</module>
         <module>pdd-api</module>
+        <module>wei-api</module>
     </modules>
 
     <properties>

microservices/wei-api/pom.xml

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

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

@@ -0,0 +1,10 @@
+package cn.qihangerp.api.wei;
+
+import lombok.Data;
+
+@Data
+public class PullRequest {
+    private Long shopId;//店铺Id
+    private Long orderId;//订单编号
+    private Integer pullType;
+}

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

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

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

@@ -1,4 +1,4 @@
-package cn.qihangerp.open.wei;
+package cn.qihangerp.api.wei;
 
 
 import cn.qihangerp.common.ResultVo;
@@ -8,6 +8,7 @@ import cn.qihangerp.common.enums.HttpStatus;
 import cn.qihangerp.domain.OShop;
 import cn.qihangerp.module.service.OShopService;
 import cn.qihangerp.open.common.ApiResultVo;
+import cn.qihangerp.open.wei.WeiTokenApiHelper;
 import cn.qihangerp.open.wei.WeiTokenResponse;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;

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

@@ -1,15 +1,17 @@
-package cn.qihangerp.open.wei.controller;
+package cn.qihangerp.api.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.module.open.wei.domain.OmsWeiGoods;
 import cn.qihangerp.module.open.wei.domain.OmsWeiGoodsSku;
 import cn.qihangerp.module.open.wei.service.OmsWeiGoodsService;
-import cn.qihangerp.open.PullRequest;
 import cn.qihangerp.open.common.ApiResultVo;
-import cn.qihangerp.open.wei.WeiApiCommon;
+
 import cn.qihangerp.open.wei.WeiGoodsApiService;
 import cn.qihangerp.open.wei.model.Product;
 import com.alibaba.fastjson2.JSONObject;

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

@@ -1,18 +1,15 @@
-package cn.qihangerp.open.wei.controller;
+package cn.qihangerp.api.wei.controller;
-
 
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;
 import cn.qihangerp.common.TableDataInfo;
-
 import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo;
 import cn.qihangerp.module.goods.domain.OGoodsSku;
 import cn.qihangerp.module.goods.service.OGoodsSkuService;
 import cn.qihangerp.module.open.wei.domain.OmsWeiGoodsSku;
 import cn.qihangerp.module.open.wei.service.OmsWeiGoodsSkuService;
-
 import cn.qihangerp.security.common.BaseController;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;

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

@@ -1,16 +1,18 @@
-package cn.qihangerp.open.wei.controller;
+package cn.qihangerp.api.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.module.open.wei.domain.OmsWeiOrder;
 import cn.qihangerp.module.open.wei.domain.OmsWeiOrderItem;
 import cn.qihangerp.module.open.wei.service.OmsWeiOrderService;
-import cn.qihangerp.open.PullRequest;
+
 import cn.qihangerp.open.common.ApiResultVo;
-import cn.qihangerp.open.wei.WeiApiCommon;
+
 import cn.qihangerp.open.wei.WeiOrderApiHelper;
 import cn.qihangerp.open.wei.model.Order;
 import cn.qihangerp.open.wei.model.OrderDetailDeliverInfoAddress;

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

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

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

@@ -1,14 +1,16 @@
-package cn.qihangerp.open.wei.controller;
+package cn.qihangerp.api.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.module.open.wei.domain.OmsWeiRefund;
 import cn.qihangerp.module.open.wei.service.OmsWeiRefundService;
-import cn.qihangerp.open.PullRequest;
+
 import cn.qihangerp.open.common.ApiResultVo;
-import cn.qihangerp.open.wei.WeiApiCommon;
+
 import cn.qihangerp.open.wei.WeiRefundApiHelper;
 import cn.qihangerp.open.wei.model.AfterSaleOrder;
 import cn.qihangerp.security.common.BaseController;

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

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

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

@@ -1,4 +1,4 @@
-package cn.qihangerp.open.wei.controller.feign;
+package cn.qihangerp.api.wei.controller.feign;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.module.open.wei.domain.OmsWeiOrder;

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

@@ -1,4 +1,4 @@
-package cn.qihangerp.open.wei.controller.feign;
+package cn.qihangerp.api.wei.controller.feign;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.module.open.wei.domain.OmsWeiRefund;

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

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

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

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

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

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

module/pom.xml

@@ -19,7 +19,7 @@
         <module>goods</module>
         <module>order</module>
         <module>shop</module>
-        <module>open</module>
+        <module>wei</module>
         <module>stock</module>
         <module>jd</module>
         <module>dou</module>

module/wei/pom.xml

@@ -7,10 +7,10 @@
         <version>1.0</version>
     </parent>
     <groupId>cn.qihangerp.module</groupId>
-    <artifactId>open</artifactId>
+    <artifactId>wei</artifactId>
     <packaging>jar</packaging>
 
-    <name>open</name>
+    <name>wei</name>
     <url>http://maven.apache.org</url>
 
     <properties>