feat: 修改用户信息获取接口 & 优化返回值格式

routes/microApp/index.ts

@@ -12,12 +12,24 @@ const manageLogin = async (req: Request, isSeek = false) => {
   if (!code) {
     return new Response("code not found", { status: 400 });
   }
-  const { data: userInfo } = await service.lark.user.code2Login(code, isSeek);
-  console.log("🚀 ~ manageLogin ~ userInfo:", userInfo);
+  const {
+    code: resCode,
+    data,
+    msg,
+  } = await service.lark.user.code2Login(code, isSeek);
+  console.log("🚀 ~ manageLogin:", resCode, data, msg);
+  if (resCode !== 0) {
+    return Response.json({
+      code: resCode,
+      message: msg,
+      data: null,
+    });
+  }
+
   return Response.json({
     code: 0,
     message: "success",
-    data: userInfo,
+    data,
   });
 };
 
@@ -33,12 +45,11 @@ const manageBatchUser = async (req: Request, isSeek = false) => {
   if (!user_ids) {
     return new Response("user_ids not found", { status: 400 });
   }
-  const {
-    code,
-    data,
-    msg,
-  } = await service.lark.user.batchGet(user_ids, isSeek);
-  console.log("🚀 ~ manageBatchUser ~ code:", code, data, msg);
+  const { code, data, msg } = await service.lark.user.batchGet(
+    user_ids,
+    isSeek
+  );
+  console.log("🚀 ~ manageBatchUser:", code, data, msg);
   if (code !== 0) {
     return Response.json({
       code,
@@ -49,7 +60,7 @@ const manageBatchUser = async (req: Request, isSeek = false) => {
   return Response.json({
     code,
     message: "success",
-    data: data.user,
+    data: data.items,
   });
 };
 

services/lark/user.ts

@@ -49,13 +49,13 @@ const get = async (user_id: string, isSeek = false) => {
  * @returns
  */
 const batchGet = async (user_ids: string[], isSeek = false) => {
-  const URL = `https://open.f.mioffice.cn/open-apis/user/v1/batch_get`;
+  const URL = `https://open.f.mioffice.cn/open-apis/contact/v3/users/batch`;
   const headers = isSeek
     ? {
         Authorization: `Bearer ${await db.tenantAccessToken.getSeek()}`,
       }
     : {};
-  return larkNetTool.get<LarkServer.UserInfoRes>(
+  return larkNetTool.get<LarkServer.BatchUserInfoRes>(
     URL,
     {
       user_ids,

types/larkServer.ts

@@ -57,6 +57,12 @@ export namespace LarkServer {
     };
   }
 
+  export interface BatchUserInfoRes extends BaseRes {
+    data: {
+      items: any[];
+    };
+  }
+
   export type ReceiveIDType =
     | "open_id"
     | "user_id"