From 64b5ce659afb6eb3c84e571b06bf9d8dc95e7bb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?=
 <2847127106@qq.com>
Date: Wed, 31 Jul 2024 19:45:26 +0800
Subject: [PATCH] common

---
 .../cloud-pay-client/pom.xml                  |  3 ++-
 .../cloud-pay-common/pom.xml                  |  3 ++-
 .../cloud-pay-remote/pom.xml                  |  3 ++-
 .../cloud-pay-server/pom.xml                  |  8 ++++++-
 .../com/muyu}/pay/MuYuPayApplication.java     |  2 +-
 .../muyu}/pay/controller/TestController.java  |  4 ++--
 .../src/main/resources/banner.txt             |  0
 .../src/main/resources/bootstrap.yml          |  2 +-
 {cloud-pay => cloud-server-pay}/pom.xml       | 22 ++++++++++++++++++-
 pom.xml                                       |  4 +++-
 10 files changed, 41 insertions(+), 10 deletions(-)
 rename {cloud-pay => cloud-server-pay}/cloud-pay-client/pom.xml (89%)
 rename {cloud-pay => cloud-server-pay}/cloud-pay-common/pom.xml (89%)
 rename {cloud-pay => cloud-server-pay}/cloud-pay-remote/pom.xml (89%)
 rename {cloud-pay => cloud-server-pay}/cloud-pay-server/pom.xml (93%)
 rename {cloud-pay/cloud-pay-server/src/main/java/com/muyu/cloud => cloud-server-pay/cloud-pay-server/src/main/java/com/muyu}/pay/MuYuPayApplication.java (95%)
 rename {cloud-pay/cloud-pay-server/src/main/java/com/muyu/cloud => cloud-server-pay/cloud-pay-server/src/main/java/com/muyu}/pay/controller/TestController.java (76%)
 rename {cloud-pay => cloud-server-pay}/cloud-pay-server/src/main/resources/banner.txt (100%)
 rename {cloud-pay => cloud-server-pay}/cloud-pay-server/src/main/resources/bootstrap.yml (98%)
 rename {cloud-pay => cloud-server-pay}/pom.xml (60%)

diff --git a/cloud-pay/cloud-pay-client/pom.xml b/cloud-server-pay/cloud-pay-client/pom.xml
similarity index 89%
rename from cloud-pay/cloud-pay-client/pom.xml
rename to cloud-server-pay/cloud-pay-client/pom.xml
index 3952c9c..7a7200e 100644
--- a/cloud-pay/cloud-pay-client/pom.xml
+++ b/cloud-server-pay/cloud-pay-client/pom.xml
@@ -5,11 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.muyu</groupId>
-        <artifactId>cloud-pay</artifactId>
+        <artifactId>cloud-server-pay</artifactId>
         <version>1.0.0</version>
     </parent>
 
     <artifactId>cloud-pay-client</artifactId>
+    <version>1.0.0</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
diff --git a/cloud-pay/cloud-pay-common/pom.xml b/cloud-server-pay/cloud-pay-common/pom.xml
similarity index 89%
rename from cloud-pay/cloud-pay-common/pom.xml
rename to cloud-server-pay/cloud-pay-common/pom.xml
index f90c01f..b726760 100644
--- a/cloud-pay/cloud-pay-common/pom.xml
+++ b/cloud-server-pay/cloud-pay-common/pom.xml
@@ -5,11 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.muyu</groupId>
-        <artifactId>cloud-pay</artifactId>
+        <artifactId>cloud-server-pay</artifactId>
         <version>1.0.0</version>
     </parent>
 
     <artifactId>cloud-pay-common</artifactId>
+    <version>1.0.0</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
diff --git a/cloud-pay/cloud-pay-remote/pom.xml b/cloud-server-pay/cloud-pay-remote/pom.xml
similarity index 89%
rename from cloud-pay/cloud-pay-remote/pom.xml
rename to cloud-server-pay/cloud-pay-remote/pom.xml
index 84d77ce..f4eba3d 100644
--- a/cloud-pay/cloud-pay-remote/pom.xml
+++ b/cloud-server-pay/cloud-pay-remote/pom.xml
@@ -5,11 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.muyu</groupId>
-        <artifactId>cloud-pay</artifactId>
+        <artifactId>cloud-server-pay</artifactId>
         <version>1.0.0</version>
     </parent>
 
     <artifactId>cloud-pay-remote</artifactId>
+    <version>1.0.0</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
diff --git a/cloud-pay/cloud-pay-server/pom.xml b/cloud-server-pay/cloud-pay-server/pom.xml
similarity index 93%
rename from cloud-pay/cloud-pay-server/pom.xml
rename to cloud-server-pay/cloud-pay-server/pom.xml
index ca88d36..403b4e8 100644
--- a/cloud-pay/cloud-pay-server/pom.xml
+++ b/cloud-server-pay/cloud-pay-server/pom.xml
@@ -5,11 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.muyu</groupId>
-        <artifactId>cloud-pay</artifactId>
+        <artifactId>cloud-server-pay</artifactId>
         <version>1.0.0</version>
     </parent>
 
     <artifactId>cloud-pay-server</artifactId>
