bugfix: consoleApiService that could not be found (#7959)

Author: funky-eyes

changes/en-us/2.6.0.md

@@ -74,6 +74,7 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#7891](https://github.com/apache/incubator-seata/pull/7891)] raft split-brain causes incorrect cluster information
 - [[#7908](https://github.com/apache/incubator-seata/pull/7908)] handle timestamp with time zone in postgresql primary key
 - [[#7938](https://github.com/apache/incubator-seata/pull/7938)] ensure the Jakarta-related package paths are correct.
+- [[#7959](https://github.com/apache/incubator-seata/pull/7959)] fix consoleApiService bean that could not be found
 
 
 ### optimize:

changes/zh-cn/2.6.0.md

@@ -74,6 +74,7 @@
 - [[#7891](https://github.com/apache/incubator-seata/pull/7891)] 修复raft重选举与心跳并发时可能导致namingserver侧的元数据存在多个leader
 - [[#7908](https://github.com/apache/incubator-seata/pull/7908)] 在 PostgreSQL 主键中处理带时区的时间戳
 - [[#7938](https://github.com/apache/incubator-seata/pull/7938)] 保证Jakarta相关包路径正确
+- [[#7959](https://github.com/apache/incubator-seata/pull/7959)] 修复consoleApiService bean未加载的问题
 
 
 ### optimize:

console/src/main/java/org/apache/seata/mcp/service/impl/ConsoleRemoteServiceImpl.java

@@ -17,7 +17,6 @@
 package org.apache.seata.mcp.service.impl;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.seata.common.NamingServerLocalMarker;
 import org.apache.seata.common.exception.AuthenticationFailedException;
 import org.apache.seata.common.util.StringUtils;
 import org.apache.seata.console.config.WebSecurityConfig;
@@ -44,10 +43,12 @@
 import static org.apache.seata.mcp.core.utils.UrlUtils.buildUrl;
 import static org.apache.seata.mcp.core.utils.UrlUtils.objectToQueryParamMap;
 
-@ConditionalOnMissingBean(NamingServerLocalMarker.class)
+@ConditionalOnMissingBean(name = "consoleLocalServiceImpl")
 @Service
 public class ConsoleRemoteServiceImpl implements ConsoleApiService {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(ConsoleRemoteServiceImpl.class);
+
     private final JwtTokenUtils jwtTokenUtils;
 
     private final RestTemplate restTemplate;
@@ -65,10 +66,9 @@ public ConsoleRemoteServiceImpl(
         this.restTemplate = restTemplate;
         this.objectMapper = objectMapper;
         this.namingServerProperties = namingServerProperties;
+        LOGGER.info("ConsoleRemoteServiceImpl initialized.");
     }
 
-    private final Logger logger = LoggerFactory.getLogger(ConsoleRemoteServiceImpl.class);
-
     public String getToken() {
         Authentication auth = SecurityContextHolder.getContext().getAuthentication();
         if (auth == null || !auth.isAuthenticated()) {
@@ -111,13 +111,13 @@ public String getCallNameSpace(String path) {
                 String errorMsg = String.format(
                         "MCP GET request failed with status: %s, response: %s",
                         response.getStatusCode(), response.getBody());
-                logger.warn(errorMsg);
+                LOGGER.warn(errorMsg);
                 throw new ServiceCallException(errorMsg, response.getStatusCode());
             }
             return responseBody;
         } catch (RestClientException e) {
             String errorMsg = "MCP GET Call NameSpace Failed.";
-            logger.error(errorMsg, e);
+            LOGGER.error(errorMsg, e);
             throw new ServiceCallException(errorMsg);
         }
     }
@@ -151,13 +151,13 @@ public String getCallTC(
                 String errorMsg = String.format(
                         "MCP GET request failed with status: %s, response: %s",
                         response.getStatusCode(), response.getBody());
-                logger.warn(errorMsg);
+                LOGGER.warn(errorMsg);
                 throw new ServiceCallException(errorMsg, response.getStatusCode());
             }
             return responseBody;
         } catch (RestClientException e) {
             String errorMsg = "MCP GET Call TC Failed.";
-            logger.error(errorMsg, e);
+            LOGGER.error(errorMsg, e);
             throw new ServiceCallException(errorMsg);
         }
     }
@@ -191,13 +191,13 @@ public String deleteCallTC(
                 String errorMsg = String.format(
                         "MCP DELETE request returned non-success status: %s, response: %s",
                         response.getStatusCode(), response.getBody());
-                logger.warn(errorMsg);
+                LOGGER.warn(errorMsg);
                 throw new ServiceCallException(errorMsg, response.getStatusCode());
             }
             return responseBody;
         } catch (RestClientException e) {
             String errorMsg = "MCP DELETE Call TC Failed.";
-            logger.error(errorMsg, e);
+            LOGGER.error(errorMsg, e);
             throw new ServiceCallException(errorMsg);
         }
     }
@@ -231,13 +231,13 @@ public String putCallTC(
                 String errorMsg = String.format(
                         "MCP PUT request returned non-success status: %s, response: %s",
                         response.getStatusCode(), response.getBody());
-                logger.warn(errorMsg);
+                LOGGER.warn(errorMsg);
                 throw new ServiceCallException(errorMsg, response.getStatusCode());
             }
             return responseBody;
         } catch (RestClientException e) {
             String errorMsg = "MCP PUT Call TC Failed.";
-            logger.error(errorMsg, e);
+            LOGGER.error(errorMsg, e);
             throw new ServiceCallException(errorMsg);
         }
     }

namingserver/src/main/java/org/apache/seata/namingserver/service/ConsoleLocalServiceImpl.java

@@ -26,7 +26,6 @@
 import org.apache.seata.mcp.core.props.NameSpaceDetail;
 import org.apache.seata.mcp.exception.ServiceCallException;
 import org.apache.seata.mcp.service.ConsoleApiService;
-import org.apache.seata.mcp.service.impl.ConsoleRemoteServiceImpl;
 import org.apache.seata.namingserver.manager.NamingManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -48,12 +47,12 @@
 import static org.apache.seata.mcp.core.utils.UrlUtils.buildUrl;
 import static org.apache.seata.mcp.core.utils.UrlUtils.objectToQueryParamMap;
 
-@ConditionalOnBean(ConsoleRemoteServiceImpl.class)
+@ConditionalOnBean(NamingServerLocalMarkerImpl.class)
 @Primary
 @Service
 public class ConsoleLocalServiceImpl implements ConsoleApiService {
 
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private static final Logger LOGGER = LoggerFactory.getLogger(ConsoleLocalServiceImpl.class);
 
     private final NamingManager namingManager;
 
@@ -65,6 +64,7 @@ public ConsoleLocalServiceImpl(NamingManager namingManager, RestTemplate restTem
         this.namingManager = namingManager;
         this.restTemplate = restTemplate;
         this.objectMapper = objectMapper;
+        LOGGER.info("ConsoleLocalServiceImpl initialized.");
     }
 
     public String getResult(
@@ -109,13 +109,13 @@ public String getResult(
                             String errorMsg = String.format(
                                     "MCP request failed with status: %s, response: %s",
                                     response.getStatusCode(), response.getBody());
-                            logger.warn(errorMsg);
+                            LOGGER.warn(errorMsg);
                             throw new ServiceCallException(errorMsg, response.getStatusCode());
                         }
                         return responseBody;
                     } catch (RestClientException e) {
                         String errorMsg = "MCP Call TC Failed.";
-                        logger.error(errorMsg, e);
+                        LOGGER.error(errorMsg, e);
                         throw new ServiceCallException(errorMsg);
                     }
                 }
@@ -161,7 +161,7 @@ public String getCallNameSpace(String path) {
         try {
             namespace = objectMapper.writeValueAsString(namingManager.namespace());
         } catch (JsonProcessingException e) {
-            logger.error("Get NameSpace failed: {}", e.getMessage());
+            LOGGER.error("Get NameSpace failed: {}", e.getMessage());
             return "Failed to get namespace";
         }
         return namespace;