message-verify 1.0.1-beta.38 → 1.0.1-beta.4

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-import { ModalConfig, LoginModalConfig } from './utils/type.js';
+import { ModalConfig } from './utils/type.js';
 export declare const initFingerprint: () => Promise<string>;
 export declare const createMessageVerifyModal: (modalProps: ModalConfig) => void;
-export declare const createReLoginModal: (modalProps: LoginModalConfig) => void;

package/dist/index.js

@@ -2,27 +2,26 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import ReactDOM from 'react-dom/client';
 import VerifyModal from './verify-modal.js';
 import Fingerprint2 from 'fingerprintjs2';
-import ReLoginModal from './relogin-modal.js';
-let fingerprintPromise = null; // 用 Promise 本身作为缓存
+let cachedFingerprint = null;
 export const initFingerprint = async () => {
-    console.log('fingerprintPromise:', fingerprintPromise);
-    if (!fingerprintPromise) {
-        fingerprintPromise = new Promise((resolve) => {
-            Fingerprint2.get(components => {
-                const includeKeys = ['userAgent', 'cpuClass', 'hardwareConcurrency', 'platform'];
-                console.log('components:', components);
-                const values = components
-                    .filter(c => includeKeys.includes(c.key))
-                    .map(c => c.value)
-                    .join('###');
-                console.log('values:', values);
-                const fingerprint = Fingerprint2.x64hash128(values, 31);
-                console.log('fingerprint:', fingerprint);
-                resolve(fingerprint);
-            });
-        });
+    if (cachedFingerprint) {
+        // 已有缓存，直接返回 Promise
+        return Promise.resolve(cachedFingerprint);
     }
-    return fingerprintPromise;
+    // 首次异步获取并缓存
+    return new Promise((resolve) => {
+        Fingerprint2.get(function (components) {
+            console.log('components', components);
+            const includeKeys = ['userAgent', 'deviceMemory', 'cpuClass', 'hardwareConcurrency', 'platform'];
+            const values = components
+                .filter(component => includeKeys.includes(component.key))
+                .map(component => component.value)
+                .join('###');
+            const fingerprint = Fingerprint2.x64hash128(values, 31);
+            cachedFingerprint = fingerprint;
+            resolve(fingerprint);
+        });
+    });
 };
 let modalRoot = null;
 export const createMessageVerifyModal = (modalProps) => {
@@ -38,16 +37,6 @@ export const createMessageVerifyModal = (modalProps) => {
             }
         } }));
 };
