From d98a24dffe3641901efde96de50b016654e629c4 Mon Sep 17 00:00:00 2001
From: HanaHimeUnica <860563585bxy@gmail.com>
Date: Tue, 20 Feb 2024 17:13:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=91=E5=AE=9Auid?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81#=E7=BB=91=E5=AE=9A+123456789?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/genshin/apps/user.js         |  2 +-
 plugins/genshin/model/mys/mysInfo.js | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/plugins/genshin/apps/user.js b/plugins/genshin/apps/user.js
index 279990f..9ca972b 100644
--- a/plugins/genshin/apps/user.js
+++ b/plugins/genshin/apps/user.js
@@ -42,7 +42,7 @@ export class user extends plugin {
           fnc: 'delUid'
         },
         {
-          reg: '^#(原神|星铁)?绑定(uid|UID)?\\s*([1-9]|18)[0-9]{8}$',
+          reg: '^#(原神|星铁)?绑定(uid|UID)?(\\s|\\+)*([1-9]|18)[0-9]{8}$',
           fnc: 'bingUid'
         },
         {
diff --git a/plugins/genshin/model/mys/mysInfo.js b/plugins/genshin/model/mys/mysInfo.js
index 5c18259..66b7fc2 100644
--- a/plugins/genshin/model/mys/mysInfo.js
+++ b/plugins/genshin/model/mys/mysInfo.js
@@ -355,7 +355,7 @@ export default class MysInfo {
 
   async checkCode(res, type, mysApi = {}, data = {}, isTask = false) {
     if (!res) {
-      if (!isTask) this.e.reply(['米游社接口请求失败，暂时无法查询', this.mysButton])
+      if (!isTask) this.e.reply([`UID:${this.uid}，米游社接口请求失败，暂时无法查询`, this.mysButton])
       return false
     }
 
@@ -380,27 +380,27 @@ export default class MysInfo {
             if (!isTask) this.e.reply([`UID:${this.ckInfo.uid}，米游社Cookie已失效`, this.mysButton])
           } else {
             logger.mark(`[公共ck失效][ltuid:${this.ckInfo.ltuid}]`)
-            if (!isTask) this.e.reply(['米游社查询失败，请稍后再试', this.mysButton])
+            if (!isTask) this.e.reply([`UID:${this.uid}，米游社查询失败，请稍后再试`, this.mysButton])
           }
           if (!isTask) await this.delCk()
         } else {
-          if (!isTask) this.e.reply([`米游社接口报错，暂时无法查询：${res.message}`, this.mysButton])
+          if (!isTask) this.e.reply([`UID:${this.uid}，米游社接口报错，暂时无法查询：${res.message}`, this.mysButton])
         }
         break
       case 1008:
-        if (!isTask) this.e.reply(['请先去米游社绑定角色', this.mysButton], false, { at: this.userId })
+        if (!isTask) this.e.reply([`UID:${this.uid}，请先去米游社绑定角色`, this.mysButton], false, { at: this.userId })
         break
       case 10101:
         if (!isTask) {
           await this.disableToday()
-          this.e.reply(['查询已达今日上限', this.mysButton])
+          this.e.reply([`UID:${this.uid}，查询已达今日上限`, this.mysButton])
         }
         break
       case 10102:
         if (res.message === 'Data is not public for the user') {
           if (!isTask) this.e.reply([`\nUID:${this.uid}，米游社数据未公开`, this.mysButton], false, { at: this.userId })
         } else {
-          if (!isTask) this.e.reply([`uid:${this.uid}，请先去米游社绑定角色`, this.mysButton])
+          if (!isTask) this.e.reply([`UID:${this.uid}，请先去米游社绑定角色`, this.mysButton])
         }
         break
       // 伙伴不存在~
@@ -408,7 +408,7 @@ export default class MysInfo {
         if (res.api === 'detail') res.retcode = 0
         break
       case 5003:
-        if (!isTask) this.e.reply(['米游社账号异常，暂时无法查询', this.mysButton])
+        if (!isTask) this.e.reply([`UID:${this.uid}，米游社账号异常，暂时无法查询`, this.mysButton])
         break
       case 1034:
         let handler = this.e.runtime?.handler || {}
@@ -421,14 +421,14 @@ export default class MysInfo {
 
         if (!res || res?.retcode == 1034) {
           logger.mark(`[米游社查询失败][uid:${this.uid}][qq:${this.userId}] 遇到验证码`)
-          if (!isTask) this.e.reply(['米游社查询遇到验证码，请稍后再试', this.mysButton])
+          if (!isTask) this.e.reply([`UID:${this.uid}，米游社查询遇到验证码，请稍后再试`, this.mysButton])
         }
         break
       case 10307:
-        if (!isTask) this.e.reply(['版本更新期间，数据维护中', this.mysButton])
+        if (!isTask) this.e.reply([`UID:${this.uid}，版本更新期间，数据维护中`, this.mysButton])
         break
       default:
-        if (!isTask) this.e.reply([`米游社接口报错，暂时无法查询：${res.message || 'error'}`, this.mysButton])
+        if (!isTask) this.e.reply([`UID:${this.uid}，米游社接口报错，暂时无法查询：${res.message || 'error'}`, this.mysButton])
         break
     }
     if (res.retcode !== 0) {