message-verify 0.0.51-beta.0 → 1.0.0-beta.0

package/dist/compoments/input.js

@@ -25,28 +25,32 @@ const OTPInput = ({ length, value = '', onChange, style }) => {
             inputsRef.current[idx - 1]?.focus();
         }
     };
-    return (_jsx("div", { style: { display: 'flex', gap: 8, ...style }, children: Array.from({ length }).map((_, idx) => (_jsx("input", { ref: el => { inputsRef.current[idx] = el; }, type: "text", maxLength: 1, value: chars[idx], onChange: e => handleChange(idx, e.target.value), onKeyDown: e => handleKeyDown(idx, e), style: {
-                width: 32,
-                height: 36,
+    return (_jsx("div", { style: { display: 'flex', gap: 4, ...style }, children: Array.from({ length }).map((_, idx) => (_jsx("input", { ref: el => { inputsRef.current[idx] = el; }, type: "text", maxLength: 1, value: chars[idx], onChange: e => handleChange(idx, e.target.value), onKeyDown: e => handleKeyDown(idx, e), style: {
+                width: 36,
+                height: 32,
                 textAlign: 'center',
-                fontSize: 18,
+                fontSize: 16,
                 border: '1px solid #d9d9d9',
-                borderRadius: 8,
+                borderRadius: 6,
                 outline: 'none',
-            } }, idx))) }));
+                background: '#fff',
+                transition: 'border-color 0.2s',
+            }, onFocus: e => (e.currentTarget.style.borderColor = '#4096ff'), onBlur: e => (e.currentTarget.style.borderColor = '#d9d9d9') }, idx))) }));
 };
 const Input = (props) => {
     return (_jsx("input", { type: props.type || 'text', value: props.value, placeholder: props.placeholder, onChange: e => props.onChange?.(e.target.value), style: {
-            padding: '6px 12px',
+            padding: '4px 11px',
             border: '1px solid #d9d9d9',
-            borderRadius: 4,
+            borderRadius: 6,
             outline: 'none',
             fontSize: 14,
             width: '100%',
             boxSizing: 'border-box',
-            height: 36,
+            height: 32,
+            background: '#fff',
+            transition: 'border-color 0.2s',
             ...props.style,
-        } }));
+        }, onFocus: e => (e.currentTarget.style.borderColor = '#4096ff'), onBlur: e => (e.currentTarget.style.borderColor = '#d9d9d9') }));
 };
 Input.OTP = OTPInput;
 export default Input;

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-export declare const getFingerprint: () => string | null;
 export declare const initFingerprint: () => Promise<string>;
 export type ModalConfig = {
     data: string;

package/dist/index.js

@@ -2,10 +2,6 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import ReactDOM from 'react-dom/client';
 import VerifyModal from './verify-modal.js';
 import Fingerprint2 from 'fingerprintjs2';
-let cachedFingerprint = null;
-export const getFingerprint = () => {
-    return cachedFingerprint;
-};
 export const initFingerprint = () => {
     return new Promise((resolve) => {
         Fingerprint2.get(function (components) {
@@ -15,7 +11,6 @@ export const initFingerprint = () => {
                 .map(component => component.value)
                 .join('###');
             const fingerprint = Fingerprint2.x64hash128(values, 31);
-            cachedFingerprint = fingerprint;
             resolve(fingerprint);
         });
     });

package/dist/main.js

@@ -1,16 +1,11 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { createRoot } from 'react-dom/client';
 import { createMessageVerifyModal } 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\":\"需要填写验证码\"}";
 createRoot(document.getElementById('root')).render(_jsx("button", { onClick: () => createMessageVerifyModal({
         data,
         config: {},
         lang: 'en',
-        http: Object.assign(() => Promise.resolve({}), {
-            defaults: {
-                headers: {
-                    common: {}
-                }
-            }
-        }),
+        http: axios,
     }), children: "Show Modal" }));

package/dist/resource.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("@yqg/resource").default & Record<"urlPrefix" | "getCaptchaKey" | "reSendCode" | "getCaptchaImgUrl", import("@yqg/resource").CustomMethod>;
+declare const _default: import("@yqg/resource").default & Record<"getCaptchaKey" | "reSendCode" | "getCaptchaImgUrl", import("@yqg/resource").CustomMethod>;
 export default _default;

package/dist/resource.js

@@ -1,50 +1,7 @@
 import { assign, customPost } from '@yqg/resource';
-// import { assign, axios as instance, customPost } from '@yqg/resource';
-// import { message } from './compoments/index.js';
-// import { YQG_SUCCESS } from './utils/status.js';
-const urlPrefix = '/messageVerify/admin/';
-// axios.defaults.headers.common['Access-Control-Allow-Origin'] = '*';
-// instance.interceptors.response.use(
-//     (res) => {
-//         const { status } = res?.data || {};
-//         const { code, detail } = status || {};
-//         if (res?.config?.responseType === 'blob') {
-//             if (res?.data?.type === 'application/json') {
-//                 // 没有拿到文件时，将拿到的 blob 流转为 js 对象，进而拿到错误信息(detail)并返回 reject 状态
-//                 // 不处理将默认下载一个 json 文件
-//                 const reader = new FileReader();
-//                 reader.readAsText(res.data, 'utf-8');
-//                 reader.onload = () => {
-//                     const parsedObj = JSON.parse(reader.result as string);
-//                     message.info(parsedObj?.status?.detail);
-//                 };
-//                 return Promise.reject();
-//             } else {
-//                 return res;
-//             }
-//         }
-//         if (res.headers && res.headers['content-type'] === 'image/jpeg') {
-//             return res;
-//         }
-//         switch (code) {
-//             case YQG_SUCCESS:
-//                 return Promise.resolve(res);
-//             default: {
-//                 message.error(detail);
-//                 return Promise.reject(res);
-//             }
-//         }
-//     },
-//     (err: {data: {status: {detail: string}}}) => {
-//         const detail = err?.data?.status?.detail || 'Unknown error';
-//         message.error(detail);
-//         return Promise.reject(err);
-//     },
-// );
 const api = {
-    urlPrefix,
-    getCaptchaKey: customPost('captcha/key'),
-    reSendCode: customPost('sms/send'),
+    getCaptchaKey: customPost('/messageVerify/admin/captcha/key'),
+    reSendCode: customPost('/admin/sms/send'),
     getCaptchaImgUrl: (captchaKey) => { return `/messageVerify/admin/captcha/image/${captchaKey}`; },
 };
 export default assign(api);

package/dist/verify-modal.js

@@ -14,12 +14,20 @@ const CreateMessageVerifyModal = ({ props }) => {
     const dataObj = JSON.parse(data || '{}');
     const { mobile, verifyCodeKey } = dataObj || {};
     const getKey = async () => {
-        const res = await Api.getCaptchaKey();
-        const { body: key } = res.data || {};
-        setCaptchaKey(key);
-        if (key) {
-            const image = Api.getCaptchaImgUrl(key);
-            setCaptchaImage(image);
+        try {
+            const res = await Api.getCaptchaKey();
+            const { body: key } = res.data || {};
+            setCaptchaKey(key);
+            if (key) {
+                const image = Api.getCaptchaImgUrl(key);
+                setCaptchaImage(image);
+            }
+        }
+        catch (err) {
+            const msg = typeof err === 'object' && err !== null && 'message' in err
+                ? err.message
+                : String(err);
+            message.error(msg);
         }
     };
     useEffect(() => {
@@ -49,9 +57,15 @@ const CreateMessageVerifyModal = ({ props }) => {
         }, 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: (val) => {
                             setOtp(val);
                             if (val.length === 6) {
-                                http.defaults.headers.common['sms-code'] = val;
-                                http.defaults.headers.common['sms-code-key'] = verifyCodeKey;
-                                http(config);
+                                console.log('otp', val);
+                                http({
+                                    ...config,
+                                    headers: {
+                                        ...http.defaults.headers.common,
+                                        'sms-code': val,
+                                        'sms-code-key': verifyCodeKey,
+                                    }
+                                });
                                 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 :

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "message-verify",
-  "version": "0.0.51-beta.0",
+  "version": "1.0.0-beta.0",
   "type": "module",
   "main": "dist/index.js",
   "dependencies": {

package/src/compoments/input.tsx

@@ -44,7 +44,7 @@ const OTPInput: React.FC<OTPInputProps> = ({ length, value = '', onChange, style
     };
 
     return (
-        <div style={{ display: 'flex', gap: 8, ...style }}>
+        <div style={{ display: 'flex', gap: 4, ...style }}>
             {Array.from({ length }).map((_, idx) => (
                 <input
                     key={idx}
@@ -55,14 +55,18 @@ const OTPInput: React.FC<OTPInputProps> = ({ length, value = '', onChange, style
                     onChange={e => handleChange(idx, e.target.value)}
                     onKeyDown={e => handleKeyDown(idx, e)}
                     style={{
-                        width: 32,
-                        height: 36,
+                        width: 36,
+                        height: 32,
                         textAlign: 'center',
-                        fontSize: 18,
+                        fontSize: 16,
                         border: '1px solid #d9d9d9',
-                        borderRadius: 8,
+                        borderRadius: 6,
                         outline: 'none',
+                        background: '#fff',
+                        transition: 'border-color 0.2s',
                     }}
+                    onFocus={e => (e.currentTarget.style.borderColor = '#4096ff')}
+                    onBlur={e => (e.currentTarget.style.borderColor = '#d9d9d9')}
                 />
             ))}
         </div>
@@ -77,16 +81,20 @@ const Input: React.FC<CustomInputProps> & { OTP: typeof OTPInput } = (props) =>
             placeholder={props.placeholder}
             onChange={e => props.onChange?.(e.target.value)}
             style={{
-                padding: '6px 12px',
+                padding: '4px 11px',
                 border: '1px solid #d9d9d9',
-                borderRadius: 4,
+                borderRadius: 6,
                 outline: 'none',
                 fontSize: 14,
                 width: '100%',
                 boxSizing: 'border-box',
-                height: 36,
+                height: 32,
+                background: '#fff',
+                transition: 'border-color 0.2s',
                 ...props.style,
             }}
+            onFocus={e => (e.currentTarget.style.borderColor = '#4096ff')}
+            onBlur={e => (e.currentTarget.style.borderColor = '#d9d9d9')}
         />
     );
 };

package/src/index.tsx

@@ -2,12 +2,6 @@ import ReactDOM from 'react-dom/client'
 import VerifyModal from './verify-modal.js'
 import Fingerprint2 from 'fingerprintjs2';
 
-let cachedFingerprint: string | null = null;
-
-export const getFingerprint = (): string | null => {
-    return cachedFingerprint;
-};
-
 export const initFingerprint = (): Promise<string> => {
     return new Promise((resolve) => {
         Fingerprint2.get(function (components) {
@@ -17,7 +11,6 @@ export const initFingerprint = (): Promise<string> => {
                 .map(component => component.value)
                 .join('###');
             const fingerprint = Fingerprint2.x64hash128(values, 31);
-            cachedFingerprint = fingerprint;
             resolve(fingerprint);
         });
     });

package/src/main.tsx

@@ -1,5 +1,6 @@
 import { createRoot } from 'react-dom/client';
 import { createMessageVerifyModal } 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\":\"需要填写验证码\"}";
 
@@ -8,16 +9,7 @@ createRoot(document.getElementById('root')!).render(
         data,
         config: {},
         lang: 'en',
-        http: Object.assign(
-            () => Promise.resolve({}),
-            {
-                defaults: {
-                    headers: {
-                        common: {}
-                    }
-                }
-            }
-        ),
+        http: axios,
     })}>
       Show Modal
     </button>);

package/src/resource.ts

@@ -1,56 +1,8 @@
 import { assign, customPost } from '@yqg/resource';
-// import { assign, axios as instance, customPost } from '@yqg/resource';
-// import { message } from './compoments/index.js';
-// import { YQG_SUCCESS } from './utils/status.js';
 
-const urlPrefix = '/messageVerify/admin/';
-// axios.defaults.headers.common['Access-Control-Allow-Origin'] = '*';
-// instance.interceptors.response.use(
-//     (res) => {
-//         const { status } = res?.data || {};
-//         const { code, detail } = status || {};
-//         if (res?.config?.responseType === 'blob') {
-//             if (res?.data?.type === 'application/json') {
-//                 // 没有拿到文件时，将拿到的 blob 流转为 js 对象，进而拿到错误信息(detail)并返回 reject 状态
-//                 // 不处理将默认下载一个 json 文件
-//                 const reader = new FileReader();
-//                 reader.readAsText(res.data, 'utf-8');
-//                 reader.onload = () => {
-//                     const parsedObj = JSON.parse(reader.result as string);
-//                     message.info(parsedObj?.status?.detail);
-//                 };
-
-//                 return Promise.reject();
-//             } else {
-//                 return res;
-//             }
-//         }
-
-//         if (res.headers && res.headers['content-type'] === 'image/jpeg') {
-//             return res;
-//         }
-
-//         switch (code) {
-//             case YQG_SUCCESS:
-//                 return Promise.resolve(res);
-//             default: {
-//                 message.error(detail);
-//                 return Promise.reject(res);
-//             }
-//         }
-//     },
-//     (err: {data: {status: {detail: string}}}) => {
-//         const detail = err?.data?.status?.detail || 'Unknown error';
-//         message.error(detail);
-
-//         return Promise.reject(err);
-//     },
-// );
 const api = {
-    urlPrefix,
-
-    getCaptchaKey: customPost('captcha/key'),
-    reSendCode: customPost('sms/send'),
+    getCaptchaKey: customPost('/messageVerify/admin/captcha/key'),
+    reSendCode: customPost('/admin/sms/send'),
     getCaptchaImgUrl: (captchaKey: string) => {return `/messageVerify/admin/captcha/image/${captchaKey}`},
 };
 

package/src/verify-modal.tsx

@@ -20,7 +20,6 @@ type ModalConfig = {
     };
 }
 const CreateMessageVerifyModal = ({ props }: { props: ModalConfig }) => {
-
     const [visible, setVisible] = useState(true);
     const [countdown, setCountdown] = useState(3);
     const [otp, setOtp] = useState('');
@@ -32,12 +31,19 @@ const CreateMessageVerifyModal = ({ props }: { props: ModalConfig }) => {
     const { mobile, verifyCodeKey } = dataObj || {};
 
     const getKey = async () => {
-        const res = await Api.getCaptchaKey();
-        const { body: key } = res.data || {};
-        setCaptchaKey(key);
-        if (key) {
-            const image = Api.getCaptchaImgUrl(key) as unknown;
-            setCaptchaImage(image as string);
+        try {
+            const res = await Api.getCaptchaKey();
+            const { body: key } = res.data || {};
+            setCaptchaKey(key);
+            if (key) {
+                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);
+            message.error(msg as React.ReactNode);
         }
     }
 
@@ -81,9 +87,15 @@ const CreateMessageVerifyModal = ({ props }: { props: ModalConfig }) => {
                     onChange={(val) => {
                         setOtp(val);
                         if (val.length === 6) {
-                            http.defaults.headers.common['sms-code'] = val as string;
-                            http.defaults.headers.common['sms-code-key'] = verifyCodeKey as string;
-                            http(config);
+                            console.log('otp', val);
+                            http({
+                                ...config,
+                                headers: {
+                                    ...http.defaults.headers.common,
+                                    'sms-code': val,
+                                    'sms-code-key': verifyCodeKey,
+                                }
+                            });
                             setVisible(false);
                         }
                     }} />

package/vite.config.ts

@@ -15,8 +15,15 @@ export default defineConfig({
           host: 'reconcile-test.yangqianguan.com', // 和转发url一样 host不带协议头 origin带上
           origin: 'https://reconcile-test.yangqianguan.com'
         },
-
       },
+      '/admin': {
+        target: 'https://chidori-admin-test.yangqianguan.com',
+        changeOrigin: true,
+        headers: {
+          host: 'chidori-admin-test.yangqianguan.com', // 和转发url一样 host不带协议头 origin带上
+          origin: 'https://chidori-admin-test.yangqianguan.com'
+        },
+      }
     },
   },
   build: {