koishi-plugin-jscn-aaaquery 1.0.2 → 1.0.3

package/lib/index.d.ts

@@ -4,6 +4,7 @@ export interface Config {
     loginName: string;
     password: string;
     baseUrl: string;
+    radiusApiUrl?: string;
 }
 export declare const Config: Schema<Config>;
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -28,9 +28,11 @@ module.exports = __toCommonJS(src_exports);
 var import_koishi = require("koishi");
 var name = "jscn-aaaquery";
 var Config = import_koishi.Schema.object({
-  loginName: import_koishi.Schema.string().required().description("运维系统登录账号"),
-  password: import_koishi.Schema.string().required().description("运维系统登录密码"),
-  baseUrl: import_koishi.Schema.string().default("http://172.16.251.75:8090/nms/api").description("运维系统API地址")
+  loginName: import_koishi.Schema.string().required().description("运维系统登录账号").default("admin"),
+  password: import_koishi.Schema.string().required().description("运维系统登录密码").default("admin"),
+  baseUrl: import_koishi.Schema.string().default("http://172.16.251.75:8090/nms/api").description("运维系统API地址"),
+  // 添加RADIUS API的配置项
+  radiusApiUrl: import_koishi.Schema.string().description("RADIUS API基础URL").default("http://111.208.114.248:28210/api/radius")
 });
 function apply(ctx, config) {
   let currentToken = null;
@@ -203,7 +205,7 @@ function apply(ctx, config) {
         console.log("查询响应:", JSON.stringify(response, null, 2));
         if (response.status === 200 && response.data) {
           if (!isAccountResponseComplete(response.data)) {
-            throw new Error("账号信息不完整，请检查账号是否正确");
+            throw new Error("账号信息有误，请检查账号是否正确");
           }
           setCache("account", { account: formattedAccount }, response.data);
           return response.data;
@@ -486,82 +488,168 @@ function apply(ctx, config) {
     });
   }
   __name(queryOrderLog, "queryOrderLog");
-  ctx.middleware(async (session, next) => {
-    const input = session.content.trim();
-    if (input.includes(" ") || /[\u4e00-\u9fa5]/.test(input)) {
-      return next();
+  async function queryRadiusUser(account) {
+    const cachedData = getFromCache("radiusUser", { account });
+    if (cachedData) {
+      console.log("使用缓存的RADIUS用户信息");
+      return cachedData;
     }
-    const cleanInput = formatMacAddress(input);
-    console.log("处理后的内容:", cleanInput);
-    if (isValidMacAddress(cleanInput)) {
+    return addToQueue("radiusUser", { account }, async () => {
       try {
-        const onuList = await queryOnuList(cleanInput);
-        if (!onuList) {
-          return "未找到该MAC地址的设备信息";
-        }
-        const onuDetail = await queryOnuDetailInfo(onuList.id);
-        const ccname = await queryCCName(cleanInput);
-        const order = await queryOnuOrder(onuDetail);
-        const vlanInfo = await queryOnuDetailVlanInfo(onuList.id);
-        const messages = [
-          "📊 终端基本信息",
-          "--------------------------------",
-          `MAC地址: ${cleanInput}`,
-          `状态：${onuDetail.status === 1 ? "在线" : "不在线"}`,
-          `机房: ${onuDetail.roomName}`,
-          `设备名称: ${onuDetail.deviceName}`,
-          `OLT IP: ${onuDetail.oltIp}`,
-          `PON端口: ${onuDetail.portName}`,
-          `端口逻辑号: ${onuDetail.logicId}`,
-          `发射光功率: ${onuDetail.onuSendPower}dBm`,
-          `接收光功率: ${onuDetail.onuReceivePower}dBm`,
-          `CCName: ${ccname}`,
-          "",
-          "📝 工单信息",
-          "--------------------------------",
-          order ? [
-            `工单编号: ${order.orderId}`,
-            `创建时间: ${order.createDate}`,
-            `更新时间: ${order.updateDate}`
-          ].join("\n") : "无工单信息",
-          "",
-          "🔧 业务配置信息",
-          "--------------------------------"
-        ];
-        vlanInfo.forEach((info) => {
-          messages.push(
-            `端口 ${info.LAN}:`,
-            `  VLAN: ${info.actualVlan}`
-          );
-        });
-        return messages.join("\n");
+        console.log("开始查询RADIUS用户信息...");
+        const response = await ctx.http.post(
+          `${config.radiusApiUrl}/userquery`,
+          {
+            login_name: account,
+            org_code: "403",
+            // 固定值
+            channel: "ALL"
+            // 固定值
+          },
+          {
+            headers: {
+              "Content-Type": "application/json",
+              "Accept": "application/json"
+            }
+          }
+        );
+        console.log("查询响应:", JSON.stringify(response, null, 2));
+        setCache("radiusUser", { account }, response);
+        return response;
       } catch (error) {
-        console.error("查询过程出错:", error);
-        return "查询失败，请稍后重试";
+        console.error("查询RADIUS用户错误详情:", error);
+        if (error.response) {
+          console.error("错误响应:", error.response.data);
+        }
+        throw error;
       }
-    } else {
-      try {
-        const accountInfo = await queryAccount(input);
-        const message = [
-          "📊 账号查询结果",
-          "--------------------------------",
-          `账号: ${accountInfo.accessUserName}`,
-          `状态: ${accountInfo.onlineStatus}`,
-          `认证: ${accountInfo.isPass}`,
-          `IP地址: ${accountInfo.userIp}`,
-          `MAC地址: ${accountInfo.mac}`,
-          `最大上行: ${accountInfo.maxUpSpeed}Mbps`,
-          `最大下行: ${accountInfo.maxDownSpeed}Mbps`,
-          `接入域: ${accountInfo.accessDomain}`,
-          `开始时间: ${accountInfo.startTime}`,
-          `在线时长: ${accountInfo.startTimeSum}分钟`,
-          `设备名称: ${accountInfo.nickName}`
-        ].join("\n");
-        return message;
-      } catch (error) {
-        console.error("查询过程出错:", error);
-        return error.message || "查询失败，请检查账号是否正确";
+    });
+  }
+  __name(queryRadiusUser, "queryRadiusUser");
+  function formatRadiusTime(timeString) {
+    if (!timeString || timeString.length < 14) return "未知时间";
+    const year = timeString.substring(0, 4);
+    const month = timeString.substring(4, 6);
+    const day = timeString.substring(6, 8);
+    const hour = timeString.substring(8, 10);
+    const minute = timeString.substring(10, 12);
+    const second = timeString.substring(12, 14);
+    return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
+  }
+  __name(formatRadiusTime, "formatRadiusTime");
+  function translateOrderStatus(status) {
+    switch (status) {
+      case "active":
+        return "有效";
+      case "inactive":
+        return "无效";
+      case "suspend":
+        return "暂停";
+      default:
+        return status;
+    }
+  }
+  __name(translateOrderStatus, "translateOrderStatus");
+  function translateUserStatus(status) {
+    switch (status) {
+      case "active":
+        return "正常";
+      case "inactive":
+        return "停用";
+      case "suspend":
+        return "暂停";
+      default:
+        return status;
+    }
+  }
+  __name(translateUserStatus, "translateUserStatus");
+  ctx.middleware(async (session, next) => {
+    console.log("原始消息:", session.content);
+    const input = session.content.trim();
+    console.log("接收到消息:", input);
+    try {
+      if (input.includes(" ") || /[\u4e00-\u9fa5]/.test(input)) {
+        console.log("消息包含空格或中文，跳过智能查询");
+        return next();
+      }
+      const cleanInput = formatMacAddress(input);
+      console.log("处理后的内容:", cleanInput);
+      if (isValidMacAddress(cleanInput)) {
+        console.log("内容是合法的MAC地址，开始查询");
+        try {
+          const onuList = await queryOnuList(cleanInput);
+          if (!onuList) {
+            return "未找到该MAC地址的设备信息";
+          }
+          const onuDetail = await queryOnuDetailInfo(onuList.id);
+          const ccname = await queryCCName(cleanInput);
+          const order = await queryOnuOrder(onuDetail);
+          const vlanInfo = await queryOnuDetailVlanInfo(onuList.id);
+          const messages = [
+            "📊 终端基本信息",
+            "--------------------------------",
+            `MAC地址: ${cleanInput}`,
+            `状态：${onuDetail.status === 1 ? "在线" : "不在线"}`,
+            `机房: ${onuDetail.roomName}`,
+            `设备名称: ${onuDetail.deviceName}`,
+            `OLT IP: ${onuDetail.oltIp}`,
+            `PON端口: ${onuDetail.portName}`,
+            `端口逻辑号: ${onuDetail.logicId}`,
+            `发射光功率: ${onuDetail.onuSendPower}dBm`,
+            `接收光功率: ${onuDetail.onuReceivePower}dBm`,
+            `CCName: ${ccname}`,
+            "",
+            "📝 工单信息",
+            "--------------------------------",
+            order ? [
+              `工单编号: ${order.orderId}`,
+              `创建时间: ${order.createDate}`,
+              `更新时间: ${order.updateDate}`
+            ].join("\n") : "无工单信息",
+            "",
+            "🔧 业务配置信息",
+            "--------------------------------"
+          ];
+          vlanInfo.forEach((info) => {
+            messages.push(
+              `端口 ${info.LAN}:`,
+              `  VLAN: ${info.actualVlan}`
+            );
+          });
+          return messages.join("\n");
+        } catch (error) {
+          console.error("查询MAC地址过程出错:", error);
+          return "查询失败，请稍后重试";
+        }
+      } else {
+        console.log("内容不是MAC地址，尝试作为账号查询");
+        try {
+          const accountInfo = await queryAccount(input);
+          const message = [
+            "📊 账号查询结果",
+            "--------------------------------",
+            `账号: ${accountInfo.accessUserName}`,
+            `状态: ${accountInfo.onlineStatus}`,
+            `认证: ${accountInfo.isPass}`,
+            `IP地址: ${accountInfo.userIp}`,
+            `MAC地址: ${accountInfo.mac}`,
+            `最大上行: ${accountInfo.maxUpSpeed}Mbps`,
+            `最大下行: ${accountInfo.maxDownSpeed}Mbps`,
+            `接入域: ${accountInfo.accessDomain}`,
+            `开始时间: ${accountInfo.startTime}`,
+            `在线时长: ${accountInfo.startTimeSum}分钟`,
+            `设备名称: ${accountInfo.nickName}`
+          ].join("\n");
+          return message;
+        } catch (error) {
+          console.error("查询账号过程出错:", error);
+          console.log("账号查询失败，交给其他中间件处理");
+          return next();
+        }
       }
+    } catch (error) {
+      console.error("智能查询过程出错:", error);
+      return next();
     }
   });
   ctx.command("账号查询 <account:string>", "查询宽带账号状态").action(async (_, account) => {
@@ -831,6 +919,50 @@ function apply(ctx, config) {
       return "查询失败，请稍后重试";
     }
   });
+  ctx.command("用户查询 <account:string>", "查询RADIUS用户信息").action(async (_, account) => {
+    if (!account) return "请输入要查询的账号";
+    try {
+      const radiusUserInfo = await queryRadiusUser(account);
+      if (radiusUserInfo.code !== "000000" || !radiusUserInfo.data) {
+        return `查询失败: ${radiusUserInfo.message || "未知错误"}`;
+      }
+      const { user, orders } = radiusUserInfo.data;
+      const messages = [
+        "📊 RADIUS用户信息",
+        "--------------------------------",
+        `账号: ${user.login_name}`,
+        `密码: ${user.password}`,
+        `状态: ${translateUserStatus(user.user_status)}`,
+        `漫游状态: ${user.roam_status === "0" ? "允许漫游" : "禁止漫游"}`,
+        `分公司标识: ${user.org_code}`,
+        `BOSS分公司标识: ${user.boss_org_code}`,
+        `用户VLAN: ${user.user_vlan}`,
+        "",
+        "📝 订购信息",
+        "--------------------------------"
+      ];
+      if (orders && orders.length > 0) {
+        orders.forEach((order, index) => {
+          messages.push(
+            `订购 #${index + 1}:`,
+            `  订购序列号: ${order.order_id}`,
+            `  订购状态: ${translateOrderStatus(order.order_status)}`,
+            `  服务名称: ${order.service_name}`,
+            `  并发数: ${order.online_num}`,
+            `  生效时间: ${formatRadiusTime(order.valid_date)}`,
+            `  失效时间: ${formatRadiusTime(order.expire_date)}`,
+            ""
+          );
+        });
+      } else {
+        messages.push("无订购信息");
+      }
+      return messages.join("\n");
+    } catch (error) {
+      console.error("查询过程出错:", error);
+      return error.message || "查询失败，请稍后重试";
+    }
+  });
 }
 __name(apply, "apply");
 // Annotate the CommonJS export names for ESM import in node:

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-jscn-aaaquery",
   "description": "江苏有线无锡分公司宽带信息查询插件",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [