From 0f8b38338b6557c24c8c836f770aa2cac7b04c1a Mon Sep 17 00:00:00 2001
From: Ctrlcvs <1509167646@qq.com>
Date: Thu, 8 Dec 2022 15:44:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96authkey=E8=A1=A5=E5=85=85uid?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/user.js  |  7 +++++--
 model/user.js | 21 +++++++++++++--------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/apps/user.js b/apps/user.js
index b748c82..b6c1d91 100644
--- a/apps/user.js
+++ b/apps/user.js
@@ -184,10 +184,13 @@ export async function gclog(e) {
 	return true;
 }
 async function getAuthKey(e, user) {
+	if(!e.uid){
+		e.uid=e?.runtime?.user?._regUid
+	}
 	e.region = getServer(e.uid)
-	let authkeyrow = await user.getData("authKey");
+	let authkeyrow = await user.getData("authKey",{});
 	if (!authkeyrow?.data) {
-		e.reply("authkey获取失败：" + (authkeyrow.message.includes("登录失效") ? "请重新绑定stoken" : authkeyrow.message))
+		e.reply(`uid:${e.uid},authkey获取失败：` + (authkeyrow.message.includes("登录失效") ? "请重新绑定stoken" : authkeyrow.message))
 		return false;
 	}
 	return authkeyrow.data["authkey"];
diff --git a/model/user.js b/model/user.js
index 283da20..2b6cff6 100644
--- a/model/user.js
+++ b/model/user.js
@@ -173,7 +173,7 @@ export default class user {
 							}
 							item.total_sign_day++;
 							message +=
-								`${item.nickname}-${item.game_uid}：${res.message=="OK"?"签到成功":res.message}\n`
+								`${item.nickname}-${item.game_uid}：${res.message == "OK" ? "签到成功" : res.message}\n`
 						}
 					}
 					// }
@@ -222,14 +222,16 @@ export default class user {
 		return res
 	}
 	async cloudSeach() {
-		let res = await this.getData("cloudGet") //这样会算签到？具体待测试
+		let res = await this.getData("cloudGet")
 		if (res?.retcode == -100) {
 			res.message = "云原神token失效/防沉迷"
 			res.isOk = false;
-		} else {
+		} else { 
 			res.isOk = true;
-			res.message =
-				`米云币:${res?.data?.coin?.coin_num},免费时长:${res?.data?.free_time?.free_time}分钟,总时长:${res?.data.total_time}分钟`;
+			if (res?.data?.total_time) {
+				res.message =
+					`米云币:${res?.data?.coin?.coin_num},免费时长:${res?.data?.free_time?.free_time}分钟,总时长:${res?.data?.total_time}分钟`;
+			}
 		}
 		return res;
 	}
@@ -343,7 +345,7 @@ export default class user {
 				if (res?.message && res?.retcode == 0) {
 					Share++;
 				}
-				message += `共读取帖子记录${20*sumcount}\n浏览成功：${trueDetail}\n点赞成功：${Vote}\n分享成功：${Share}`;
+				message += `共读取帖子记录${20 * sumcount}\n浏览成功：${trueDetail}\n点赞成功：${Vote}\n分享成功：${Share}`;
 				Bot.logger.mark(`\n用户${this.e.user_id}:\n${message}`)
 				await utils.randomSleepAsync(3);
 			}
@@ -688,6 +690,9 @@ export default class user {
 				skuid = BotConfig.NoteCookie[e.user_id];
 			}
 		}
+		if (!uid) {
+			uid = e.runtime?.user?._regUid
+		}
 		this.e.uid = uid;
 		this.e.cookie = cookie;
 		return {
@@ -753,7 +758,7 @@ export default class user {
 				// 	ltoken=res?.data?.ltoken
 				// }
 				this.e.cookie =
-					`ltoken=${this.e.sk?.get('ltoken')||ltoken};ltuid=${this.e.sk?.get('stuid')};cookie_token=${data.data.cookie_token}; account_id=${this.e.sk?.get('stuid')};`
+					`ltoken=${this.e.sk?.get('ltoken') || ltoken};ltuid=${this.e.sk?.get('stuid')};cookie_token=${data.data.cookie_token}; account_id=${this.e.sk?.get('stuid')};`
 				// if(this.e.sk?.get('mid')){
 				// 	this.e.cookie =
 				// 		`ltoken_v2=${this.e.sk?.get('ltoken')||ltoken};cookie_token_v2=${data.data.cookie_token}; account_mid_v2=${this.e.sk.get('mid')};ltmid_v2=${this.e.sk.get('mid')}`
@@ -762,7 +767,7 @@ export default class user {
 				this.e.cookie = this.e.original_msg
 			}
 			res = await this.getData("userGameInfo", this.ForumData[1], false)
-			if(res?.retcode!=0){
+			if (res?.retcode != 0) {
 				return false;
 			}
 			let uids = []