From c4f9f489facfb572bc49422b6a54f7b3afddd7e8 Mon Sep 17 00:00:00 2001
From: shuaidawang <https://gitee.com/shuaidawang>
Date: Sat, 23 Apr 2022 23:32:24 +0800
Subject: [PATCH] 【营销模块】新建模块重命名

---
 yudao-module-mall/pom.xml                                                                                                            | 26 ++++++++++++++++++++++++++
 yudao-module-mall/yudao-module-market-api/pom.xml                                                                                    | 26 ++++++++++++++++++++++++++
 yudao-module-mall/yudao-module-market-biz/pom.xml                                                                                    | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/MarketTestController.java    | 25 +++++++++++++++++++++++++
 yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/app/AppMarketTestController.java   | 24 ++++++++++++++++++++++++
 yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/package-info.java                             |  8 ++++++++
 yudao-module-market/pom.xml                                                                                                          | 26 --------------------------
 yudao-module-market/yudao-module-market-api/pom.xml                                                                                  | 26 --------------------------
 yudao-module-market/yudao-module-market-biz/pom.xml                                                                                  | 61 -------------------------------------------------------------
 yudao-module-market/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/MarketTestController.java  | 25 -------------------------
 yudao-module-market/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/app/AppMarketTestController.java | 24 ------------------------
 yudao-module-market/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/package-info.java                           |  8 --------
 12 files changed, 170 insertions(+), 170 deletions(-)
 create mode 100644 yudao-module-mall/pom.xml
 create mode 100644 yudao-module-mall/yudao-module-market-api/pom.xml
 create mode 100644 yudao-module-mall/yudao-module-market-biz/pom.xml
 create mode 100644 yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/MarketTestController.java
 create mode 100644 yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/app/AppMarketTestController.java
 create mode 100644 yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/package-info.java
 delete mode 100644 yudao-module-market/pom.xml
 delete mode 100644 yudao-module-market/yudao-module-market-api/pom.xml
 delete mode 100644 yudao-module-market/yudao-module-market-biz/pom.xml
 delete mode 100644 yudao-module-market/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/MarketTestController.java
 delete mode 100644 yudao-module-market/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/app/AppMarketTestController.java
 delete mode 100644 yudao-module-market/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/package-info.java

