diff --git a/public/i18n/en.yml b/public/i18n/en.yml index a4b2e3a..7ed8688 100644 --- a/public/i18n/en.yml +++ b/public/i18n/en.yml @@ -245,6 +245,7 @@ SETTINGS_ENCODE_OUTPUT_URL: Encode Output(or Copyed) URL SETTINGS_WATCH_CLIPBOARD: Watch clipboard when software start SETTINGS_SHORT_URL: Use short url SETTINGS_SHORT_URL_SERVER: Short url server +SETTINGS_SHORT_URL_C1N_TOKEN: C1N Token SETTINGS_SHORT_URL_YOURLS_DOMAIN: YOURLS domain SETTINGS_SHORT_URL_YOURLS_SIGNATURE: YOURLS signature SETTINGS_DELETE_LOCAL_FILE_AFTER_UPLOAD: Delete local file after upload diff --git a/public/i18n/zh-CN.yml b/public/i18n/zh-CN.yml index 146f784..cdec641 100644 --- a/public/i18n/zh-CN.yml +++ b/public/i18n/zh-CN.yml @@ -248,6 +248,7 @@ SETTINGS_ENCODE_OUTPUT_URL: 输出（复制） URL 时进行转义 SETTINGS_WATCH_CLIPBOARD: 软件启动时自动监听剪贴板上传 SETTINGS_SHORT_URL: 使用短链接 SETTINGS_SHORT_URL_SERVER: 短链接服务 +SETTINGS_SHORT_URL_C1N_TOKEN: C1N Token SETTINGS_SHORT_URL_YOURLS_DOMAIN: YOURLS域名 SETTINGS_SHORT_URL_YOURLS_SIGNATURE: YOURLS signature SETTINGS_DELETE_LOCAL_FILE_AFTER_UPLOAD: 上传后删除本地文件 diff --git a/public/i18n/zh-TW.yml b/public/i18n/zh-TW.yml index a7ec151..a2ab2ce 100644 --- a/public/i18n/zh-TW.yml +++ b/public/i18n/zh-TW.yml @@ -246,6 +246,7 @@ SETTINGS_ENCODE_OUTPUT_URL: 輸出（複製） URL 時進行轉義 SETTINGS_WATCH_CLIPBOARD: 軟體啟動時自動監聽剪貼簿上傳 SETTINGS_SHORT_URL: 使用短網址 SETTINGS_SHORT_URL_SERVER: 短網址服務 +SETTINGS_SHORT_URL_C1N_TOKEN: C1N Token SETTINGS_SHORT_URL_YOURLS_DOMAIN: YOURLS域名 SETTINGS_SHORT_URL_YOURLS_SIGNATURE: YOURLS signature SETTINGS_DELETE_LOCAL_FILE_AFTER_UPLOAD: 上傳後刪除本地檔案 diff --git a/src/main/utils/common.ts b/src/main/utils/common.ts index e958380..9542b55 100644 --- a/src/main/utils/common.ts +++ b/src/main/utils/common.ts @@ -4,7 +4,6 @@ import { clipboard, Notification, dialog } from 'electron' import { handleUrlEncode } from '~/universal/utils/common' import axios from 'axios' import FormData from 'form-data' -import { C1 } from '#/utils/static' import logger from '../apis/core/picgo/logger' export const handleCopyUrl = (str: string): void => { @@ -132,18 +131,22 @@ export const generateShortUrl = async (url: string) => { if (server === 'c1n') { const form = new FormData() form.append('url', url) - const C = Buffer.from(C1, 'base64').toString() + const c1nToken = db.get('settings.c1nToken') || '' + if (!c1nToken) { + logger.warn('c1n token is not set') + return url + } try { const res = await axios.post(c1nApi, form, { headers: { - token: C + token: c1nToken } }) if (res.status >= 200 && res.status < 300 && res.data?.code === 0) { return res.data.data } } catch (e: any) { - console.log(e) + logger.error(e) } } else if (server === 'yourls') { let domain = db.get('settings.yourlsDomain') || '' @@ -161,7 +164,7 @@ export const generateShortUrl = async (url: string) => { if (e.response.data.message.indexOf('already exists in database') !== -1) { return e.response.data.shorturl } - console.log(e) + logger.error(e) } } else { logger.warn('Yourls server or signature is not set') diff --git a/src/renderer/pages/PicGoSetting.vue b/src/renderer/pages/PicGoSetting.vue index ccabc9b..3cd8f00 100644 --- a/src/renderer/pages/PicGoSetting.vue +++ b/src/renderer/pages/PicGoSetting.vue @@ -485,6 +485,18 @@ /> + + + ({ isAutoListenClipboard: false, useShortUrl: false, shortUrlServer: 'c1n', + c1nToken: '', yourlsDomain: '', yourlsSignature: '', deleteLocalFile: false, @@ -2001,6 +2014,7 @@ async function initData () { form.isHideDock = settings.isHideDock || false form.useShortUrl = settings.useShortUrl || false form.shortUrlServer = settings.shortUrlServer || 'c1n' + form.c1nToken = settings.c1nToken || '' form.yourlsDomain = settings.yourlsDomain || '' form.yourlsSignature = settings.yourlsSignature || '' form.deleteLocalFile = settings.deleteLocalFile || false @@ -2354,6 +2368,10 @@ function handleShortUrlServerChange (val: string) { saveConfig('settings.shortUrlServer', val) } +function handleC1nTokenChange (val: string) { + saveConfig('settings.c1nToken', val) +} + function handleYourlsDomainChange (val: string) { saveConfig('settings.yourlsDomain', val) } diff --git a/src/universal/events/constants.ts b/src/universal/events/constants.ts index 9132b06..688ccb4 100644 --- a/src/universal/events/constants.ts +++ b/src/universal/events/constants.ts @@ -3,7 +3,6 @@ export const SHOW_INPUT_BOX_RESPONSE = 'SHOW_INPUT_BOX_RESPONSE' export const TOGGLE_SHORTKEY_MODIFIED_MODE = 'TOGGLE_SHORTKEY_MODIFIED_MODE' export const TALKING_DATA_APPID = 'B743C16E2989419A9B02EDE9D1E6A530' export const TALKING_DATA_EVENT = 'TALKING_DATA_EVENT' -export const C1N = 'WjJoeFdWWklhVTlXYVRKTU5EUmFOVkEwUlVRPQ==' export const PICGO_SAVE_CONFIG = 'PICGO_SAVE_CONFIG' export const PICGO_GET_CONFIG = 'PICGO_GET_CONFIG' export const PICGO_GET_DB = 'PICGO_GET_DB' diff --git a/src/universal/types/i18n.d.ts b/src/universal/types/i18n.d.ts index 9fddb61..00b05b8 100644 --- a/src/universal/types/i18n.d.ts +++ b/src/universal/types/i18n.d.ts @@ -241,6 +241,7 @@ interface ILocales { SETTINGS_WATCH_CLIPBOARD: string SETTINGS_SHORT_URL: string SETTINGS_SHORT_URL_SERVER: string + SETTINGS_SHORT_URL_C1N_TOKEN: string SETTINGS_SHORT_URL_YOURLS_DOMAIN: string SETTINGS_SHORT_URL_YOURLS_SIGNATURE: string SETTINGS_DELETE_LOCAL_FILE_AFTER_UPLOAD: string diff --git a/src/universal/types/view.d.ts b/src/universal/types/view.d.ts index ebb1693..1e450e0 100644 --- a/src/universal/types/view.d.ts +++ b/src/universal/types/view.d.ts @@ -24,6 +24,7 @@ interface ISettingForm { encodeOutputURL: boolean, isAutoListenClipboard: boolean, useShortUrl: boolean, + c1nToken: string, shortUrlServer: string, yourlsDomain: string, yourlsSignature: string, diff --git a/src/universal/utils/static.ts b/src/universal/utils/static.ts index 5db3b77..424655b 100644 --- a/src/universal/utils/static.ts +++ b/src/universal/utils/static.ts @@ -1,10 +1,7 @@ -import { C1N } from '../events/constants' - export const CLIPBOARD_IMAGE_FOLDER = 'piclist-clipboard-images' export const RELEASE_URL = 'https://api.github.com/repos/Kuingsmile/PicList/releases' export const RELEASE_URL_BACKUP = 'https://release.piclist.cn' export const STABLE_RELEASE_URL = 'https://github.com/Kuingsmile/PicList/releases/latest' -export const C1 = Buffer.from(C1N, 'base64').toString() export const picBedsCanbeDeleted = [ 'aliyun',