From 9629fbc2eab90cc613f7ade523045d6cd8cff7ea Mon Sep 17 00:00:00 2001 From: terwer Date: Sat, 2 Sep 2023 11:43:40 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/adaptors/api/base/baseBlogApi.ts | 4 +- .../gitlab/commonGitlabApiAdaptor.spec.ts | 4 +- .../api/base/gitlab/commonGitlabApiAdaptor.ts | 4 +- src/adaptors/api/cnblogs/cnblogsApiAdaptor.ts | 4 +- src/adaptors/api/cnblogs/useCnblogsApi.ts | 4 +- .../api/gitlab-hexo/useGitlabhexoApi.ts | 4 +- src/adaptors/api/hexo/useHexoApi.ts | 4 +- .../api/metaweblog/useMetaweblogApi.ts | 4 +- src/adaptors/api/notion/useNotionApi.ts | 4 +- src/adaptors/api/typecho/typechoApiAdaptor.ts | 4 +- src/adaptors/api/typecho/useTypechoApi.ts | 4 +- src/adaptors/api/wordpress/useWordpressApi.ts | 4 +- .../api/wordpress/wordpressApiAdaptor.ts | 4 +- src/adaptors/api/yuque/useYuqueApi.ts | 4 +- src/adaptors/web/base/baseWebApi.ts | 4 +- src/adaptors/web/csdn/csdnUtils.spec.ts | 17 +- src/adaptors/web/csdn/csdnWebAdaptor.ts | 12 +- src/adaptors/web/csdn/useCsdnWeb.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/adaptors/web/zhihu/zhihuWebAdaptor.ts | 2 +- src/components/set/PublishSetting.vue | 6 +- .../singleplatform/base/CommonBlogSetting.vue | 4 +- src/components/test/CnblogsTest.vue | 4 +- src/components/test/CsdnTest.vue | 161 ++++++++++++++++++ src/components/test/HexoTest.vue | 4 +- src/components/test/HugoTest.vue | 4 +- src/components/test/SiyuanTest.vue | 4 +- src/components/test/TypechoTest.vue | 4 +- src/components/test/VitepressTest.vue | 4 +- src/components/test/WordpressTest.vue | 4 +- src/components/test/YuqueTest.vue | 4 +- src/components/test/ZhihuTest.vue | 4 +- src/components/test/kmsTest.vue | 4 +- src/composables/useProxy.ts | 4 +- src/composables/usePublishConfig.ts | 4 +- src/composables/useVueRouter.ts | 5 + src/pages/Test.vue | 4 + ...appInstance.ts => publisherAppInstance.ts} | 2 +- src/utils/utils.ts | 6 +- testdata/csdn/csdn.http | 141 +++++++++++++++ testdata/zhihu/zhihu.http | 0 44 files changed, 411 insertions(+), 77 deletions(-) create mode 100644 src/components/test/CsdnTest.vue rename src/{appInstance.ts => publisherAppInstance.ts} (98%) create mode 100644 testdata/csdn/csdn.http create mode 100644 testdata/zhihu/zhihu.http diff --git a/src/adaptors/api/base/baseBlogApi.ts b/src/adaptors/api/base/baseBlogApi.ts index 5f925569..0bfb73ac 100644 --- a/src/adaptors/api/base/baseBlogApi.ts +++ b/src/adaptors/api/base/baseBlogApi.ts @@ -24,7 +24,7 @@ */ import { BlogApi, BlogConfig, Post, YamlConvertAdaptor } from "zhi-blog-api" -import { AppInstance } from "~/src/appInstance.ts" +import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" import { createAppLogger, ILogger } from "~/src/utils/appLogger.ts" import { useProxy } from "~/src/composables/useProxy.ts" import { BaseExtendApi } from "~/src/adaptors/base/baseExtendApi.ts" @@ -48,7 +48,7 @@ export class BaseBlogApi extends BlogApi { * @param appInstance 应用实例 * @param cfg 配置项 */ - constructor(appInstance: AppInstance, cfg: BlogConfig) { + constructor(appInstance: PublisherAppInstance, cfg: BlogConfig) { super() this.cfg = cfg diff --git a/src/adaptors/api/base/gitlab/commonGitlabApiAdaptor.spec.ts b/src/adaptors/api/base/gitlab/commonGitlabApiAdaptor.spec.ts index efe0cee8..1db67244 100644 --- a/src/adaptors/api/base/gitlab/commonGitlabApiAdaptor.spec.ts +++ b/src/adaptors/api/base/gitlab/commonGitlabApiAdaptor.spec.ts @@ -24,12 +24,12 @@ */ import { describe, it } from "vitest" -import { AppInstance } from "~/src/appInstance.ts" +import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" import { CommonGitlabConfig } from "~/src/adaptors/api/base/gitlab/commonGitlabConfig.ts" import { CommonGitlabApiAdaptor } from "~/src/adaptors/api/base/gitlab/commonGitlabApiAdaptor.ts" describe("test commonGitlabApiAdaptor", () => { - const appInstance = new AppInstance() + const appInstance = new PublisherAppInstance() const gitlabCfg = new CommonGitlabConfig("terwer", "", "terwer-github-io", "main") gitlabCfg.apiUrl = "http://localhost:8002" gitlabCfg.home = "http://localhost:8002" diff --git a/src/adaptors/api/base/gitlab/commonGitlabApiAdaptor.ts b/src/adaptors/api/base/gitlab/commonGitlabApiAdaptor.ts index 118d62f7..8d6ee4c1 100644 --- a/src/adaptors/api/base/gitlab/commonGitlabApiAdaptor.ts +++ b/src/adaptors/api/base/gitlab/commonGitlabApiAdaptor.ts @@ -24,7 +24,7 @@ */ import { BaseBlogApi } from "~/src/adaptors/api/base/baseBlogApi.ts" -import { AppInstance } from "~/src/appInstance.ts" +import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" import { CommonGitlabConfig } from "~/src/adaptors/api/base/gitlab/commonGitlabConfig.ts" import { createAppLogger } from "~/src/utils/appLogger.ts" import { CommonGitlabClient } from "zhi-gitlab-middleware" @@ -44,7 +44,7 @@ import { isDev } from "~/src/utils/constants.ts" class CommonGitlabApiAdaptor extends BaseBlogApi { private gitlabClient: CommonGitlabClient - constructor(appInstance: AppInstance, cfg: CommonGitlabConfig) { + constructor(appInstance: PublisherAppInstance, cfg: CommonGitlabConfig) { super(appInstance, cfg) this.logger = createAppLogger("common-gitlab-api-adaptor") diff --git a/src/adaptors/api/cnblogs/cnblogsApiAdaptor.ts b/src/adaptors/api/cnblogs/cnblogsApiAdaptor.ts index 49e431ab..cea99f3f 100644 --- a/src/adaptors/api/cnblogs/cnblogsApiAdaptor.ts +++ b/src/adaptors/api/cnblogs/cnblogsApiAdaptor.ts @@ -25,7 +25,7 @@ import { CategoryInfo, Post, UserBlog } from "zhi-blog-api" import { CnblogsConfig } from "~/src/adaptors/api/cnblogs/cnblogsConfig.ts" -import { AppInstance } from "~/src/appInstance.ts" +import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" import { createAppLogger } from "~/src/utils/appLogger.ts" import { CnblogsConstants } from "~/src/adaptors/api/cnblogs/cnblogsConstants.ts" import { MetaweblogBlogApiAdaptor } from "~/src/adaptors/api/base/metaweblog/metaweblogBlogApiAdaptor.ts" @@ -49,7 +49,7 @@ class CnblogsApiAdaptor extends MetaweblogBlogApiAdaptor { * @param appInstance 应用实例 * @param cfg 配置项 */ - constructor(appInstance: AppInstance, cfg: CnblogsConfig) { + constructor(appInstance: PublisherAppInstance, cfg: CnblogsConfig) { super(appInstance, cfg) this.logger = createAppLogger("cnblogs-api-adaptor") this.cfg.blogid = "cnblogs" diff --git a/src/adaptors/api/cnblogs/useCnblogsApi.ts b/src/adaptors/api/cnblogs/useCnblogsApi.ts index bc74a34f..d8999c61 100644 --- a/src/adaptors/api/cnblogs/useCnblogsApi.ts +++ b/src/adaptors/api/cnblogs/useCnblogsApi.ts @@ -27,7 +27,7 @@ import { createAppLogger } from "~/src/utils/appLogger.ts" 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 { AppInstance } from "~/src/appInstance.ts" +import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" import { useSettingStore } from "~/src/stores/useSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { getDynPostidKey } from "~/src/platforms/dynamicConfig.ts" @@ -50,7 +50,7 @@ export const useCnblogsApi = async (key?: string, newCfg?: CnblogsConfig) => { logger.info("Start using Cnblogs API...") // 创建应用实例 - const appInstance = new AppInstance() + const appInstance = new PublisherAppInstance() let cfg: CnblogsConfig if (newCfg) { diff --git a/src/adaptors/api/gitlab-hexo/useGitlabhexoApi.ts b/src/adaptors/api/gitlab-hexo/useGitlabhexoApi.ts index 175ba3f8..a5e962e8 100644 --- a/src/adaptors/api/gitlab-hexo/useGitlabhexoApi.ts +++ b/src/adaptors/api/gitlab-hexo/useGitlabhexoApi.ts @@ -24,7 +24,7 @@ */ import { createAppLogger } from "~/src/utils/appLogger.ts" -import { AppInstance } from "~/src/appInstance.ts" +import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" import { useSettingStore } from "~/src/stores/useSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { Utils } from "~/src/utils/utils.ts" @@ -42,7 +42,7 @@ const useGitlabhexoApi = async (key: string, newCfg?: GitlabhexoConfig) => { logger.info("Start using Gitlabhexo API...") // 创建应用实例 - const appInstance = new AppInstance() + const appInstance = new PublisherAppInstance() let cfg: GitlabhexoConfig if (newCfg) { diff --git a/src/adaptors/api/hexo/useHexoApi.ts b/src/adaptors/api/hexo/useHexoApi.ts index e28622d0..63c82a13 100644 --- a/src/adaptors/api/hexo/useHexoApi.ts +++ b/src/adaptors/api/hexo/useHexoApi.ts @@ -24,7 +24,7 @@ */ import { createAppLogger } from "~/src/utils/appLogger.ts" -import { AppInstance } from "~/src/appInstance.ts" +import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" import { useSettingStore } from "~/src/stores/useSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { Utils } from "~/src/utils/utils.ts" @@ -42,7 +42,7 @@ const useHexoApi = async (key: string, newCfg?: HexoConfig) => { logger.info("Start using Hexo API...") // 创建应用实例 - const appInstance = new AppInstance() + const appInstance = new PublisherAppInstance() let cfg: HexoConfig if (newCfg) { diff --git a/src/adaptors/api/metaweblog/useMetaweblogApi.ts b/src/adaptors/api/metaweblog/useMetaweblogApi.ts index 1484357c..55058b32 100644 --- a/src/adaptors/api/metaweblog/useMetaweblogApi.ts +++ b/src/adaptors/api/metaweblog/useMetaweblogApi.ts @@ -25,7 +25,7 @@ import { MetaweblogConfig } from "~/src/adaptors/api/base/metaweblog/metaweblogConfig.ts" import { createAppLogger } from "~/src/utils/appLogger.ts" -import { AppInstance } from "~/src/appInstance.ts" +import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" import { useSettingStore } from "~/src/stores/useSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { Utils } from "~/src/utils/utils.ts" @@ -50,7 +50,7 @@ export const useMetaweblogApi = async (key?: string, newCfg?: MetaweblogConfig) logger.info("Start using Metaweblog API...") // 创建应用实例 - const appInstance = new AppInstance() + const appInstance = new PublisherAppInstance() let cfg: MetaweblogConfig if (newCfg) { diff --git a/src/adaptors/api/notion/useNotionApi.ts b/src/adaptors/api/notion/useNotionApi.ts index 9d582c2a..a2135e3e 100644 --- a/src/adaptors/api/notion/useNotionApi.ts +++ b/src/adaptors/api/notion/useNotionApi.ts @@ -24,7 +24,7 @@ */ import { createAppLogger } from "~/src/utils/appLogger.ts" -import { AppInstance } from "~/src/appInstance.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" @@ -41,7 +41,7 @@ const useNotionApi = async (key: string, newCfg?: NotionConfig) => { logger.info("Start using Notion API...") // 创建应用实例 - const appInstance = new AppInstance() + const appInstance = new PublisherAppInstance() let cfg: NotionConfig if (newCfg) { diff --git a/src/adaptors/api/typecho/typechoApiAdaptor.ts b/src/adaptors/api/typecho/typechoApiAdaptor.ts index 6db206c3..9c19051e 100644 --- a/src/adaptors/api/typecho/typechoApiAdaptor.ts +++ b/src/adaptors/api/typecho/typechoApiAdaptor.ts @@ -23,7 +23,7 @@ * questions. */ -import { AppInstance } from "~/src/appInstance.ts" +import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" import { createAppLogger } from "~/src/utils/appLogger.ts" import { TypechoConfig } from "~/src/adaptors/api/typecho/typechoConfig.ts" import { MetaweblogBlogApiAdaptor } from "~/src/adaptors/api/base/metaweblog/metaweblogBlogApiAdaptor.ts" @@ -42,7 +42,7 @@ class TypechoApiAdaptor extends MetaweblogBlogApiAdaptor { * @param appInstance 应用实例 * @param cfg 配置项 */ - constructor(appInstance: AppInstance, cfg: TypechoConfig) { + constructor(appInstance: PublisherAppInstance, cfg: TypechoConfig) { super(appInstance, cfg) this.logger = createAppLogger("typecho-api-adaptor") this.cfg.blogid = "typecho" diff --git a/src/adaptors/api/typecho/useTypechoApi.ts b/src/adaptors/api/typecho/useTypechoApi.ts index 08da1923..f4556e94 100644 --- a/src/adaptors/api/typecho/useTypechoApi.ts +++ b/src/adaptors/api/typecho/useTypechoApi.ts @@ -24,7 +24,7 @@ */ import { createAppLogger } from "~/src/utils/appLogger.ts" -import { AppInstance } from "~/src/appInstance.ts" +import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" import { Utils } from "~/src/utils/utils.ts" import { useSettingStore } from "~/src/stores/useSettingStore.ts" import { TypechoConfig } from "~/src/adaptors/api/typecho/typechoConfig.ts" @@ -50,7 +50,7 @@ export const useTypechoApi = async (key?: string, newCfg?: TypechoConfig) => { logger.info("Start using Typecho API...") // 创建应用实例 - const appInstance = new AppInstance() + const appInstance = new PublisherAppInstance() let cfg: TypechoConfig if (newCfg) { diff --git a/src/adaptors/api/wordpress/useWordpressApi.ts b/src/adaptors/api/wordpress/useWordpressApi.ts index bc84b033..6b652a55 100644 --- a/src/adaptors/api/wordpress/useWordpressApi.ts +++ b/src/adaptors/api/wordpress/useWordpressApi.ts @@ -24,7 +24,7 @@ */ import { createAppLogger } from "~/src/utils/appLogger.ts" -import { AppInstance } from "~/src/appInstance.ts" +import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" import { Utils } from "~/src/utils/utils.ts" import { useSettingStore } from "~/src/stores/useSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" @@ -50,7 +50,7 @@ export const useWordpressApi = async (key?: string, newCfg?: WordpressConfig) => logger.info("Start using Wordpress API...") // 创建应用实例 - const appInstance = new AppInstance() + const appInstance = new PublisherAppInstance() let cfg: WordpressConfig if (newCfg) { diff --git a/src/adaptors/api/wordpress/wordpressApiAdaptor.ts b/src/adaptors/api/wordpress/wordpressApiAdaptor.ts index 1902118e..417eedf9 100644 --- a/src/adaptors/api/wordpress/wordpressApiAdaptor.ts +++ b/src/adaptors/api/wordpress/wordpressApiAdaptor.ts @@ -24,7 +24,7 @@ */ import { WordpressConfig } from "~/src/adaptors/api/wordpress/wordpressConfig.ts" -import { AppInstance } from "~/src/appInstance.ts" +import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" import { createAppLogger } from "~/src/utils/appLogger.ts" import { MetaweblogBlogApiAdaptor } from "~/src/adaptors/api/base/metaweblog/metaweblogBlogApiAdaptor.ts" @@ -42,7 +42,7 @@ class WordpressApiAdaptor extends MetaweblogBlogApiAdaptor { * @param appInstance 应用实例 * @param cfg 配置项 */ - constructor(appInstance: AppInstance, cfg: WordpressConfig) { + constructor(appInstance: PublisherAppInstance, cfg: WordpressConfig) { super(appInstance, cfg) this.logger = createAppLogger("wordpress-api-adaptor") this.cfg.blogid = "wordpress" diff --git a/src/adaptors/api/yuque/useYuqueApi.ts b/src/adaptors/api/yuque/useYuqueApi.ts index df6654d6..faeb07e1 100644 --- a/src/adaptors/api/yuque/useYuqueApi.ts +++ b/src/adaptors/api/yuque/useYuqueApi.ts @@ -24,7 +24,7 @@ */ import { createAppLogger } from "~/src/utils/appLogger.ts" -import { AppInstance } from "~/src/appInstance.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" @@ -41,7 +41,7 @@ const useYuqueApi = async (key: string, newCfg?: YuqueConfig) => { logger.info("Start using Yuque API...") // 创建应用实例 - const appInstance = new AppInstance() + const appInstance = new PublisherAppInstance() let cfg: YuqueConfig if (newCfg) { diff --git a/src/adaptors/web/base/baseWebApi.ts b/src/adaptors/web/base/baseWebApi.ts index b26c8ddb..dd74b17b 100644 --- a/src/adaptors/web/base/baseWebApi.ts +++ b/src/adaptors/web/base/baseWebApi.ts @@ -23,7 +23,7 @@ * questions. */ import { Attachment, ElectronCookie, MediaObject, Post, WebApi, WebConfig, YamlConvertAdaptor } from "zhi-blog-api" -import { AppInstance } from "~/src/appInstance.ts" +import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" import { createAppLogger, ILogger } from "~/src/utils/appLogger.ts" import { useProxy } from "~/src/composables/useProxy.ts" import { BaseExtendApi } from "~/src/adaptors/base/baseExtendApi.ts" @@ -47,7 +47,7 @@ class BaseWebApi extends WebApi { * @param appInstance 应用实例 * @param cfg 配置项 */ - constructor(appInstance: AppInstance, cfg: WebConfig) { + constructor(appInstance: PublisherAppInstance, cfg: WebConfig) { super() this.cfg = cfg diff --git a/src/adaptors/web/csdn/csdnUtils.spec.ts b/src/adaptors/web/csdn/csdnUtils.spec.ts index 8b9984ff..88a2aaed 100644 --- a/src/adaptors/web/csdn/csdnUtils.spec.ts +++ b/src/adaptors/web/csdn/csdnUtils.spec.ts @@ -33,7 +33,8 @@ describe("test csdnUtils", () => { }) it("test generateXCaSignature", () => { - const url = "https://bizapi.csdn.net/blog-console-api/v1/user/info" + // const url = "https://bizapi.csdn.net/blog-console-api/v1/user/info" + const url = "https://bizapi.csdn.net/blog/phoenix/console/v1/column/list?type=all" const method = "GET" const accept = "*/*" @@ -43,4 +44,18 @@ describe("test csdnUtils", () => { console.log("x-ca-nonce:", xCaNonce) console.log("x-ca-signature:", xCaSignature) }) + + it("test generateXCaSignature2", () => { + // const url = "https://bizapi.csdn.net/blog/phoenix/console/v1/column/save" + const url = "https://bizapi.csdn.net/blog/phoenix/console/v1/column/upgrade-column-pay" + const method = "POST" + const accept = "*/*" + const contentType = "application/json" + + const xCaNonce = CsdnUtils.generateXCaNonce() + const xCaSignature = CsdnUtils.generateXCaSignature(url, method, accept, xCaNonce, contentType) + + console.log("x-ca-nonce:", xCaNonce) + console.log("x-ca-signature:", xCaSignature) + }) }) diff --git a/src/adaptors/web/csdn/csdnWebAdaptor.ts b/src/adaptors/web/csdn/csdnWebAdaptor.ts index 32603ab2..c350a1d2 100644 --- a/src/adaptors/web/csdn/csdnWebAdaptor.ts +++ b/src/adaptors/web/csdn/csdnWebAdaptor.ts @@ -26,10 +26,11 @@ import { BaseWebApi } from "~/src/adaptors/web/base/baseWebApi.ts" import CsdnUtils from "~/src/adaptors/web/csdn/csdnUtils.ts" import { CsdnConfig } from "~/src/adaptors/web/csdn/csdnConfig.ts" -import { AppInstance } from "~/src/appInstance.ts" +import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" import { createAppLogger } from "~/src/utils/appLogger.ts" import { CommonFetchClient } from "zhi-fetch-middleware" import { isDev } from "~/src/utils/constants.ts" +import { UserBlog } from "zhi-blog-api" /** * CSDN网页授权适配器 @@ -48,7 +49,7 @@ class CsdnWebAdaptor extends BaseWebApi { * @param appInstance 应用实例 * @param cfg 配置项 */ - constructor(appInstance: AppInstance, cfg: CsdnConfig) { + constructor(appInstance: PublisherAppInstance, cfg: CsdnConfig) { super(appInstance, cfg) this.cfg = cfg @@ -74,6 +75,13 @@ class CsdnWebAdaptor extends BaseWebApi { } } + public async getUsersBlogs(): Promise> { + let result: UserBlog[] = [] + + this.logger.debug("getUsersBlogs=>", result) + return result + } + // ================ // private methods // ================ diff --git a/src/adaptors/web/csdn/useCsdnWeb.ts b/src/adaptors/web/csdn/useCsdnWeb.ts index 88310c37..d7d3ab69 100644 --- a/src/adaptors/web/csdn/useCsdnWeb.ts +++ b/src/adaptors/web/csdn/useCsdnWeb.ts @@ -25,7 +25,7 @@ import { CsdnConfig } from "~/src/adaptors/web/csdn/csdnConfig.ts" import { createAppLogger } from "~/src/utils/appLogger.ts" -import { AppInstance } from "~/src/appInstance.ts" +import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" import { useSettingStore } from "~/src/stores/useSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { Utils } from "~/src/utils/utils.ts" @@ -44,7 +44,7 @@ const useCsdnWeb = async (key?: string, newCfg?: CsdnConfig) => { logger.info("Start using Csdn WebAuth...") // 创建应用实例 - const appInstance = new AppInstance() + const appInstance = new PublisherAppInstance() let cfg: CsdnConfig if (newCfg) { logger.info("Initialize with the latest newCfg passed in...") diff --git a/src/adaptors/web/jianshu/useJianshuWeb.ts b/src/adaptors/web/jianshu/useJianshuWeb.ts index 5c8fb0cf..551d0525 100644 --- a/src/adaptors/web/jianshu/useJianshuWeb.ts +++ b/src/adaptors/web/jianshu/useJianshuWeb.ts @@ -25,7 +25,7 @@ import { JianshuConfig } from "~/src/adaptors/web/jianshu/jianshuConfig.ts" import { createAppLogger } from "~/src/utils/appLogger.ts" -import { AppInstance } from "~/src/appInstance.ts" +import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" import { useSettingStore } from "~/src/stores/useSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { Utils } from "~/src/utils/utils.ts" @@ -43,7 +43,7 @@ const useJianshuWeb = async (key?: string, newCfg?: JianshuConfig) => { logger.info("Start using Jianshu WebAuth...") // 创建应用实例 - const appInstance = new AppInstance() + const appInstance = new PublisherAppInstance() let cfg: JianshuConfig if (newCfg) { logger.info("Initialize with the latest newCfg passed in...") diff --git a/src/adaptors/web/juejin/useJuejinWeb.ts b/src/adaptors/web/juejin/useJuejinWeb.ts index 72e2f764..616cd9bf 100644 --- a/src/adaptors/web/juejin/useJuejinWeb.ts +++ b/src/adaptors/web/juejin/useJuejinWeb.ts @@ -25,7 +25,7 @@ import { JuejinConfig } from "~/src/adaptors/web/juejin/juejinConfig.ts" import { createAppLogger } from "~/src/utils/appLogger.ts" -import { AppInstance } from "~/src/appInstance.ts" +import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" import { useSettingStore } from "~/src/stores/useSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { Utils } from "~/src/utils/utils.ts" @@ -43,7 +43,7 @@ const useJuejinWeb = async (key?: string, newCfg?: JuejinConfig) => { logger.info("Start using Juejin WebAuth...") // 创建应用实例 - const appInstance = new AppInstance() + const appInstance = new PublisherAppInstance() let cfg: JuejinConfig if (newCfg) { logger.info("Initialize with the latest newCfg passed in...") diff --git a/src/adaptors/web/wechat/useWechatWeb.ts b/src/adaptors/web/wechat/useWechatWeb.ts index b7db38de..e48445a2 100644 --- a/src/adaptors/web/wechat/useWechatWeb.ts +++ b/src/adaptors/web/wechat/useWechatWeb.ts @@ -24,7 +24,7 @@ */ import { WechatConfig } from "~/src/adaptors/web/wechat/wechatConfig.ts" -import { AppInstance } from "~/src/appInstance.ts" +import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" import { createAppLogger } from "~/src/utils/appLogger.ts" import { useSettingStore } from "~/src/stores/useSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" @@ -43,7 +43,7 @@ const useWechatWeb = async (key?: string, newCfg?: WechatConfig) => { logger.info("Start using Wechat WebAuth...") // 创建应用实例 - const appInstance = new AppInstance() + const appInstance = new PublisherAppInstance() let cfg: WechatConfig if (newCfg) { logger.info("Initialize with the latest newCfg passed in...") diff --git a/src/adaptors/web/zhihu/useZhihuWeb.ts b/src/adaptors/web/zhihu/useZhihuWeb.ts index 1e7592bc..5f7020aa 100644 --- a/src/adaptors/web/zhihu/useZhihuWeb.ts +++ b/src/adaptors/web/zhihu/useZhihuWeb.ts @@ -26,7 +26,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 { AppInstance } from "~/src/appInstance.ts" +import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" import { useSettingStore } from "~/src/stores/useSettingStore.ts" import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common" import { Utils } from "~/src/utils/utils.ts" @@ -44,7 +44,7 @@ const useZhihuWeb = async (key?: string, newCfg?: ZhihuConfig) => { logger.info("Start using Zhihu WebAuth...") // 创建应用实例 - const appInstance = new AppInstance() + const appInstance = new PublisherAppInstance() let cfg: ZhihuConfig if (newCfg) { logger.info("Initialize with the latest newCfg passed in...") diff --git a/src/adaptors/web/zhihu/zhihuWebAdaptor.ts b/src/adaptors/web/zhihu/zhihuWebAdaptor.ts index 7a100e85..ff91733e 100644 --- a/src/adaptors/web/zhihu/zhihuWebAdaptor.ts +++ b/src/adaptors/web/zhihu/zhihuWebAdaptor.ts @@ -46,7 +46,7 @@ class ZhihuWebAdaptor extends BaseWebApi { // * @param appInstance 应用实例 // * @param cfg 配置项 // */ - // constructor(appInstance: AppInstance, cfg: ZhihuConfig) { + // constructor(appInstance: PublisherAppInstance, cfg: ZhihuConfig) { // super(appInstance, cfg) // // this.cfg = cfg diff --git a/src/components/set/PublishSetting.vue b/src/components/set/PublishSetting.vue index 0b38660b..b094e43d 100644 --- a/src/components/set/PublishSetting.vue +++ b/src/components/set/PublishSetting.vue @@ -48,7 +48,7 @@ import { svgIcons } from "~/src/utils/svgIcons.ts" import { openBrowserWindow } from "~/src/utils/widgetUtils.ts" import Adaptors from "~/src/adaptors" import { Utils } from "~/src/utils/utils.ts" -import { AppInstance } from "~/src/appInstance.ts" +import { PublisherAppInstance } from "~/src/publisherAppInstance.ts" import { ElectronCookie, WebConfig } from "zhi-blog-api" import { useSiyuanDevice } from "~/src/composables/useSiyuanDevice.ts" import CookieSetting from "~/src/components/set/publish/singleplatform/base/CookieSetting.vue" @@ -260,7 +260,7 @@ const _handleValidateOpenBrowserAuth = (dynCfg: DynamicConfig) => { formData.webAuthLoadingMap[dynCfg.platformKey] = true try { - const appInstance = new AppInstance() + const appInstance = new PublisherAppInstance() const cfg = (await Adaptors.getCfg(dynCfg.platformKey)) as CommonWebConfig const apiAdaptor = await Adaptors.getAdaptor(dynCfg.platformKey, cfg) const api = Utils.webApi(appInstance, apiAdaptor) @@ -314,7 +314,7 @@ const _handleValidateChromeExtensionAuth = async (dynCfg: DynamicConfig) => { formData.webAuthLoadingMap[dynCfg.platformKey] = true try { - const appInstance = new AppInstance() + const appInstance = new PublisherAppInstance() // 这里会有配置初始化 const cfg = (await Adaptors.getCfg(dynCfg.platformKey)) as CommonWebConfig const apiAdaptor = await Adaptors.getAdaptor(dynCfg.platformKey, cfg) diff --git a/src/components/set/publish/singleplatform/base/CommonBlogSetting.vue b/src/components/set/publish/singleplatform/base/CommonBlogSetting.vue index 0305184a..065f1c74 100644 --- a/src/components/set/publish/singleplatform/base/CommonBlogSetting.vue +++ b/src/components/set/publish/singleplatform/base/CommonBlogSetting.vue @@ -25,7 +25,7 @@ + + + + diff --git a/src/components/test/HexoTest.vue b/src/components/test/HexoTest.vue index 2baebc2b..60069971 100644 --- a/src/components/test/HexoTest.vue +++ b/src/components/test/HexoTest.vue @@ -24,7 +24,7 @@ -->