-// 新增 relogin 弹窗创建方法
-export const createReLoginModal = (modalProps) => {
-    const container = document.createElement('div');
-    container.id = 'antd-modal-container';
-    document.body.appendChild(container);
-    modalRoot = ReactDOM.createRoot(container);
-    modalRoot.render(_jsx(ReLoginModal, { props: {
-            ...modalProps,
-        } }));
-};
 const destroyModal = () => {
     if (modalRoot) {
         modalRoot.unmount();

package/dist/locales/en.d.ts

@@ -7,9 +7,5 @@ declare const _default: {
     sendFailed: string;
     reSend: string;
     countDownSecound: string;
-    accountAlert: string;
-    alertContent: string;
-    ok: string;
-    chidoriOpenPro: string;
 };
 export default _default;

package/dist/locales/en.js

@@ -6,9 +6,5 @@ export default {
     sendSuccess: 'Successfully sent',
     sendFailed: 'Send failed',
     reSend: 'Resend',
-    countDownSecound: '{countdown} seconds',
-    accountAlert: 'Account Security Alert',
-    alertContent: 'Changes have been detected in your login environment or network information.To ensure account security, please log in again to verify your identity.',
-    ok: 'OK',
-    chidoriOpenPro: 'Chidori has activated security protection for you'
+    countDownSecound: '{countdown} seconds'
 };

package/dist/locales/id.d.ts

@@ -7,9 +7,5 @@ declare const _default: {
     sendFailed: string;
     reSend: string;
     countDownSecound: string;
-    accountAlert: string;
-    alertContent: string;
-    ok: string;
-    chidoriOpenPro: string;
 };
 export default _default;

package/dist/locales/id.js

@@ -6,9 +6,5 @@ export default {
     sendSuccess: 'Berhasil dikirim',
     sendFailed: 'Gagal mengirim',
     reSend: 'Kirim Ulang',
-    countDownSecound: '{countdown} detik',
-    accountAlert: 'Peringatan Keamanan Akun',
-    alertContent: 'Terdeteksi perubahan pada lingkungan login atau informasi jaringan Anda.Untuk menjaga keamanan akun, silakan login kembali untuk memverifikasi identitas Anda.',
-    ok: 'Baiklah',
-    chidoriOpenPro: 'chidori telah mengaktifkan keamanan untuk Anda'
+    countDownSecound: '{countdown} detik'
 };

package/dist/locales/zh.d.ts

@@ -7,9 +7,5 @@ declare const _default: {
     sendFailed: string;
     reSend: string;
     countDownSecound: string;
-    accountAlert: string;
-    alertContent: string;
-    ok: string;
-    chidoriOpenPro: string;
 };
 export default _default;

package/dist/locales/zh.js

@@ -6,9 +6,5 @@ export default {
     sendSuccess: '发送成功',
     sendFailed: '发送失败',
     reSend: '重新发送',
-    countDownSecound: '{countdown}秒',
-    accountAlert: '账号安全提醒',
-    alertContent: '检测到您的登录环境或网络信息有变动，为保障账户安全，请重新登录验证身份',
-    ok: '好的',
-    chidoriOpenPro: 'chidori已为您开启安全防护'
+    countDownSecound: '{countdown}秒'
 };

package/dist/main.js

@@ -1,17 +1,22 @@
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { createRoot } from 'react-dom/client';
-import { createMessageVerifyModal, initFingerprint, createReLoginModal } from './index.js'; // 或 './index'
+import { createMessageVerifyModal, initFingerprint } from './index.js'; // 或 './index'
 import { axios } from '@yqg/resource';
 const data = "{\"mobile\":\"188****4035\",\"verifyCodeKey\":\"3f025b33-988e-47c0-950d-6beb776d043f\",\"needValid\":true,\"step\":2,\"message\":\"需要填写验证码\"}";
 const fp = await initFingerprint();
-const fp2 = await initFingerprint();
-console.log(fp, fp2);
+console.log(fp);
 const config = {
     "transitional": {
         "silentJSONParsing": true,
         "forcedJSONParsing": true,
         "clarifyTimeoutError": false
     },
+    "transformRequest": [
+        null
+    ],
+    "transformResponse": [
+        null
+    ],
     "timeout": 0,
     "xsrfCookieName": "XSRF-TOKEN",
     "xsrfHeaderName": "X-XSRF-TOKEN",
@@ -20,7 +25,9 @@ const config = {
     "headers": {
         "Accept": "application/json, text/plain, */*",
         "X-Device-Fingerprint": "185fcce88c629725321adf29daa5e444",
-        "Content-Type": "application/json"
+        "Content-Type": "application/json",
+        "sms-code": "121212",
+        "sms-code-key": "212190c7-2f5e-4cc1-82ec-a242c2ab5425"
     },
     "url": "/classification/admin/level/edit",
     "method": "post",
@@ -36,20 +43,12 @@ const config = {
     "data": "{\"id\":1,\"classificationName\":\"个人基本概况信息\",\"classificationLevel\":2}",
     "baseURL": "http://localhost:62888"
 };
-createRoot(document.getElementById('root')).render(_jsxs(_Fragment, { children: [_jsx("button", { onClick: () => createMessageVerifyModal({
-                data,
-                config,
-                lang: 'en',
-                http: axios,
-                apiReject: () => {
-                },
-                apiResolve: () => {
-                },
-                apiPromiseToEmpty: () => {
-                }
-            }), children: "Show verify Modal" }), _jsx("button", { onClick: () => createReLoginModal({
-                goLogin: () => {
-                    console.log('goLogin');
-                },
-                lang: 'zh',
-            }), children: "Show login Modal" })] }));
+createRoot(document.getElementById('root')).render(_jsx(_Fragment, { children: _jsx("button", { onClick: () => createMessageVerifyModal({
+            data,
+            config,
+            response: {
+                config
+            },
+            lang: 'en',
+            http: axios,
+        }), children: "Show verify Modal" }) }));

package/dist/relogin-modal.d.ts

@@ -1,5 +1,5 @@
-import { LoginModalConfig } from './utils/type.js';
+import { ModalConfig } from './utils/type.js';
 declare const ReLoginModal: ({ props }: {
-    props: LoginModalConfig;
+    props: ModalConfig;
 }) => import("react/jsx-runtime.js").JSX.Element;
 export default ReLoginModal;

package/dist/relogin-modal.js

@@ -1,23 +1,22 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState } from 'react';
 import { Modal, Button } from './compoments/index.js';
-import t from './utils/i18n.js';
 const ReLoginModal = ({ props }) => {
-    const { goLogin, lang } = props || {};
+    console.log('props', props);
     const [visible, setVisible] = useState(true);
     const onClose = () => {
         setVisible(false);
-        goLogin();
     };
-    return (_jsxs(Modal, { visible: visible, onClose: onClose, width: 420, children: [_jsx("div", { style: { fontWeight: 500, fontSize: 20, marginBottom: 24 }, children: t('accountAlert', lang) }), _jsx("div", { style: { color: '#222', fontSize: 16, marginBottom: 40, lineHeight: '24px' }, children: t('alertContent', lang) }), _jsx("div", { style: { display: 'flex', justifyContent: 'center' }, children: _jsx(Button, { style: {
+    return (_jsxs(Modal, { visible: visible, onClose: onClose, width: 420, children: [_jsx("div", { style: { fontWeight: 500, fontSize: 20, marginBottom: 24 }, children: "\u8D26\u53F7\u5B89\u5168\u63D0\u9192" }), _jsx("div", { style: { color: '#222', fontSize: 16, marginBottom: 40, lineHeight: '24px' }, children: "\u68C0\u6D4B\u5230\u60A8\u7684\u767B\u5F55\u73AF\u5883\u6216\u7F51\u7EDC\u4FE1\u606F\u6709\u53D8\u52A8\uFF0C\u4E3A\u4FDD\u969C\u8D26\u6237\u5B89\u5168\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55\u9A8C\u8BC1\u8EAB\u4EFD" }), _jsx("div", { style: { display: 'flex', justifyContent: 'center' }, children: _jsx(Button, { style: {
                         background: '#1677ff',
                         color: '#fff',
                         border: 'none',
-                        width: 80,
-                        height: 36,
-                        fontSize: 14,
+                        width: 160,
+                        height: 44,
+                        fontSize: 18,
+                        fontWeight: 500,
                         borderRadius: 8,
                         boxShadow: '0 2px 8px rgba(22,119,255,0.08)',
-                    }, onClick: onClose, children: t('ok', lang) }) })] }));
+                    }, onClick: onClose, children: "\u597D\u7684" }) })] }));
 };
 export default ReLoginModal;

package/dist/utils/type.d.ts

@@ -7,7 +7,7 @@ export type ModalConfig = {
         };
         [key: string]: unknown;
     };
-    lang?: 'zh' | 'en' | 'id';
+    lang: 'zh' | 'en' | 'id';
     http: {
         (params: object): Promise<unknown>;
         defaults: {
@@ -19,11 +19,5 @@ export type ModalConfig = {
         };
     };
     api?: string;
-    apiReject: any;
-    apiResolve: any;
-    apiPromiseToEmpty: () => void;
-};
-export type LoginModalConfig = {
-    goLogin: () => void;
-    lang?: 'zh' | 'en' | 'id';
+    response: any;
 };

package/dist/verify-modal.js

@@ -11,7 +11,7 @@ const CreateMessageVerifyModal = ({ props }) => {
     const [captchaImage, setCaptchaImage] = useState('');
     const [captchCode, setCaptchCode] = useState('');
     const [captchaKey, setCaptchaKey] = useState('');
-    const { data, http, lang, api = '/admin/sms/send', config, apiResolve, apiPromiseToEmpty } = props || {};
+    const { data, http, lang, api = '/admin/sms/send', response } = props || {};
     const dataObj = JSON.parse(data || '{}');
     const { mobile, verifyCodeKey } = dataObj || {};
     const getKey = async () => {
@@ -58,58 +58,37 @@ const CreateMessageVerifyModal = ({ props }) => {
             return;
         }
         message.success(t('sendSuccess', lang));
-        // 重置倒计时、验证码
         setCountdown(60);
-        setOtp('');
     };
     return (_jsxs(Modal, { width: 420, visible: visible, onClose: () => {
             setVisible(false);
-            apiPromiseToEmpty();
             props.onClose?.();
         }, children: [_jsx("div", { style: { fontSize: 14, color: '#666' }, children: t('alreadySend', lang, { phone: mobile }) }), _jsxs("div", { style: { display: 'flex', alignItems: 'center', gap: 8, marginTop: 12 }, children: [_jsx(Input.OTP, { length: 6, value: otp, onChange: async (val) => {
                             setOtp(val);
                             if (val.length === 6) {
-                                try {
-                                    const res = await Promise.race([
-                                        new Promise((resolve, reject) => {
-                                            setTimeout(() => {
-                                                reject(new Error('Timeout'));
-                                            }, 1000);
-                                        }),
-                                        new Promise((resolve, reject) => {
-                                            http({
-                                                ...config,
-                                                headers: {
-                                                    ...http.defaults.headers.common,
-                                                    'sms-code': val,
-                                                    'sms-code-key': verifyCodeKey,
-                                                    'Content-Type': config.headers['Content-Type'],
-                                                }
-                                            }).then(res => {
-                                                resolve(res);
-                                            }).catch(err => {
-                                                reject(err);
-                                            });
-                                        })
-                                    ]);
-                                    if (res?.data?.status?.code === 0) {
-                                        apiResolve(res);
-                                        setVisible(false);
-                                    }
-                                    else {
-                                        message.error('验证失败');
-                                        setOtp('');
+                                const { data: { status: { code, detail } = {}, config } } = response || {};
+                                http({
+                                    ...config,
+                                    headers: {
+                                        ...http.defaults.headers.common,
+                                        'sms-code': val,
+                                        'sms-code-key': verifyCodeKey,
+                                        'Content-Type': config.headers['Content-Type'],
                                     }
+                                });
+                                console.log(response, code, 'config');
+                                if (code !== 0) {
+                                    message.error(detail || t('verifyFailed', lang));
+                                    return;
                                 }
-                                catch (error) {
-                                    console.warn('catch', error);
-                                    message.error('验证失败');
-                                    setOtp('');
+                                else {
+                                    message.success(t('verifySuccess', lang));
+                                    setVisible(false);
                                 }
                             }
                         } }), _jsx(Button, { disabled: countdown > 0 || !captchCode, onClick: handleResend, style: { padding: '8px' }, children: countdown > 0 ? t('countDownSecound', lang, { countdown }) : t('reSend', lang) })] }), countdown > 0 ? null :
                 _jsxs("div", { style: { marginTop: 12, display: 'flex', alignItems: 'center' }, children: [_jsx(Input, { placeholder: t('pleaseEnterPicVerifyCode', lang), onChange: (e) => {
                                 setCaptchCode(e);
-                            }, style: { width: 300 } }), captchaImage && _jsx("img", { src: captchaImage, alt: t('verifyCode', lang), style: { width: 100, height: 30, marginLeft: 8 }, onClick: getKey })] }), (countdown > 0 || captchCode) ? null : _jsx("div", { style: { fontSize: 14, color: 'red' }, children: t('pleaseEnterAndSend', lang) }), _jsx("div", { style: { fontSize: 14, color: '#666', marginTop: 12 }, children: t('chidoriOpenPro', lang) })] }));
+                            }, style: { width: 300 } }), captchaImage && _jsx("img", { src: captchaImage, alt: t('verifyCode', lang), style: { width: 100, height: 30, marginLeft: 8 }, onClick: getKey })] }), (countdown > 0 || captchCode) ? null : _jsx("div", { style: { fontSize: 14, color: 'red' }, children: t('pleaseEnterAndSend', lang) })] }));
 };
 export default CreateMessageVerifyModal;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "message-verify",
