From 1fe8d1cc8962f0022e8173d6d5d11c6e6fe98178 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 29 Apr 2021 23:57:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=20x=208=20:=20=E8=B2=8C=E4=BC=BC=E4=B8=8D=E8=87=AA?=
 =?UTF-8?q?=E9=97=AD=E4=BA=86=202048?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  2 +-
 yudao-admin-server/pom.xml                    | 33 +++++++++++++++----
 .../src/test/resources/logback-spring.xml     |  4 +++
 yudao-dependencies/pom.xml                    |  2 +-
 yudao-framework/pom.xml                       |  5 +++
 .../framework/test/package-info.java          |  4 ---
 .../framework}/BaseMockitoUnitTest.java       |  2 +-
 .../dashboard/framework/package-info.java     |  1 -
 .../impl/aliyun/AliyunSmsClientTest.java      |  2 +-
 .../impl/aliyun/AliyunSmsCodeMappingTest.java |  2 +-
 .../impl/yunpian/YunpianSmsClientTest.java    |  2 +-
 .../yunpian/YunpianSmsCodeMappingTest.java    |  2 +-
 12 files changed, 43 insertions(+), 18 deletions(-)
 create mode 100644 yudao-admin-server/src/test/resources/logback-spring.xml
 delete mode 100644 yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/package-info.java
 rename yudao-framework/src/{main/java/cn/iocoder/dashboard/framework/test/core => test/java/cn/iocoder/dashboard/framework}/BaseMockitoUnitTest.java (82%)
 delete mode 100644 yudao-framework/src/test/java/cn/iocoder/dashboard/framework/package-info.java

diff --git a/pom.xml b/pom.xml
index e911ac6c3..c4094b83b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
         <module>yudao-admin-server</module>
     </modules>
 
-    <name>yudao</name>
+    <name>${artifactId}</name>
     <description>芋道项目基础脚手架</description>
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
diff --git a/yudao-admin-server/pom.xml b/yudao-admin-server/pom.xml
index e9a5ed279..23082c6b5 100644
--- a/yudao-admin-server/pom.xml
+++ b/yudao-admin-server/pom.xml
@@ -2,12 +2,14 @@
 <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>
+        <groupId>cn.iocoder.boot</groupId>
+        <artifactId>yudao</artifactId>
+        <version>${revision}</version>
+    </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>cn.iocoder.boot</groupId>
     <artifactId>yudao-admin-server</artifactId>
-    <version>${revision}</version>
-
     <packaging>jar</packaging>
 
     <name>yudao-admin-server</name>
@@ -15,8 +17,6 @@
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>1.0.0</revision>
-
         <java.version>1.8</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
@@ -53,7 +53,28 @@
             <artifactId>podam</artifactId>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
 
+    <build>
+        <!-- 设置构建的 jar 包名 -->
+        <finalName>${artifactId}</finalName>
+        <plugins>
+            <!-- 打包 -->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <fork>true</fork>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/yudao-admin-server/src/test/resources/logback-spring.xml b/yudao-admin-server/src/test/resources/logback-spring.xml
new file mode 100644
index 000000000..daf756bff
--- /dev/null
+++ b/yudao-admin-server/src/test/resources/logback-spring.xml
@@ -0,0 +1,4 @@
+<configuration>
+    <!-- 引用 Spring Boot 的 logback 基础配置 -->
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+</configuration>
diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index 227a0ed7c..4d94b1291 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -9,7 +9,7 @@
     <version>${revision}</version>
     <packaging>pom</packaging>
 
-    <name>yudao-dependencies</name>
+    <name>${artifactId}</name>
     <description>基础 bom 文件，管理整个项目的依赖版本</description>
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml
index 9d989197f..76d4839f1 100644
--- a/yudao-framework/pom.xml
+++ b/yudao-framework/pom.xml
@@ -10,6 +10,11 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>yudao-framework</artifactId>
+    <packaging>jar</packaging>
+
+    <name>${artifactId}</name>
+    <description>基础框架，各种组件的拓展</description>
+    <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/package-info.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/package-info.java
deleted file mode 100644
index 6e2073812..000000000
--- a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * 单元测试、集成测试的拓展
- */
-package cn.iocoder.dashboard.framework.test;
diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/core/BaseMockitoUnitTest.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/BaseMockitoUnitTest.java
similarity index 82%
rename from yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/core/BaseMockitoUnitTest.java
rename to yudao-framework/src/test/java/cn/iocoder/dashboard/framework/BaseMockitoUnitTest.java
index eb909a846..15d6a5285 100644
--- a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/core/BaseMockitoUnitTest.java
+++ b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/BaseMockitoUnitTest.java
@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.framework.test.core;
+package cn.iocoder.dashboard.framework;
 
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.junit.jupiter.MockitoExtension;
diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/package-info.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/package-info.java
deleted file mode 100644
index 0274647fb..000000000
--- a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package cn.iocoder.dashboard.framework;
diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java
index 89c1d597b..3f407af62 100644
--- a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java
+++ b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java
@@ -1,7 +1,7 @@
 package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun;
 
 import cn.hutool.core.util.ReflectUtil;
-import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest;
+import cn.iocoder.dashboard.framework.BaseMockitoUnitTest;
 import cn.iocoder.dashboard.common.core.KeyValue;
 import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants;
 import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult;
diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java
index 67db4308d..42c98716b 100644
--- a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java
+++ b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java
@@ -1,6 +1,6 @@
 package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun;
 
-import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest;
+import cn.iocoder.dashboard.framework.BaseMockitoUnitTest;
 import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants;
 import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants;
 import org.junit.jupiter.api.Test;
diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java
index 0d1232e67..d6b412daf 100644
--- a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java
+++ b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java
@@ -1,7 +1,7 @@
 package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian;
 
 import cn.hutool.core.util.ReflectUtil;
-import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest;
+import cn.iocoder.dashboard.framework.BaseMockitoUnitTest;
 import cn.iocoder.dashboard.common.core.KeyValue;
 import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants;
 import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult;
diff --git a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java
index 261bc0d22..aaf200d55 100644
--- a/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java
+++ b/yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java
@@ -1,6 +1,6 @@
 package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian;
 
-import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest;
+import cn.iocoder.dashboard.framework.BaseMockitoUnitTest;
 import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants;
 import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants;
 import org.junit.jupiter.api.Test;