diff --git a/package.json b/package.json index 587b4f9..e94ea2a 100644 --- a/package.json +++ b/package.json @@ -61,8 +61,10 @@ "zhi-common": "^1.11.5", "zhi-device": "^2.3.0", "zhi-fetch-middleware": "^0.1.19", + "zhi-github-middleware": "^0.1.0", "zhi-lib-base": "^0.4.2", "zhi-siyuan-api": "^1.27.2", + "zhi-wechatsync-middleware": "^0.1.2", "zhi-xmlrpc-middleware": "^0.2.19" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 792daeb..22d130b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -59,12 +59,18 @@ dependencies: zhi-fetch-middleware: specifier: ^0.1.19 version: 0.1.19 + zhi-github-middleware: + specifier: ^0.1.0 + version: 0.1.0 zhi-lib-base: specifier: ^0.4.2 version: 0.4.2 zhi-siyuan-api: specifier: ^1.27.2 version: 1.27.2 + zhi-wechatsync-middleware: + specifier: ^0.1.2 + version: 0.1.2 zhi-xmlrpc-middleware: specifier: ^0.2.19 version: 0.2.19 @@ -2032,7 +2038,7 @@ packages: resolution: {integrity: sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==} dependencies: '@gar/promisify': 1.1.3 - semver: 7.3.8 + semver: 7.5.4 dev: true /@npmcli/move-file@1.1.2: @@ -2066,6 +2072,72 @@ packages: - supports-color dev: true + /@octokit/auth-token@4.0.0: + resolution: {integrity: sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==} + engines: {node: '>= 18'} + dev: false + + /@octokit/core@5.0.0: + resolution: {integrity: sha512-YbAtMWIrbZ9FCXbLwT9wWB8TyLjq9mxpKdgB3dUNxQcIVTf9hJ70gRPwAcqGZdY6WdJPZ0I7jLaaNDCiloGN2A==} + engines: {node: '>= 18'} + dependencies: + '@octokit/auth-token': 4.0.0 + '@octokit/graphql': 7.0.1 + '@octokit/request': 8.1.1 + '@octokit/request-error': 5.0.0 + '@octokit/types': 11.1.0 + before-after-hook: 2.2.3 + universal-user-agent: 6.0.0 + dev: false + + /@octokit/endpoint@9.0.0: + resolution: {integrity: sha512-szrQhiqJ88gghWY2Htt8MqUDO6++E/EIXqJ2ZEp5ma3uGS46o7LZAzSLt49myB7rT+Hfw5Y6gO3LmOxGzHijAQ==} + engines: {node: '>= 18'} + dependencies: + '@octokit/types': 11.1.0 + is-plain-object: 5.0.0 + universal-user-agent: 6.0.0 + dev: false + + /@octokit/graphql@7.0.1: + resolution: {integrity: sha512-T5S3oZ1JOE58gom6MIcrgwZXzTaxRnxBso58xhozxHpOqSTgDS6YNeEUvZ/kRvXgPrRz/KHnZhtb7jUMRi9E6w==} + engines: {node: '>= 18'} + dependencies: + '@octokit/request': 8.1.1 + '@octokit/types': 11.1.0 + universal-user-agent: 6.0.0 + dev: false + + /@octokit/openapi-types@18.0.0: + resolution: {integrity: sha512-V8GImKs3TeQRxRtXFpG2wl19V7444NIOTDF24AWuIbmNaNYOQMWRbjcGDXV5B+0n887fgDcuMNOmlul+k+oJtw==} + dev: false + + /@octokit/request-error@5.0.0: + resolution: {integrity: sha512-1ue0DH0Lif5iEqT52+Rf/hf0RmGO9NWFjrzmrkArpG9trFfDM/efx00BJHdLGuro4BR/gECxCU2Twf5OKrRFsQ==} + engines: {node: '>= 18'} + dependencies: + '@octokit/types': 11.1.0 + deprecation: 2.3.1 + once: 1.4.0 + dev: false + + /@octokit/request@8.1.1: + resolution: {integrity: sha512-8N+tdUz4aCqQmXl8FpHYfKG9GelDFd7XGVzyN8rc6WxVlYcfpHECnuRkgquzz+WzvHTK62co5di8gSXnzASZPQ==} + engines: {node: '>= 18'} + dependencies: + '@octokit/endpoint': 9.0.0 + '@octokit/request-error': 5.0.0 + '@octokit/types': 11.1.0 + is-plain-object: 5.0.0 + universal-user-agent: 6.0.0 + dev: false + + /@octokit/types@11.1.0: + resolution: {integrity: sha512-Fz0+7GyLm/bHt8fwEqgvRBWwIV1S6wRRyq+V6exRKLVWaKGsuy6H9QFYeBVDV7rK6fO3XwHgQOPxv+cLj2zpXQ==} + dependencies: + '@octokit/openapi-types': 18.0.0 + dev: false + /@oozcitak/dom@1.15.10: resolution: {integrity: sha512-0JT29/LaxVgRcGKvHmSrUTEvZ8BXvZhGl2LASRUgHqDTC1M5g1pLmVv56IYNyt3bG2CUjDkc67wnyZC14pbQrQ==} engines: {node: '>=8.0'} @@ -2870,7 +2942,7 @@ packages: recast: 0.21.5 remark-frontmatter: 4.0.1 remark-mdx-frontmatter: 1.1.1 - semver: 7.3.8 + semver: 7.5.4 sort-package-json: 1.57.0 tar-fs: 2.1.1 tsconfig-paths: 4.2.0 @@ -3465,6 +3537,10 @@ packages: resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} dev: true + /before-after-hook@2.2.3: + resolution: {integrity: sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==} + dev: false + /big-integer@1.6.51: resolution: {integrity: sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==} engines: {node: '>=0.6'} @@ -4242,6 +4318,10 @@ packages: engines: {node: '>= 0.8'} dev: true + /deprecation@2.3.1: + resolution: {integrity: sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==} + dev: false + /dequal@2.0.3: resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==} engines: {node: '>=6'} @@ -5177,6 +5257,7 @@ packages: /fast-json-stable-stringify@2.1.0: resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} + requiresBuild: true dev: true /fast-levenshtein@2.0.6: @@ -5950,6 +6031,11 @@ packages: engines: {node: '>=12'} dev: true + /is-plain-object@5.0.0: + resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==} + engines: {node: '>=0.10.0'} + dev: false + /is-reference@3.0.1: resolution: {integrity: sha512-baJJdQLiYaJdvFbJqXrcGv3WU3QCzBlUcI5QhbesIm6/xPsvmO+2CDoi/GMOFBQEQm+PXkwOPrp9KK5ozZsp2w==} dependencies: @@ -6074,6 +6160,7 @@ packages: /json-schema-traverse@0.4.1: resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==} + requiresBuild: true dev: true /json-schema-traverse@1.0.0: @@ -6957,6 +7044,7 @@ packages: /node-addon-api@1.7.2: resolution: {integrity: sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==} + requiresBuild: true dev: true optional: true @@ -7116,7 +7204,6 @@ packages: resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} dependencies: wrappy: 1.0.2 - dev: true /onetime@5.1.2: resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==} @@ -7732,6 +7819,7 @@ packages: /punycode@2.3.0: resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==} engines: {node: '>=6'} + requiresBuild: true dev: true /qs@6.11.0: @@ -8865,6 +8953,10 @@ packages: unist-util-visit-parents: 5.1.3 dev: true + /universal-user-agent@6.0.0: + resolution: {integrity: sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==} + dev: false + /universalify@0.1.2: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} @@ -9434,7 +9526,6 @@ packages: /wrappy@1.0.2: resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} - dev: true /ws@7.5.9: resolution: {integrity: sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==} @@ -9573,6 +9664,15 @@ packages: zhi-lib-base: 0.4.2 dev: false + /zhi-github-middleware@0.1.0: + resolution: {integrity: sha512-SAmHGln9rDXHu/2frUM7TuZ3wyZe2j2o905q+KjhpJzIiQuY5KH0ii+cTdtZBwKUz6TQCzlK8H3zVijNCHxUOg==} + dependencies: + '@octokit/core': 5.0.0 + js-base64: 3.7.5 + zhi-common: 1.11.5 + zhi-lib-base: 0.4.2 + dev: false + /zhi-lib-base@0.4.2: resolution: {integrity: sha512-kfKgN4hb5efUf+k5Y9028CVV1p/hsnK0NbRsxI3uwJoTlHfTBjfi6ZfrkhDn+XEnEYeWidO75sx4RdcnT7C3KA==} dev: false @@ -9585,6 +9685,14 @@ packages: zhi-lib-base: 0.4.2 dev: false + /zhi-wechatsync-middleware@0.1.2: + resolution: {integrity: sha512-/swjrL9pe/GrktW/mMcHitYtWdqc7KSguHr1g8dUCA9SnTgQ4JFUi3F1D5M3T8mQWM5hPKsGBLpihlXSZMNOtg==} + dependencies: + zhi-blog-api: 1.16.0 + zhi-common: 1.11.5 + zhi-lib-base: 0.4.2 + dev: false + /zhi-xmlrpc-middleware@0.2.19: resolution: {integrity: sha512-tlynKM3XKFilPAZEuJWwvzX8spEhEQociR91EmGe6NSfymMAl0seuU4A4MR57uCkPdj6/xWAzyHUg6dvPI05+g==} dependencies: diff --git a/src/adaptors/api/base/github/adaptor/GithubApiAdaptor.ts b/src/adaptors/api/base/github/adaptor/CommonGithubApiAdaptor.ts similarity index 94% rename from src/adaptors/api/base/github/adaptor/GithubApiAdaptor.ts rename to src/adaptors/api/base/github/adaptor/CommonGithubApiAdaptor.ts index feeed9e..bf4db7a 100644 --- a/src/adaptors/api/base/github/adaptor/GithubApiAdaptor.ts +++ b/src/adaptors/api/base/github/adaptor/CommonGithubApiAdaptor.ts @@ -32,8 +32,8 @@ import { BlogApi } from "zhi-blog-api" * @version 0.9.0 * @since 0.9.0 */ -class GithubApiAdaptor extends BlogApi { +class CommonGithubApiAdaptor extends BlogApi { } -export { GithubApiAdaptor } +export { CommonGithubApiAdaptor } diff --git a/src/adaptors/api/base/github/config/CommonGithubConfig.ts b/src/adaptors/api/base/github/config/CommonGithubConfig.ts new file mode 100644 index 0000000..bc01844 --- /dev/null +++ b/src/adaptors/api/base/github/config/CommonGithubConfig.ts @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2023, Terwer . All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Terwer designates this + * particular file as subject to the "Classpath" exception as provided + * by Terwer in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Terwer, Shenzhen, Guangdong, China, youweics@163.com + * or visit www.terwer.space if you need additional information or have any + * questions. + */ + +class CommonGithubConfig {} + +export { CommonGithubConfig } diff --git a/src/adaptors/index.ts b/src/adaptors/index.ts index e3a0a78..0fedb02 100644 --- a/src/adaptors/index.ts +++ b/src/adaptors/index.ts @@ -51,6 +51,9 @@ class Adaptors { const type: SubPlatformType = getSubPlatformTypeByKey(key) switch (type) { + case SubPlatformType.Common_Zhihu:{ + break + } case SubPlatformType.Common_Yuque: { const { blogApi } = await useYuqueApi(key, newCfg) blogAdaptor = blogApi diff --git a/src/components/set/PublishSetting.vue b/src/components/set/PublishSetting.vue index bbabc05..2d5c135 100644 --- a/src/components/set/PublishSetting.vue +++ b/src/components/set/PublishSetting.vue @@ -24,7 +24,7 @@ -->