feat: 支持邮箱和手机号同时注册

src/service/errorCode.ts

@@ -8,7 +8,8 @@ export const openaiError: Record<string, string> = {
 };
 export const openaiError2: Record<string, string> = {
   insufficient_quota: 'API 余额不足',
-  invalid_request_error: 'openai 接口异常'
+  billing_not_active: 'openai 账号异常',
+  invalid_request_error: '无效的 openai 请求'
 };
 export const proxyError: Record<string, boolean> = {
   ECONNABORTED: true,

src/service/events/generateQA.ts

@@ -9,6 +9,7 @@ import { generateVector } from './generateVector';
 import { connectRedis } from '../redis';
 import { VecModelDataPrefix } from '@/constants/redis';
 import { customAlphabet } from 'nanoid';
+import { openaiError2 } from '../errorCode';
 import { ModelSplitDataSchema } from '@/types/mongoSchema';
 const nanoid = customAlphabet('abcdefghijklmnopqrstuvwxyz1234567890', 12);
 
@@ -102,6 +103,7 @@ export async function generateQA(next = false): Promise<any> {
           .then((res) => {
             const rawContent = res?.data.choices[0].message?.content || ''; // chatgpt 原本的回复
             const result = splitText(res?.data.choices[0].message?.content || ''); // 格式化后的QA对
+            console.log(`split result length: `, result.length);
             // 计费
             pushSplitDataBill({
               isPay: !userApiKey && result.length > 0,
@@ -115,6 +117,10 @@ export async function generateQA(next = false): Promise<any> {
               result
             };
           })
+          .catch((err) => {
+            console.log('QA 拆分错误');
+            return Promise.reject(err);
+          })
       )
     );
 
@@ -152,12 +158,7 @@ export async function generateQA(next = false): Promise<any> {
       })
     ]);
 
-    console.log(
-      '生成QA成功，time:',
-      `${(Date.now() - startTime) / 1000}s`,
-      'QA数量：',
-      resultList.length
-    );
+    console.log('生成QA成功，time:', `${(Date.now() - startTime) / 1000}s`);
 
     generateQA(true);
     generateVector();
@@ -171,12 +172,8 @@ export async function generateQA(next = false): Promise<any> {
     }
 
     // 没有余额或者凭证错误时，拒绝任务
-    if (
-      dataId &&
-      (+error.response?.status === 401 ||
-        error?.response?.data?.error?.type === 'insufficient_quota')
-    ) {
-      console.log('api 异常，删除QA任务');
+    if (dataId && openaiError2[error?.response?.data?.error?.type]) {
+      console.log(openaiError2[error?.response?.data?.error?.type], '删除QA任务');
 
       await SplitData.findByIdAndUpdate(dataId, {
         textList: [],

src/service/events/generateVector.ts

@@ -3,6 +3,7 @@ import { VecModelDataIdx } from '@/constants/redis';
 import { vectorToBuffer } from '@/utils/tools';
 import { ModelDataStatusEnum } from '@/constants/redis';
 import { openaiCreateEmbedding, getOpenApiKey } from '../utils/openai';
+import { openaiError2 } from '../errorCode';
 
 export async function generateVector(next = false): Promise<any> {
   if (process.env.queueTask !== '1') {
@@ -91,11 +92,7 @@ export async function generateVector(next = false): Promise<any> {
     }
 
     // 没有余额或者凭证错误时，拒绝任务
-    if (
-      dataId &&
-      (+error.response?.status === 401 ||
-        error?.response?.data?.error?.type === 'insufficient_quota')
-    ) {
+    if (dataId && openaiError2[error?.response?.data?.error?.type]) {
       console.log('删除向量生成任务记录');
       const redis = await connectRedis();
       redis.del(dataId);