-  "version": "1.0.1-beta.38",
+  "version": "1.0.1-beta.4",
   "type": "module",
   "main": "dist/index.js",
   "dependencies": {
@@ -29,7 +29,6 @@
     "build": "tsc -b",
     "analyze": "vite build",
     "lint": "eslint .",
-    "preview": "vite preview",
-    "release:beta": "pnpm version prerelease --preid=beta && pnpm run build && pnpm publish"
+    "preview": "vite preview"
   }
 }

package/src/index.tsx

@@ -1,30 +1,28 @@
 import ReactDOM from 'react-dom/client'
 import VerifyModal from './verify-modal.js'
 import Fingerprint2 from 'fingerprintjs2';
-import ReLoginModal from './relogin-modal.js';
-import { ModalConfig, LoginModalConfig } from './utils/type.js';
-
-let fingerprintPromise: Promise<string> | null = null; // 用 Promise 本身作为缓存
+import { ModalConfig } from './utils/type.js';
 
+let cachedFingerprint: string | null = null;
 export const initFingerprint = async (): Promise<string> => {
-    console.log('fingerprintPromise:', fingerprintPromise);
-    if (!fingerprintPromise) {
-        fingerprintPromise = new Promise((resolve) => {
-            Fingerprint2.get(components => {
-                const includeKeys = ['userAgent', 'cpuClass', 'hardwareConcurrency', 'platform'];
-                console.log('components:', components);
-                const values = components
-                    .filter(c => includeKeys.includes(c.key))
-                    .map(c => c.value)
-                    .join('###');
-                console.log('values:', values);
-                const fingerprint = Fingerprint2.x64hash128(values, 31);
-                console.log('fingerprint:', fingerprint);
-                resolve(fingerprint);
-            });
-        });
+    if (cachedFingerprint) {
+        // 已有缓存，直接返回 Promise
+        return Promise.resolve(cachedFingerprint);
     }
-    return fingerprintPromise;
+    // 首次异步获取并缓存
+    return new Promise((resolve) => {
+        Fingerprint2.get(function (components) {
+          console.log('components', components);
+            const includeKeys = ['userAgent', 'deviceMemory', 'cpuClass', 'hardwareConcurrency', 'platform'];
+            const values = components
+                .filter(component => includeKeys.includes(component.key))
+                .map(component => component.value)
+                .join('###');
+            const fingerprint = Fingerprint2.x64hash128(values, 31);
+            cachedFingerprint = fingerprint;
+            resolve(fingerprint);
+        });
+    });
 };
 
 let modalRoot: ReactDOM.Root | null = null
@@ -48,22 +46,6 @@ export const createMessageVerifyModal = (modalProps: ModalConfig) => {
   )
 }
 
