From d5883771c81212eedd11be8738ae5bfc183307be Mon Sep 17 00:00:00 2001 From: YunaiV Date: Fri, 30 Apr 2021 09:44:36 +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=2010=20:=20=E4=BD=BF=E7=94=A8=E9=98=BF=E9=87=8C?= =?UTF-8?q?=E4=BA=91=E7=9A=84=E6=BA=90=EF=BC=9B=E8=A7=A3=E5=86=B3=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 9 +++++++++ yudao-admin-server/pom.xml | 11 +++++++++++ .../service/auth/impl/SysAuthServiceImpl.java | 2 +- yudao-dependencies/pom.xml | 19 +++++++++++++++++++ yudao-framework/pom.xml | 16 ++++++++++++++++ .../dashboard/util/test/RandomUtils.java | 2 +- 6 files changed, 57 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2d8cd6cf8..d1a3e1291 100644 --- a/pom.xml +++ b/pom.xml @@ -38,4 +38,13 @@ + + + + aliyun + aliyun + http://maven.aliyun.com/nexus/content/groups/public + + + diff --git a/yudao-admin-server/pom.xml b/yudao-admin-server/pom.xml index dc30b5234..8c09991c4 100644 --- a/yudao-admin-server/pom.xml +++ b/yudao-admin-server/pom.xml @@ -68,6 +68,17 @@ + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M5 + + + org.apache.maven.plugins + maven-failsafe-plugin + 3.0.0-M5 + 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 768dec9a8..40eb79ae3 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 e2d8c106d..6b076f2db 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -49,6 +49,8 @@ 4.5.18 2.1.0 1.2.7 + + 3.0.0-M5 @@ -291,4 +293,21 @@ + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + org.apache.maven.plugins + maven-failsafe-plugin + ${maven-surefire-plugin.version} + + + + + diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml index 2c06091e9..55b813c83 100644 --- a/yudao-framework/pom.xml +++ b/yudao-framework/pom.xml @@ -212,4 +212,20 @@ + + + ${artifactId} + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M5 + + + org.apache.maven.plugins + maven-failsafe-plugin + 3.0.0-M5 + + + 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 9ff8d1c4c..f5712500a 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 List randomPojoList(Class clazz, Consumer... 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()); }