ctrlcvs/xiaoyao-cvs-plugin
2
0
Fork 0
mirror of https://github.com/ctrlcvs/xiaoyao-cvs-plugin.git synced 2024-12-23 03:20:52 +08:00
Code

更正sk绑定时星穹铁道数据异常问题（#81）

Browse Source
This commit is contained in:
Ctrlcvs 2023-05-05 13:32:31 +08:00
parent ceaf5f2903
commit a389028b57
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
model/mys/mysTool.js
View File

@ -199,6 +199,7 @@ const boards = {
name: '崩坏星穹铁道', name: '崩坏星穹铁道',
actid: 'e202304121516551', actid: 'e202304121516551',
biz:'hkrpg_cn', biz:'hkrpg_cn',
osbiz: 'hkrpg_global',
url: "https://bbs.mihoyo.com/sr/", url: "https://bbs.mihoyo.com/sr/",
signUrl(data, type, api) { //预留方法方便后续迭代 signUrl(data, type, api) { //预留方法方便后续迭代
let dataUrl = {} let dataUrl = {}

32
model/user.js
View File

@ -155,7 +155,7 @@ export default class user {
`${item.nickname}-${item.game_uid}:签到出现验证码~\n请晚点后重试，或者手动上米游社签到\n`; `${item.nickname}-${item.game_uid}:签到出现验证码~\n请晚点后重试，或者手动上米游社签到\n`;
} }
} else { } else {
if (this.allSign ) { if (this.allSign) {
this.allSign[forum.name].error++; this.allSign[forum.name].error++;
} }
signMsg = `${item.nickname}-${item.game_uid}:验证码失败~\n` signMsg = `${item.nickname}-${item.game_uid}:验证码失败~\n`
@ -391,7 +391,7 @@ export default class user {
let msg = e?.msg; let msg = e?.msg;
//暂时先这样吧，等有空再优化~ //暂时先这样吧，等有空再优化~
this.allSign = { this.allSign = {
findModel: ["崩坏3", "崩坏2", '原神', '未定事件簿'], findModel: ["崩坏3", "崩坏2", '原神', '未定事件簿', '崩坏星穹铁道'],
"崩坏3": { "崩坏3": {
bindGame: 0, bindGame: 0,
sign: 0, sign: 0,
@ -475,7 +475,7 @@ export default class user {
let mul = e; let mul = e;
Bot.logger.mark(`云原神签到任务开始`); Bot.logger.mark(`云原神签到任务开始`);
let files = fs.readdirSync(this.yunPath).filter(file => file.endsWith('.yaml')) let files = fs.readdirSync(this.yunPath).filter(file => file.endsWith('.yaml'))
if(files.length==0) return; if (files.length == 0) return;
let isCloudSignMsg = this.configSign.isCloudSignMsg let isCloudSignMsg = this.configSign.isCloudSignMsg
let userIdList = (files.join(",").replace(/.yaml/g, "").split(",")) let userIdList = (files.join(",").replace(/.yaml/g, "").split(","))
if (cloudTask) { if (cloudTask) {
@ -617,7 +617,7 @@ export default class user {
bbsTask = false; bbsTask = false;
} }
async bbsGeetest() { async bbsGeetest() {
if(!this.getToken) return "" if (!this.getToken) return ""
try { try {
let res = await this.getData('bbsGetCaptcha', false) let res = await this.getData('bbsGetCaptcha', false)
// let challenge = res.data["challenge"] // let challenge = res.data["challenge"]
@ -636,7 +636,7 @@ export default class user {
return "" return ""
} }
async geetest(data) { async geetest(data) {
if(!this.getToken) return "" if (!this.getToken) return ""
try { try {
data.getToken = this.getToken data.getToken = this.getToken
let res = await this.getData("validate", data, false) let res = await this.getData("validate", data, false)
@ -788,16 +788,20 @@ export default class user {
res = await this.getData('getLtoken', { cookies: this.cookies }, false) res = await this.getData('getLtoken', { cookies: this.cookies }, false)
v2Sk = await this.getData('getByStokenV2', { headers: { Cookie: this.cookies } }, false) v2Sk = await this.getData('getByStokenV2', { headers: { Cookie: this.cookies } }, false)
} }
res = await this.getData("userGameInfo", this.ForumData[1], false) let list = []
if (res?.retcode != 0) { for (let item of ['崩坏星穹铁道', '原神']) {
return false; let result = await this.getData("userGameInfo",this.getDataList(item)[0], false)
if (result?.retcode != 0) {
continue;
} }
// console.log(res,this.e.sk) list.push(...result?.data?.list)
}
if(list.length==0) return false;
let uids = [] let uids = []
for (let s of res.data.list) { for (let s of list) {
let datalist = {} let datalist = {}
let uid = s.game_uid let uid = s.game_uid
uids.push(uid) uids.push(s.region_name+':'+uid)
datalist[uid] = { datalist[uid] = {
stuid: this.e?.sk?.get('stuid') || this.e.stuid, stuid: this.e?.sk?.get('stuid') || this.e.stuid,
stoken: v2Sk?.data?.token?.token || this.e?.sk?.get('stoken') || data?.data?.list[0].token, stoken: v2Sk?.data?.token?.token || this.e?.sk?.get('stoken') || data?.data?.list[0].token,
@ -805,11 +809,13 @@ export default class user {
mid: this.e?.sk?.get('mid') || v2Sk?.data?.user_info?.mid, mid: this.e?.sk?.get('mid') || v2Sk?.data?.user_info?.mid,
uid: uid, uid: uid,
userId: this.e.user_id, userId: this.e.user_id,
is_sign: true is_sign: true,
region_name:s.region_name,
region:s.region
} }
await gsCfg.saveBingStoken(this.e.user_id, datalist) await gsCfg.saveBingStoken(this.e.user_id, datalist)
} }
let msg = `uid:${uids.join(',')}\nstoken绑定成功您可通过下列指令进行操作:`; let msg = `${uids.join('\n')}\nstoken绑定成功您可通过下列指令进行操作:`;
msg += '\n【#米币查询】查询米游币余额' msg += '\n【#米币查询】查询米游币余额'
msg += '\n【#mys原神签到】获取米游币' msg += '\n【#mys原神签到】获取米游币'
msg += '\n【#更新抽卡记录】更新抽卡记录' msg += '\n【#更新抽卡记录】更新抽卡记录'