-// 新增 relogin 弹窗创建方法
-export const createReLoginModal = (modalProps: LoginModalConfig) => {
-  const container = document.createElement('div')
-  container.id = 'antd-modal-container'
-  document.body.appendChild(container)
-
-  modalRoot = ReactDOM.createRoot(container)
-  modalRoot.render(
-    <ReLoginModal
-      props={{
-        ...modalProps,
-      }}
-    />
-  )
-}
-
 const destroyModal = () => {
   if (modalRoot) {
     modalRoot.unmount()

package/src/locales/en.ts

@@ -6,9 +6,5 @@ export default {
     sendSuccess: 'Successfully sent',
     sendFailed: 'Send failed',
     reSend: 'Resend',
-    countDownSecound: '{countdown} seconds',
-    accountAlert: 'Account Security Alert',
-    alertContent: 'Changes have been detected in your login environment or network information.To ensure account security, please log in again to verify your identity.',
-    ok: 'OK',
-    chidoriOpenPro: 'Chidori has activated security protection for you'
+    countDownSecound: '{countdown} seconds'
 };

package/src/locales/id.ts

@@ -6,9 +6,5 @@ export default {
     sendSuccess: 'Berhasil dikirim',
     sendFailed: 'Gagal mengirim',
     reSend: 'Kirim Ulang',
-    countDownSecound: '{countdown} detik',
-    accountAlert: 'Peringatan Keamanan Akun',
-    alertContent: 'Terdeteksi perubahan pada lingkungan login atau informasi jaringan Anda.Untuk menjaga keamanan akun, silakan login kembali untuk memverifikasi identitas Anda.',
-    ok: 'Baiklah',
-    chidoriOpenPro: 'chidori telah mengaktifkan keamanan untuk Anda'
+    countDownSecound: '{countdown} detik'
 };

package/src/locales/zh.ts

@@ -6,9 +6,5 @@ export default {
     sendSuccess: '发送成功',
     sendFailed: '发送失败',
     reSend: '重新发送',
-    countDownSecound: '{countdown}秒',
-    accountAlert: '账号安全提醒',
-    alertContent: '检测到您的登录环境或网络信息有变动，为保障账户安全，请重新登录验证身份',
-    ok: '好的',
-    chidoriOpenPro: 'chidori已为您开启安全防护'
+    countDownSecound: '{countdown}秒'
 };

package/src/main.tsx

@@ -1,12 +1,11 @@
 import { createRoot } from 'react-dom/client';
-import { createMessageVerifyModal, initFingerprint, createReLoginModal } from './index.js'; // 或 './index'
+import { createMessageVerifyModal, initFingerprint } from './index.js'; // 或 './index'
 import { axios } from '@yqg/resource';
 
 const data = "{\"mobile\":\"188****4035\",\"verifyCodeKey\":\"3f025b33-988e-47c0-950d-6beb776d043f\",\"needValid\":true,\"step\":2,\"message\":\"需要填写验证码\"}";
 
 const fp = await initFingerprint();
-const fp2 = await initFingerprint();
-console.log(fp, fp2);
+console.log(fp);
 
 const config = {
     "transitional": {
@@ -14,6 +13,12 @@ const config = {
         "forcedJSONParsing": true,
         "clarifyTimeoutError": false
     },
+    "transformRequest": [
+        null
+    ],
+    "transformResponse": [
+        null
+    ],
     "timeout": 0,
     "xsrfCookieName": "XSRF-TOKEN",
     "xsrfHeaderName": "X-XSRF-TOKEN",
@@ -22,7 +27,9 @@ const config = {
     "headers": {
         "Accept": "application/json, text/plain, */*",
         "X-Device-Fingerprint": "185fcce88c629725321adf29daa5e444",
-        "Content-Type": "application/json"
+        "Content-Type": "application/json",
+        "sms-code": "121212",
+        "sms-code-key": "212190c7-2f5e-4cc1-82ec-a242c2ab5425"
     },
     "url": "/classification/admin/level/edit",
     "method": "post",
@@ -43,23 +50,12 @@ createRoot(document.getElementById('root')!).render(
         <button onClick={() => createMessageVerifyModal({
             data,
             config,
+            response: {
+                config
+            },
             lang: 'en',
             http: axios,
-            apiReject: () => {
-            },
-            apiResolve: () => {
-            },
-            apiPromiseToEmpty: () => {
-            }
         })}>
             Show verify Modal
         </button>
-        <button  onClick={() => createReLoginModal({
-            goLogin: () => {
-                console.log('goLogin');
-            },
-            lang: 'zh',
-        })}>
-            Show login Modal
-        </button>
     </>);

package/src/relogin-modal.tsx

@@ -1,22 +1,20 @@
 import { useState } from 'react'
 import { Modal, Button } from './compoments/index.js'
-import { LoginModalConfig } from './utils/type.js';
-import t from './utils/i18n.js'
+import { ModalConfig } from './utils/type.js';
 
-const ReLoginModal = ({ props }: { props: LoginModalConfig }) => {
-    const { goLogin, lang } = props || {};
+const ReLoginModal = ({ props }: { props: ModalConfig }) => {
+    console.log('props', props);
     const [visible, setVisible] = useState(true);
     const onClose = () => {
         setVisible(false);
-        goLogin();
     };
     return (
         <Modal visible={visible} onClose={onClose} width={420}>
             <div style={{ fontWeight: 500, fontSize: 20, marginBottom: 24 }}>
-                {t('accountAlert', lang)}
+                账号安全提醒
             </div>
             <div style={{ color: '#222', fontSize: 16, marginBottom: 40, lineHeight: '24px' }}>
-                {t('alertContent', lang)}
+                检测到您的登录环境或网络信息有变动，为保障账户安全，请重新登录验证身份
             </div>
             <div style={{ display: 'flex', justifyContent: 'center' }}>
                 <Button
@@ -24,15 +22,16 @@ const ReLoginModal = ({ props }: { props: LoginModalConfig }) => {
                         background: '#1677ff',
                         color: '#fff',
                         border: 'none',
-                        width: 80,
-                        height: 36,
-                        fontSize: 14,
+                        width: 160,
+                        height: 44,
+                        fontSize: 18,
+                        fontWeight: 500,
                         borderRadius: 8,
                         boxShadow: '0 2px 8px rgba(22,119,255,0.08)',
                     }}
                     onClick={onClose}
                 >
-                    {t('ok', lang)}
+                    好的
                 </Button>
             </div>
         </Modal>

package/src/utils/type.ts

@@ -8,7 +8,7 @@ export type ModalConfig = {
         };
         [key: string]: unknown;
     };
-    lang?: 'zh' | 'en' | 'id';
+    lang: 'zh' | 'en' | 'id';
     http: {
         (params: object): Promise<unknown>;
         defaults: {
@@ -20,12 +20,5 @@ export type ModalConfig = {
         }
     };
     api?: string;
-    apiReject: any;
-    apiResolve: any;
-    apiPromiseToEmpty: () => void;
-}
-
-export type LoginModalConfig = {
-    goLogin: () => void;
-    lang?: 'zh' | 'en' | 'id';
+    response: any;
 }

package/src/verify-modal.tsx

@@ -12,7 +12,7 @@ const CreateMessageVerifyModal = ({ props }: { props: ModalConfig }) => {
     const [captchaImage, setCaptchaImage] = useState<string>('');
     const [captchCode, setCaptchCode] = useState<string>('');
     const [captchaKey, setCaptchaKey] = useState<string>('');
-    const { data, http, lang, api = '/admin/sms/send', config, apiResolve, apiPromiseToEmpty } = props || {};
+    const { data, http, lang, api='/admin/sms/send', response } = props || {};
     const dataObj = JSON.parse(data || '{}');
     const { mobile, verifyCodeKey } = dataObj || {};
 
@@ -25,11 +25,10 @@ const CreateMessageVerifyModal = ({ props }: { props: ModalConfig }) => {
                 const image = Api.getCaptchaImgUrl(key) as unknown;
                 setCaptchaImage(image as string);
             }
-        } catch (err) {
-            const msg =
-                typeof err === 'object' && err !== null && 'message' in err
-                    ? (err as { message: string }).message
-                    : String(err);
+        } catch (err) {const msg =
+            typeof err === 'object' && err !== null && 'message' in err
+                ? (err as {message: string}).message
+                : String(err);
             message.error(msg as React.ReactNode);
         }
     }
@@ -61,9 +60,7 @@ const CreateMessageVerifyModal = ({ props }: { props: ModalConfig }) => {
             return;
         }
         message.success(t('sendSuccess', lang));
-        // 重置倒计时、验证码
         setCountdown(60);
-        setOtp('');
     }
 
     return (
@@ -72,7 +69,6 @@ const CreateMessageVerifyModal = ({ props }: { props: ModalConfig }) => {
             visible={visible}
             onClose={() => {
                 setVisible(false);
-                apiPromiseToEmpty();
                 props.onClose?.();
             }}
         >
@@ -85,40 +81,23 @@ const CreateMessageVerifyModal = ({ props }: { props: ModalConfig }) => {
                     onChange={async (val) => {
                         setOtp(val);
                         if (val.length === 6) {
-                            try {
-                                const res = await Promise.race([
-                                    new Promise((resolve, reject) => {
-                                        setTimeout(() => {
-                                            reject(new Error('Timeout'));
-                                        }, 1000);
-                                    }),
-                                    new Promise((resolve, reject) => {
-                                        http({
-                                            ...config,
-                                            headers: {
-                                                ...http.defaults.headers.common,
-                                                'sms-code': val,
-                                                'sms-code-key': verifyCodeKey,
-                                                'Content-Type': config.headers['Content-Type'],
-                                            }
-                                        }).then(res => {
-                                            resolve(res);
-                                        }).catch(err => {
-                                            reject(err);
-                                        })
-                                    })
-                                ]) as any;
-                                if (res?.data?.status?.code === 0) {
-                                    apiResolve(res);
-                                    setVisible(false);
-                                } else {
-                                    message.error('验证失败');
-                                    setOtp('');
+                            const {data: {status: {code, detail} = {}, config}} = response || {};
+                            http({
+                                ...config,
+                                headers: {
+                                    ...http.defaults.headers.common,
+                                    'sms-code': val,
+                                    'sms-code-key': verifyCodeKey,
+                                    'Content-Type': config.headers['Content-Type'],
                                 }
-                            } catch (error) {
-                                console.warn('catch', error);
-                                message.error('验证失败');
-                                setOtp('');
+                            }) as any;
+                            console.log(response, code, 'config');
+                            if(code !== 0) {
+                                message.error(detail || t('verifyFailed', lang));
+                                return;
+                            } else {
+                                message.success(t('verifySuccess', lang));
+                                setVisible(false);
                             }
                         }
                     }} />
@@ -143,7 +122,6 @@ const CreateMessageVerifyModal = ({ props }: { props: ModalConfig }) => {
                     {captchaImage && <img src={captchaImage} alt={t('verifyCode', lang)} style={{ width: 100, height: 30, marginLeft: 8 }} onClick={getKey} />}
                 </div>}
             {(countdown > 0 || captchCode) ? null : <div style={{ fontSize: 14, color: 'red' }}>{t('pleaseEnterAndSend', lang)}</div>}
-            <div style={{ fontSize: 14, color: '#666', marginTop: 12 }}>{t('chidoriOpenPro', lang)}</div>
         </Modal>
     );
 };