fix: conflict

This commit is contained in:
archer
2023-03-24 20:18:27 +08:00
15 changed files with 321 additions and 122 deletions

View File

@@ -6,7 +6,7 @@ import { getOpenAIApi, authChat } from '@/service/utils/chat';
import { ChatItemType } from '@/types/chat';
import { httpsAgent } from '@/service/utils/tools';
import { modelList } from '@/constants/model';
import { pushBill } from '@/service/events/bill';
import { pushBill } from '@/service/events/pushChatBill';
/* 发送提示词 */
export default async function handler(req: NextApiRequest, res: NextApiResponse) {