fix: incorrect domain of loc in sitemap url entry (#25)

### What this PR does? 修复 sitemap 中的 loc 的域名不正确问题 Fixes #13, #11 ```release-note 修复 sitemap 中的 loc 的域名不正确问题 ```
halo-dev · Sep 25, 2023 · b3f00e8 · b3f00e8
1 parent 4ebd330
commit b3f00e8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -22,7 +22,7 @@ jar {
 }
 
 dependencies {
-    implementation platform('run.halo.tools.platform:plugin:2.5.0-SNAPSHOT')
+    implementation platform('run.halo.tools.platform:plugin:2.9.0-SNAPSHOT')
     compileOnly 'run.halo.app:api'
 
     testImplementation 'run.halo.app:api'

diff --git a/src/main/java/run/halo/sitemap/SitemapPluginConfig.java b/src/main/java/run/halo/sitemap/SitemapPluginConfig.java
@@ -3,7 +3,6 @@
 import static org.springframework.web.reactive.function.server.RequestPredicates.GET;
 import static org.springframework.web.reactive.function.server.RequestPredicates.accept;
 
-import java.net.MalformedURLException;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.annotation.Bean;
@@ -13,7 +12,6 @@
 import org.springframework.web.reactive.function.server.RouterFunction;
 import org.springframework.web.reactive.function.server.RouterFunctions;
 import org.springframework.web.reactive.function.server.ServerResponse;
-import reactor.core.Exceptions;
 import run.halo.app.infra.ExternalUrlSupplier;
 import run.halo.app.plugin.ReactiveSettingFetcher;
 
@@ -31,18 +29,13 @@ public class SitemapPluginConfig {
     RouterFunction<ServerResponse> sitemapRouterFunction(CachedSitemapGetter cachedSitemapGetter) {
         return RouterFunctions.route(GET("/sitemap.xml")
                 .and(accept(MediaType.TEXT_XML)), request -> {
-                var uri = externalUrlSupplier.get();
-                if (!uri.isAbsolute()) {
-                    uri = request.exchange().getRequest().getURI().resolve(uri);
-                }
-                SitemapGeneratorOptions options;
-                try {
-                    options = SitemapGeneratorOptions.builder()
-                        .siteUrl(uri.toURL())
-                        .build();
-                } catch (MalformedURLException e) {
-                    throw Exceptions.propagate(e);
+                var url = externalUrlSupplier.getRaw();
+                if (url == null) {
+                    url = externalUrlSupplier.getURL(request.exchange().getRequest());
                 }
+                var options = SitemapGeneratorOptions.builder()
+                    .siteUrl(url)
+                    .build();
                 return cachedSitemapGetter.get(options)
                     .flatMap(sitemap -> ServerResponse.ok()
                         .contentType(MediaType.TEXT_XML).bodyValue(sitemap));