fix: maven构建失败 (#5872)

Author: KouShenhai

laokou-common/laokou-common-mybatis-plus/pom.xml

@@ -70,6 +70,10 @@
           <groupId>com.alibaba</groupId>
           <artifactId>druid-spring-boot-4-starter</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.mybatis</groupId>
+          <artifactId>mybatis-spring</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>

laokou-service/laokou-auth/laokou-auth-app/src/main/java/org/laokou/auth/service/validator/AuthorizationCodeAuthParamValidator.java

@@ -19,6 +19,7 @@
 
 import org.laokou.auth.model.AuthA;
 import org.laokou.auth.model.validator.AuthParamValidator;
+import org.laokou.auth.model.valueobject.CaptchaV;
 import org.laokou.auth.model.valueobject.UserV;
 import org.laokou.common.i18n.util.ParamValidator;
 import org.springframework.stereotype.Component;
@@ -37,9 +38,14 @@ public class AuthorizationCodeAuthParamValidator implements AuthParamValidator {
 	@Override
 	public void validateAuth(AuthA authA) {
 		UserV userV = authA.getUserV();
+		CaptchaV captchaV = authA.getCaptchaV();
 		ParamValidator.validate(authA.getValidateName(),
 				// 校验租户编码
 				OAuth2ParamValidator.validateTenantCode(userV.tenantCode()),
+				// 校验UUID
+				OAuth2ParamValidator.validateUuid(captchaV.uuid()),
+				// 校验验证码
+				OAuth2ParamValidator.validateCaptcha(captchaV.captcha()),
 				// 校验用户名
 				OAuth2ParamValidator.validateUsername(userV.username()),
 				// 校验密码

laokou-service/laokou-auth/laokou-auth-domain/src/main/java/org/laokou/auth/model/AuthA.java

@@ -219,6 +219,7 @@ public AuthA createMailAuth() throws Exception {
 
 	public AuthA createAuthorizationCodeAuth() throws Exception {
 		this.grantType = GrantType.AUTHORIZATION_CODE;
+		this.captchaV = getCaptchaVByAuthorizationCodeAuth();
 		this.userV = getUserVByAuthorizationCodeAuth();
 		return create();
 	}
@@ -407,6 +408,10 @@ private String getParameterValue(String key) {
 		return parameterMap.getOrDefault(key, new String[] { StringConstants.EMPTY })[0];
 	}
 
+	private CaptchaV getCaptchaVByAuthorizationCodeAuth() {
+		return getCaptchaVByUsernamePasswordAuth();
+	}
+
 	private CaptchaV getCaptchaVByUsernamePasswordAuth() {
 		String uuid = getParameterValue(Constants.UUID);
 		String captcha = getParameterValue(Constants.CAPTCHA);

laokou-service/laokou-auth/laokou-auth-domain/src/test/java/org/laokou/auth/model/DomainServiceTest.java

@@ -295,14 +295,16 @@ void test_auth_test_success() throws Exception {
 	}
 
 	@Test
-	@DisplayName("Test authorization code password auth success")
+	@DisplayName("Test authorization code auth success")
 	void test_auth_authorizationCode_success() throws Exception {
 		createAuthorizationCodeAuthInfo(createAuthorizationCodeAuthParam());
 		AuthA authorizationCodeAuth = createAuth().createAuthorizationCodeAuth();
 		Assertions.assertThat(authorizationCodeAuth).isNotNull();
 		Assertions.assertThatCode(() -> domainService.auth(authorizationCodeAuth)).doesNotThrowAnyException();
 		Mockito.verify(tenantGateway, Mockito.times(1)).getTenantId(this.tenantCode);
 		Mockito.verify(httpRequest, Mockito.times(1)).getParameterMap();
+		Mockito.verify(captchaValidator, Mockito.times(1))
+			.validateCaptcha(RedisKeyUtils.getAuthorizationCodeAuthCaptchaKey(this.uuid), this.captcha);
 		Mockito.verify(passwordValidator, Mockito.times(1)).validatePassword(this.password, this.password);
 		Mockito.verify(userGateway, Mockito.times(1)).getUserProfile(createUserVByAuthorizationCode());
 		Mockito.verify(menuGateway, Mockito.times(1)).getMenuPermissions(createUserE());
@@ -432,9 +434,16 @@ private void createAuthorizationCodeAuthInfo(AuthorizationCodAuthParam authoriza
 		Mockito.doAnswer(invocation -> {
 			AuthA authA = invocation.getArgument(0);
 			UserV userV = authA.getUserV();
+			CaptchaV captchaV = authA.getCaptchaV();
 			if (StringExtUtils.isEmpty(userV.tenantCode())) {
 				throw new IllegalArgumentException("tenant code must not be empty");
 			}
+			if (StringExtUtils.isEmpty(captchaV.uuid())) {
+				throw new IllegalArgumentException("uuid must not be empty");
+			}
+			if (StringExtUtils.isEmpty(captchaV.captcha())) {
+				throw new IllegalArgumentException("captcha must not be empty");
+			}
 			if (StringExtUtils.isEmpty(userV.username())) {
 				throw new IllegalArgumentException("username must not be empty");
 			}
@@ -444,6 +453,7 @@ private void createAuthorizationCodeAuthInfo(AuthorizationCodAuthParam authoriza
 			return null;
 		}).when(authorizationCodeAuthParamValidator).validateAuth(Mockito.any());
 		Mockito.when(passwordValidator.validatePassword(Mockito.anyString(), Mockito.anyString())).thenReturn(true);
+		Mockito.when(captchaValidator.validateCaptcha(Mockito.anyString(), Mockito.anyString())).thenReturn(true);
 		Mockito.when(tenantGateway.getTenantId(Mockito.anyString())).thenReturn(1L);
 		Mockito.when(roleGateway.getDataScopes(Mockito.any())).thenReturn(Set.of("self", "custom"));
 		Mockito.when(deptGateway.getDeptIds(Mockito.any(), Mockito.any())).thenReturn(Set.of(1L));
@@ -453,8 +463,11 @@ private void createAuthorizationCodeAuthInfo(AuthorizationCodAuthParam authoriza
 		Map<String, String[]> params = MapUtils.newHashMap(4);
 		params.put(Constants.USERNAME, new String[] { authorizationCodeAuthParam.username() });
 		params.put(Constants.PASSWORD, new String[] { authorizationCodeAuthParam.password() });
+		params.put(Constants.UUID, new String[] { authorizationCodeAuthParam.uuid() });
+		params.put(Constants.CAPTCHA, new String[] { authorizationCodeAuthParam.captcha() });
 		params.put(Constants.TENANT_CODE, new String[] { authorizationCodeAuthParam.tenantCode() });
 		params.put(Constants.GRANT_TYPE, new String[] { authorizationCodeAuthParam.grantType() });
+
 		Mockito.when(httpRequest.getParameterMap()).thenReturn(params);
 	}
 
@@ -535,7 +548,7 @@ private TestAuthParam createTestAuthParam() {
 	}
 
 	private AuthorizationCodAuthParam createAuthorizationCodeAuthParam() {
-		return new AuthorizationCodAuthParam(this.username, this.password, this.tenantCode,
+		return new AuthorizationCodAuthParam(this.uuid, this.captcha, this.username, this.password, this.tenantCode,
 				GrantType.AUTHORIZATION_CODE.getCode());
 	}
 
@@ -552,7 +565,7 @@ private TestAuthParam createTestEmptyAuthParam() {
 	}
 
 	private AuthorizationCodAuthParam createAuthorizationCodeEmptyAuthParam() {
-		return new AuthorizationCodAuthParam(null, null, null, GrantType.AUTHORIZATION_CODE.getCode());
+		return new AuthorizationCodAuthParam(null, null, null, null, null, GrantType.AUTHORIZATION_CODE.getCode());
 	}
 
 	private UserV createUserVByUsernamePassword() throws Exception {
@@ -624,7 +637,8 @@ private record MailAuthParam(String mail, String code, String tenantCode, String
 	private record TestAuthParam(String username, String password, String tenantCode, String grantType) {
 	}
 
-	private record AuthorizationCodAuthParam(String username, String password, String tenantCode, String grantType) {
+	private record AuthorizationCodAuthParam(String uuid, String captcha, String username, String password,
+			String tenantCode, String grantType) {
 	}
 
 }