fix: #857 修复查看最新文章路径错误

terwer · Nov 4, 2023 · c5dda53 · c5dda53
1 parent 1d86ab9
commit c5dda53
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 8 deletions.
diff --git a/src/adaptors/api/base/github/commonGithubApiAdaptor.ts b/src/adaptors/api/base/github/commonGithubApiAdaptor.ts
@@ -203,7 +203,7 @@ class CommonGithubApiAdaptor extends BaseBlogApi {
       .replace("[branch]", cfg.githubBranch)
       .replace("[docpath]", postid)
     // 路径组合
-    previewUrl = StrUtil.pathJoin(this.cfg.home, previewUrl)
+    // previewUrl = StrUtil.pathJoin(this.cfg.home, previewUrl)
     return previewUrl
   }
 

diff --git a/src/adaptors/api/base/gitlab/commonGitlabApiAdaptor.ts b/src/adaptors/api/base/gitlab/commonGitlabApiAdaptor.ts
@@ -211,7 +211,7 @@ class CommonGitlabApiAdaptor extends BaseBlogApi {
       .replace("[branch]", cfg.githubBranch)
       .replace("[docpath]", postid)
     // 路径组合
-    previewUrl = StrUtil.pathJoin(this.cfg.home, previewUrl)
+    // previewUrl = StrUtil.pathJoin(this.cfg.home, previewUrl)
     return previewUrl
   }
 

diff --git a/src/adaptors/api/base/metaweblog/metaweblogBlogApiAdaptor.ts b/src/adaptors/api/base/metaweblog/metaweblogBlogApiAdaptor.ts
@@ -187,7 +187,8 @@ class MetaweblogBlogApiAdaptor extends BaseBlogApi {
 
   public async getPreviewUrl(postid: string): Promise<string> {
     const previewUrl = this.cfg.previewUrl.replace(/\[postid\]/g, postid)
-    return StrUtil.pathJoin(this.cfg.home ?? "", previewUrl)
+    // return StrUtil.pathJoin(this.cfg.home ?? "", previewUrl)
+    return previewUrl
   }
 
   public async getCategories(): Promise<CategoryInfo[]> {

diff --git a/src/adaptors/api/halo/HaloApiAdaptor.ts b/src/adaptors/api/halo/HaloApiAdaptor.ts
@@ -238,7 +238,8 @@ class HaloApiAdaptor extends BaseBlogApi {
       .replace("{year}", haloPostKey.year)
       .replace("{month}", haloPostKey.month)
       .replace("{day}", haloPostKey.day)
-    return StrUtil.pathJoin(this.cfg.home ?? "", postUrl)
+    return postUrl
+    // return StrUtil.pathJoin(this.cfg.home ?? "", postUrl)
   }
 
   public async deletePost(postid: string): Promise<boolean> {

diff --git a/src/adaptors/web/csdn/csdnWebAdaptor.ts b/src/adaptors/web/csdn/csdnWebAdaptor.ts
@@ -393,7 +393,8 @@ class CsdnWebAdaptor extends BaseWebApi {
     const token = this.cfg.password
     const userid = WebUtils.readCookie("UserName", token)
     const previewUrl = this.cfg.previewUrl.replace(/\[userid\]/g, userid).replace(/\[postid\]/g, postid)
-    return StrUtil.pathJoin(this.cfg.home ?? "", previewUrl)
+    return previewUrl
+    // return StrUtil.pathJoin(this.cfg.home ?? "", previewUrl)
   }
 }
 

diff --git a/src/adaptors/web/jianshu/jianshuWebAdaptor.ts b/src/adaptors/web/jianshu/jianshuWebAdaptor.ts
@@ -134,7 +134,8 @@ class JianshuWebAdaptor extends BaseWebApi {
     // const pageId = jianshuPostKey.pageId
     const endUrl = jianshuPostKey.endUrl
     const postUrl = purl.replace("[postid]", endUrl)
-    return StrUtil.pathJoin(this.cfg.home ?? "", postUrl)
+    return postUrl
+    // return StrUtil.pathJoin(this.cfg.home ?? "", postUrl)
   }
 
   public async deletePost(postid: string): Promise<boolean> {

diff --git a/src/adaptors/web/juejin/juejinWebAdaptor.ts b/src/adaptors/web/juejin/juejinWebAdaptor.ts
@@ -180,7 +180,8 @@ class JuejinWebAdaptor extends BaseWebApi {
     const juejinPostKey = this.getJuejinPostidKey(postid)
     const pageId = juejinPostKey.pageId
     const postUrl = this.cfg.previewUrl.replace("[postid]", pageId)
-    return StrUtil.pathJoin(this.cfg.home ?? "", postUrl)
+    return postUrl
+    // return StrUtil.pathJoin(this.cfg.home ?? "", postUrl)
   }
 
   public async deletePost(postid: string): Promise<boolean> {

diff --git a/src/composables/usePublish.ts b/src/composables/usePublish.ts
@@ -343,7 +343,8 @@ const usePublish = () => {
     const postMeta = ObjectUtil.getProperty(setting, id, {})
     const newPostid = postMeta[posidKey]
     const previewUrl = await api.getPreviewUrl(newPostid)
-    return StrUtil.pathJoin(cfg?.home ?? "", previewUrl)
+    const isAbsoluteUrl = /^http/.test(previewUrl)
+    return isAbsoluteUrl ? previewUrl : `${cfg?.home ?? ""}${previewUrl}`
   }
 
   /**