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

terwer · Aug 6, 2023 · 47f132e · 47f132e
1 parent 4a5d091
commit 47f132e
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git a/...etaweblog/adaptor/metaweblogApiAdaptor.ts → ...rs/api/metaweblog/metaweblogApiAdaptor.ts b/...etaweblog/adaptor/metaweblogApiAdaptor.ts → ...rs/api/metaweblog/metaweblogApiAdaptor.ts
diff --git a/src/adaptors/api/metaweblog/useMetaweblogApi.ts b/src/adaptors/api/metaweblog/useMetaweblogApi.ts
@@ -30,7 +30,7 @@ import { useSettingStore } from "~/src/stores/useSettingStore.ts"
 import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common"
 import { Utils } from "~/src/utils/utils.ts"
 import { getDynPostidKey } from "~/src/platform/dynamicConfig.ts"
-import { MetaweblogApiAdaptor } from "~/src/adaptors/api/metaweblog/adaptor/metaweblogApiAdaptor.ts"
+import { MetaweblogApiAdaptor } from "~/src/adaptors/api/metaweblog/metaweblogApiAdaptor.ts"
 
 /**
  * 使用Metaweblog API的自定义hook

diff --git a/...rs/api/notion/adaptor/notionApiAdaptor.ts → src/adaptors/api/notion/notionApiAdaptor.ts b/...rs/api/notion/adaptor/notionApiAdaptor.ts → src/adaptors/api/notion/notionApiAdaptor.ts
@@ -25,7 +25,7 @@
 
 import { CategoryInfo, Post, UserBlog } from "zhi-blog-api"
 import { BaseBlogApi } from "~/src/adaptors/api/base/baseBlogApi.ts"
-import { NotionConfig } from "~/src/adaptors/api/notion/config/notionConfig.ts"
+import { NotionConfig } from "~/src/adaptors/api/notion/notionConfig.ts"
 import { createAppLogger } from "~/src/utils/appLogger.ts"
 import { ObjectUtil, StrUtil } from "zhi-common"
 import { NotionMarkdownConverter } from "zhi-notion-markdown"

diff --git a/...daptors/api/notion/config/notionConfig.ts → src/adaptors/api/notion/notionConfig.ts b/...daptors/api/notion/config/notionConfig.ts → src/adaptors/api/notion/notionConfig.ts
diff --git a/...rs/api/notion/config/notionPlaceHolder.ts → src/adaptors/api/notion/notionPlaceHolder.ts b/...rs/api/notion/config/notionPlaceHolder.ts → src/adaptors/api/notion/notionPlaceHolder.ts
diff --git a/src/adaptors/api/notion/useNotionApi.ts b/src/adaptors/api/notion/useNotionApi.ts
@@ -26,11 +26,11 @@
 import { createAppLogger } from "~/src/utils/appLogger.ts"
 import { AppInstance } from "~/src/appInstance.ts"
 import { Utils } from "~/src/utils/utils.ts"
-import { NotionConfig } from "~/src/adaptors/api/notion/config/notionConfig.ts"
+import { NotionConfig } from "~/src/adaptors/api/notion/notionConfig.ts"
 import { useSettingStore } from "~/src/stores/useSettingStore.ts"
 import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common"
 import { getDynPostidKey } from "~/src/platform/dynamicConfig.ts"
-import { NotionApiAdaptor } from "~/src/adaptors/api/notion/adaptor/notionApiAdaptor.ts"
+import { NotionApiAdaptor } from "~/src/adaptors/api/notion/notionApiAdaptor.ts"
 
 const useNotionApi = async (key: string, newCfg?: NotionConfig) => {
   // 创建应用日志记录器

diff --git a/src/components/set/publish/singleplatform/commonblog/NotionSetting.vue b/src/components/set/publish/singleplatform/commonblog/NotionSetting.vue
@@ -27,8 +27,8 @@
 import CommonBlogSetting from "~/src/components/set/publish/singleplatform/base/CommonBlogSetting.vue"
 import { useVueI18n } from "~/src/composables/useVueI18n.ts"
 import {useNotionApi} from "~/src/adaptors/api/notion/useNotionApi.ts";
-import {NotionConfig} from "~/src/adaptors/api/notion/config/notionConfig.ts";
-import {NotionPlaceHolder} from "~/src/adaptors/api/notion/config/notionPlaceHolder.ts";
+import {NotionConfig} from "~/src/adaptors/api/notion/notionConfig.ts";
+import {NotionPlaceHolder} from "~/src/adaptors/api/notion/notionPlaceHolder.ts";
 
 const props = defineProps({
   apiType: {