This is an automated email from the ASF dual-hosted git repository.
liuhongyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new c5cf249353 fix 2.6.1 shenyu-client register failed (#5960)
c5cf249353 is described below
commit c5cf2493535ef16f983990c91b5998a717b9dadb
Author: Wweiei <[email protected]>
AuthorDate: Sat Mar 15 19:59:24 2025 +0800
fix 2.6.1 shenyu-client register failed (#5960)
---
.../controller/ShenyuClientHttpRegistryController.java | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/ShenyuClientHttpRegistryController.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/ShenyuClientHttpRegistryController.java
index a2d8f0f5ca..374e1bd3d2 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/ShenyuClientHttpRegistryController.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/ShenyuClientHttpRegistryController.java
@@ -23,6 +23,7 @@ import org.apache.shenyu.admin.model.vo.NamespaceVO;
import org.apache.shenyu.admin.register.ShenyuClientServerRegisterPublisher;
import org.apache.shenyu.admin.service.NamespaceService;
import org.apache.shenyu.admin.utils.ShenyuResultMessage;
+import org.apache.shenyu.common.constant.Constants;
import org.apache.shenyu.register.common.dto.ApiDocRegisterDTO;
import org.apache.shenyu.register.common.dto.DiscoveryConfigRegisterDTO;
import org.apache.shenyu.register.common.dto.MetaDataRegisterDTO;
@@ -57,7 +58,9 @@ public class ShenyuClientHttpRegistryController {
@PostMapping("/register-metadata")
@ResponseBody
public String registerMetadata(@RequestBody final MetaDataRegisterDTO
metaDataRegisterDTO) {
- checkClientNamespaceExist(metaDataRegisterDTO.getNamespaceId());
+ if (Objects.isNull(metaDataRegisterDTO.getNamespaceId())) {
+
metaDataRegisterDTO.setNamespaceId(Constants.SYS_DEFAULT_NAMESPACE_ID);
+ }
publisher.publish(metaDataRegisterDTO);
return ShenyuResultMessage.SUCCESS;
}
@@ -71,7 +74,9 @@ public class ShenyuClientHttpRegistryController {
@PostMapping("/register-uri")
@ResponseBody
public String registerURI(@RequestBody final URIRegisterDTO
uriRegisterDTO) {
- checkClientNamespaceExist(uriRegisterDTO.getNamespaceId());
+ if (Objects.isNull(uriRegisterDTO.getNamespaceId())) {
+ uriRegisterDTO.setNamespaceId(Constants.SYS_DEFAULT_NAMESPACE_ID);
+ }
publisher.publish(uriRegisterDTO);
return ShenyuResultMessage.SUCCESS;
}
@@ -98,7 +103,9 @@ public class ShenyuClientHttpRegistryController {
@PostMapping("/register-discoveryConfig")
@ResponseBody
public String registerDiscoveryConfig(@RequestBody final
DiscoveryConfigRegisterDTO discoveryConfigRegisterDTO) {
- checkClientNamespaceExist(discoveryConfigRegisterDTO.getNamespaceId());
+ if (Objects.isNull(discoveryConfigRegisterDTO.getNamespaceId())) {
+
discoveryConfigRegisterDTO.setNamespaceId(Constants.SYS_DEFAULT_NAMESPACE_ID);
+ }
publisher.publish(discoveryConfigRegisterDTO);
return ShenyuResultMessage.SUCCESS;
}
@@ -112,7 +119,9 @@ public class ShenyuClientHttpRegistryController {
@PostMapping("/offline")
@ResponseBody
public String offline(@RequestBody final URIRegisterDTO offlineDTO) {
- checkClientNamespaceExist(offlineDTO.getNamespaceId());
+ if (Objects.isNull(offlineDTO.getNamespaceId())) {
+ offlineDTO.setNamespaceId(Constants.SYS_DEFAULT_NAMESPACE_ID);
+ }
publisher.publish(offlineDTO);
return ShenyuResultMessage.SUCCESS;
}