feat: 统一整合各平台配置-Metaweblog

terwer · Aug 6, 2023 · 2477fa3 · 2477fa3
1 parent 42b25a6
commit 2477fa3
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 18 deletions.
diff --git a/src/adaptors/api/base/CommonblogConfig.ts b/src/adaptors/api/base/CommonblogConfig.ts
@@ -24,7 +24,7 @@
  */
 
 import { BlogConfig, PageTypeEnum } from "zhi-blog-api"
-import { MetaweblogPlaceholder } from "~/src/adaptors/api/base/metaweblog/config/MetaweblogPlaceholder.ts"
+import { MetaweblogPlaceholder } from "~/src/adaptors/api/base/metaweblog/MetaweblogPlaceholder.ts"
 import { CommonblogPlaceholder } from "~/src/adaptors/api/base/CommonblogPlaceholder.ts"
 
 /*

diff --git a/...ase/metaweblog/config/MetaweblogConfig.ts → ...s/api/base/metaweblog/MetaweblogConfig.ts b/...ase/metaweblog/config/MetaweblogConfig.ts → ...s/api/base/metaweblog/MetaweblogConfig.ts
@@ -23,13 +23,14 @@
  * questions.
  */
 
-import { BlogConfig, PageTypeEnum } from "zhi-blog-api"
-import { MetaweblogPlaceholder } from "~/src/adaptors/api/base/metaweblog/config/MetaweblogPlaceholder.ts"
+import { PageTypeEnum } from "zhi-blog-api"
+import { MetaweblogPlaceholder } from "~/src/adaptors/api/base/metaweblog/MetaweblogPlaceholder.ts"
+import { CommonblogConfig } from "~/src/adaptors/api/base/CommonblogConfig.ts"
 
 /**
  * Metaweblog配置类
  */
