From d5883771c81212eedd11be8738ae5bfc183307be Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 30 Apr 2021 09:44:36 +0800
Subject: [PATCH] 项目结构调整 x 10 : 使用阿里云的源；解决单元测试报错问题

---
 pom.xml                                                                                                        |  9 +++++++++
 yudao-admin-server/pom.xml                                                                                     | 11 +++++++++++
 yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysAuthServiceImpl.java |  2 +-
 yudao-dependencies/pom.xml                                                                                     | 19 +++++++++++++++++++
 yudao-framework/pom.xml                                                                                        | 16 ++++++++++++++++
 yudao-framework/src/main/java/cn/iocoder/dashboard/util/test/RandomUtils.java                                  |  2 +-
 6 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2d8cd6c..d1a3e12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,4 +38,13 @@
         </dependencies>
     </dependencyManagement>
 
+    <!-- 使用 aliyun 的 Maven 源，提升下载速度 -->
+    <repositories>
+        <repository>
+            <id>aliyun</id>
+            <name>aliyun</name>
+            <url>http://maven.aliyun.com/nexus/content/groups/public</url>
+        </repository>
+    </repositories>
+
 </project>
diff --git a/yudao-admin-server/pom.xml b/yudao-admin-server/pom.xml
index dc30b52..8c09991 100644
--- a/yudao-admin-server/pom.xml
+++ b/yudao-admin-server/pom.xml
@@ -68,6 +68,17 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M5</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>3.0.0-M5</version>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysAuthServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysAuthServiceImpl.java
index 768dec9..40eb79a 100644
--- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysAuthServiceImpl.java
+++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysAuthServiceImpl.java
@@ -85,7 +85,7 @@ public class SysAuthServiceImpl implements SysAuthService {
     @Override
     public String login(SysAuthLoginReqVO reqVO, String userIp, String userAgent) {
         // 判断验证码是否正确
-//        this.verifyCaptcha(reqVO.getUsername(), reqVO.getUuid(), reqVO.getCode());
+        this.verifyCaptcha(reqVO.getUsername(), reqVO.getUuid(), reqVO.getCode());
 
         // 使用账号密码，进行登陆。
         LoginUser loginUser = this.login0(reqVO.getUsername(), reqVO.getPassword());
diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index e2d8c10..6b076f2 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -49,6 +49,8 @@
         <aliyun-java-sdk-core.version>4.5.18</aliyun-java-sdk-core.version>
         <aliyun-java-sdk-dysmsapi.version>2.1.0</aliyun-java-sdk-dysmsapi.version>
         <yunpian-java-sdk.version>1.2.7</yunpian-java-sdk.version>
+        <!-- Maven 插件 -->
+        <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
     </properties>
 
     <dependencyManagement>
@@ -291,4 +293,21 @@
         </dependencies>
     </dependencyManagement>
 
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>${maven-surefire-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-failsafe-plugin</artifactId>
+                    <version>${maven-surefire-plugin.version}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
 </project>
diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml
index 2c06091..55b813c 100644
--- a/yudao-framework/pom.xml
+++ b/yudao-framework/pom.xml
@@ -212,4 +212,20 @@
 
     </dependencies>
 
+    <build>
+        <!-- 设置构建的 jar 包名 -->
+        <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M5</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>3.0.0-M5</version>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/util/test/RandomUtils.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/util/test/RandomUtils.java
index 9ff8d1c..f571250 100644
--- a/yudao-framework/src/main/java/cn/iocoder/dashboard/util/test/RandomUtils.java
+++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/util/test/RandomUtils.java
@@ -92,7 +92,7 @@ public class RandomUtils {
 
     @SafeVarargs
     public static <T> List<T> randomPojoList(Class<T> clazz, Consumer<T>... consumers) {
-        int size = RandomUtil.randomInt(0, RANDOM_COLLECTION_LENGTH);
+        int size = RandomUtil.randomInt(1, RANDOM_COLLECTION_LENGTH);
         return Stream.iterate(0, i -> i).limit(size).map(o -> randomPojo(clazz, consumers))
                 .collect(Collectors.toList());
     }
--
libgit2 0.21.4