koishi-plugin-ets2-tools-tmp 2.2.0 → 2.2.1

package/lib/command/ets-app/queryPoint.js

@@ -1,8 +1,6 @@
 module.exports = async (ctx, cfg, session, targetQQ) => {
-  const { url, token, logOutput, platformVersion } = cfg.mainSettings?.settings || {};
-  if ((platformVersion || "v1").toLowerCase() === "v2") {
-    return "车队平台V2.0暂不支持积分查询";
-  }
+  const { Name, url, token, logOutput, platformVersion } = cfg.mainSettings?.settings || {};
+  const platform = (platformVersion || "v1").toLowerCase();
   let queryQQ = targetQQ;
   if (!queryQQ) {
     queryQQ = session.userId;
@@ -30,27 +28,48 @@ module.exports = async (ctx, cfg, session, targetQQ) => {
     if (logOutput) {
       ctx.logger.info(`开始查询用户 ${queryQQ} 的积分`);
     }
-    const userInfoUrl = `https://${url}/api/user/info/list?token=${token}&page=0&limit=7&tmpId=&tmpName=&teamId=&qq=${queryQQ}&state=0&teamRole=`;
-    if (logOutput) {
-      ctx.logger.info(`请求用户信息: ${userInfoUrl}`);
-    }
-    const userInfoResponse = await ctx.http.post(userInfoUrl);
-    if (logOutput) {
-      ctx.logger.info(`用户信息响应: ${JSON.stringify(userInfoResponse)}`);
-    }
-    if (userInfoResponse.code !== 0) {
-      return `获取用户信息失败: ${userInfoResponse.msg || "未知错误"}`;
-    }
-    const userList = userInfoResponse.page?.list || [];
-    if (userList.length === 0) {
-      return `未找到QQ号 ${queryQQ} 关联的用户信息`;
+    let userInfo;
+    if (platform === "v2") {
+      const baseUrl = url || "open.vtcm.link";
+      const userInfoUrl = `https://${baseUrl}/members/get?token=${token}&qq=${queryQQ}`;
+      if (logOutput) {
+        ctx.logger.info(`请求V2.0用户信息: ${userInfoUrl}`);
+      }
+      const userInfoResponse = await ctx.http.get(userInfoUrl);
+      if (logOutput) {
+        ctx.logger.info(`V2.0用户信息响应: ${JSON.stringify(userInfoResponse)}`);
+      }
+      if (userInfoResponse.code !== 200) {
+        return `获取用户信息失败: ${userInfoResponse.msg || "未知错误"}`;
+      }
+      if (!userInfoResponse.data) {
+        return `未找到QQ号 ${queryQQ} 关联的用户信息`;
+      }
+      userInfo = userInfoResponse.data;
+    } else {
+      const userInfoUrl = `https://${url}/api/user/info/list?token=${token}&page=0&limit=7&tmpId=&tmpName=&teamId=&qq=${queryQQ}&state=0&teamRole=`;
+      if (logOutput) {
+        ctx.logger.info(`请求V1.0用户信息: ${userInfoUrl}`);
+      }
+      const userInfoResponse = await ctx.http.post(userInfoUrl);
+      if (logOutput) {
+        ctx.logger.info(`V1.0用户信息响应: ${JSON.stringify(userInfoResponse)}`);
+      }
+      if (userInfoResponse.code !== 0) {
+        return `获取用户信息失败: ${userInfoResponse.msg || "未知错误"}`;
+      }
+      const userList = userInfoResponse.page?.list || [];
+      if (userList.length === 0) {
+        return `未找到QQ号 ${queryQQ} 关联的用户信息`;
+      }
+      userInfo = userList[0];
     }
-    const userInfo = userList[0];
-    const rewardPoints = userInfo.rewardPoints || 0;
     const tmpName = userInfo.tmpName || "未知用户";
-    const teamRole = userInfo.teamRole || "未知职位";
-    const teamId = userInfo.teamId || "未知编号";
-    let message = `🚛 晚风车队平台 - 积分查询🚚
+    const teamRole = userInfo.teamRole || userInfo.tmpRole || "未知职位";
+    const teamId = userInfo.teamId || userInfo.uid || "未知编号";
+    const rewardPoints = userInfo.rewardPoints || userInfo.point || 0;
+    const joinDate = userInfo.joinDate || "未知";
+    let message = `🚛 ${Name}平台 - 积分查询🚚
 `;
     message += `👤 用户: ${tmpName}
 `;
@@ -62,7 +81,7 @@ module.exports = async (ctx, cfg, session, targetQQ) => {
 `;
     message += `⭐ 当前积分: ${rewardPoints}
 `;
-    message += `📅 加入日期: ${userInfo.joinDate || "未知"}`;
+    message += `📅 加入日期: ${joinDate}`;
     return message;
   } catch (error) {
     ctx.logger.error(`积分查询过程出错: ${error}`);

package/lib/index.js

@@ -99,6 +99,7 @@ exports.Config = koishi_1.Schema.intersect([
         }).description('路况查询配置'),
         mainSettings: koishi_1.Schema.object({
             settings: koishi_1.Schema.object({
+                Name: koishi_1.Schema.string().description("车队名称"),
                 platformVersion: koishi_1.Schema.union([
                     koishi_1.Schema.const("v1").description("车队平台V1.0"),
                     koishi_1.Schema.const("v2").description("车队平台V2.0")
@@ -111,7 +112,7 @@ exports.Config = koishi_1.Schema.intersect([
                 mailTemplate: koishi_1.Schema.string().description("V2.0重置密码邮件内容模板，支持变量：{uid} {qq} {password} {psw}").default("我们已将您平台的密码进行重置，您的账号:{uid},新的密码为：{psw} 请妥善保管好您的密码，以防泄露"),
                 mailFromName: koishi_1.Schema.string().description("V2.0重置密码邮件发件人名字（覆盖 adapter-mail 的 name）").default(""),
                 logOutput: koishi_1.Schema.boolean().description("是否输出日志").default(true)
-            }).description("V1/V2通用配置")
+            }).description("通用配置")
         }).description("车队平台配置"),
         resetPassword: koishi_1.Schema.object({
             settings: koishi_1.Schema.object({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-ets2-tools-tmp",
   "description": "欧卡2 TMP在线查询、车队平台查询及活动提醒",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "contributors": [
     "opwop <slhp1013@qq.com>",
     "bot_actions <168329908@qq.com>"