Fix that spring.ai.mcp.server.base-url is ignored

Signed-off-by: Yanming Zhou <[email protected]>

Author: quaff

auto-configurations/mcp/spring-ai-autoconfigure-mcp-server/src/main/java/org/springframework/ai/mcp/server/autoconfigure/McpWebFluxServerAutoConfiguration.java

@@ -61,6 +61,7 @@
  * }</pre>
  *
  * @author Christian Tzolov
+ * @author Yanming Zhou
  * @since 1.0.0
  * @see McpServerProperties
  * @see WebFluxSseServerTransportProvider
@@ -76,8 +77,8 @@ public class McpWebFluxServerAutoConfiguration {
 	public WebFluxSseServerTransportProvider webFluxTransport(ObjectProvider<ObjectMapper> objectMapperProvider,
 			McpServerProperties serverProperties) {
 		ObjectMapper objectMapper = objectMapperProvider.getIfAvailable(ObjectMapper::new);
-		return new WebFluxSseServerTransportProvider(objectMapper, serverProperties.getSseMessageEndpoint(),
-				serverProperties.getSseEndpoint());
+		return new WebFluxSseServerTransportProvider(objectMapper, serverProperties.getBaseUrl(),
+				serverProperties.getSseMessageEndpoint(), serverProperties.getSseEndpoint());
 	}
 
 	// Router function for SSE transport used by Spring WebFlux to start an HTTP server.

auto-configurations/mcp/spring-ai-autoconfigure-mcp-server/src/main/java/org/springframework/ai/mcp/server/autoconfigure/McpWebMvcServerAutoConfiguration.java

@@ -56,6 +56,7 @@
  * }</pre>
  *
  * @author Christian Tzolov
+ * @author Yanming Zhou
  * @since 1.0.0
  * @see McpServerProperties
  * @see WebMvcSseServerTransportProvider
@@ -71,8 +72,8 @@ public class McpWebMvcServerAutoConfiguration {
 	public WebMvcSseServerTransportProvider webMvcSseServerTransportProvider(
 			ObjectProvider<ObjectMapper> objectMapperProvider, McpServerProperties serverProperties) {
 		ObjectMapper objectMapper = objectMapperProvider.getIfAvailable(ObjectMapper::new);
-		return new WebMvcSseServerTransportProvider(objectMapper, serverProperties.getSseMessageEndpoint(),
-				serverProperties.getSseEndpoint());
+		return new WebMvcSseServerTransportProvider(objectMapper, serverProperties.getBaseUrl(),
+				serverProperties.getSseMessageEndpoint(), serverProperties.getSseEndpoint());
 	}
 
 	@Bean

auto-configurations/mcp/spring-ai-autoconfigure-mcp-server/src/test/java/org/springframework/ai/mcp/server/autoconfigure/McpWebFluxServerAutoConfigurationIT.java

@@ -61,4 +61,11 @@ void serverDisableConfiguration() {
 		});
 	}
 
+	@Test
+	void serverBaseUrlConfiguration() {
+		this.contextRunner.withPropertyValues("spring.ai.mcp.server.base-url=/test")
+			.run(context -> assertThat(context.getBean(WebFluxSseServerTransportProvider.class)).extracting("baseUrl")
+				.isEqualTo("/test"));
+	}
+
 }

auto-configurations/mcp/spring-ai-autoconfigure-mcp-server/src/test/java/org/springframework/ai/mcp/server/autoconfigure/McpWebMvcServerAutoConfigurationIT.java

@@ -61,4 +61,11 @@ void serverDisableConfiguration() {
 		});
 	}
 
+	@Test
+	void serverBaseUrlConfiguration() {
+		this.contextRunner.withPropertyValues("spring.ai.mcp.server.base-url=/test")
+			.run(context -> assertThat(context.getBean(WebMvcSseServerTransportProvider.class)).extracting("baseUrl")
+				.isEqualTo("/test"));
+	}
+
 }