项目结构调整 x 8 : 貌似不自闭了 2048

YunaiV
1 parent c37d5d7f
Showing 12 changed files with 43 additions and 18 deletions
pom.xml
yudao-admin-server/pom.xml
yudao-admin-server/src/test/resources/logback-spring.xml
yudao-dependencies/pom.xml
yudao-framework/pom.xml
yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/package-info.java
yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/core/BaseMockitoUnitTest.java → yudao-framework/src/test/java/cn/iocoder/dashboard/framework/BaseMockitoUnitTest.java
yudao-framework/src/test/java/cn/iocoder/dashboard/framework/package-info.java
yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java
yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java
yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java
yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java
@@ -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>
@@ -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>
+<configuration>
+    <!-- 引用 Spring Boot 的 logback 基础配置 -->
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+</configuration>
@@ -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>
@@ -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>
-/**
- * 单元测试、集成测试的拓展
- */
-package cn.iocoder.dashboard.framework.test;
-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;
-package cn.iocoder.dashboard.framework;
 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;
 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;
 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;
 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;