+    <version>1.0.0</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
@@ -73,6 +74,11 @@
             <artifactId>cloud-common-api-doc</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-pay-common</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/cloud-pay/cloud-pay-server/src/main/java/com/muyu/cloud/pay/MuYuPayApplication.java b/cloud-server-pay/cloud-pay-server/src/main/java/com/muyu/pay/MuYuPayApplication.java
similarity index 95%
rename from cloud-pay/cloud-pay-server/src/main/java/com/muyu/cloud/pay/MuYuPayApplication.java
rename to cloud-server-pay/cloud-pay-server/src/main/java/com/muyu/pay/MuYuPayApplication.java
index 61a1a90..53ae382 100644
--- a/cloud-pay/cloud-pay-server/src/main/java/com/muyu/cloud/pay/MuYuPayApplication.java
+++ b/cloud-server-pay/cloud-pay-server/src/main/java/com/muyu/pay/MuYuPayApplication.java
@@ -1,4 +1,4 @@
-package com.muyu.cloud.pay;
+package com.muyu.pay;
 
 
 import com.muyu.common.security.annotation.EnableCustomConfig;
diff --git a/cloud-pay/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/TestController.java b/cloud-server-pay/cloud-pay-server/src/main/java/com/muyu/pay/controller/TestController.java
similarity index 76%
rename from cloud-pay/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/TestController.java
rename to cloud-server-pay/cloud-pay-server/src/main/java/com/muyu/pay/controller/TestController.java
index 52d903a..486d946 100644
--- a/cloud-pay/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/TestController.java
+++ b/cloud-server-pay/cloud-pay-server/src/main/java/com/muyu/pay/controller/TestController.java
@@ -1,4 +1,4 @@
-package com.muyu.cloud.pay.controller;
+package com.muyu.pay.controller;
 
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @Author：胡杨
  * @name：Test
  * @Date：2024/7/31 上午10:10
- * @Description: com.muyu.cloud.pay.controller
+ * @Description: com.muyu.pay.controller
  */
 
 @RestController
diff --git a/cloud-pay/cloud-pay-server/src/main/resources/banner.txt b/cloud-server-pay/cloud-pay-server/src/main/resources/banner.txt
similarity index 100%
rename from cloud-pay/cloud-pay-server/src/main/resources/banner.txt
rename to cloud-server-pay/cloud-pay-server/src/main/resources/banner.txt
diff --git a/cloud-pay/cloud-pay-server/src/main/resources/bootstrap.yml b/cloud-server-pay/cloud-pay-server/src/main/resources/bootstrap.yml
similarity index 98%
rename from cloud-pay/cloud-pay-server/src/main/resources/bootstrap.yml
rename to cloud-server-pay/cloud-pay-server/src/main/resources/bootstrap.yml
index 58c72d9..bfaaa52 100644
--- a/cloud-pay/cloud-pay-server/src/main/resources/bootstrap.yml
+++ b/cloud-server-pay/cloud-pay-server/src/main/resources/bootstrap.yml
@@ -15,7 +15,7 @@ spring:
     allow-bean-definition-overriding: true
   application:
     # 应用名称
-    name: cloud-system
+    name: cloud-pay
   profiles:
     # 环境配置
     active: dev
diff --git a/cloud-pay/pom.xml b/cloud-server-pay/pom.xml
similarity index 60%
rename from cloud-pay/pom.xml
rename to cloud-server-pay/pom.xml
index 4213ca0..81b5130 100644
--- a/cloud-pay/pom.xml
+++ b/cloud-server-pay/pom.xml
@@ -9,7 +9,7 @@
         <version>3.6.3</version>
     </parent>
 
-    <artifactId>cloud-pay</artifactId>
+    <artifactId>cloud-server-pay</artifactId>
     <version>1.0.0</version>
     <packaging>pom</packaging>
     <modules>
@@ -25,4 +25,24 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.muyu]</groupId>
+            <artifactId>cloud-pay-client</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-pay-remote</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-pay-common</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+    </dependencies>
+
 </project>
diff --git a/pom.xml b/pom.xml
index 8897c9b..a5dd156 100644
--- a/pom.xml
+++ b/pom.xml
@@ -259,6 +259,8 @@
                 <artifactId>cloud-common-xxl</artifactId>
                 <version>${muyu.version}</version>
             </dependency>
+
+
         </dependencies>
     </dependencyManagement>
 
@@ -268,7 +270,7 @@
         <module>cloud-visual</module>
         <module>cloud-modules</module>
         <module>cloud-common</module>
-        <module>cloud-pay</module>
+        <module>cloud-server-pay</module>
     </modules>
     <packaging>pom</packaging>