reactor：移除 mall-product 的 api 包

YunaiV
1 parent 86f88ea5
Showing 150 changed files with 17 additions and 59 deletions
yudao-module-mall/pom.xml
yudao-module-mall/yudao-module-product-api/pom.xml
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/package-info.java
yudao-module-mall/yudao-module-product-biz/pom.xml → yudao-module-mall/yudao-module-product/pom.xml
yudao-module-mall/yudao-module-product-biz/src/test/resources/application-unit-test.yaml → yudao-module-mall/yudao-module-product/src/test/resources/application-unit-test.yaml
yudao-module-mall/yudao-module-product-biz/src/test/resources/logback.xml → yudao-module-mall/yudao-module-product/src/test/resources/logback.xml
yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/clean.sql → yudao-module-mall/yudao-module-product/src/test/resources/sql/clean.sql
yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql → yudao-module-mall/yudao-module-product/src/test/resources/sql/create_tables.sql
yudao-module-mall/yudao-module-promotion-biz/pom.xml
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/mq/consumer/coupon/CouponTakeByRegisterConsumer.java
yudao-module-mall/yudao-module-statistics-biz/pom.xml
yudao-module-mall/yudao-module-trade-biz/pom.xml
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/aftersale/AfterSaleController.java
@@ -20,8 +20,7 @@
     <modules>
         <module>yudao-module-promotion-api</module>
         <module>yudao-module-promotion-biz</module>
-        <module>yudao-module-product-api</module>
-        <module>yudao-module-product-biz</module>
+        <module>yudao-module-product</module>
         <module>yudao-module-trade-api</module>
         <module>yudao-module-trade-biz</module>
         <module>yudao-module-statistics-api</module>
-<?xml version="1.0" encoding="UTF-8"?>
-<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.iocoder.boot</groupId>
-        <artifactId>yudao-module-mall</artifactId>
-        <version>${revision}</version>
-    </parent>
-
-    <artifactId>yudao-module-product-api</artifactId>
-    <packaging>jar</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>
-        product 模块 API，暴露给其它模块调用
-    </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-common</artifactId>
-        </dependency>
-
-        <!-- 参数校验 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-            <optional>true</optional>
-        </dependency>
-    </dependencies>
-
-</project>
-package cn.iocoder.yudao.module.product.api;
@@ -8,7 +8,7 @@
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>yudao-module-product-biz</artifactId>
+    <artifactId>yudao-module-product</artifactId>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
@@ -20,12 +20,7 @@
     <dependencies>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-module-product-api</artifactId>
-            <version>${revision}</version>
-        </dependency>
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-module-member-api</artifactId>
+            <artifactId>yudao-module-member</artifactId>
             <version>${revision}</version>
         </dependency>
 /**
- * 占位
+ * product API 包，定义并实现提供给其它模块的 API
  */
-package cn.iocoder.yudao.module.product.api;
 \ No newline at end of file
+package cn.iocoder.yudao.module.product.api;
@@ -26,7 +26,7 @@
         </dependency>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-module-product-api</artifactId>
+            <artifactId>yudao-module-product</artifactId>
             <version>${revision}</version>
         </dependency>
         <dependency>
@@ -36,17 +36,17 @@
         </dependency>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-module-system-api</artifactId>
+            <artifactId>yudao-module-system</artifactId>
             <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-module-infra-api</artifactId>
+            <artifactId>yudao-module-infra</artifactId>
             <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-module-member-api</artifactId>
+            <artifactId>yudao-module-member</artifactId>
             <version>${revision}</version>
         </dependency>
 package cn.iocoder.yudao.module.promotion.mq.consumer.coupon;
-import cn.iocoder.yudao.module.member.message.user.MemberUserCreateMessage;
+import cn.iocoder.yudao.module.member.api.message.user.MemberUserCreateMessage;
 import cn.iocoder.yudao.module.promotion.service.coupon.CouponService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.event.EventListener;
@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-module-product-api</artifactId>
+            <artifactId>yudao-module-product</artifactId>
             <version>${revision}</version>
         </dependency>
         <dependency>
@@ -40,12 +40,12 @@
         </dependency>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-module-member-api</artifactId>
+            <artifactId>yudao-module-member</artifactId>
             <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-module-pay-api</artifactId>
+            <artifactId>yudao-module-pay</artifactId>
             <version>${revision}</version>
         </dependency>
@@ -25,12 +25,12 @@
         </dependency>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-module-product-api</artifactId>
+            <artifactId>yudao-module-product</artifactId>
             <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-module-pay-api</artifactId>
+            <artifactId>yudao-module-pay</artifactId>
             <version>${revision}</version>
         </dependency>
         <dependency>
@@ -40,12 +40,12 @@
         </dependency>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-module-member-api</artifactId>
+            <artifactId>yudao-module-member</artifactId>
             <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-module-system-api</artifactId>
+            <artifactId>yudao-module-system</artifactId>
             <version>${revision}</version>
         </dependency>
@@ -21,7 +21,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;