优化
This commit is contained in:
@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
|||||||
import feign.FeignException;
|
import feign.FeignException;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.core.annotation.Order;
|
import org.springframework.core.annotation.Order;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@@ -42,6 +43,7 @@ public class TenantAdministratorProvisioningService implements TenantApprovalIni
|
|||||||
private final String internalToken;
|
private final String internalToken;
|
||||||
private final SecureRandom random;
|
private final SecureRandom random;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
public TenantAdministratorProvisioningService(MemberRepository members, IamRoleMapper roles,
|
public TenantAdministratorProvisioningService(MemberRepository members, IamRoleMapper roles,
|
||||||
AuthAccountClient authClient,
|
AuthAccountClient authClient,
|
||||||
@Value("${baiyue.security.internal-service-token}") String internalToken) {
|
@Value("${baiyue.security.internal-service-token}") String internalToken) {
|
||||||
|
|||||||
+18
@@ -11,6 +11,8 @@ import com.baiyue.iam.repository.MemberRepository;
|
|||||||
import org.junit.jupiter.api.BeforeEach;
|
import org.junit.jupiter.api.BeforeEach;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
import org.mockito.ArgumentCaptor;
|
import org.mockito.ArgumentCaptor;
|
||||||
|
import org.springframework.boot.test.util.TestPropertyValues;
|
||||||
|
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
|
||||||
|
|
||||||
import java.security.SecureRandom;
|
import java.security.SecureRandom;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -39,6 +41,22 @@ class TenantAdministratorProvisioningServiceTest {
|
|||||||
new TenantAdministratorProvisioningService(members, roles, auth, "internal-token", new SecureRandom());
|
new TenantAdministratorProvisioningService(members, roles, auth, "internal-token", new SecureRandom());
|
||||||
private IamTenant tenant;
|
private IamTenant tenant;
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void springContextUsesProductionConstructorWhenTestConstructorAlsoExists() {
|
||||||
|
try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext()) {
|
||||||
|
TestPropertyValues.of("baiyue.security.internal-service-token=internal-token-at-least-32-bytes-long")
|
||||||
|
.applyTo(context);
|
||||||
|
context.registerBean(MemberRepository.class, () -> mock(MemberRepository.class));
|
||||||
|
context.registerBean(IamRoleMapper.class, () -> mock(IamRoleMapper.class));
|
||||||
|
context.registerBean(AuthAccountClient.class, () -> mock(AuthAccountClient.class));
|
||||||
|
context.register(TenantAdministratorProvisioningService.class);
|
||||||
|
|
||||||
|
context.refresh();
|
||||||
|
|
||||||
|
assertNotNull(context.getBean(TenantAdministratorProvisioningService.class));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@BeforeEach
|
@BeforeEach
|
||||||
void setUp() {
|
void setUp() {
|
||||||
tenant = new IamTenant();
|
tenant = new IamTenant();
|
||||||
|
|||||||
Reference in New Issue
Block a user