Commit d5883771c81212eedd11be8738ae5bfc183307be

Authored by YunaiV
1 parent 35f1eb95

项目结构调整 x 10 : 使用阿里云的源;解决单元测试报错问题

@@ -38,4 +38,13 @@ @@ -38,4 +38,13 @@
38 </dependencies> 38 </dependencies>
39 </dependencyManagement> 39 </dependencyManagement>
40 40
  41 + <!-- 使用 aliyun 的 Maven 源,提升下载速度 -->
  42 + <repositories>
  43 + <repository>
  44 + <id>aliyun</id>
  45 + <name>aliyun</name>
  46 + <url>http://maven.aliyun.com/nexus/content/groups/public</url>
  47 + </repository>
  48 + </repositories>
  49 +
41 </project> 50 </project>
yudao-admin-server/pom.xml
@@ -68,6 +68,17 @@ @@ -68,6 +68,17 @@
68 </execution> 68 </execution>
69 </executions> 69 </executions>
70 </plugin> 70 </plugin>
  71 +
  72 + <plugin>
  73 + <groupId>org.apache.maven.plugins</groupId>
  74 + <artifactId>maven-surefire-plugin</artifactId>
  75 + <version>3.0.0-M5</version>
  76 + </plugin>
  77 + <plugin>
  78 + <groupId>org.apache.maven.plugins</groupId>
  79 + <artifactId>maven-failsafe-plugin</artifactId>
  80 + <version>3.0.0-M5</version>
  81 + </plugin>
71 </plugins> 82 </plugins>
72 </build> 83 </build>
73 84
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 { @@ -85,7 +85,7 @@ public class SysAuthServiceImpl implements SysAuthService {
85 @Override 85 @Override
86 public String login(SysAuthLoginReqVO reqVO, String userIp, String userAgent) { 86 public String login(SysAuthLoginReqVO reqVO, String userIp, String userAgent) {
87 // 判断验证码是否正确 87 // 判断验证码是否正确
88 -// this.verifyCaptcha(reqVO.getUsername(), reqVO.getUuid(), reqVO.getCode()); 88 + this.verifyCaptcha(reqVO.getUsername(), reqVO.getUuid(), reqVO.getCode());
89 89
90 // 使用账号密码,进行登陆。 90 // 使用账号密码,进行登陆。
91 LoginUser loginUser = this.login0(reqVO.getUsername(), reqVO.getPassword()); 91 LoginUser loginUser = this.login0(reqVO.getUsername(), reqVO.getPassword());
yudao-dependencies/pom.xml
@@ -49,6 +49,8 @@ @@ -49,6 +49,8 @@
49 <aliyun-java-sdk-core.version>4.5.18</aliyun-java-sdk-core.version> 49 <aliyun-java-sdk-core.version>4.5.18</aliyun-java-sdk-core.version>
50 <aliyun-java-sdk-dysmsapi.version>2.1.0</aliyun-java-sdk-dysmsapi.version> 50 <aliyun-java-sdk-dysmsapi.version>2.1.0</aliyun-java-sdk-dysmsapi.version>
51 <yunpian-java-sdk.version>1.2.7</yunpian-java-sdk.version> 51 <yunpian-java-sdk.version>1.2.7</yunpian-java-sdk.version>
  52 + <!-- Maven 插件 -->
  53 + <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
52 </properties> 54 </properties>
53 55
54 <dependencyManagement> 56 <dependencyManagement>
@@ -291,4 +293,21 @@ @@ -291,4 +293,21 @@
291 </dependencies> 293 </dependencies>
292 </dependencyManagement> 294 </dependencyManagement>
293 295
  296 + <build>
  297 + <pluginManagement>
  298 + <plugins>
  299 + <plugin>
  300 + <groupId>org.apache.maven.plugins</groupId>
  301 + <artifactId>maven-surefire-plugin</artifactId>
  302 + <version>${maven-surefire-plugin.version}</version>
  303 + </plugin>
  304 + <plugin>
  305 + <groupId>org.apache.maven.plugins</groupId>
  306 + <artifactId>maven-failsafe-plugin</artifactId>
  307 + <version>${maven-surefire-plugin.version}</version>
  308 + </plugin>
  309 + </plugins>
  310 + </pluginManagement>
  311 + </build>
  312 +
294 </project> 313 </project>
yudao-framework/pom.xml
@@ -212,4 +212,20 @@ @@ -212,4 +212,20 @@
212 212
213 </dependencies> 213 </dependencies>
214 214
  215 + <build>
  216 + <!-- 设置构建的 jar 包名 -->
  217 + <finalName>${artifactId}</finalName>
  218 + <plugins>
  219 + <plugin>
  220 + <groupId>org.apache.maven.plugins</groupId>
  221 + <artifactId>maven-surefire-plugin</artifactId>
  222 + <version>3.0.0-M5</version>
  223 + </plugin>
  224 + <plugin>
  225 + <groupId>org.apache.maven.plugins</groupId>
  226 + <artifactId>maven-failsafe-plugin</artifactId>
  227 + <version>3.0.0-M5</version>
  228 + </plugin>
  229 + </plugins>
  230 + </build>
215 </project> 231 </project>
yudao-framework/src/main/java/cn/iocoder/dashboard/util/test/RandomUtils.java
@@ -92,7 +92,7 @@ public class RandomUtils { @@ -92,7 +92,7 @@ public class RandomUtils {
92 92
93 @SafeVarargs 93 @SafeVarargs
94 public static <T> List<T> randomPojoList(Class<T> clazz, Consumer<T>... consumers) { 94 public static <T> List<T> randomPojoList(Class<T> clazz, Consumer<T>... consumers) {
95 - int size = RandomUtil.randomInt(0, RANDOM_COLLECTION_LENGTH); 95 + int size = RandomUtil.randomInt(1, RANDOM_COLLECTION_LENGTH);
96 return Stream.iterate(0, i -> i).limit(size).map(o -> randomPojo(clazz, consumers)) 96 return Stream.iterate(0, i -> i).limit(size).map(o -> randomPojo(clazz, consumers))
97 .collect(Collectors.toList()); 97 .collect(Collectors.toList());
98 } 98 }