fix: 反代后流式输出意外停止的问题

fix: 反代后无法发送图片和文件的问题
feat: 后台登录支持2FA

Author: nianhua99

api/v1/errors.go

@@ -13,4 +13,6 @@ var (
 	// more biz errors
 	ErrEmailAlreadyUse = newError(1001, "The email is already in use.")
 	ErrCannotRefresh   = newError(1002, "Can not refresh account.")
+	Err2FARequired     = newError(1003, "2FA is required.")
+	Err2FACode         = newError(1004, "2FA code error.")
 )

api/v1/user.go

@@ -6,7 +6,8 @@ type RegisterRequest struct {
 }
 
 type LoginRequest struct {
-	Password string `json:"password" binding:"required" example:"123456"`
+	Password     string `json:"password" binding:"required" example:"123456"`
+	ValidateCode string `json:"validateCode" example:"123456"`
 }
 type LoginResponseData struct {
 	AccessToken string                 `json:"accessToken"`

data/config.json

@@ -1,58 +1,59 @@
 {
-  "security": {
-    "admin_password": ""
+  "database": {
+    "driver": "sqlite",
+    "dsn": "./data/data.db"
   },
   "http": {
     "host": "0.0.0.0",
     "port": 9000,
     "proxy-pass": {
-      "oaifree": {
-        "enable": true,
-        "host": "https://new.oaifree.com",
-        "port": 9001
-      },
       "fuclaude": {
         "enable": true,
         "host": "https://demo.fuclaude.com",
         "port": 9002
+      },
+      "oaifree": {
+        "enable": true,
+        "host": "https://new.oaifree.com",
+        "port": 9001
       }
     },
-    "title": "Pandora",
-    "rate": 1000
+    "rate": 1000,
+    "title": "Pandora"
   },
-  "database": {
-    "driver": "sqlite",
-    "dsn": "./data/data.db"
+  "log": {
+    "compress": true,
+    "encoding": "console",
+    "level": "info",
+    "log_file_name": "./logs/server.log",
+    "max_age": 7,
+    "max_backups": 30,
+    "max_size": 1024,
+    "output": "console"
   },
-  "share": {
-    "random": true,
-    "custom": true
+  "moderation": {
+    "apikey": "",
+    "apiurl": "https://api-proxy.oaipro.com/v1/moderations",
+    "message": "您的消息包含不当内容，请修改后重试!"
+  },
+  "oneapi": {
+    "domain": "",
+    "token": ""
   },
   "pandora": {
     "domain": {
       "chat": "https://chat.oaifree.com",
-      "token": "https://token.oaifree.com",
-      "index": "https://new.oaifree.com",
-      "claude": "https://demo.fuclaude.com"
+      "claude": "http://localhost:9002",
+      "index": "http://localhost:9001",
+      "token": "https://token.oaifree.com"
     }
   },
-  "moderation": {
-    "apiKey": "",
-    "apiUrl": "https://api-proxy.oaipro.com/v1/moderations",
-    "message": "您的消息包含不当内容，请修改后重试!"
-  },
-  "oneapi": {
-    "token": "",
-    "domain": ""
+  "security": {
+    "2fa_secret": "",
+    "admin_password": ""
   },
-  "log": {
-    "level": "info",
-    "encoding": "console",
-    "output": "console",
-    "log_file_name": "./logs/server.log",
-    "max_backups": 30,
-    "max_age": 7,
-    "max_size": 1024,
-    "compress": true
+  "share": {
+    "custom": true,
+    "random": true
   }
 }

frontend/package.json

@@ -54,6 +54,7 @@
     "react-icons": "^4.11.0",
     "react-markdown": "^8.0.7",
     "react-organizational-chart": "^2.2.1",
+    "react-qrcode-logo": "^3.0.0",
     "react-quill": "^2.0.0",
     "react-router-dom": "^6.16.0",
     "react-use": "^17.4.0",

frontend/pnpm-lock.yaml

@@ -3,6 +3,8 @@ import apiClient from '../apiClient';
 export enum SysApi {
   pandoraUsage = '/sys_info/usage',
   setting = '/sys_info/info',
+  getMfaSecret = '/user/2fa_secret',
+  verifyMfa = '/user/2fa_verify',
 }
 
 export type PandoraUsage = {
@@ -11,10 +13,14 @@ export type PandoraUsage = {
   ttl: number;
 };
 
+const getMfaSecretUrl = () => apiClient.get({ url: SysApi.getMfaSecret });
+const verifyMfa = (code: string,secret: string) => apiClient.post({ url: SysApi.verifyMfa, params: { code, secret } });
 const getPandoraUsage = () => apiClient.get<PandoraUsage>({ url: SysApi.pandoraUsage });
 const getSetting = () => apiClient.get({ url: SysApi.setting });
 
 export default {
   getPandoraUsage,
   getSetting,
+  getMfaSecretUrl,
+  verifyMfa
 };

frontend/src/api/services/sysService.ts

@@ -5,6 +5,7 @@ import {UserInfo} from "#/entity.ts";
 
 export interface SignInReq {
   password: string;
+  validateCode?: string;
   token?: string;
 }
 
@@ -16,11 +17,10 @@ export type SignInRes = {
 
 export enum UserApi {
   SignIn = 'login',
-  // SignIn = '/auth/signin',
   Logout = '/auth/logout',
 }
 
-const signin = (data: SignInReq) => apiClient.post<SignInRes>({ url: UserApi.SignIn, data });
+const signin = (data: SignInReq) => apiClient.post({ url: UserApi.SignIn, data });
 const logout = () => apiClient.get({ url: UserApi.Logout });
 
 export default {

frontend/src/api/services/userService.ts

@@ -1,17 +1,17 @@
 import { Divider, MenuProps } from 'antd';
 import Dropdown, { DropdownProps } from 'antd/es/dropdown/dropdown';
-import React from 'react';
+import React, {useState} from 'react';
 import { useTranslation } from 'react-i18next';
-import { NavLink } from 'react-router-dom';
 
 import { IconButton } from '@/components/icon';
 import { useLoginStateContext } from '@/pages/sys/login/providers/LoginStateProvider';
 import { useRouter } from '@/router/hooks';
 import { useUserInfo, useUserActions } from '@/store/userStore';
 import { useThemeToken } from '@/theme/hooks';
 import avatar from '@/assets/images/qinshihuang.jpg';
+import MfaBindingModal from "@/layouts/_common/mfa-modal.tsx";
+import sysService from "@/api/services/sysService.ts";
 
-const { VITE_APP_HOMEPAGE: HOMEPAGE } = import.meta.env;
 
 /**
  * Account Dropdown
@@ -24,8 +24,6 @@ export default function AccountDropdown() {
   const { t } = useTranslation();
   const logout = () => {
     try {
-      // todo const logoutMutation = useMutation(userService.logout);
-      // todo logoutMutation.mutateAsync();
       clearUserInfoAndToken();
       backToLogin();
     } catch (error) {
@@ -35,6 +33,7 @@ export default function AccountDropdown() {
     }
   };
   const { colorBgElevated, borderRadiusLG, boxShadowSecondary } = useThemeToken();
+  const [mfaModalVisible, setMfaModalVisible] = useState(false);
 
   const contentStyle: React.CSSProperties = {
     backgroundColor: colorBgElevated,
@@ -58,14 +57,10 @@ export default function AccountDropdown() {
   );
 
   const items: MenuProps['items'] = [
-    { label: <NavLink to={HOMEPAGE}>{t('sys.menu.dashboard')}</NavLink>, key: '0' },
     {
-      label: <NavLink to="/management/user/profile">{t('sys.menu.user.profile')}</NavLink>,
-      key: '1',
-    },
-    {
-      label: <NavLink to="/management/user/account">{t('sys.menu.user.account')}</NavLink>,
+      label: <button>2FA认证</button>,
       key: '2',
+      onClick: () => setMfaModalVisible(true),
     },
     { type: 'divider' },
     {
@@ -75,11 +70,21 @@ export default function AccountDropdown() {
     },
   ];
 
+  const handleVerify = (mfaCode: string, secret: string) => {
+    sysService.verifyMfa(mfaCode, secret).then(res => {
+      console.log(res);
+      setMfaModalVisible(false);
+    });
+  }
+
   return (
-    <Dropdown menu={{ items }} trigger={['click']} dropdownRender={dropdownRender}>
-      <IconButton className="h-10 w-10 transform-none px-0 hover:scale-105">
-        <img className="h-8 w-8 rounded-full" src={avatar} alt="" />
-      </IconButton>
-    </Dropdown>
+    <>
+      <Dropdown menu={{ items }} trigger={['click']} dropdownRender={dropdownRender}>
+        <IconButton className="h-10 w-10 transform-none px-0 hover:scale-105">
+          <img className="h-8 w-8 rounded-full" src={avatar} alt="" />
+        </IconButton>
+      </Dropdown>
+      <MfaBindingModal isOpen={mfaModalVisible} onVerify={handleVerify} onClose={() => setMfaModalVisible(false)}/>
+    </>
   );
 }