From c1b646a440b9a12b737d1fddd553c01c4a47c968 Mon Sep 17 00:00:00 2001 From: terwer Date: Tue, 31 Oct 2023 15:40:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=87=8D=E6=9E=84=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/adaptors/api/cnblogs/useCnblogsApi.ts | 4 ++-- src/adaptors/api/gitlab-hexo/useGitlabhexoApi.ts | 4 ++-- src/adaptors/api/gitlab-hugo/useGitlabhugoApi.ts | 4 ++-- src/adaptors/api/gitlab-jekyll/useGitlabjekyllApi.ts | 4 ++-- .../api/gitlab-vitepress/useGitlabvitepressApi.ts | 4 ++-- .../api/gitlab-vuepress/useGitlabvuepressApi.ts | 4 ++-- .../api/gitlab-vuepress2/useGitlabvuepress2Api.ts | 4 ++-- src/adaptors/api/halo/useHaloApi.ts | 4 ++-- src/adaptors/api/hexo/useHexoApi.ts | 4 ++-- src/adaptors/api/hugo/useHugoApi.ts | 4 ++-- src/adaptors/api/jekyll/useJekyllApi.ts | 4 ++-- src/adaptors/api/metaweblog/useMetaweblogApi.ts | 4 ++-- src/adaptors/api/notion/notionApiAdaptor.ts | 4 ++-- src/adaptors/api/notion/useNotionApi.ts | 4 ++-- src/adaptors/api/typecho/useTypechoApi.ts | 4 ++-- src/adaptors/api/vitepress/useVitepressApi.ts | 4 ++-- src/adaptors/api/vuepress/useVuepressApi.ts | 4 ++-- src/adaptors/api/vuepress2/useVuepress2Api.ts | 4 ++-- src/adaptors/api/wordpress/useWordpressApi.ts | 4 ++-- src/adaptors/api/yuque/useYuqueApi.ts | 4 ++-- src/adaptors/base/baseExtendApi.ts | 6 +++--- src/adaptors/web/csdn/useCsdnWeb.ts | 4 ++-- src/adaptors/web/flowus/useFlowusWeb.ts | 4 ++-- src/adaptors/web/jianshu/useJianshuWeb.ts | 4 ++-- src/adaptors/web/juejin/useJuejinWeb.ts | 4 ++-- src/adaptors/web/wechat/useWechatWeb.ts | 4 ++-- src/adaptors/web/zhihu/useZhihuWeb.ts | 4 ++-- src/components/publish/SinglePublishSelectPlatform.vue | 4 ++-- src/components/publish/form/PublishPlatform.vue | 4 ++-- src/components/set/PublishSetting.vue | 4 ++-- src/components/set/SiyuanSetting.vue | 4 ++-- src/components/set/preference/AiSetting.vue | 4 ++-- src/components/set/preference/ChangeLocal.vue | 4 ++-- src/components/set/preference/PostBind.vue | 4 ++-- src/components/set/preference/PreferenceSetting.vue | 4 ++-- src/components/set/publish/PlatformAddForm.vue | 4 ++-- src/components/set/publish/PlatformUpdateForm.vue | 4 ++-- .../publish/singleplatform/base/CommonBlogSetting.vue | 4 ++-- .../set/publish/singleplatform/base/CookieSetting.vue | 4 ++-- src/composables/useChatGPT.ts | 4 ++-- src/composables/usePublish.ts | 6 +++--- src/composables/usePublishConfig.ts | 4 ++-- src/composables/useSiyuanApi.ts | 8 ++++---- ...eferenceSetting.ts => usePreferenceSettingStore.ts} | 4 ++-- .../{useSettingStore.ts => usePublishSettingStore.ts} | 2 +- .../{useSiyuanSetting.ts => useSiyuanSettingStore.ts} | 10 +++++----- 46 files changed, 98 insertions(+), 98 deletions(-) rename src/stores/{usePublishPreferenceSetting.ts => usePreferenceSettingStore.ts} (97%) rename src/stores/{useSettingStore.ts => usePublishSettingStore.ts} (97%) rename src/stores/{useSiyuanSetting.ts => useSiyuanSettingStore.ts} (93%) diff --git a/src/adaptors/api/cnblogs/useCnblogsApi.ts b/src/adaptors/api/cnblogs/useCnblogsApi.ts index 2d4e15e6..61542216 100644 --- a/src/adaptors/api/cnblogs/useCnblogsApi.ts +++ b/src/adaptors/api/cnblogs/useCnblogsApi.ts @@ -28,7 +28,7 @@ import { Utils } from "~/src/utils/utils.ts" import { CnblogsConfig } from "~/src/adaptors/api/cnblogs/cnblogsConfig.ts" import { CnblogsApiAdaptor } from "~/src/adaptors/api/cnblogs/cnblogsApiAdaptor.ts" import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { getDynPostidKey } from "~/src/platforms/dynamicConfig.ts" import { CategoryTypeEnum } from "zhi-blog-api" @@ -58,7 +58,7 @@ export const useCnblogsApi = async (key?: string, newCfg?: CnblogsConfig) => { cfg = newCfg } else { // 从配置中获取数据 - const { getSetting } = useSettingStore() + const { getSetting } = usePublishSettingStore() const setting = await getSetting() cfg = JsonUtil.safeParse(setting[key], {} as CnblogsConfig) // 如果配置为空，则使用默认的环境变量值，并记录日志 diff --git a/src/adaptors/api/gitlab-hexo/useGitlabhexoApi.ts b/src/adaptors/api/gitlab-hexo/useGitlabhexoApi.ts index b5a7fce2..56e34803 100644 --- a/src/adaptors/api/gitlab-hexo/useGitlabhexoApi.ts +++ b/src/adaptors/api/gitlab-hexo/useGitlabhexoApi.ts @@ -25,7 +25,7 @@ import { createAppLogger } from "~/src/utils/appLogger.ts" import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { Utils } from "~/src/utils/utils.ts" import { getDynPostidKey } from "~/src/platforms/dynamicConfig.ts" @@ -50,7 +50,7 @@ const useGitlabhexoApi = async (key: string, newCfg?: GitlabhexoConfig) => { cfg = newCfg } else { // 从配置中获取数据 - const { getSetting } = useSettingStore() + const { getSetting } = usePublishSettingStore() const setting = await getSetting() cfg = JsonUtil.safeParse(setting[key], {} as GitlabhexoConfig) diff --git a/src/adaptors/api/gitlab-hugo/useGitlabhugoApi.ts b/src/adaptors/api/gitlab-hugo/useGitlabhugoApi.ts index ac8ce7e0..973f5d97 100644 --- a/src/adaptors/api/gitlab-hugo/useGitlabhugoApi.ts +++ b/src/adaptors/api/gitlab-hugo/useGitlabhugoApi.ts @@ -25,7 +25,7 @@ import { createAppLogger } from "~/src/utils/appLogger.ts" import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { Utils } from "~/src/utils/utils.ts" import { getDynPostidKey } from "~/src/platforms/dynamicConfig.ts" @@ -50,7 +50,7 @@ const useGitlabhugoApi = async (key: string, newCfg?: GitlabhugoConfig) => { cfg = newCfg } else { // 从配置中获取数据 - const { getSetting } = useSettingStore() + const { getSetting } = usePublishSettingStore() const setting = await getSetting() cfg = JsonUtil.safeParse(setting[key], {} as GitlabhugoConfig) diff --git a/src/adaptors/api/gitlab-jekyll/useGitlabjekyllApi.ts b/src/adaptors/api/gitlab-jekyll/useGitlabjekyllApi.ts index 756ae18b..b328018a 100644 --- a/src/adaptors/api/gitlab-jekyll/useGitlabjekyllApi.ts +++ b/src/adaptors/api/gitlab-jekyll/useGitlabjekyllApi.ts @@ -25,7 +25,7 @@ import { createAppLogger } from "~/src/utils/appLogger.ts" import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { Utils } from "~/src/utils/utils.ts" import { getDynPostidKey } from "~/src/platforms/dynamicConfig.ts" @@ -50,7 +50,7 @@ const useGitlabjekyllApi = async (key: string, newCfg?: GitlabjekyllConfig) => { cfg = newCfg } else { // 从配置中获取数据 - const { getSetting } = useSettingStore() + const { getSetting } = usePublishSettingStore() const setting = await getSetting() cfg = JsonUtil.safeParse(setting[key], {} as GitlabjekyllConfig) diff --git a/src/adaptors/api/gitlab-vitepress/useGitlabvitepressApi.ts b/src/adaptors/api/gitlab-vitepress/useGitlabvitepressApi.ts index e4607fa6..c5c236f0 100644 --- a/src/adaptors/api/gitlab-vitepress/useGitlabvitepressApi.ts +++ b/src/adaptors/api/gitlab-vitepress/useGitlabvitepressApi.ts @@ -25,7 +25,7 @@ import { createAppLogger } from "~/src/utils/appLogger.ts" import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { Utils } from "~/src/utils/utils.ts" import { getDynPostidKey } from "~/src/platforms/dynamicConfig.ts" @@ -50,7 +50,7 @@ const useGitlabvitepressApi = async (key: string, newCfg?: GitlabvitepressConfig cfg = newCfg } else { // 从配置中获取数据 - const { getSetting } = useSettingStore() + const { getSetting } = usePublishSettingStore() const setting = await getSetting() cfg = JsonUtil.safeParse(setting[key], {} as GitlabvitepressConfig) diff --git a/src/adaptors/api/gitlab-vuepress/useGitlabvuepressApi.ts b/src/adaptors/api/gitlab-vuepress/useGitlabvuepressApi.ts index 410944e2..acc446e7 100644 --- a/src/adaptors/api/gitlab-vuepress/useGitlabvuepressApi.ts +++ b/src/adaptors/api/gitlab-vuepress/useGitlabvuepressApi.ts @@ -25,7 +25,7 @@ import { createAppLogger } from "~/src/utils/appLogger.ts" import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { Utils } from "~/src/utils/utils.ts" import { getDynPostidKey } from "~/src/platforms/dynamicConfig.ts" @@ -50,7 +50,7 @@ const useGitlabvuepressApi = async (key: string, newCfg?: GitlabvuepressConfig) cfg = newCfg } else { // 从配置中获取数据 - const { getSetting } = useSettingStore() + const { getSetting } = usePublishSettingStore() const setting = await getSetting() cfg = JsonUtil.safeParse(setting[key], {} as GitlabvuepressConfig) diff --git a/src/adaptors/api/gitlab-vuepress2/useGitlabvuepress2Api.ts b/src/adaptors/api/gitlab-vuepress2/useGitlabvuepress2Api.ts index ecd8721d..aaa3f607 100644 --- a/src/adaptors/api/gitlab-vuepress2/useGitlabvuepress2Api.ts +++ b/src/adaptors/api/gitlab-vuepress2/useGitlabvuepress2Api.ts @@ -25,7 +25,7 @@ import { createAppLogger } from "~/src/utils/appLogger.ts" import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { Utils } from "~/src/utils/utils.ts" import { getDynPostidKey } from "~/src/platforms/dynamicConfig.ts" @@ -50,7 +50,7 @@ const useGitlabvuepress2Api = async (key: string, newCfg?: Gitlabvuepress2Config cfg = newCfg } else { // 从配置中获取数据 - const { getSetting } = useSettingStore() + const { getSetting } = usePublishSettingStore() const setting = await getSetting() cfg = JsonUtil.safeParse(setting[key], {} as Gitlabvuepress2Config) diff --git a/src/adaptors/api/halo/useHaloApi.ts b/src/adaptors/api/halo/useHaloApi.ts index a83d424d..fe8a39e6 100644 --- a/src/adaptors/api/halo/useHaloApi.ts +++ b/src/adaptors/api/halo/useHaloApi.ts @@ -26,7 +26,7 @@ import { HaloConfig } from "~/src/adaptors/api/halo/HaloConfig.ts" import { createAppLogger } from "~/src/utils/appLogger.ts" import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { Utils } from "~/src/utils/utils.ts" import { getDynPostidKey } from "~/src/platforms/dynamicConfig.ts" @@ -49,7 +49,7 @@ const useHaloApi = async (key: string, newCfg?: HaloConfig) => { cfg = newCfg } else { // 从配置中获取数据 - const { getSetting } = useSettingStore() + const { getSetting } = usePublishSettingStore() const setting = await getSetting() cfg = JsonUtil.safeParse(setting[key], {} as HaloConfig) diff --git a/src/adaptors/api/hexo/useHexoApi.ts b/src/adaptors/api/hexo/useHexoApi.ts index 0180ca31..0b730c41 100644 --- a/src/adaptors/api/hexo/useHexoApi.ts +++ b/src/adaptors/api/hexo/useHexoApi.ts @@ -25,7 +25,7 @@ import { createAppLogger } from "~/src/utils/appLogger.ts" import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { Utils } from "~/src/utils/utils.ts" import { getDynPostidKey } from "~/src/platforms/dynamicConfig.ts" @@ -50,7 +50,7 @@ const useHexoApi = async (key: string, newCfg?: HexoConfig) => { cfg = newCfg } else { // 从配置中获取数据 - const { getSetting } = useSettingStore() + const { getSetting } = usePublishSettingStore() const setting = await getSetting() cfg = JsonUtil.safeParse(setting[key], {} as HexoConfig) diff --git a/src/adaptors/api/hugo/useHugoApi.ts b/src/adaptors/api/hugo/useHugoApi.ts index 72990789..29e4905e 100644 --- a/src/adaptors/api/hugo/useHugoApi.ts +++ b/src/adaptors/api/hugo/useHugoApi.ts @@ -25,7 +25,7 @@ import { createAppLogger } from "~/src/utils/appLogger.ts" import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { Utils } from "~/src/utils/utils.ts" import { getDynPostidKey } from "~/src/platforms/dynamicConfig.ts" @@ -50,7 +50,7 @@ const useHugoApi = async (key: string, newCfg?: HugoConfig) => { cfg = newCfg } else { // 从配置中获取数据 - const { getSetting } = useSettingStore() + const { getSetting } = usePublishSettingStore() const setting = await getSetting() cfg = JsonUtil.safeParse(setting[key], {} as HugoConfig) diff --git a/src/adaptors/api/jekyll/useJekyllApi.ts b/src/adaptors/api/jekyll/useJekyllApi.ts index 93776ec3..5ca2575c 100644 --- a/src/adaptors/api/jekyll/useJekyllApi.ts +++ b/src/adaptors/api/jekyll/useJekyllApi.ts @@ -25,7 +25,7 @@ import { createAppLogger } from "~/src/utils/appLogger.ts" import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { Utils } from "~/src/utils/utils.ts" import { getDynPostidKey } from "~/src/platforms/dynamicConfig.ts" @@ -50,7 +50,7 @@ const useJekyllApi = async (key: string, newCfg?: JekyllConfig) => { cfg = newCfg } else { // 从配置中获取数据 - const { getSetting } = useSettingStore() + const { getSetting } = usePublishSettingStore() const setting = await getSetting() cfg = JsonUtil.safeParse(setting[key], {} as JekyllConfig) diff --git a/src/adaptors/api/metaweblog/useMetaweblogApi.ts b/src/adaptors/api/metaweblog/useMetaweblogApi.ts index 23f2970b..1cb9fcc3 100644 --- a/src/adaptors/api/metaweblog/useMetaweblogApi.ts +++ b/src/adaptors/api/metaweblog/useMetaweblogApi.ts @@ -26,7 +26,7 @@ import { MetaweblogConfig } from "~/src/adaptors/api/base/metaweblog/metaweblogConfig.ts" import { createAppLogger } from "~/src/utils/appLogger.ts" import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { Utils } from "~/src/utils/utils.ts" import { getDynPostidKey } from "~/src/platforms/dynamicConfig.ts" @@ -58,7 +58,7 @@ export const useMetaweblogApi = async (key?: string, newCfg?: MetaweblogConfig) cfg = newCfg } else { // 从配置中获取数据 - const { getSetting } = useSettingStore() + const { getSetting } = usePublishSettingStore() const setting = await getSetting() cfg = JsonUtil.safeParse(setting[key], {} as MetaweblogConfig) // 如果配置为空，则使用默认的环境变量值，并记录日志 diff --git a/src/adaptors/api/notion/notionApiAdaptor.ts b/src/adaptors/api/notion/notionApiAdaptor.ts index 6561e414..5e66e181 100644 --- a/src/adaptors/api/notion/notionApiAdaptor.ts +++ b/src/adaptors/api/notion/notionApiAdaptor.ts @@ -29,7 +29,7 @@ import { NotionConfig } from "~/src/adaptors/api/notion/notionConfig.ts" import { createAppLogger } from "~/src/utils/appLogger.ts" import { ObjectUtil } from "zhi-common" import { NotionMarkdownConverter } from "zhi-notion-markdown" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" /** * Notion API 适配器 @@ -69,7 +69,7 @@ class NotionApiAdaptor extends BaseBlogApi { // ================================ // 下面这一段是更新postid，需要注意适配 // 写入属性到配置 - const { getSetting, updateSetting } = useSettingStore() + const { getSetting, updateSetting } = usePublishSettingStore() const setting = await getSetting() const posidKey = this.cfg.posidKey const id = post.originalId diff --git a/src/adaptors/api/notion/useNotionApi.ts b/src/adaptors/api/notion/useNotionApi.ts index d2242703..cc74faed 100644 --- a/src/adaptors/api/notion/useNotionApi.ts +++ b/src/adaptors/api/notion/useNotionApi.ts @@ -27,7 +27,7 @@ import { createAppLogger } from "~/src/utils/appLogger.ts" import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" import { Utils } from "~/src/utils/utils.ts" import { NotionConfig } from "~/src/adaptors/api/notion/notionConfig.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { getDynPostidKey } from "~/src/platforms/dynamicConfig.ts" import { NotionApiAdaptor } from "~/src/adaptors/api/notion/notionApiAdaptor.ts" @@ -49,7 +49,7 @@ const useNotionApi = async (key: string, newCfg?: NotionConfig) => { cfg = newCfg } else { // 从配置中获取数据 - const { getSetting } = useSettingStore() + const { getSetting } = usePublishSettingStore() const setting = await getSetting() cfg = JsonUtil.safeParse(setting[key], {} as NotionConfig) diff --git a/src/adaptors/api/typecho/useTypechoApi.ts b/src/adaptors/api/typecho/useTypechoApi.ts index 9bd8d9b7..9b337866 100644 --- a/src/adaptors/api/typecho/useTypechoApi.ts +++ b/src/adaptors/api/typecho/useTypechoApi.ts @@ -26,7 +26,7 @@ import { createAppLogger } from "~/src/utils/appLogger.ts" import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" import { Utils } from "~/src/utils/utils.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { TypechoConfig } from "~/src/adaptors/api/typecho/typechoConfig.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { getDynPostidKey } from "~/src/platforms/dynamicConfig.ts" @@ -58,7 +58,7 @@ export const useTypechoApi = async (key?: string, newCfg?: TypechoConfig) => { cfg = newCfg } else { // 从配置中获取数据 - const { getSetting } = useSettingStore() + const { getSetting } = usePublishSettingStore() const setting = await getSetting() cfg = JsonUtil.safeParse(setting[key], {} as TypechoConfig) // 如果配置为空，则使用默认的环境变量值，并记录日志 diff --git a/src/adaptors/api/vitepress/useVitepressApi.ts b/src/adaptors/api/vitepress/useVitepressApi.ts index acf0e625..7da6cb60 100644 --- a/src/adaptors/api/vitepress/useVitepressApi.ts +++ b/src/adaptors/api/vitepress/useVitepressApi.ts @@ -25,7 +25,7 @@ import { createAppLogger } from "~/src/utils/appLogger.ts" import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { Utils } from "~/src/utils/utils.ts" import { getDynPostidKey } from "~/src/platforms/dynamicConfig.ts" @@ -50,7 +50,7 @@ const useVitepressApi = async (key: string, newCfg?: VitepressConfig) => { cfg = newCfg } else { // 从配置中获取数据 - const { getSetting } = useSettingStore() + const { getSetting } = usePublishSettingStore() const setting = await getSetting() cfg = JsonUtil.safeParse(setting[key], {} as VitepressConfig) diff --git a/src/adaptors/api/vuepress/useVuepressApi.ts b/src/adaptors/api/vuepress/useVuepressApi.ts index b3f0e356..121f2cd7 100644 --- a/src/adaptors/api/vuepress/useVuepressApi.ts +++ b/src/adaptors/api/vuepress/useVuepressApi.ts @@ -25,7 +25,7 @@ import { createAppLogger } from "~/src/utils/appLogger.ts" import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { Utils } from "~/src/utils/utils.ts" import { getDynPostidKey } from "~/src/platforms/dynamicConfig.ts" @@ -50,7 +50,7 @@ const useVuepressApi = async (key: string, newCfg?: VuepressConfig) => { cfg = newCfg } else { // 从配置中获取数据 - const { getSetting } = useSettingStore() + const { getSetting } = usePublishSettingStore() const setting = await getSetting() cfg = JsonUtil.safeParse(setting[key], {} as VuepressConfig) diff --git a/src/adaptors/api/vuepress2/useVuepress2Api.ts b/src/adaptors/api/vuepress2/useVuepress2Api.ts index ab29baff..cacd00c3 100644 --- a/src/adaptors/api/vuepress2/useVuepress2Api.ts +++ b/src/adaptors/api/vuepress2/useVuepress2Api.ts @@ -25,7 +25,7 @@ import { createAppLogger } from "~/src/utils/appLogger.ts" import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { Utils } from "~/src/utils/utils.ts" import { getDynPostidKey } from "~/src/platforms/dynamicConfig.ts" @@ -50,7 +50,7 @@ const useVuepress2Api = async (key: string, newCfg?: Vuepress2Config) => { cfg = newCfg } else { // 从配置中获取数据 - const { getSetting } = useSettingStore() + const { getSetting } = usePublishSettingStore() const setting = await getSetting() cfg = JsonUtil.safeParse(setting[key], {} as Vuepress2Config) diff --git a/src/adaptors/api/wordpress/useWordpressApi.ts b/src/adaptors/api/wordpress/useWordpressApi.ts index 5aea4248..cb3f0f2a 100644 --- a/src/adaptors/api/wordpress/useWordpressApi.ts +++ b/src/adaptors/api/wordpress/useWordpressApi.ts @@ -26,7 +26,7 @@ import { createAppLogger } from "~/src/utils/appLogger.ts" import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" import { Utils } from "~/src/utils/utils.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { WordpressConfig } from "~/src/adaptors/api/wordpress/wordpressConfig.ts" import { WordpressApiAdaptor } from "~/src/adaptors/api/wordpress/wordpressApiAdaptor.ts" @@ -58,7 +58,7 @@ export const useWordpressApi = async (key?: string, newCfg?: WordpressConfig) => cfg = newCfg } else { // 从配置中获取数据 - const { getSetting } = useSettingStore() + const { getSetting } = usePublishSettingStore() const setting = await getSetting() cfg = JsonUtil.safeParse(setting[key], {} as WordpressConfig) // 如果配置为空，则使用默认的环境变量值，并记录日志 diff --git a/src/adaptors/api/yuque/useYuqueApi.ts b/src/adaptors/api/yuque/useYuqueApi.ts index e627360f..8f738e49 100644 --- a/src/adaptors/api/yuque/useYuqueApi.ts +++ b/src/adaptors/api/yuque/useYuqueApi.ts @@ -27,7 +27,7 @@ import { createAppLogger } from "~/src/utils/appLogger.ts" import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" import { Utils } from "~/src/utils/utils.ts" import { YuqueConfig } from "~/src/adaptors/api/yuque/yuqueConfig.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { getDynPostidKey } from "~/src/platforms/dynamicConfig.ts" import { YuqueApiAdaptor } from "~/src/adaptors/api/yuque/yuqueApiAdaptor.ts" @@ -49,7 +49,7 @@ const useYuqueApi = async (key: string, newCfg?: YuqueConfig) => { cfg = newCfg } else { // 从配置中获取数据 - const { getSetting } = useSettingStore() + const { getSetting } = usePublishSettingStore() const setting = await getSetting() cfg = JsonUtil.safeParse(setting[key], {} as YuqueConfig) diff --git a/src/adaptors/base/baseExtendApi.ts b/src/adaptors/base/baseExtendApi.ts index d6548dbd..c54f3cf8 100644 --- a/src/adaptors/base/baseExtendApi.ts +++ b/src/adaptors/base/baseExtendApi.ts @@ -50,7 +50,7 @@ import { DynamicConfig } from "~/src/platforms/dynamicConfig.ts" import { CATE_AUTO_NAME, MUST_USE_OWN_PLATFORM, MUST_USE_PICBED_PLATFORM } from "~/src/utils/constants.ts" import { toRaw } from "vue" import _ from "lodash" -import { usePublishPreferenceSetting } from "~/src/stores/usePublishPreferenceSetting.ts" +import { usePreferenceSettingStore } from "~/src/stores/usePreferenceSettingStore.ts" import { SiyuanDevice } from "zhi-device" import { SypConfig } from "~/syp.config.ts" @@ -155,7 +155,7 @@ class BaseExtendApi extends WebApi implements IBlogApi, IWebApi { post.mdFilename = filename } - const { getReadOnlyPublishPreferenceSetting } = usePublishPreferenceSetting() + const { getReadOnlyPublishPreferenceSetting } = usePreferenceSettingStore() const pref = getReadOnlyPublishPreferenceSetting() if (pref.value.fixTitle) { post.title = HtmlUtil.removeTitleNumber(post.title).replace(/\.md/g, "") @@ -263,7 +263,7 @@ class BaseExtendApi extends WebApi implements IBlogApi, IWebApi { md = md.replace(/\*\*(.*?)\*\*/g, '$1') // 处理外链 - const { getReadOnlyPublishPreferenceSetting } = usePublishPreferenceSetting() + const { getReadOnlyPublishPreferenceSetting } = usePreferenceSettingStore() const pref = getReadOnlyPublishPreferenceSetting() const outerLinkRegex = /\[(.+?)]\(siyuan:\/\/blocks\/(\d+-\w+)\)/g md = await this.replaceOuterLinks(md, outerLinkRegex, { pref, cfg, setting }) diff --git a/src/adaptors/web/csdn/useCsdnWeb.ts b/src/adaptors/web/csdn/useCsdnWeb.ts index 7d4ade84..f93f41f9 100644 --- a/src/adaptors/web/csdn/useCsdnWeb.ts +++ b/src/adaptors/web/csdn/useCsdnWeb.ts @@ -26,7 +26,7 @@ import { CsdnConfig } from "~/src/adaptors/web/csdn/csdnConfig.ts" import { createAppLogger } from "~/src/utils/appLogger.ts" import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { Utils } from "~/src/utils/utils.ts" import { getDynPostidKey } from "~/src/platforms/dynamicConfig.ts" @@ -51,7 +51,7 @@ const useCsdnWeb = async (key?: string, newCfg?: CsdnConfig) => { cfg = newCfg } else { // 从配置中获取数据 - const { getSetting } = useSettingStore() + const { getSetting } = usePublishSettingStore() const setting = await getSetting() cfg = JsonUtil.safeParse(setting[key], {} as CsdnConfig) // 如果配置为空，则使用默认的环境变量值，并记录日志 diff --git a/src/adaptors/web/flowus/useFlowusWeb.ts b/src/adaptors/web/flowus/useFlowusWeb.ts index c545a4f8..1e9db861 100644 --- a/src/adaptors/web/flowus/useFlowusWeb.ts +++ b/src/adaptors/web/flowus/useFlowusWeb.ts @@ -27,7 +27,7 @@ import { FlowusWebAdaptor } from "~/src/adaptors/web/flowus/flowusWebAdaptor.ts" import { FlowusConfig } from "~/src/adaptors/web/flowus/flowusConfig.ts" import { createAppLogger } from "~/src/utils/appLogger.ts" import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { Utils } from "~/src/utils/utils.ts" import { getDynPostidKey } from "~/src/platforms/dynamicConfig.ts" @@ -51,7 +51,7 @@ const useFlowusWeb = async (key?: string, newCfg?: FlowusConfig) => { cfg = newCfg } else { // 从配置中获取数据 - const { getSetting } = useSettingStore() + const { getSetting } = usePublishSettingStore() const setting = await getSetting() cfg = JsonUtil.safeParse(setting[key], {} as FlowusConfig) // 如果配置为空，则使用默认的环境变量值，并记录日志 diff --git a/src/adaptors/web/jianshu/useJianshuWeb.ts b/src/adaptors/web/jianshu/useJianshuWeb.ts index 2d4f3062..08f4b00f 100644 --- a/src/adaptors/web/jianshu/useJianshuWeb.ts +++ b/src/adaptors/web/jianshu/useJianshuWeb.ts @@ -26,7 +26,7 @@ import { JianshuConfig } from "~/src/adaptors/web/jianshu/jianshuConfig.ts" import { createAppLogger } from "~/src/utils/appLogger.ts" import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { Utils } from "~/src/utils/utils.ts" import { getDynPostidKey } from "~/src/platforms/dynamicConfig.ts" @@ -51,7 +51,7 @@ const useJianshuWeb = async (key?: string, newCfg?: JianshuConfig) => { cfg = newCfg } else { // 从配置中获取数据 - const { getSetting } = useSettingStore() + const { getSetting } = usePublishSettingStore() const setting = await getSetting() cfg = JsonUtil.safeParse(setting[key], {} as JianshuConfig) // 如果配置为空，则使用默认的环境变量值，并记录日志 diff --git a/src/adaptors/web/juejin/useJuejinWeb.ts b/src/adaptors/web/juejin/useJuejinWeb.ts index f68b4a56..d1e944f0 100644 --- a/src/adaptors/web/juejin/useJuejinWeb.ts +++ b/src/adaptors/web/juejin/useJuejinWeb.ts @@ -26,7 +26,7 @@ import { JuejinConfig } from "~/src/adaptors/web/juejin/juejinConfig.ts" import { createAppLogger } from "~/src/utils/appLogger.ts" import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { Utils } from "~/src/utils/utils.ts" import { getDynPostidKey } from "~/src/platforms/dynamicConfig.ts" @@ -51,7 +51,7 @@ const useJuejinWeb = async (key?: string, newCfg?: JuejinConfig) => { cfg = newCfg } else { // 从配置中获取数据 - const { getSetting } = useSettingStore() + const { getSetting } = usePublishSettingStore() const setting = await getSetting() cfg = JsonUtil.safeParse(setting[key], {} as JuejinConfig) // 如果配置为空，则使用默认的环境变量值，并记录日志 diff --git a/src/adaptors/web/wechat/useWechatWeb.ts b/src/adaptors/web/wechat/useWechatWeb.ts index d42446d2..7d843b9e 100644 --- a/src/adaptors/web/wechat/useWechatWeb.ts +++ b/src/adaptors/web/wechat/useWechatWeb.ts @@ -26,7 +26,7 @@ import { WechatConfig } from "~/src/adaptors/web/wechat/wechatConfig.ts" import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" import { createAppLogger } from "~/src/utils/appLogger.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { Utils } from "~/src/utils/utils.ts" import { getDynPostidKey } from "~/src/platforms/dynamicConfig.ts" @@ -50,7 +50,7 @@ const useWechatWeb = async (key?: string, newCfg?: WechatConfig) => { cfg = newCfg } else { // 从配置中获取数据 - const { getSetting } = useSettingStore() + const { getSetting } = usePublishSettingStore() const setting = await getSetting() cfg = JsonUtil.safeParse(setting[key], {} as WechatConfig) // 如果配置为空，则使用默认的环境变量值，并记录日志 diff --git a/src/adaptors/web/zhihu/useZhihuWeb.ts b/src/adaptors/web/zhihu/useZhihuWeb.ts index 5d39fefb..54e89ebb 100644 --- a/src/adaptors/web/zhihu/useZhihuWeb.ts +++ b/src/adaptors/web/zhihu/useZhihuWeb.ts @@ -27,7 +27,7 @@ import { ZhihuWebAdaptor } from "~/src/adaptors/web/zhihu/zhihuWebAdaptor.ts" import { ZhihuConfig } from "~/src/adaptors/web/zhihu/zhihuConfig.ts" import { createAppLogger } from "~/src/utils/appLogger.ts" import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { Utils } from "~/src/utils/utils.ts" import { getDynPostidKey } from "~/src/platforms/dynamicConfig.ts" @@ -51,7 +51,7 @@ const useZhihuWeb = async (key?: string, newCfg?: ZhihuConfig) => { cfg = newCfg } else { // 从配置中获取数据 - const { getSetting } = useSettingStore() + const { getSetting } = usePublishSettingStore() const setting = await getSetting() cfg = JsonUtil.safeParse(setting[key], {} as ZhihuConfig) // 如果配置为空，则使用默认的环境变量值，并记录日志 diff --git a/src/components/publish/SinglePublishSelectPlatform.vue b/src/components/publish/SinglePublishSelectPlatform.vue index af1e11ac..a637e702 100644 --- a/src/components/publish/SinglePublishSelectPlatform.vue +++ b/src/components/publish/SinglePublishSelectPlatform.vue @@ -31,7 +31,7 @@ import { createAppLogger } from "~/src/utils/appLogger.ts" import { DynamicConfig, DynamicJsonCfg, getDynPostidKey } from "~/src/platforms/dynamicConfig.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { DYNAMIC_CONFIG_KEY } from "~/src/utils/constants.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { useLoadingTimer } from "~/src/composables/useLoadingTimer.ts" import CrossPageUtils from "~/cross/crossPageUtils.ts" @@ -48,7 +48,7 @@ const props = defineProps({ // uses const { t } = useVueI18n() const router = useRouter() -const { getSetting } = useSettingStore() +const { getSetting } = usePublishSettingStore() // datas const formData = reactive({ diff --git a/src/components/publish/form/PublishPlatform.vue b/src/components/publish/form/PublishPlatform.vue index 17828954..9e9bd39f 100644 --- a/src/components/publish/form/PublishPlatform.vue +++ b/src/components/publish/form/PublishPlatform.vue @@ -28,7 +28,7 @@ import { onMounted, reactive } from "vue" import { JsonUtil, StrUtil } from "zhi-common" import { DynamicConfig, DynamicJsonCfg, getDynPostidKey } from "~/src/platforms/dynamicConfig.ts" import { DYNAMIC_CONFIG_KEY } from "~/src/utils/constants.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { svgIcons } from "../../../utils/svgIcons.ts" import { pre } from "~/src/utils/import/pre.ts" import { createAppLogger } from "~/src/utils/appLogger.ts" @@ -44,7 +44,7 @@ const props = defineProps({ }) // uses -const { getSetting } = useSettingStore() +const { getSetting } = usePublishSettingStore() // datas const sysKeys = pre.systemCfg.map((item) => { diff --git a/src/components/set/PublishSetting.vue b/src/components/set/PublishSetting.vue index 833bec87..6258ca71 100644 --- a/src/components/set/PublishSetting.vue +++ b/src/components/set/PublishSetting.vue @@ -27,7 +27,7 @@ import { markRaw, onMounted, reactive } from "vue" import { useVueI18n } from "~/src/composables/useVueI18n.ts" import { Delete, Lock, Tools, WarningFilled } from "@element-plus/icons-vue" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { SypConfig } from "~/syp.config.ts" import { createAppLogger } from "~/src/utils/appLogger.ts" import { DateUtil, JsonUtil } from "zhi-common" @@ -63,7 +63,7 @@ const logger = createAppLogger("publish-setting") // uses const { t } = useVueI18n() const router = useRouter() -const { getSetting, updateSetting, deleteKey } = useSettingStore() +const { getSetting, updateSetting, deleteKey } = usePublishSettingStore() const { getPrePlatformKeys, platformTypeList, getPrePlatformList } = usePlatformDefine() const { isInSiyuanWidget, isInChromeExtension } = useSiyuanDevice() diff --git a/src/components/set/SiyuanSetting.vue b/src/components/set/SiyuanSetting.vue index 4f241c6d..cf8afa92 100644 --- a/src/components/set/SiyuanSetting.vue +++ b/src/components/set/SiyuanSetting.vue @@ -25,10 +25,10 @@ diff --git a/src/components/set/preference/AiSetting.vue b/src/components/set/preference/AiSetting.vue index 3242d8be..6b81eb95 100644 --- a/src/components/set/preference/AiSetting.vue +++ b/src/components/set/preference/AiSetting.vue @@ -25,10 +25,10 @@ diff --git a/src/components/set/preference/ChangeLocal.vue b/src/components/set/preference/ChangeLocal.vue index de422b5b..dadd408b 100644 --- a/src/components/set/preference/ChangeLocal.vue +++ b/src/components/set/preference/ChangeLocal.vue @@ -26,11 +26,11 @@ diff --git a/src/components/set/publish/PlatformAddForm.vue b/src/components/set/publish/PlatformAddForm.vue index cd39a846..b22388a2 100644 --- a/src/components/set/publish/PlatformAddForm.vue +++ b/src/components/set/publish/PlatformAddForm.vue @@ -44,7 +44,7 @@ import { svgIcons } from "~/src/utils/svgIcons.ts" import { usePlatformDefine } from "~/src/composables/usePlatformDefine.ts" import { JsonUtil, StrUtil } from "zhi-common" import { DYNAMIC_CONFIG_KEY } from "~/src/utils/constants.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { ElMessage, FormRules } from "element-plus" import { SypConfig } from "~/syp.config.ts" @@ -56,7 +56,7 @@ const router = useRouter() const route = useRoute() const { query } = useRoute() const { getPlatformType, getPrePlatform } = usePlatformDefine() -const { getSetting, updateSetting, checkKeyExists } = useSettingStore() +const { getSetting, updateSetting, checkKeyExists } = usePublishSettingStore() // datas const params = reactive(route.params) diff --git a/src/components/set/publish/PlatformUpdateForm.vue b/src/components/set/publish/PlatformUpdateForm.vue index fa96b245..ae015445 100644 --- a/src/components/set/publish/PlatformUpdateForm.vue +++ b/src/components/set/publish/PlatformUpdateForm.vue @@ -41,7 +41,7 @@ import { import { JsonUtil } from "zhi-common" import { DYNAMIC_CONFIG_KEY } from "~/src/utils/constants.ts" import { SypConfig } from "~/syp.config.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { createAppLogger } from "~/src/utils/appLogger.ts" import { ElMessage, FormRules } from "element-plus" @@ -51,7 +51,7 @@ const logger = createAppLogger("platform-update-form") const { t } = useVueI18n() const router = useRouter() const route = useRoute() -const { getSetting, updateSetting } = useSettingStore() +const { getSetting, updateSetting } = usePublishSettingStore() // datas const params = reactive(route.params) diff --git a/src/components/set/publish/singleplatform/base/CommonBlogSetting.vue b/src/components/set/publish/singleplatform/base/CommonBlogSetting.vue index 8140b807..d659b46b 100644 --- a/src/components/set/publish/singleplatform/base/CommonBlogSetting.vue +++ b/src/components/set/publish/singleplatform/base/CommonBlogSetting.vue @@ -27,7 +27,7 @@ import { createAppLogger } from "~/src/utils/appLogger.ts" import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" import { useVueI18n } from "~/src/composables/useVueI18n.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { onMounted, reactive, ref, toRaw, watch } from "vue" import { DynamicConfig, DynamicJsonCfg, getDynCfgByKey, setDynamicJsonCfg } from "~/src/platforms/dynamicConfig.ts" import { SypConfig } from "~/syp.config.ts" @@ -45,7 +45,7 @@ const appInstance = new PublisherAppInstance() // uses const { t } = useVueI18n() -const { getSetting, updateSetting } = useSettingStore() +const { getSetting, updateSetting } = usePublishSettingStore() const props = defineProps({ apiType: { diff --git a/src/components/set/publish/singleplatform/base/CookieSetting.vue b/src/components/set/publish/singleplatform/base/CookieSetting.vue index 41c3c3db..b96a5e6a 100644 --- a/src/components/set/publish/singleplatform/base/CookieSetting.vue +++ b/src/components/set/publish/singleplatform/base/CookieSetting.vue @@ -28,7 +28,7 @@ import { reactive, ref, watch } from "vue" import { ElMessage, FormRules } from "element-plus" import { useVueI18n } from "~/src/composables/useVueI18n.ts" import { createAppLogger } from "~/src/utils/appLogger.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { StrUtil } from "zhi-common" const logger = createAppLogger("cookie-setting") @@ -44,7 +44,7 @@ const emit = defineEmits(["emitHideDlg"]) // uses const { t } = useVueI18n() -const { updateSetting } = useSettingStore() +const { updateSetting } = usePublishSettingStore() // datas const formRef = ref() diff --git a/src/composables/useChatGPT.ts b/src/composables/useChatGPT.ts index 868d12a3..15646638 100644 --- a/src/composables/useChatGPT.ts +++ b/src/composables/useChatGPT.ts @@ -23,7 +23,7 @@ * questions. */ -import { usePublishPreferenceSetting } from "~/src/stores/usePublishPreferenceSetting.ts" +import { usePreferenceSettingStore } from "~/src/stores/usePreferenceSettingStore.ts" import { HtmlUtil, StrUtil } from "zhi-common" import type { ChatGPTAPI, ChatGPTUnofficialProxyAPI, SendMessageOptions } from "chatgpt" import { Utils } from "~/src/utils/utils.ts" @@ -41,7 +41,7 @@ import { AiConstants } from "~/src/utils/ai/AiConstants.ts" */ const useChatGPT = () => { const logger = createAppLogger("use-chatgpt") - const { getReadOnlyPublishPreferenceSetting } = usePublishPreferenceSetting() + const { getReadOnlyPublishPreferenceSetting } = usePreferenceSettingStore() const pref = getReadOnlyPublishPreferenceSetting() // 创建 ChatGPTAPI 实例 diff --git a/src/composables/usePublish.ts b/src/composables/usePublish.ts index 0883c348..ae860953 100644 --- a/src/composables/usePublish.ts +++ b/src/composables/usePublish.ts @@ -37,7 +37,7 @@ import { YamlFormatObj, } from "zhi-blog-api" import { useVueI18n } from "~/src/composables/useVueI18n.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { useSiyuanApi } from "~/src/composables/useSiyuanApi.ts" import { pre } from "~/src/utils/import/pre.ts" import { MethodEnum } from "~/src/models/methodEnum.ts" @@ -61,7 +61,7 @@ const usePublish = () => { // uses const { t } = useVueI18n() - const { updateSetting } = useSettingStore() + const { updateSetting } = usePublishSettingStore() const { kernelApi, blogApi } = useSiyuanApi() const { getPublishApi } = usePublishConfig() @@ -326,7 +326,7 @@ const usePublish = () => { const getPostPreviewUrl = async (api: BlogAdaptor, id: string, cfg: BlogConfig) => { // 获取最新id，兼容某些平台自定义行为 - const { getSetting } = useSettingStore() + const { getSetting } = usePublishSettingStore() const setting = await getSetting() const posidKey = cfg.posidKey const postMeta = ObjectUtil.getProperty(setting, id, {}) diff --git a/src/composables/usePublishConfig.ts b/src/composables/usePublishConfig.ts index 0e8a7323..ff5564e0 100644 --- a/src/composables/usePublishConfig.ts +++ b/src/composables/usePublishConfig.ts @@ -28,7 +28,7 @@ import { JsonUtil } from "zhi-common" import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" import Adaptors from "~/src/adaptors" import { Utils } from "~/src/utils/utils.ts" -import { useSettingStore } from "~/src/stores/useSettingStore.ts" +import { usePublishSettingStore } from "~/src/stores/usePublishSettingStore.ts" import { DynamicJsonCfg, getDynCfgByKey } from "~/src/platforms/dynamicConfig.ts" import { DYNAMIC_CONFIG_KEY } from "~/src/utils/constants.ts" import { BlogAdaptor, BlogConfig, WebAdaptor } from "zhi-blog-api" @@ -40,7 +40,7 @@ import { BlogAdaptor, BlogConfig, WebAdaptor } from "zhi-blog-api" * @since 1.3.2 */ const usePublishConfig = () => { - const { getSetting } = useSettingStore() + const { getSetting } = usePublishSettingStore() const appInstance = new PublisherAppInstance() /** diff --git a/src/composables/useSiyuanApi.ts b/src/composables/useSiyuanApi.ts index 92e652fa..13440e76 100644 --- a/src/composables/useSiyuanApi.ts +++ b/src/composables/useSiyuanApi.ts @@ -26,17 +26,17 @@ import { SiYuanApiAdaptor, SiyuanConfig, SiyuanKernelApi } from "zhi-siyuan-api" import { createAppLogger } from "~/src/utils/appLogger.ts" import { useSiyuanDevice } from "~/src/composables/useSiyuanDevice.ts" -import { useSiyuanSetting } from "~/src/stores/useSiyuanSetting" +import { useSiyuanSettingStore } from "~/src/stores/useSiyuanSettingStore.ts" import { Utils } from "~/src/utils/utils.ts" -import { usePublishPreferenceSetting } from "~/src/stores/usePublishPreferenceSetting.ts" +import { usePreferenceSettingStore } from "~/src/stores/usePreferenceSettingStore.ts" /** * 通用 Siyuan API 封装 */ export const useSiyuanApi = () => { const logger = createAppLogger("use-siyuan-api") - const { getReadOnlySiyuanSetting } = useSiyuanSetting() - const { getReadOnlyPublishPreferenceSetting } = usePublishPreferenceSetting() + const { getReadOnlySiyuanSetting } = useSiyuanSettingStore() + const { getReadOnlyPublishPreferenceSetting } = usePreferenceSettingStore() const envSiyuanApiUrl = Utils.emptyOrDefault(process.env.VITE_SIYUAN_API_URL, "") const envSiyuanAuthToken = Utils.emptyOrDefault(process.env.VITE_SIYUAN_AUTH_TOKEN, "") diff --git a/src/stores/usePublishPreferenceSetting.ts b/src/stores/usePreferenceSettingStore.ts similarity index 97% rename from src/stores/usePublishPreferenceSetting.ts rename to src/stores/usePreferenceSettingStore.ts index 4a9219b5..0c9334fb 100644 --- a/src/stores/usePublishPreferenceSetting.ts +++ b/src/stores/usePreferenceSettingStore.ts @@ -33,7 +33,7 @@ import useCommonLocalStorage from "~/src/stores/common/useCommonLocalStorage.ts" /** * 使用发布偏好设置的自定义钩子 */ -const usePublishPreferenceSetting = () => { +const usePreferenceSettingStore = () => { // 存储键 const filePath = "storage/syp/publish-preference-cfg.json" const storageKey = "publish-preference-cfg" @@ -91,4 +91,4 @@ const usePublishPreferenceSetting = () => { } } -export { usePublishPreferenceSetting } +export { usePreferenceSettingStore } diff --git a/src/stores/useSettingStore.ts b/src/stores/usePublishSettingStore.ts similarity index 97% rename from src/stores/useSettingStore.ts rename to src/stores/usePublishSettingStore.ts index dc4373a6..f3ef6591 100755 --- a/src/stores/useSettingStore.ts +++ b/src/stores/usePublishSettingStore.ts @@ -9,7 +9,7 @@ import { computed, ref } from "vue" * https://pinia.vuejs.org/ssr/nuxt.html * 从0.9.0+ 开始，配置文件变更为 /data/storage/syp/sy-p-plus-cfg.json ，旧数据会自动迁移 */ -export const useSettingStore = defineStore("setting", () => { +export const usePublishSettingStore = defineStore("setting", () => { const logger = createAppLogger("use-setting-store") const storageKey = "/data/storage/syp/sy-p-plus-cfg.json" const initialValue = SypConfig diff --git a/src/stores/useSiyuanSetting.ts b/src/stores/useSiyuanSettingStore.ts similarity index 93% rename from src/stores/useSiyuanSetting.ts rename to src/stores/useSiyuanSettingStore.ts index cf3d1019..d5e0dec1 100644 --- a/src/stores/useSiyuanSetting.ts +++ b/src/stores/useSiyuanSettingStore.ts @@ -37,7 +37,7 @@ import useCommonLocalStorage from "~/src/stores/common/useCommonLocalStorage.ts" * @version 1.8.0 * @since 1.8.0 */ -const useSiyuanSetting = () => { +const useSiyuanSettingStore = () => { const filePath = "storage/syp/siyuan-cfg.json" const storageKey = "siyuan-cfg" const { isInSiyuanOrSiyuanNewWin } = useSiyuanDevice() @@ -49,9 +49,9 @@ const useSiyuanSetting = () => { * @since 0.6.0 */ const getSiyuanSetting = (): RemovableRef => { - let baseUrl = "http://127.0.0.1:6806" - let token = "" - let middlewareUrl = "https://api.terwer.space/api/middleware" + const baseUrl = "http://127.0.0.1:6806" + const token = "" + const middlewareUrl = "https://api.terwer.space/api/middleware" // PC客户端多个工作空间情况下，自动读取思源地址 let origin: string if (isInSiyuanOrSiyuanNewWin()) { @@ -88,4 +88,4 @@ const useSiyuanSetting = () => { return { getSiyuanSetting, getReadOnlySiyuanSetting } } -export { useSiyuanSetting } +export { useSiyuanSettingStore }