diff --git a/yudao-module-mall/pom.xml b/yudao-module-mall/pom.xml
new file mode 100644
index 0000000..448986c
--- /dev/null
+++ b/yudao-module-mall/pom.xml
@@ -0,0 +1,26 @@
+<?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">
+    <parent>
+        <artifactId>yudao</artifactId>
+        <groupId>cn.iocoder.boot</groupId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>yudao-module-market</artifactId>
+    <packaging>pom</packaging>
+
+    <name>${project.artifactId}</name>
+
+    <description>
+        market模块，主要实现营销相关功能
+        例如：营销活动、banner广告、优惠券、优惠码等功能。
+    </description>
+    <modules>
+        <module>yudao-module-market-api</module>
+        <module>yudao-module-market-biz</module>
+    </modules>
+
+</project>
diff --git a/yudao-module-mall/yudao-module-market-api/pom.xml b/yudao-module-mall/yudao-module-market-api/pom.xml
new file mode 100644
index 0000000..c831796
--- /dev/null
+++ b/yudao-module-mall/yudao-module-market-api/pom.xml
@@ -0,0 +1,26 @@
+<?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">
+    <parent>
+        <artifactId>yudao-module-market</artifactId>
+        <groupId>cn.iocoder.boot</groupId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>yudao-module-market-api</artifactId>
+    <packaging>jar</packaging>
+
+    <name>${project.artifactId}</name>
+    <description>
+        market 模块 API，暴露给其它模块调用
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-common</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/yudao-module-mall/yudao-module-market-biz/pom.xml b/yudao-module-mall/yudao-module-market-biz/pom.xml
new file mode 100644
index 0000000..0e3a049
--- /dev/null
+++ b/yudao-module-mall/yudao-module-market-biz/pom.xml
@@ -0,0 +1,61 @@
+<?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">
+    <parent>
+        <artifactId>yudao-module-market</artifactId>
+        <groupId>cn.iocoder.boot</groupId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
+    <artifactId>yudao-module-market-biz</artifactId>
+
+    <name>${project.artifactId}</name>
+
+    <description>
+        market模块，主要实现营销相关功能
+        例如：营销活动、banner广告、优惠券、优惠码等功能。
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-module-market-api</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
+        <!-- 业务组件 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-biz-operatelog</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-biz-weixin</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
+        </dependency>
+
+        <!-- Web 相关 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <!-- DB 相关 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-mybatis</artifactId>
+        </dependency>
+
+        <!-- Test 测试相关 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-test</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/MarketTestController.java b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/MarketTestController.java
new file mode 100644
index 0000000..49b83b6
--- /dev/null
+++ b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/MarketTestController.java
@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.module.market.controller.admin;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Api(tags = "管理后台 - 营销")
+@RestController
+@RequestMapping("/market/test")
+@Validated
+public class MarketTestController {
+
+    @GetMapping("/get")
+    @ApiOperation("获取 market 信息")
+    public CommonResult<String> get() {
+        return success("true");
+    }
+
+}
diff --git a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/app/AppMarketTestController.java b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/app/AppMarketTestController.java
new file mode 100644
index 0000000..7d45b87
--- /dev/null
+++ b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/app/AppMarketTestController.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.market.controller.app;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Api(tags = "用户 App - 营销")
+@RestController
+@RequestMapping("/market/test")
+@Validated
+public class AppMarketTestController {
+
+    @GetMapping("/get")
+    @ApiOperation("获取 market 信息")
+    public CommonResult<String> get() {
+        return success("true");
+    }
+}
diff --git a/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/package-info.java b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/package-info.java
new file mode 100644
index 0000000..2efde4e
--- /dev/null
+++ b/yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/package-info.java
@@ -0,0 +1,8 @@
+/**
+ * market 模块，我们放营销业务。
+ * 例如说：营销活动、banner、优惠券等等
+ *
+ * 1. Controller URL：以 /market/ 开头，避免和其它 Module 冲突
+ * 2. DataObject 表名：以 market_ 开头，方便在数据库中区分
+ */
+package cn.iocoder.yudao.module.market;
diff --git a/yudao-module-market/pom.xml b/yudao-module-market/pom.xml
deleted file mode 100644
index 448986c..0000000
--- a/yudao-module-market/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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">
-    <parent>
-        <artifactId>yudao</artifactId>
-        <groupId>cn.iocoder.boot</groupId>
-        <version>${revision}</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>yudao-module-market</artifactId>
-    <packaging>pom</packaging>
-
-    <name>${project.artifactId}</name>
-
-    <description>
-        market模块，主要实现营销相关功能
-        例如：营销活动、banner广告、优惠券、优惠码等功能。
-    </description>
-    <modules>
-        <module>yudao-module-market-api</module>
-        <module>yudao-module-market-biz</module>
-    </modules>
-
-</project>
diff --git a/yudao-module-market/yudao-module-market-api/pom.xml b/yudao-module-market/yudao-module-market-api/pom.xml
deleted file mode 100644
index c831796..0000000
--- a/yudao-module-market/yudao-module-market-api/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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">
-    <parent>
-        <artifactId>yudao-module-market</artifactId>
-        <groupId>cn.iocoder.boot</groupId>
-        <version>${revision}</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>yudao-module-market-api</artifactId>
-    <packaging>jar</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>
-        market 模块 API，暴露给其它模块调用
-    </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-common</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/yudao-module-market/yudao-module-market-biz/pom.xml b/yudao-module-market/yudao-module-market-biz/pom.xml
deleted file mode 100644
index 0e3a049..0000000
--- a/yudao-module-market/yudao-module-market-biz/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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">
-    <parent>
-        <artifactId>yudao-module-market</artifactId>
-        <groupId>cn.iocoder.boot</groupId>
-        <version>${revision}</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>jar</packaging>
-    <artifactId>yudao-module-market-biz</artifactId>
-
-    <name>${project.artifactId}</name>
-
-    <description>
-        market模块，主要实现营销相关功能
-        例如：营销活动、banner广告、优惠券、优惠码等功能。
-    </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-module-market-api</artifactId>
-            <version>${revision}</version>
-        </dependency>
-
-        <!-- 业务组件 -->
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-spring-boot-starter-biz-operatelog</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-spring-boot-starter-biz-weixin</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
-        </dependency>
-
-        <!-- Web 相关 -->
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <!-- DB 相关 -->
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-spring-boot-starter-mybatis</artifactId>
-        </dependency>
-
-        <!-- Test 测试相关 -->
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-spring-boot-starter-test</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/yudao-module-market/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/MarketTestController.java b/yudao-module-market/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/MarketTestController.java
deleted file mode 100644
index 49b83b6..0000000
--- a/yudao-module-market/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/MarketTestController.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package cn.iocoder.yudao.module.market.controller.admin;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Api(tags = "管理后台 - 营销")
-@RestController
-@RequestMapping("/market/test")
-@Validated
-public class MarketTestController {
-
-    @GetMapping("/get")
-    @ApiOperation("获取 market 信息")
-    public CommonResult<String> get() {
-        return success("true");
-    }
-
-}
diff --git a/yudao-module-market/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/app/AppMarketTestController.java b/yudao-module-market/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/app/AppMarketTestController.java
deleted file mode 100644
index 7d45b87..0000000
--- a/yudao-module-market/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/app/AppMarketTestController.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package cn.iocoder.yudao.module.market.controller.app;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Api(tags = "用户 App - 营销")
-@RestController
-@RequestMapping("/market/test")
-@Validated
-public class AppMarketTestController {
-
-    @GetMapping("/get")
-    @ApiOperation("获取 market 信息")
-    public CommonResult<String> get() {
-        return success("true");
-    }
-}
diff --git a/yudao-module-market/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/package-info.java b/yudao-module-market/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/package-info.java
deleted file mode 100644
index 2efde4e..0000000
--- a/yudao-module-market/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * market 模块，我们放营销业务。
- * 例如说：营销活动、banner、优惠券等等
- *
- * 1. Controller URL：以 /market/ 开头，避免和其它 Module 冲突
- * 2. DataObject 表名：以 market_ 开头，方便在数据库中区分
- */
-package cn.iocoder.yudao.module.market;
--
libgit2 0.21.4