From fee9368a0f87ae15cb17bee50555835801deb61f Mon Sep 17 00:00:00 2001 From: jiahao ren Date: Wed, 25 Oct 2023 14:10:04 +0800 Subject: [PATCH 1/6] try to fix the bug. --- .../java/space/ao/services/support/platform/PlatformClient.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/space/ao/services/support/platform/PlatformClient.java b/src/main/java/space/ao/services/support/platform/PlatformClient.java index 96175cc..0373ead 100644 --- a/src/main/java/space/ao/services/support/platform/PlatformClient.java +++ b/src/main/java/space/ao/services/support/platform/PlatformClient.java @@ -91,6 +91,7 @@ public ClientRegistryResult registerClient(String requestId, ClientRegistryInfo } private String obtainBoxRegKey(String requestId) { + init(); try { // Check if the cache is still valid if (cachedBoxRegKey != null && lastFetchedTime != null && Duration.between(lastFetchedTime, LocalDateTime.now()).compareTo(CACHE_DURATION) <= 0) { From 5768ce0d648ec03595224edfe4ef1ea2dc649191 Mon Sep 17 00:00:00 2001 From: jiahao ren Date: Wed, 25 Oct 2023 19:12:39 +0800 Subject: [PATCH 2/6] make the troubleshooting. --- .../java/space/ao/services/support/platform/PlatformClient.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/space/ao/services/support/platform/PlatformClient.java b/src/main/java/space/ao/services/support/platform/PlatformClient.java index 0373ead..3ac80a9 100644 --- a/src/main/java/space/ao/services/support/platform/PlatformClient.java +++ b/src/main/java/space/ao/services/support/platform/PlatformClient.java @@ -49,6 +49,8 @@ private void init() { public UserRegistryResult registerUser(String requestId, UserRegistryInfo userRegistryInfo) { init(); try { + LOG.info("requestId:{}",requestId); + LOG.info("UserRegistryInfo:{}",userRegistryInfo); // Obtain BoxRegKey String boxRegKey = obtainBoxRegKey(requestId); if (boxRegKey == null) { From 7b08eaf1df63696f9820e2541f7e1a48704661a9 Mon Sep 17 00:00:00 2001 From: jiahao ren Date: Wed, 25 Oct 2023 19:40:26 +0800 Subject: [PATCH 3/6] make the troubleshooting. --- .../java/space/ao/services/support/platform/PlatformClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/space/ao/services/support/platform/PlatformClient.java b/src/main/java/space/ao/services/support/platform/PlatformClient.java index 3ac80a9..eacc217 100644 --- a/src/main/java/space/ao/services/support/platform/PlatformClient.java +++ b/src/main/java/space/ao/services/support/platform/PlatformClient.java @@ -35,7 +35,7 @@ private void init() { this.client = new Client(host, null); } } - private static final Logger LOG = LoggerFactory.getLogger(PlatformClient.class); + private static final Logger LOG = LoggerFactory.getLogger("app.log"); // Cache variables private String cachedBoxRegKey = null; From 93cb220036ac1b03750c7c85fadaaf9a009bf291 Mon Sep 17 00:00:00 2001 From: jiahao ren Date: Thu, 26 Oct 2023 12:33:31 +0800 Subject: [PATCH 4/6] make the troubleshooting. --- pom.xml | 2 +- .../support/platform/PlatformClient.java | 22 ++++++++++++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index fd69301..0870a3d 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ io.github.ren2003u platform-sdk-java - 1.0.3 + 1.0.4 diff --git a/src/main/java/space/ao/services/support/platform/PlatformClient.java b/src/main/java/space/ao/services/support/platform/PlatformClient.java index eacc217..25e80dd 100644 --- a/src/main/java/space/ao/services/support/platform/PlatformClient.java +++ b/src/main/java/space/ao/services/support/platform/PlatformClient.java @@ -11,13 +11,18 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import space.ao.services.config.ApplicationProperties; +import space.ao.services.support.OperationUtils; import space.ao.services.support.platform.info.registry.ClientRegistryInfo; import space.ao.services.support.platform.info.registry.ClientRegistryResult; import space.ao.services.support.platform.info.registry.UserRegistryInfo; import space.ao.services.support.platform.info.registry.UserRegistryResult; +import space.ao.services.support.platform.info.token.TokenVerifySignInfo; +import space.ao.services.support.security.SecurityUtils; +import java.nio.charset.StandardCharsets; import java.time.Duration; import java.time.LocalDateTime; +import java.util.Base64; import java.util.List; @ApplicationScoped @@ -26,6 +31,11 @@ public class PlatformClient { @Inject ApplicationProperties properties; + @Inject + SecurityUtils securityUtils; + + @Inject + OperationUtils utils; private String host; private Client client; @@ -35,7 +45,7 @@ private void init() { this.client = new Client(host, null); } } - private static final Logger LOG = LoggerFactory.getLogger("app.log"); + private static final Logger LOG = LoggerFactory.getLogger(PlatformClient.class); // Cache variables private String cachedBoxRegKey = null; @@ -71,6 +81,7 @@ public UserRegistryResult registerUser(String requestId, UserRegistryInfo userRe } } public ClientRegistryResult registerClient(String requestId, ClientRegistryInfo clientRegistryInfo, String userId) { + init(); try { // Obtain BoxRegKey String boxRegKey = obtainBoxRegKey(requestId); @@ -99,8 +110,11 @@ private String obtainBoxRegKey(String requestId) { if (cachedBoxRegKey != null && lastFetchedTime != null && Duration.between(lastFetchedTime, LocalDateTime.now()).compareTo(CACHE_DURATION) <= 0) { return cachedBoxRegKey; } - - ApiResponse response = client.obtainBoxRegKey(properties.boxUuid(), List.of("10001"), requestId); + var sign = securityUtils.getSecurityProvider().signUsingBoxPrivateKey(requestId, + Base64.getEncoder().encodeToString( + utils.objectToJson(TokenVerifySignInfo.of(properties.boxUuid(), List.of("10001"))) + .getBytes(StandardCharsets.UTF_8))); + ApiResponse response = client.obtainBoxRegKey(properties.boxUuid(), List.of("10001"), requestId,sign); if (response.getError() != null) { LOG.error("Error obtaining BoxRegKey: {}", response.getError().getMessage()); return null; @@ -117,6 +131,7 @@ private String obtainBoxRegKey(String requestId) { } } public void deleteUser(String requestId, String userId) { + init(); try { // Obtain BoxRegKey String boxRegKey = obtainBoxRegKey(requestId); @@ -132,6 +147,7 @@ public void deleteUser(String requestId, String userId) { } } public void deleteClient(String requestId, String userId, String clientUUID) { + init(); try { // Obtain BoxRegKey String boxRegKey = obtainBoxRegKey(requestId); From f4e6d24262d2c1c4681e0e921255d98e8726c3c9 Mon Sep 17 00:00:00 2001 From: jiahao ren Date: Thu, 26 Oct 2023 13:25:24 +0800 Subject: [PATCH 5/6] make the troubleshooting. --- .../ao/services/account/member/service/AdminUserService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/space/ao/services/account/member/service/AdminUserService.java b/src/main/java/space/ao/services/account/member/service/AdminUserService.java index 3df1fd0..6439e3c 100644 --- a/src/main/java/space/ao/services/account/member/service/AdminUserService.java +++ b/src/main/java/space/ao/services/account/member/service/AdminUserService.java @@ -132,6 +132,7 @@ public UserEntity bindAdminUser(String requestId, AdminBindInfo adminBindInfo) { userEntity.setClientUUID(adminBindInfo.getClientUUID()); userEntity.setApplyEmail(adminBindInfo.getApplyEmail()); userEntity.setPersonalName(adminBindInfo.getSpaceName()); + //设置属性 userEntity.setUserDomain(userRegistryResult.userDomain()); userEntity.setAuthKey(authKey); userInfoRepository.insertAdminUser(userEntity); From 67d35e0d5074509c927f272dff9d21e9d20bb4ab Mon Sep 17 00:00:00 2001 From: jiahao ren Date: Thu, 26 Oct 2023 14:18:14 +0800 Subject: [PATCH 6/6] . --- .../ao/services/account/member/service/AdminUserService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/space/ao/services/account/member/service/AdminUserService.java b/src/main/java/space/ao/services/account/member/service/AdminUserService.java index 6439e3c..3df1fd0 100644 --- a/src/main/java/space/ao/services/account/member/service/AdminUserService.java +++ b/src/main/java/space/ao/services/account/member/service/AdminUserService.java @@ -132,7 +132,6 @@ public UserEntity bindAdminUser(String requestId, AdminBindInfo adminBindInfo) { userEntity.setClientUUID(adminBindInfo.getClientUUID()); userEntity.setApplyEmail(adminBindInfo.getApplyEmail()); userEntity.setPersonalName(adminBindInfo.getSpaceName()); - //设置属性 userEntity.setUserDomain(userRegistryResult.userDomain()); userEntity.setAuthKey(authKey); userInfoRepository.insertAdminUser(userEntity);