diff --git a/.gitignore b/.gitignore index 021b19a..0178a0d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ /build .husky/ */__pycache__ -src/buildinfo.ts \ No newline at end of file +src/buildinfo.ts +**/.DS_Store \ No newline at end of file diff --git a/src/bilibiliclient/account/login.ts b/src/bilibiliclient/account/login.ts index fbeb2e7..c1e204c 100644 --- a/src/bilibiliclient/account/login.ts +++ b/src/bilibiliclient/account/login.ts @@ -1,4 +1,4 @@ -import { storage } from '../../tsimports'; +import { storage, router } from '../../tsimports'; import { AccountData } from './accountData'; // 登录相关的方法 @@ -6,6 +6,14 @@ export const BilibiliClientLoginMethods = { // 更新账号信息 async updateAccountInfo(this: any): Promise { const accountInfoResponse = await this.getRequest("https://api.bilibili.com/x/web-interface/nav"); + + if(!accountInfoResponse.data.data.isLogin){ + router.clear(); + router.replace({ + uri: "pages/error/sessionood" + }) + } + this.accountInfo = accountInfoResponse.data.data; return !!this.accountInfo; }, @@ -38,8 +46,11 @@ export const BilibiliClientLoginMethods = { this.dedeUserID = accountData.dedeUserID; this.sid = accountData.sid; global.logger.log('使用存储的账号数据登录成功'); + global.logger.log('拉账号信息') await this.updateAccountInfo(); + global.logger.log('拉buvid') await this.updateBUVID(); + return { success: true, message: "登录成功" }; } else if (send_req) { const response = await this.getRequest(`https://passport.bilibili.com/x/passport-login/web/qrcode/poll?qrcode_key=${this.qrCodeKey}`); diff --git a/src/bilibiliclient/api/request.ts b/src/bilibiliclient/api/request.ts index 9069a97..9738362 100644 --- a/src/bilibiliclient/api/request.ts +++ b/src/bilibiliclient/api/request.ts @@ -59,9 +59,10 @@ export const BilibiliClientAPIRequestMethods = { }); return response.data; } catch (error) { - global.logger.error(`GET请求失败,错误码 = ${error.code}`); - throw error; + global.logger.error(`GET请求失败,详细数据:`, error); } + + return void 0; }, // 发送带Wbi签名的GET请求 @@ -89,9 +90,10 @@ export const BilibiliClientAPIRequestMethods = { }); return response.data; } catch (error) { - global.logger.error(`POST请求失败,错误码 = ${error.code}`); - throw error; + global.logger.error(`POST请求失败,详细数据:`, error); } + + return void 0; }, // 发送带Wbi签名的POST请求 diff --git a/src/bilibiliclient/user/user.ts b/src/bilibiliclient/user/user.ts index b0940ad..cb0b6d6 100644 --- a/src/bilibiliclient/user/user.ts +++ b/src/bilibiliclient/user/user.ts @@ -4,7 +4,23 @@ export const BilibiliClientUserMethods = { const url = `https://api.bilibili.com/x/space/wbi/acc/info`; const response = await this.getRequestWbi(url, { mid: uid - }) + }); + + return response.data.data + }, + + // 获取单个用户的状态数 + async getUserStatByUID(this: any, uid: String) { + const url = `https://api.bilibili.com/x/relation/stat`; + const response = await this.getRequest(`${url}?vmid=${uid}`); + + return response.data.data + }, + + // 获取单个用户的导航栏状态数 + async getUserNavnumByUID(this: any, uid: String) { + const url = `https://api.bilibili.com/x/space/navnum`; + const response = await this.getRequest(`${url}?mid=${uid}`); return response.data.data }, diff --git a/src/common/donation.png b/src/common/donation.png index 8103668..466006b 100644 Binary files a/src/common/donation.png and b/src/common/donation.png differ diff --git a/src/common/settings_about.png b/src/common/settings_about.png index 738f366..e603cd7 100644 Binary files a/src/common/settings_about.png and b/src/common/settings_about.png differ diff --git a/src/common/settings_enablefullanim.png b/src/common/settings_enablefullanim.png index fefe6c2..4585f9c 100644 Binary files a/src/common/settings_enablefullanim.png and b/src/common/settings_enablefullanim.png differ diff --git a/src/common/settings_freshtype.png b/src/common/settings_freshtype.png index 07fc819..1be44f5 100644 Binary files a/src/common/settings_freshtype.png and b/src/common/settings_freshtype.png differ diff --git a/src/common/settings_homevidcount.png b/src/common/settings_homevidcount.png index 1ca2d4b..85c7964 100644 Binary files a/src/common/settings_homevidcount.png and b/src/common/settings_homevidcount.png differ diff --git a/src/common/settings_logout.png b/src/common/settings_logout.png index e4cc01c..452b95e 100644 Binary files a/src/common/settings_logout.png and b/src/common/settings_logout.png differ diff --git a/src/common/settings_removetmp.png b/src/common/settings_removetmp.png index 3804ffe..3c5a714 100644 Binary files a/src/common/settings_removetmp.png and b/src/common/settings_removetmp.png differ diff --git a/src/common/settings_version.png b/src/common/settings_version.png index 5503dd5..62b13f9 100644 Binary files a/src/common/settings_version.png and b/src/common/settings_version.png differ diff --git a/src/components/DynShow/DynShow.ux b/src/components/DynShow/DynShow.ux index c718cd5..0e042fe 100644 --- a/src/components/DynShow/DynShow.ux +++ b/src/components/DynShow/DynShow.ux @@ -3,7 +3,7 @@