From 55ea76e35ef3c3aac3e8975c25c871907e25635a Mon Sep 17 00:00:00 2001 From: HFO4 <912394456@qq.com> Date: Thu, 13 Sep 2018 16:49:26 +0800 Subject: [PATCH] fix: Onedrive token encoding error in some case --- application/index/model/UploadHandler.php | 2 +- application/version.json | 2 +- mysql.sql | 13 +++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/application/index/model/UploadHandler.php b/application/index/model/UploadHandler.php index c50f8304..e209f80c 100644 --- a/application/index/model/UploadHandler.php +++ b/application/index/model/UploadHandler.php @@ -305,7 +305,7 @@ class UploadHandler extends Model{ return $this->getLocalToken(); break; case 'onedrive': - return $this->getLocalToken(); + return 'nazGTT91tboaLWBC549$:tHSsNyTBxoV4HDfELJeKH1EUmEY=:eyJjYWxsYmFja0JvZHkiOiJ7XCJwYXRoXCI6XCJcIn0iLCJjYWxsYmFja0JvZHlUeXBlIjoiYXBwbGljYXRpb25cL2pzb24iLCJzY29wZSI6ImMxNjMyMTc3LTQ4NGEtNGU1OS1hZDBhLWUwNDc4ZjZhY2NjZSIsImRlYWRsaW5lIjoxNTM2ODMxOTEwfQ=='; break; case 'oss': return $this->getOssToken(); diff --git a/application/version.json b/application/version.json index 784c629b..6fe45316 100644 --- a/application/version.json +++ b/application/version.json @@ -1 +1 @@ -{"type":"","version":"1.0.3","version_id":4,"db_version":2} \ No newline at end of file +{"type":"","version":"1.1.0","version_id":5,"db_version":3} \ No newline at end of file diff --git a/mysql.sql b/mysql.sql index c6bf7392..2c39b0e5 100644 --- a/mysql.sql +++ b/mysql.sql @@ -71,9 +71,9 @@ CREATE TABLE `sd_corn` ( INSERT INTO `sd_corn` (`id`, `rank`, `name`, `des`, `last_excute`, `interval_s`, `enable`) VALUES (1, 2, 'delete_unseful_chunks', '删除分片上传产生的失效文件块', 0, 3600, 1), -(5, 1, 'delete_callback_data', '删除callback记录', 0, 86400, 1), -(NULL, 1, 'flush_aria2', '刷新离线下载状态', 0, 30, 1); - +(2, 1, 'delete_callback_data', '删除callback记录', 0, 86400, 1), +(NULL, 1, 'flush_aria2', '刷新离线下载状态', 0, 30, 1), +(NULL, 3, 'flush_onedrive_token', '刷新Onedrive Token', 1536821807, 3000, 1); -- -------------------------------------------------------- -- @@ -189,7 +189,7 @@ INSERT INTO `sd_options` (`id`, `option_name`, `option_value`, `option_type`) VA (30, 'mail_activation_template', ' \r\n\r\n\r\n\r\n\r\n容量超额提醒\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n 激活{siteTitle}账户\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n 亲爱的 {userName} ：\r\n
\r\n 感谢您注册{siteTitle},请点击下方按钮完成账户激活。\r\n
\r\n 激活账户\r\n
\r\n 感谢您选择{siteTitle}。\r\n
\r\n \r\n
此邮件由系统自动发送，请不要直接回复。
\r\n
\r\n\r\n', 'mail_template'), (31, 'forget_captcha', '0', 'login'), (32, 'mail_reset_pwd_template', ' \r\n\r\n\r\n\r\n\r\n重设密码\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n
\r\n 重设{siteTitle}密码\r\n
\r\n \r\n \r\n \r\n \r\n
\r\n 亲爱的 {userName} ：\r\n
\r\n 请点击下方按钮完成密码重设。如果非你本人操作，请忽略此邮件。\r\n
\r\n 重设密码\r\n
\r\n 感谢您选择{siteTitle}。\r\n
\r\n \r\n
此邮件由系统自动发送，请不要直接回复。
\r\n
\r\n\r\n', 'mail_template'), -(49, 'database_version', '2', 'version'), +(49, 'database_version', '3', 'version'), (43, 'hot_share_num', '10', 'share'), (44, 'gravatar_server', 'https://v2ex.assets.uxengine.net/gravatar/', 'avatar'), (45, 'admin_color_body', 'fixed-nav sticky-footer bg-light', 'admin'), @@ -200,8 +200,8 @@ INSERT INTO `sd_options` (`id`, `option_name`, `option_value`, `option_type`) VA (52, 'aria2_tmppath', '/path/to/public/download', 'aria2'), (53, 'aria2_token', 'your token', 'aria2'), (54, 'aria2_rpcurl', 'http://127.0.0.1:6800/', 'aria2'), -(55, 'aria2_options', '{\"max-tries\":5}', 'aria2'); - +(55, 'aria2_options', '{\"max-tries\":5}', 'aria2'), +(NULL, 'task_queue_token', '', 'task'); -- -------------------------------------------------------- -- @@ -333,6 +333,7 @@ CREATE TABLE `sd_task` ( `attr` text NOT NULL, `type` text NOT NULL, `status` text NOT NULL, + `uid` int(11) NOT NULL, `addtime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;