From 004044a085d76daff646faced8e69fae7bdd7659 Mon Sep 17 00:00:00 2001
From: zhaoyingbo <zhaoyingbo@xiaomi.com>
Date: Fri, 24 May 2024 19:32:39 +0800
Subject: [PATCH] chore: Update devcontainer.json and pbTools.ts

---
 .devcontainer/devcontainer.json | 5 +----
 db/user/index.ts                | 8 ++++----
 utils/pbTools.ts                | 3 +--
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index f49d6f5..cbf9df2 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -10,9 +10,7 @@
         "editor.guides.bracketPairs": true,
         "editor.defaultFormatter": "esbenp.prettier-vscode",
         "editor.formatOnSave": true,
-        "editor.codeActionsOnSave": {
-          "source.fixAll.stylelint": true
-        }
+        "github.copilot.chat.localeOverride": "zh-CN"
       },
       "extensions": [
         "dbaeumer.vscode-eslint",
@@ -24,7 +22,6 @@
         "ChakrounAnas.turbo-console-log",
         "Gruntfuggly.todo-tree",
         "MS-CEINTL.vscode-language-pack-zh-hans",
-        "stylelint.vscode-stylelint",
         "GitHub.copilot"
       ]
     }
diff --git a/db/user/index.ts b/db/user/index.ts
index 41f30ce..389a9ec 100644
--- a/db/user/index.ts
+++ b/db/user/index.ts
@@ -11,19 +11,19 @@ export interface UserRecordModel extends RecordModel {
 }
 
 const getOne = (id: string) =>
-  managePb404(
+  managePb404<UserRecordModel>(
     async () => await pbClient.collection("user").getOne(id)
-  ) as Promise<UserRecordModel>;
+  );
 
 const getOneByUserId = (user_id: number) => {
-  return managePb404(
+  return managePb404<UserRecordModel>(
     async () =>
       await pbClient
         .collection("user")
         .getFirstListItem(`user_id="${user_id}"`, {
           sort: "-created",
         })
-  ) as Promise<UserRecordModel>;
+  );
 };
 
 const create = async (data: Partial<UserRecordModel>) =>
diff --git a/utils/pbTools.ts b/utils/pbTools.ts
index 01d3186..3d8a903 100644
--- a/utils/pbTools.ts
+++ b/utils/pbTools.ts
@@ -1,8 +1,7 @@
-export const managePb404 = async (dbFunc: Function) => {
+export const managePb404 = async <T>(dbFunc: Function): Promise<T | null> => {
   try {
     return await dbFunc();
   } catch (err: any) {
-    // 没有这个提醒就返回空
     if (err?.message === "The requested resource wasn't found.") {
       return null;
     } else throw err;