-export class MetaweblogConfig extends BlogConfig {
+export class MetaweblogConfig extends CommonblogConfig {
   /**
    * 首页
    */

diff --git a/...etaweblog/config/MetaweblogPlaceholder.ts → .../base/metaweblog/MetaweblogPlaceholder.ts b/...etaweblog/config/MetaweblogPlaceholder.ts → .../base/metaweblog/MetaweblogPlaceholder.ts
@@ -23,12 +23,12 @@
  * questions.
  */
 
-import { BlogPlaceholder } from "zhi-blog-api"
+import { CommonblogPlaceholder } from "~/src/adaptors/api/base/CommonblogPlaceholder.ts"
 
 /**
  * Metaweblog 操作提示
  */
-export class MetaweblogPlaceholder extends BlogPlaceholder {
+export class MetaweblogPlaceholder extends CommonblogPlaceholder {
   /**
    * 首页操作提示
    */

diff --git a/src/adaptors/api/base/metaweblog/metaweblogBlogApi.ts b/src/adaptors/api/base/metaweblog/metaweblogBlogApi.ts
@@ -25,10 +25,9 @@
 
 import { BlogApi, CategoryInfo, Post, PostStatusEnum, UserBlog } from "zhi-blog-api"
 import { AppInstance } from "~/src/appInstance.ts"
-import { CnblogsConfig } from "~/src/adaptors/api/cnblogs/config/cnblogsConfig.ts"
 import { createAppLogger } from "~/src/utils/appLogger.ts"
 import { CommonXmlrpcClient } from "zhi-xmlrpc-middleware"
-import { MetaweblogConfig } from "~/src/adaptors/api/base/metaweblog/config/MetaweblogConfig.ts"
+import { MetaweblogConfig } from "~/src/adaptors/api/base/metaweblog/MetaweblogConfig.ts"
 import { MetaweblogConstants } from "~/src/adaptors/api/base/metaweblog/metaweblogConstants.ts"
 import { StrUtil } from "zhi-common"
 import { BrowserUtil } from "zhi-device"
@@ -51,7 +50,7 @@ class MetaweblogBlogApi extends BlogApi {
    * @param appInstance 应用实例
    * @param cfg 配置项
    */
-  constructor(appInstance: AppInstance, cfg: CnblogsConfig) {
+  constructor(appInstance: AppInstance, cfg: MetaweblogConfig) {
     super()
 
     this.cfg = cfg

diff --git a/src/adaptors/api/cnblogs/config/cnblogsConfig.ts b/src/adaptors/api/cnblogs/config/cnblogsConfig.ts
@@ -24,7 +24,7 @@
  */
 
 import {PageTypeEnum} from "zhi-blog-api"
-import {MetaweblogConfig} from "~/src/adaptors/api/base/metaweblog/config/MetaweblogConfig.ts"
+import {MetaweblogConfig} from "~/src/adaptors/api/base/metaweblog/MetaweblogConfig.ts"
 
 /**
  * 博客园配置

diff --git a/src/adaptors/api/cnblogs/config/cnblogsPlaceholder.ts b/src/adaptors/api/cnblogs/config/cnblogsPlaceholder.ts
@@ -23,7 +23,7 @@
  * questions.
  */
 
-import { MetaweblogPlaceholder } from "~/src/adaptors/api/base/metaweblog/config/MetaweblogPlaceholder.ts"
+import { MetaweblogPlaceholder } from "~/src/adaptors/api/base/metaweblog/MetaweblogPlaceholder.ts"
 
 /**
  * 博客园操作提示

diff --git a/src/adaptors/api/metaweblog/useMetaweblogApi.ts b/src/adaptors/api/metaweblog/useMetaweblogApi.ts
@@ -23,7 +23,7 @@
  * questions.
  */
 
-import { MetaweblogConfig } from "~/src/adaptors/api/base/metaweblog/config/MetaweblogConfig.ts"
+import { MetaweblogConfig } from "~/src/adaptors/api/base/metaweblog/MetaweblogConfig.ts"
 import { createAppLogger } from "~/src/utils/appLogger.ts"
 import { AppInstance } from "~/src/appInstance.ts"
 import { useSettingStore } from "~/src/stores/useSettingStore.ts"

diff --git a/src/adaptors/api/typecho/config/typechoConfig.ts b/src/adaptors/api/typecho/config/typechoConfig.ts
@@ -23,7 +23,7 @@
  * questions.
  */
 
-import { MetaweblogConfig } from "~/src/adaptors/api/base/metaweblog/config/MetaweblogConfig.ts"
+import { MetaweblogConfig } from "~/src/adaptors/api/base/metaweblog/MetaweblogConfig.ts"
 import { PageTypeEnum } from "zhi-blog-api"
 import TypechoUtils from "~/src/adaptors/api/typecho/typechoUtils.ts"
 

diff --git a/src/adaptors/api/typecho/config/typechoPlaceholder.ts b/src/adaptors/api/typecho/config/typechoPlaceholder.ts
@@ -23,7 +23,7 @@
  * questions.
  */
 
-import { MetaweblogPlaceholder } from "~/src/adaptors/api/base/metaweblog/config/MetaweblogPlaceholder.ts"
+import { MetaweblogPlaceholder } from "~/src/adaptors/api/base/metaweblog/MetaweblogPlaceholder.ts"
 
 /**
  * WordPress 操作提示

diff --git a/src/adaptors/api/wordpress/config/wordpressConfig.ts b/src/adaptors/api/wordpress/config/wordpressConfig.ts
@@ -23,7 +23,7 @@
  * questions.
  */
 
-import { MetaweblogConfig } from "~/src/adaptors/api/base/metaweblog/config/MetaweblogConfig.ts"
+import { MetaweblogConfig } from "~/src/adaptors/api/base/metaweblog/MetaweblogConfig.ts"
 import { PageTypeEnum } from "zhi-blog-api"
 import WordpressUtils from "~/src/adaptors/api/wordpress/wordpressUtils.ts"
 

diff --git a/src/adaptors/api/wordpress/config/wordpressPlaceholder.ts b/src/adaptors/api/wordpress/config/wordpressPlaceholder.ts
@@ -23,7 +23,7 @@
  * questions.
  */
 
-import { MetaweblogPlaceholder } from "~/src/adaptors/api/base/metaweblog/config/MetaweblogPlaceholder.ts"
+import { MetaweblogPlaceholder } from "~/src/adaptors/api/base/metaweblog/MetaweblogPlaceholder.ts"
 
 /**
  * WordPress 操作提示

diff --git a/src/components/set/publish/singleplatform/metaweblog/OthermetaSetting.vue b/src/components/set/publish/singleplatform/metaweblog/OthermetaSetting.vue
@@ -2,8 +2,8 @@
 import { useVueI18n } from "~/src/composables/useVueI18n.ts"
 import { useMetaweblogApi } from "~/src/adaptors/api/metaweblog/useMetaweblogApi.ts"
 import MetaweblogSetting from "~/src/components/set/publish/singleplatform/base/platform/MetaweblogSetting.vue"
-import { MetaweblogConfig } from "~/src/adaptors/api/base/metaweblog/config/MetaweblogConfig.ts"
-import { MetaweblogPlaceholder } from "~/src/adaptors/api/base/metaweblog/config/MetaweblogPlaceholder.ts"
+import { MetaweblogConfig } from "~/src/adaptors/api/base/metaweblog/MetaweblogConfig.ts"
+import { MetaweblogPlaceholder } from "~/src/adaptors/api/base/metaweblog/MetaweblogPlaceholder.ts"
 
 const props = defineProps({
   apiType: {