BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 1fe8d1cc8962f0022e8173d6d5d11c6e6fe98178

Authored by YunaiV
1 parent c37d5d7f

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

Inline Side-by-side
Showing 12 changed files with 43 additions and 18 deletions
... ... @@ -14,7 +14,7 @@
14 14 <module>yudao-admin-server</module>
15 15 </modules>
16 16  
17   - <name>yudao</name>
  17 + <name>${artifactId}</name>
18 18 <description>芋道项目基础脚手架</description>
19 19 <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
20 20  
... ...
yudao-admin-server/pom.xml
  View file @1fe8d1c
... ... @@ -2,12 +2,14 @@
2 2 <project xmlns="http://maven.apache.org/POM/4.0.0"
3 3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 4 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  5 + <parent>
  6 + <groupId>cn.iocoder.boot</groupId>
  7 + <artifactId>yudao</artifactId>
  8 + <version>${revision}</version>
  9 + </parent>
5 10 <modelVersion>4.0.0</modelVersion>
6 11  
7   - <groupId>cn.iocoder.boot</groupId>
8 12 <artifactId>yudao-admin-server</artifactId>
9   - <version>${revision}</version>
10   -
11 13 <packaging>jar</packaging>
12 14  
13 15 <name>yudao-admin-server</name>
... ... @@ -15,8 +17,6 @@
15 17 <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
16 18  
17 19 <properties>
18   - <revision>1.0.0</revision>
19   -
20 20 <java.version>1.8</java.version>
21 21 <maven.compiler.source>${java.version}</maven.compiler.source>
22 22 <maven.compiler.target>${java.version}</maven.compiler.target>
... ... @@ -53,7 +53,28 @@
53 53 <artifactId>podam</artifactId>
54 54 <scope>test</scope>
55 55 </dependency>
56   -
57 56 </dependencies>
58 57  
  58 + <build>
  59 + <!-- 设置构建的 jar 包名 -->
  60 + <finalName>${artifactId}</finalName>
  61 + <plugins>
  62 + <!-- 打包 -->
  63 + <plugin>
  64 + <groupId>org.springframework.boot</groupId>
  65 + <artifactId>spring-boot-maven-plugin</artifactId>
  66 + <configuration>
  67 + <fork>true</fork>
  68 + </configuration>
  69 + <executions>
  70 + <execution>
  71 + <goals>
  72 + <goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
  73 + </goals>
  74 + </execution>
  75 + </executions>
  76 + </plugin>
  77 + </plugins>
  78 + </build>
  79 +
59 80 </project>
... ...
yudao-admin-server/src/test/resources/logback-spring.xml 0 → 100644
  View file @1fe8d1c
  1 +<configuration>
  2 + <!-- 引用 Spring Boot 的 logback 基础配置 -->
  3 + <include resource="org/springframework/boot/logging/logback/defaults.xml" />
  4 +</configuration>
... ...
yudao-dependencies/pom.xml
  View file @1fe8d1c
... ... @@ -9,7 +9,7 @@
9 9 <version>${revision}</version>
10 10 <packaging>pom</packaging>
11 11  
12   - <name>yudao-dependencies</name>
  12 + <name>${artifactId}</name>
13 13 <description>基础 bom 文件，管理整个项目的依赖版本</description>
14 14 <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
15 15  
... ...
yudao-framework/pom.xml
  View file @1fe8d1c
... ... @@ -10,6 +10,11 @@
10 10 <modelVersion>4.0.0</modelVersion>
11 11  
12 12 <artifactId>yudao-framework</artifactId>
  13 + <packaging>jar</packaging>
  14 +
  15 + <name>${artifactId}</name>
  16 + <description>基础框架，各种组件的拓展</description>
  17 + <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
13 18  
14 19 <properties>
15 20 <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
... ...
yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/package-info.java deleted
View file @c37d5d7
1   -/**
2   - * 单元测试、集成测试的拓展
3   - */
4   -package cn.iocoder.dashboard.framework.test;
yudao-framework/src/main/java/cn/iocoder/dashboard/framework/test/core/BaseMockitoUnitTest.java renamed to yudao-framework/src/test/java/cn/iocoder/dashboard/framework/BaseMockitoUnitTest.java
  View file @1fe8d1c
1   -package cn.iocoder.dashboard.framework.test.core;
  1 +package cn.iocoder.dashboard.framework;
2 2  
3 3 import org.junit.jupiter.api.extension.ExtendWith;
4 4 import org.mockito.junit.jupiter.MockitoExtension;
... ...
yudao-framework/src/test/java/cn/iocoder/dashboard/framework/package-info.java deleted
View file @c37d5d7
1   -package cn.iocoder.dashboard.framework;
yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java
  View file @1fe8d1c
1 1 package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun;
2 2  
3 3 import cn.hutool.core.util.ReflectUtil;
4   -import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest;
  4 +import cn.iocoder.dashboard.framework.BaseMockitoUnitTest;
5 5 import cn.iocoder.dashboard.common.core.KeyValue;
6 6 import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants;
7 7 import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult;
... ...
yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/aliyun/AliyunSmsCodeMappingTest.java
  View file @1fe8d1c
1 1 package cn.iocoder.dashboard.framework.sms.core.client.impl.aliyun;
2 2  
3   -import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest;
  3 +import cn.iocoder.dashboard.framework.BaseMockitoUnitTest;
4 4 import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants;
5 5 import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants;
6 6 import org.junit.jupiter.api.Test;
... ...
yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java
  View file @1fe8d1c
1 1 package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian;
2 2  
3 3 import cn.hutool.core.util.ReflectUtil;
4   -import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest;
  4 +import cn.iocoder.dashboard.framework.BaseMockitoUnitTest;
5 5 import cn.iocoder.dashboard.common.core.KeyValue;
6 6 import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants;
7 7 import cn.iocoder.dashboard.framework.sms.core.client.SmsCommonResult;
... ...
yudao-framework/src/test/java/cn/iocoder/dashboard/framework/sms/core/client/impl/yunpian/YunpianSmsCodeMappingTest.java
  View file @1fe8d1c
1 1 package cn.iocoder.dashboard.framework.sms.core.client.impl.yunpian;
2 2  
3   -import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest;
  3 +import cn.iocoder.dashboard.framework.BaseMockitoUnitTest;
4 4 import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants;
5 5 import cn.iocoder.dashboard.framework.sms.core.enums.SmsFrameworkErrorCodeConstants;
6 6 import org.junit.jupiter.api.Test;
... ...