message-verify 1.0.0 → 1.0.1-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/.arcconfig CHANGED
@@ -1,8 +1,4 @@
1
1
  {
2
- "project.name": "yqg-message-verify",
3
2
  "phabricator.uri": "https://code.yangqianguan.com/",
4
- "phutil_libraries": {
5
- "libcustom": "./arcanist"
6
- },
7
3
  "lint.engine": "YqgWebDiffLintEngine"
8
4
  }
package/dist/index.d.ts CHANGED
@@ -1,4 +1,3 @@
1
- import { VerifyModalConfig, LoginModalConfig } from './utils/type.js';
1
+ import { ModalConfig } from './utils/type.js';
2
2
  export declare const initFingerprint: () => Promise<string>;
3
- export declare const createReLoginModal: (modalProps: LoginModalConfig) => void;
4
- export declare const VerifyHandler: ({ data, config, http, verifyPromise, sendApi }: VerifyModalConfig) => Promise<any>;
3
+ export declare const createMessageVerifyModal: (modalProps: ModalConfig) => void;
package/dist/index.js CHANGED
@@ -1,71 +1,46 @@
1
1
  import { jsx as _jsx } from "react/jsx-runtime";
2
2
  import ReactDOM from 'react-dom/client';
3
- import VerifyModal from './modal/verify-modal.js';
3
+ import VerifyModal from './verify-modal.js';
4
4
  import Fingerprint2 from 'fingerprintjs2';
5
- import ReLoginModal from './modal/relogin-modal.js';
6
- let fingerprintPromise = null; // 用 Promise 本身作为缓存
7
- let modalRoot = null;
5
+ let cachedFingerprint = null;
8
6
  export const initFingerprint = async () => {
9
- if (!fingerprintPromise) {
10
- fingerprintPromise = new Promise((resolve) => {
11
- Fingerprint2.get(components => {
12
- const includeKeys = ['userAgent', 'cpuClass', 'hardwareConcurrency', 'platform'];
13
- const values = components
14
- .filter(c => includeKeys.includes(c.key))
15
- .map(c => c.value)
16
- .join('###');
17
- const fingerprint = Fingerprint2.x64hash128(values, 31);
18
- resolve(fingerprint);
19
- });
20
- });
21
- }
22
- return fingerprintPromise;
23
- };
24
- const destroyModal = (modalId) => {
25
- if (modalRoot) {
26
- modalRoot.unmount();
27
- document.getElementById(modalId)?.remove();
28
- modalRoot = null;
7
+ if (cachedFingerprint) {
8
+ // 已有缓存,直接返回 Promise
9
+ return Promise.resolve(cachedFingerprint);
29
10
  }
11
+ // 首次异步获取并缓存
12
+ return new Promise((resolve) => {
13
+ Fingerprint2.get(function (components) {
14
+ console.log('components', components);
15
+ const includeKeys = ['userAgent', 'deviceMemory', 'cpuClass', 'hardwareConcurrency', 'platform'];
16
+ const values = components
17
+ .filter(component => includeKeys.includes(component.key))
18
+ .map(component => component.value)
19
+ .join('###');
20
+ const fingerprint = Fingerprint2.x64hash128(values, 31);
21
+ cachedFingerprint = fingerprint;
22
+ resolve(fingerprint);
23
+ });
24
+ });
30
25
  };
31
- const creatModal = (modalProps, modalId, ModalDom) => {
32
- destroyModal(modalId);
26
+ let modalRoot = null;
27
+ export const createMessageVerifyModal = (modalProps) => {
33
28
  const container = document.createElement('div');
34
- container.id = modalId;
29
+ container.id = 'antd-modal-container';
35
30
  document.body.appendChild(container);
36
31
  modalRoot = ReactDOM.createRoot(container);
37
- modalRoot.render(_jsx(ModalDom, { props: {
32
+ modalRoot.render(_jsx(VerifyModal, { props: {
38
33
  ...modalProps,
39
34
  onClose: () => {
40
- destroyModal(modalId);
35
+ modalProps.onClose?.();
36
+ destroyModal();
41
37
  }
42
38
  } }));
43
39
  };
44
- const createMessageVerifyModal = (modalProps) => {
45
- const verifyModalId = 'verify-modal-container';
46
- creatModal(modalProps, verifyModalId, VerifyModal);
47
- };
48
- // 新增 relogin 弹窗创建方法
49
- export const createReLoginModal = (modalProps) => {
50
- const reLoginModalId = 'relogin-modal-container';
51
- creatModal(modalProps, reLoginModalId, ReLoginModal);
52
- };
53
- export const VerifyHandler = ({ data, config, http, verifyPromise, sendApi }) => {
54
- const toEmpty = () => {
55
- verifyPromise.current = null;
56
- };
57
- if (!verifyPromise.current) {
58
- verifyPromise.current = new Promise((resolve, reject) => {
59
- createMessageVerifyModal({
60
- data,
61
- config,
62
- http,
63
- apiResolve: resolve,
64
- apiReject: reject,
65
- apiPromiseToEmpty: toEmpty,
66
- sendApi
67
- });
68
- }).finally(toEmpty);
40
+ const destroyModal = () => {
41
+ if (modalRoot) {
42
+ modalRoot.unmount();
43
+ document.getElementById('antd-modal-container')?.remove();
44
+ modalRoot = null;
69
45
  }
70
- return verifyPromise.current;
71
46
  };
@@ -7,10 +7,5 @@ declare const _default: {
7
7
  sendFailed: string;
8
8
  reSend: string;
9
9
  countDownSecound: string;
10
- accountAlert: string;
11
- alertContent: string;
12
- ok: string;
13
- chidoriOpenPro: string;
14
- verifyFail: string;
15
10
  };
16
11
  export default _default;
@@ -6,10 +6,5 @@ export default {
6
6
  sendSuccess: 'Successfully sent',
7
7
  sendFailed: 'Send failed',
8
8
  reSend: 'Resend',
9
- countDownSecound: '{countdown} seconds',
10
- accountAlert: 'Account Security Alert',
11
- alertContent: 'Changes have been detected in your login environment or network information.To ensure account security, please log in again to verify your identity.',
12
- ok: 'OK',
13
- chidoriOpenPro: 'Chidori has activated security protection for you',
14
- verifyFail: 'Validation failed'
9
+ countDownSecound: '{countdown} seconds'
15
10
  };
@@ -7,10 +7,5 @@ declare const _default: {
7
7
  sendFailed: string;
8
8
  reSend: string;
9
9
  countDownSecound: string;
10
- accountAlert: string;
11
- alertContent: string;
12
- ok: string;
13
- chidoriOpenPro: string;
14
- verifyFail: string;
15
10
  };
16
11
  export default _default;
@@ -6,10 +6,5 @@ export default {
6
6
  sendSuccess: 'Berhasil dikirim',
7
7
  sendFailed: 'Gagal mengirim',
8
8
  reSend: 'Kirim Ulang',
9
- countDownSecound: '{countdown} detik',
10
- accountAlert: 'Peringatan Keamanan Akun',
11
- alertContent: 'Terdeteksi perubahan pada lingkungan login atau informasi jaringan Anda.Untuk menjaga keamanan akun, silakan login kembali untuk memverifikasi identitas Anda.',
12
- ok: 'Baiklah',
13
- chidoriOpenPro: 'chidori telah mengaktifkan keamanan untuk Anda',
14
- verifyFail: 'Autentikasi gagal'
9
+ countDownSecound: '{countdown} detik'
15
10
  };
@@ -7,10 +7,5 @@ declare const _default: {
7
7
  sendFailed: string;
8
8
  reSend: string;
9
9
  countDownSecound: string;
10
- accountAlert: string;
11
- alertContent: string;
12
- ok: string;
13
- chidoriOpenPro: string;
14
- verifyFail: string;
15
10
  };
16
11
  export default _default;
@@ -6,10 +6,5 @@ export default {
6
6
  sendSuccess: '发送成功',
7
7
  sendFailed: '发送失败',
8
8
  reSend: '重新发送',
9
- countDownSecound: '{countdown}秒',
10
- accountAlert: '账号安全提醒',
11
- alertContent: '检测到您的登录环境或网络信息有变动,为保障账户安全,请重新登录验证身份',
12
- ok: '好的',
13
- chidoriOpenPro: 'chidori已为您开启安全防护',
14
- verifyFail: '验证失败'
9
+ countDownSecound: '{countdown}秒'
15
10
  };
package/dist/main.js CHANGED
@@ -1,47 +1,13 @@
1
- import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
1
+ import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
2
2
  import { createRoot } from 'react-dom/client';
3
- import { initFingerprint, createReLoginModal, VerifyHandler } from './index.js'; // 或 './index'
3
+ import { createMessageVerifyModal, initFingerprint } from './index.js'; // 或 './index'
4
4
  import { axios } from '@yqg/resource';
5
5
  const data = "{\"mobile\":\"188****4035\",\"verifyCodeKey\":\"3f025b33-988e-47c0-950d-6beb776d043f\",\"needValid\":true,\"step\":2,\"message\":\"需要填写验证码\"}";
6
6
  const fp = await initFingerprint();
7
- const fp2 = await initFingerprint();
8
- console.log(fp, fp2);
9
- const config = {
10
- "transitional": {
11
- "silentJSONParsing": true,
12
- "forcedJSONParsing": true,
13
- "clarifyTimeoutError": false
14
- },
15
- "timeout": 0,
16
- "xsrfCookieName": "XSRF-TOKEN",
17
- "xsrfHeaderName": "X-XSRF-TOKEN",
18
- "maxContentLength": -1,
19
- "maxBodyLength": -1,
20
- "headers": {
21
- "Accept": "application/json, text/plain, */*",
22
- "X-Device-Fingerprint": "531f14c7176b16ebeb18e2b23d6bd124",
23
- "Content-Type": "application/json"
24
- },
25
- "url": "/classification/admin/level/edit",
26
- "method": "post",
27
- "dataFormat": "JSON",
28
- "showRequestData": true,
29
- "showResponseData": false,
30
- "showGeneralResponseData": true,
31
- "headersList": [],
32
- "requestDataFunc": "\nfunction(formFilterData){\n // 这里写你的处理逻辑\n return {\n ...formFilterData,\n 'classificationLevel': 2 //等级\n }\n}\n",
33
- "responseDataFunc": "",
34
- "responseGeneralDataFunc": "function(req, { data, util, window }) {\n return req\n .then((response) => {\n return Promise.resolve({\n status: {\n code: 0,\n }\n })\n })\n .catch((error) => {\n // 检查是否有响应数据\n if (error.response && error.response.data) {\n const responseData = error.response.data;\n const detail = responseData.body?.status?.detail || responseData.status?.detail;\n if (detail) {\n util.message.error(detail);\n } else {\n util.message.error('编辑失败,请重试');\n }\n } else {\n util.message.error('编辑失败,请重试');\n }\n console.error('Error during deletion:', error);\n });\n}",
35
- "formInstance": {},
36
- "data": "{\"id\":1,\"classificationName\":\"个人基本概况信息\",\"classificationLevel\":2}",
37
- "baseURL": "http://localhost:62888"
38
- };
39
- const promise = { current: null };
40
- createRoot(document.getElementById('root')).render(_jsxs(_Fragment, { children: [_jsx("button", { onClick: () => {
41
- return VerifyHandler({ data, config, http: axios, verifyPromise: promise });
42
- }, children: "Show verify Modal" }), _jsx("button", { onClick: () => createReLoginModal({
43
- goLogin: () => {
44
- console.log('goLogin');
45
- },
46
- lang: 'zh',
47
- }), children: "Show login Modal" })] }));
7
+ console.log(fp);
8
+ createRoot(document.getElementById('root')).render(_jsx(_Fragment, { children: _jsx("button", { onClick: () => createMessageVerifyModal({
9
+ data,
10
+ config: { headers: {} },
11
+ lang: 'en',
12
+ http: axios,
13
+ }), children: "Show verify Modal" }) }));
@@ -1,5 +1,5 @@
1
- import { LoginModalConfig } from './utils/type.js';
1
+ import { ModalConfig } from './utils/type.js';
2
2
  declare const ReLoginModal: ({ props }: {
3
- props: LoginModalConfig;
3
+ props: ModalConfig;
4
4
  }) => import("react/jsx-runtime.js").JSX.Element;
5
5
  export default ReLoginModal;
@@ -1,23 +1,22 @@
1
1
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
2
2
  import { useState } from 'react';
3
3
  import { Modal, Button } from './compoments/index.js';
4
- import t from './utils/i18n.js';
5
4
  const ReLoginModal = ({ props }) => {
6
- const { goLogin, lang } = props || {};
5
+ console.log('props', props);
7
6
  const [visible, setVisible] = useState(true);
8
7
  const onClose = () => {
9
8
  setVisible(false);
10
- goLogin();
11
9
  };
12
- 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: {
10
+ 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: {
13
11
  background: '#1677ff',
14
12
  color: '#fff',
15
13
  border: 'none',
16
- width: 80,
17
- height: 36,
18
- fontSize: 14,
14
+ width: 160,
15
+ height: 44,
16
+ fontSize: 18,
17
+ fontWeight: 500,
19
18
  borderRadius: 8,
20
19
  boxShadow: '0 2px 8px rgba(22,119,255,0.08)',
21
- }, onClick: onClose, children: t('ok', lang) }) })] }));
20
+ }, onClick: onClose, children: "\u597D\u7684" }) })] }));
22
21
  };
23
22
  export default ReLoginModal;
@@ -1 +1 @@
1
- {"root":["../src/index.tsx","../src/main.tsx","../src/vite-env.d.ts","../src/compoments/button.tsx","../src/compoments/index.ts","../src/compoments/input.tsx","../src/compoments/message.tsx","../src/compoments/modal.tsx","../src/locales/en.ts","../src/locales/id.ts","../src/locales/zh.ts","../src/modal/relogin-modal.tsx","../src/modal/verify-modal.tsx","../src/utils/i18n.ts","../src/utils/resource.ts","../src/utils/status.ts","../src/utils/type.ts"],"version":"5.7.3"}
1
+ {"root":["../src/index.tsx","../src/main.tsx","../src/relogin-modal.tsx","../src/resource.ts","../src/verify-modal.tsx","../src/vite-env.d.ts","../src/compoments/button.tsx","../src/compoments/index.ts","../src/compoments/input.tsx","../src/compoments/message.tsx","../src/compoments/modal.tsx","../src/locales/en.ts","../src/locales/id.ts","../src/locales/zh.ts","../src/utils/i18n.ts","../src/utils/status.ts","../src/utils/type.ts"],"version":"5.7.3"}
@@ -1,4 +1,4 @@
1
- export type VerifyModalConfig = {
1
+ export type ModalConfig = {
2
2
  data: string;
3
3
  onClose?: () => void;
4
4
  config: {
@@ -7,7 +7,7 @@ export type VerifyModalConfig = {
7
7
  };
8
8
  [key: string]: unknown;
9
9
  };
10
- lang?: 'zh' | 'en' | 'id';
10
+ lang: 'zh' | 'en' | 'id';
11
11
  http: {
12
12
  (params: object): Promise<unknown>;
13
13
  defaults: {
@@ -18,16 +18,5 @@ export type VerifyModalConfig = {
18
18
  };
19
19
  };
20
20
  };
21
- sendApi?: string;
22
- apiReject?: any;
23
- apiResolve?: any;
24
- apiPromiseToEmpty?: () => void;
25
- verifyPromise: {
26
- current: Promise<any> | null;
27
- };
28
- };
29
- export type LoginModalConfig = {
30
- goLogin: () => void;
31
- onClose?: () => void;
32
- lang?: 'zh' | 'en' | 'id';
21
+ api?: string;
33
22
  };
@@ -1,5 +1,5 @@
1
- import { VerifyModalConfig } from './utils/type.js';
1
+ import { ModalConfig } from './utils/type.js';
2
2
  declare const CreateMessageVerifyModal: ({ props }: {
3
- props: VerifyModalConfig;
3
+ props: ModalConfig;
4
4
  }) => import("react/jsx-runtime.js").JSX.Element;
5
5
  export default CreateMessageVerifyModal;
@@ -11,7 +11,7 @@ const CreateMessageVerifyModal = ({ props }) => {
11
11
  const [captchaImage, setCaptchaImage] = useState('');
12
12
  const [captchCode, setCaptchCode] = useState('');
13
13
  const [captchaKey, setCaptchaKey] = useState('');
14
- const { data, http, lang, sendApi = '/admin/sms/send', config, apiResolve, apiPromiseToEmpty } = props || {};
14
+ const { data, config, http, lang, api = '/admin/sms/send' } = props || {};
15
15
  const dataObj = JSON.parse(data || '{}');
16
16
  const { mobile, verifyCodeKey } = dataObj || {};
17
17
  const getKey = async () => {
@@ -51,65 +51,35 @@ const CreateMessageVerifyModal = ({ props }) => {
51
51
  formData.append('captchaKey', captchaKey);
52
52
  formData.append('captcha', captchCode);
53
53
  // 重新发送验证码
54
- const res = await axios.post(sendApi, formData);
54
+ const res = await axios.post(api, formData);
55
55
  const { code, detail } = res.data?.status || {};
56
56
  if (code !== 0) {
57
57
  message.error(detail || t('sendFailed', lang));
58
58
  return;
59
59
  }
60
60
  message.success(t('sendSuccess', lang));
61
- // 重置倒计时、验证码
62
61
  setCountdown(60);
63
- setOtp('');
64
62
  };
65
63
  return (_jsxs(Modal, { width: 420, visible: visible, onClose: () => {
66
64
  setVisible(false);
67
- apiPromiseToEmpty?.();
68
65
  props.onClose?.();
69
66
  }, 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) => {
70
67
  setOtp(val);
71
68
  if (val.length === 6) {
72
- try {
73
- const res = await Promise.race([
74
- new Promise((resolve, reject) => {
75
- setTimeout(() => {
76
- reject(new Error('Timeout'));
77
- }, 1000);
78
- }),
79
- new Promise((resolve, reject) => {
80
- http({
81
- ...config,
82
- headers: {
83
- ...http.defaults.headers.common,
84
- 'sms-code': val,
85
- 'sms-code-key': verifyCodeKey,
86
- 'Content-Type': config.headers['Content-Type'],
87
- }
88
- }).then(res => {
89
- resolve(res);
90
- }).catch(err => {
91
- reject(err);
92
- });
93
- })
94
- ]);
95
- if (res?.data?.status?.code === 0) {
96
- apiResolve(res);
97
- setVisible(false);
69
+ http({
70
+ ...config,
71
+ headers: {
72
+ ...http.defaults.headers.common,
73
+ 'sms-code': val,
74
+ 'sms-code-key': verifyCodeKey,
75
+ 'Content-Type': config.headers['Content-Type'],
98
76
  }
99
- else {
100
- message.error('验证失败');
101
- setOtp('');
102
- }
103
- }
104
- catch (error) {
105
- console.warn('catch', error);
106
- message.error('验证失败');
107
- setOtp('');
108
- }
77
+ });
78
+ setVisible(false);
109
79
  }
110
80
  } }), _jsx(Button, { disabled: countdown > 0 || !captchCode, onClick: handleResend, style: { padding: '8px' }, children: countdown > 0 ? t('countDownSecound', lang, { countdown }) : t('reSend', lang) })] }), countdown > 0 ? null :
111
81
  _jsxs("div", { style: { marginTop: 12, display: 'flex', alignItems: 'center' }, children: [_jsx(Input, { placeholder: t('pleaseEnterPicVerifyCode', lang), onChange: (e) => {
112
82
  setCaptchCode(e);
113
- }, 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) })] }));
83
+ }, 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) })] }));
114
84
  };
115
85
  export default CreateMessageVerifyModal;
package/eslint.config.js CHANGED
@@ -23,8 +23,7 @@ export default tseslint.config(
23
23
  'warn',
24
24
  { allowConstantExport: true },
25
25
  ],
26
- "@typescript-eslint/no-explicit-any": "off",
27
- 'constructor-super': 'off'
26
+ "@typescript-eslint/no-explicit-any": "off"
28
27
  },
29
28
  },
30
29
  )
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "message-verify",
3
- "version": "1.0.0",
3
+ "version": "1.0.1-beta.0",
4
4
  "type": "module",
5
5
  "main": "dist/index.js",
6
6
  "dependencies": {
@@ -29,7 +29,6 @@
29
29
  "build": "tsc -b",
30
30
  "analyze": "vite build",
31
31
  "lint": "eslint .",
32
- "preview": "vite preview",
33
- "release:beta": "pnpm version prerelease --preid=beta && pnpm run build && pnpm publish"
32
+ "preview": "vite preview"
34
33
  }
35
34
  }
package/src/index.tsx CHANGED
@@ -1,81 +1,55 @@
1
1
  import ReactDOM from 'react-dom/client'
2
- import VerifyModal from './modal/verify-modal.js'
2
+ import VerifyModal from './verify-modal.js'
3
3
  import Fingerprint2 from 'fingerprintjs2';
4
- import ReLoginModal from './modal/relogin-modal.js';
5
- import { VerifyModalConfig, LoginModalConfig } from './utils/type.js';
4
+ import { ModalConfig } from './utils/type.js';
6
5
 
7
- let fingerprintPromise: Promise<string> | null = null; // 用 Promise 本身作为缓存
8
- let modalRoot: ReactDOM.Root | null = null
6
+ let cachedFingerprint: string | null = null;
9
7
  export const initFingerprint = async (): Promise<string> => {
10
- if (!fingerprintPromise) {
11
- fingerprintPromise = new Promise((resolve) => {
12
- Fingerprint2.get(components => {
13
- const includeKeys = ['userAgent', 'cpuClass', 'hardwareConcurrency', 'platform'];
14
- const values = components
15
- .filter(c => includeKeys.includes(c.key))
16
- .map(c => c.value)
17
- .join('###');
18
- const fingerprint = Fingerprint2.x64hash128(values, 31);
19
- resolve(fingerprint);
20
- });
21
- });
8
+ if (cachedFingerprint) {
9
+ // 已有缓存,直接返回 Promise
10
+ return Promise.resolve(cachedFingerprint);
22
11
  }
23
- return fingerprintPromise;
12
+ // 首次异步获取并缓存
13
+ return new Promise((resolve) => {
14
+ Fingerprint2.get(function (components) {
15
+ console.log('components', components);
16
+ const includeKeys = ['userAgent', 'deviceMemory', 'cpuClass', 'hardwareConcurrency', 'platform'];
17
+ const values = components
18
+ .filter(component => includeKeys.includes(component.key))
19
+ .map(component => component.value)
20
+ .join('###');
21
+ const fingerprint = Fingerprint2.x64hash128(values, 31);
22
+ cachedFingerprint = fingerprint;
23
+ resolve(fingerprint);
24
+ });
25
+ });
24
26
  };
25
27
 
26
- const destroyModal = (modalId: string) => {
27
- if (modalRoot) {
28
- modalRoot.unmount()
29
- document.getElementById(modalId)?.remove()
30
- modalRoot = null
31
- }
32
- }
33
-
34
- const creatModal = (modalProps: VerifyModalConfig | LoginModalConfig, modalId: string, ModalDom:any) => {
35
- destroyModal(modalId);
36
- const container = document.createElement('div')
37
- container.id = modalId
38
- document.body.appendChild(container)
28
+ let modalRoot: ReactDOM.Root | null = null
39
29
 
40
- modalRoot = ReactDOM.createRoot(container)
41
- modalRoot.render(
42
- <ModalDom
43
- props={{
44
- ...modalProps,
45
- onClose: () => {
46
- destroyModal(modalId);
47
- }
48
- }}
49
- />
50
- )
51
- }
30
+ export const createMessageVerifyModal = (modalProps: ModalConfig) => {
31
+ const container = document.createElement('div')
32
+ container.id = 'antd-modal-container'
33
+ document.body.appendChild(container)
52
34
 
53
- const createMessageVerifyModal = (modalProps: VerifyModalConfig) => {
54
- const verifyModalId = 'verify-modal-container';
55
- creatModal(modalProps, verifyModalId, VerifyModal);
56
- }
57
- // 新增 relogin 弹窗创建方法
58
- export const createReLoginModal = (modalProps: LoginModalConfig) => {
59
- const reLoginModalId = 'relogin-modal-container';
60
- creatModal(modalProps, reLoginModalId, ReLoginModal);
35
+ modalRoot = ReactDOM.createRoot(container)
36
+ modalRoot.render(
37
+ <VerifyModal
38
+ props={{
39
+ ...modalProps,
40
+ onClose: () => {
41
+ modalProps.onClose?.()
42
+ destroyModal()
43
+ }
44
+ }}
45
+ />
46
+ )
61
47
  }
62
48
 
63
- export const VerifyHandler = ({data, config, http, verifyPromise, sendApi}: VerifyModalConfig): Promise<any> => {
64
- const toEmpty = () => {
65
- verifyPromise.current = null;
66
- };
67
- if (!verifyPromise.current) {
68
- verifyPromise.current = new Promise((resolve, reject) => {
69
- createMessageVerifyModal({
70
- data,
71
- config,
72
- http,
73
- apiResolve: resolve,
74
- apiReject: reject,
75
- apiPromiseToEmpty: toEmpty,
76
- sendApi
77
- } as VerifyModalConfig);
78
- }).finally(toEmpty);
79
- }
80
- return verifyPromise.current;
81
- };
49
+ const destroyModal = () => {
50
+ if (modalRoot) {
51
+ modalRoot.unmount()
52
+ document.getElementById('antd-modal-container')?.remove()
53
+ modalRoot = null
54
+ }
55
+ }
package/src/locales/en.ts CHANGED
@@ -6,10 +6,5 @@ export default {
6
6
  sendSuccess: 'Successfully sent',
7
7
  sendFailed: 'Send failed',
8
8
  reSend: 'Resend',
9
- countDownSecound: '{countdown} seconds',
10
- accountAlert: 'Account Security Alert',
11
- alertContent: 'Changes have been detected in your login environment or network information.To ensure account security, please log in again to verify your identity.',
12
- ok: 'OK',
13
- chidoriOpenPro: 'Chidori has activated security protection for you',
14
- verifyFail: 'Validation failed'
9
+ countDownSecound: '{countdown} seconds'
15
10
  };
package/src/locales/id.ts CHANGED
@@ -6,10 +6,5 @@ export default {
6
6
  sendSuccess: 'Berhasil dikirim',
7
7
  sendFailed: 'Gagal mengirim',
8
8
  reSend: 'Kirim Ulang',
9
- countDownSecound: '{countdown} detik',
10
- accountAlert: 'Peringatan Keamanan Akun',
11
- alertContent: 'Terdeteksi perubahan pada lingkungan login atau informasi jaringan Anda.Untuk menjaga keamanan akun, silakan login kembali untuk memverifikasi identitas Anda.',
12
- ok: 'Baiklah',
13
- chidoriOpenPro: 'chidori telah mengaktifkan keamanan untuk Anda',
14
- verifyFail: 'Autentikasi gagal'
9
+ countDownSecound: '{countdown} detik'
15
10
  };
package/src/locales/zh.ts CHANGED
@@ -6,10 +6,5 @@ export default {
6
6
  sendSuccess: '发送成功',
7
7
  sendFailed: '发送失败',
8
8
  reSend: '重新发送',
9
- countDownSecound: '{countdown}秒',
10
- accountAlert: '账号安全提醒',
11
- alertContent: '检测到您的登录环境或网络信息有变动,为保障账户安全,请重新登录验证身份',
12
- ok: '好的',
13
- chidoriOpenPro: 'chidori已为您开启安全防护',
14
- verifyFail: '验证失败'
9
+ countDownSecound: '{countdown}秒'
15
10
  };
package/src/main.tsx CHANGED
@@ -1,58 +1,20 @@
1
1
  import { createRoot } from 'react-dom/client';
2
- import { initFingerprint, createReLoginModal, VerifyHandler } from './index.js'; // 或 './index'
2
+ import { createMessageVerifyModal, initFingerprint } from './index.js'; // 或 './index'
3
3
  import { axios } from '@yqg/resource';
4
4
 
5
5
  const data = "{\"mobile\":\"188****4035\",\"verifyCodeKey\":\"3f025b33-988e-47c0-950d-6beb776d043f\",\"needValid\":true,\"step\":2,\"message\":\"需要填写验证码\"}";
6
6
 
7
7
  const fp = await initFingerprint();
8
- const fp2 = await initFingerprint();
9
- console.log(fp, fp2);
8
+ console.log(fp);
10
9
 
11
- const config = {
12
- "transitional": {
13
- "silentJSONParsing": true,
14
- "forcedJSONParsing": true,
15
- "clarifyTimeoutError": false
16
- },
17
- "timeout": 0,
18
- "xsrfCookieName": "XSRF-TOKEN",
19
- "xsrfHeaderName": "X-XSRF-TOKEN",
20
- "maxContentLength": -1,
21
- "maxBodyLength": -1,
22
- "headers": {
23
- "Accept": "application/json, text/plain, */*",
24
- "X-Device-Fingerprint": "531f14c7176b16ebeb18e2b23d6bd124",
25
- "Content-Type": "application/json"
26
- },
27
- "url": "/classification/admin/level/edit",
28
- "method": "post",
29
- "dataFormat": "JSON",
30
- "showRequestData": true,
31
- "showResponseData": false,
32
- "showGeneralResponseData": true,
33
- "headersList": [],
34
- "requestDataFunc": "\nfunction(formFilterData){\n // 这里写你的处理逻辑\n return {\n ...formFilterData,\n 'classificationLevel': 2 //等级\n }\n}\n",
35
- "responseDataFunc": "",
36
- "responseGeneralDataFunc": "function(req, { data, util, window }) {\n return req\n .then((response) => {\n return Promise.resolve({\n status: {\n code: 0,\n }\n })\n })\n .catch((error) => {\n // 检查是否有响应数据\n if (error.response && error.response.data) {\n const responseData = error.response.data;\n const detail = responseData.body?.status?.detail || responseData.status?.detail;\n if (detail) {\n util.message.error(detail);\n } else {\n util.message.error('编辑失败,请重试');\n }\n } else {\n util.message.error('编辑失败,请重试');\n }\n console.error('Error during deletion:', error);\n });\n}",
37
- "formInstance": {},
38
- "data": "{\"id\":1,\"classificationName\":\"个人基本概况信息\",\"classificationLevel\":2}",
39
- "baseURL": "http://localhost:62888"
40
- }
41
-
42
- const promise = {current: null};
43
10
  createRoot(document.getElementById('root')!).render(
44
11
  <>
45
- <button onClick={() => {
46
- return VerifyHandler({data, config, http: axios, verifyPromise: promise});
47
- }}>
48
- Show verify Modal
49
- </button>
50
- <button onClick={() => createReLoginModal({
51
- goLogin: () => {
52
- console.log('goLogin');
53
- },
54
- lang: 'zh',
55
- })}>
56
- Show login Modal
57
- </button>
12
+ <button onClick={() => createMessageVerifyModal({
13
+ data,
14
+ config: {headers: {}},
15
+ lang: 'en',
16
+ http: axios,
17
+ })}>
18
+ Show verify Modal
19
+ </button>
58
20
  </>);
@@ -1,23 +1,20 @@
1
1
  import { useState } from 'react'
2
- import { Modal, Button } from '../compoments/index.js'
3
- import { LoginModalConfig } from '../utils/type.js';
4
- import t from '../utils/i18n.js'
2
+ import { Modal, Button } from './compoments/index.js'
3
+ import { ModalConfig } from './utils/type.js';
5
4
 
6
- const ReLoginModal = ({ props }: { props: LoginModalConfig }) => {
7
- const { goLogin, lang, onClose: destroyModal } = props || {};
5
+ const ReLoginModal = ({ props }: { props: ModalConfig }) => {
6
+ console.log('props', props);
8
7
  const [visible, setVisible] = useState(true);
9
8
  const onClose = () => {
10
9
  setVisible(false);
11
- goLogin();
12
- destroyModal?.();
13
10
  };
14
11
  return (
15
12
  <Modal visible={visible} onClose={onClose} width={420}>
16
13
  <div style={{ fontWeight: 500, fontSize: 20, marginBottom: 24 }}>
17
- {t('accountAlert', lang)}
14
+ 账号安全提醒
18
15
  </div>
19
16
  <div style={{ color: '#222', fontSize: 16, marginBottom: 40, lineHeight: '24px' }}>
20
- {t('alertContent', lang)}
17
+ 检测到您的登录环境或网络信息有变动,为保障账户安全,请重新登录验证身份
21
18
  </div>
22
19
  <div style={{ display: 'flex', justifyContent: 'center' }}>
23
20
  <Button
@@ -25,15 +22,16 @@ const ReLoginModal = ({ props }: { props: LoginModalConfig }) => {
25
22
  background: '#1677ff',
26
23
  color: '#fff',
27
24
  border: 'none',
28
- width: 80,
29
- height: 36,
30
- fontSize: 14,
25
+ width: 160,
26
+ height: 44,
27
+ fontSize: 18,
28
+ fontWeight: 500,
31
29
  borderRadius: 8,
32
30
  boxShadow: '0 2px 8px rgba(22,119,255,0.08)',
33
31
  }}
34
32
  onClick={onClose}
35
33
  >
36
- {t('ok', lang)}
34
+ 好的
37
35
  </Button>
38
36
  </div>
39
37
  </Modal>
package/src/utils/type.ts CHANGED
@@ -1,5 +1,5 @@
1
1
 
2
- export type VerifyModalConfig = {
2
+ export type ModalConfig = {
3
3
  data: string;
4
4
  onClose?: () => void
5
5
  config: {
@@ -8,7 +8,7 @@ export type VerifyModalConfig = {
8
8
  };
9
9
  [key: string]: unknown;
10
10
  };
11
- lang?: 'zh' | 'en' | 'id';
11
+ lang: 'zh' | 'en' | 'id';
12
12
  http: {
13
13
  (params: object): Promise<unknown>;
14
14
  defaults: {
@@ -19,15 +19,5 @@ export type VerifyModalConfig = {
19
19
  }
20
20
  }
21
21
  };
22
- sendApi?: string;
23
- apiReject?: any;
24
- apiResolve?: any;
25
- apiPromiseToEmpty?: () => void;
26
- verifyPromise: {current: Promise<any> | null}
27
- }
28
-
29
- export type LoginModalConfig = {
30
- goLogin: () => void;
31
- onClose?: () => void
32
- lang?: 'zh' | 'en' | 'id';
22
+ api?: string;
33
23
  }
@@ -1,18 +1,18 @@
1
1
  import { useEffect, useState } from 'react'
2
- import { Modal, Input, Button, message } from '../compoments/index.js'
3
- import Api from '../utils/resource.js'
4
- import t from '../utils/i18n.js'
5
- import { VerifyModalConfig } from '../utils/type.js';
2
+ import { Modal, Input, Button, message } from './compoments/index.js'
3
+ import Api from './resource.js'
4
+ import t from './utils/i18n.js'
5
+ import { ModalConfig } from './utils/type.js';
6
6
  import { axios } from '@yqg/resource';
7
7
 
8
- const CreateMessageVerifyModal = ({ props }: { props: VerifyModalConfig }) => {
8
+ const CreateMessageVerifyModal = ({ props }: { props: ModalConfig }) => {
9
9
  const [visible, setVisible] = useState(true);
10
10
  const [countdown, setCountdown] = useState(60);
11
11
  const [otp, setOtp] = useState('');
12
12
  const [captchaImage, setCaptchaImage] = useState<string>('');
13
13
  const [captchCode, setCaptchCode] = useState<string>('');
14
14
  const [captchaKey, setCaptchaKey] = useState<string>('');
15
- const { data, http, lang, sendApi = '/admin/sms/send', config, apiResolve, apiPromiseToEmpty, onClose } = props || {};
15
+ const { data, config, http, lang, api='/admin/sms/send' } = props || {};
16
16
  const dataObj = JSON.parse(data || '{}');
17
17
  const { mobile, verifyCodeKey } = dataObj || {};
18
18
 
@@ -25,11 +25,10 @@ const CreateMessageVerifyModal = ({ props }: { props: VerifyModalConfig }) => {
25
25
  const image = Api.getCaptchaImgUrl(key) as unknown;
26
26
  setCaptchaImage(image as string);
27
27
  }
28
- } catch (err) {
29
- const msg =
30
- typeof err === 'object' && err !== null && 'message' in err
31
- ? (err as { message: string }).message
32
- : String(err);
28
+ } catch (err) {const msg =
29
+ typeof err === 'object' && err !== null && 'message' in err
30
+ ? (err as {message: string}).message
31
+ : String(err);
33
32
  message.error(msg as React.ReactNode);
34
33
  }
35
34
  }
@@ -54,16 +53,14 @@ const CreateMessageVerifyModal = ({ props }: { props: VerifyModalConfig }) => {
54
53
  formData.append('captchaKey', captchaKey);
55
54
  formData.append('captcha', captchCode);
56
55
  // 重新发送验证码
57
- const res = await axios.post(sendApi, formData);
56
+ const res = await axios.post(api, formData);
58
57
  const { code, detail } = res.data?.status || {};
59
58
  if (code !== 0) {
60
59
  message.error(detail || t('sendFailed', lang));
61
60
  return;
62
61
  }
63
62
  message.success(t('sendSuccess', lang));
64
- // 重置倒计时、验证码
65
63
  setCountdown(60);
66
- setOtp('');
67
64
  }
68
65
 
69
66
  return (
@@ -72,8 +69,7 @@ const CreateMessageVerifyModal = ({ props }: { props: VerifyModalConfig }) => {
72
69
  visible={visible}
73
70
  onClose={() => {
74
71
  setVisible(false);
75
- apiPromiseToEmpty?.();
76
- onClose?.();
72
+ props.onClose?.();
77
73
  }}
78
74
  >
79
75
  <div style={{ fontSize: 14, color: '#666' }}>{t('alreadySend', lang, { phone: mobile })}</div>
@@ -85,41 +81,16 @@ const CreateMessageVerifyModal = ({ props }: { props: VerifyModalConfig }) => {
85
81
  onChange={async (val) => {
86
82
  setOtp(val);
87
83
  if (val.length === 6) {
88
- try {
89
- const res = await Promise.race([
90
- new Promise((resolve, reject) => {
91
- setTimeout(() => {
92
- reject(new Error('Timeout'));
93
- }, 1000);
94
- }),
95
- new Promise((resolve, reject) => {
96
- http({
97
- ...config,
98
- headers: {
99
- ...http.defaults.headers.common,
100
- 'sms-code': val,
101
- 'sms-code-key': verifyCodeKey,
102
- 'Content-Type': config.headers['Content-Type'],
103
- }
104
- }).then(res => {
105
- resolve(res);
106
- }).catch(err => {
107
- reject(err);
108
- })
109
- })
110
- ]) as any;
111
- if (res?.data?.status?.code === 0) {
112
- apiResolve(res);
113
- setVisible(false);
114
- } else {
115
- message.error(t('verifyFail', lang));
116
- setOtp('');
84
+ http({
85
+ ...config,
86
+ headers: {
87
+ ...http.defaults.headers.common,
88
+ 'sms-code': val,
89
+ 'sms-code-key': verifyCodeKey,
90
+ 'Content-Type': config.headers['Content-Type'],
117
91
  }
118
- } catch (error) {
119
- console.warn('catch=>error', error);
120
- message.error(t('verifyFail', lang));
121
- setOtp('');
122
- }
92
+ }) as any;
93
+ setVisible(false);
123
94
  }
124
95
  }} />
125
96
  <Button
@@ -143,7 +114,6 @@ const CreateMessageVerifyModal = ({ props }: { props: VerifyModalConfig }) => {
143
114
  {captchaImage && <img src={captchaImage} alt={t('verifyCode', lang)} style={{ width: 100, height: 30, marginLeft: 8 }} onClick={getKey} />}
144
115
  </div>}
145
116
  {(countdown > 0 || captchCode) ? null : <div style={{ fontSize: 14, color: 'red' }}>{t('pleaseEnterAndSend', lang)}</div>}
146
- <div style={{ fontSize: 14, color: '#666', marginTop: 12 }}>{t('chidoriOpenPro', lang)}</div>
147
117
  </Modal>
148
118
  );
149
119
  };
@@ -1 +0,0 @@
1
- {"__symbol_cache_version__":11,"0861795cb7fca1601b342f4e44fe1aed":{"have":{"class":{"YqgWebDiffLintEngine":13}},"need":{"class":{"ArcanistLintEngine":42,"ExecFuture":1832,"PhutilConsole":1780}},"xmap":{"YqgWebDiffLintEngine":["ArcanistLintEngine"]}}}
@@ -1,3 +0,0 @@
1
- <?php
2
-
3
- phutil_register_library('libcustom', __FILE__);
@@ -1,18 +0,0 @@
1
- <?php
2
-
3
- /**
4
- * This file is automatically generated. Use 'arc liberate' to rebuild it.
5
- *
6
- * @generated
7
- * @phutil-library-version 2
8
- */
9
- phutil_register_library_map(array(
10
- '__library_version__' => 2,
11
- 'class' => array(
12
- 'YqgWebDiffLintEngine' => 'lint/engine/YqgWebDiffLintEngine.php',
13
- ),
14
- 'function' => array(),
15
- 'xmap' => array(
16
- 'YqgWebDiffLintEngine' => 'ArcanistLintEngine',
17
- ),
18
- ));
@@ -1,68 +0,0 @@
1
- <?php
2
-
3
- class YqgWebDiffLintEngine extends ArcanistLintEngine
4
- {
5
- /** @Override */
6
- public function buildLinters()
7
- {
8
- // Filter the affected paths.
9
- $paths = $this->getPaths();
10
- foreach ($paths as $key => $path) {
11
- if (!$this->pathExists($path)) {
12
- // Don't lint removed files. In more complex linters it is sometimes
13
- // appropriate to lint removed files so you can raise a warning like
14
- // "you deleted X, but forgot to delete Y!", but most linters do not
15
- // operate correctly on removed files.
16
- unset($paths[$key]);
17
- continue;
18
- }
19
-
20
- $disk = $this->getFilePathOnDisk($path);
21
- if (is_dir($disk)) {
22
- // Don't lint directories. (In SVN, they can be directly modified by
23
- // changing properties on them, and may appear as modified paths.)
24
- unset($paths[$key]);
25
- continue;
26
- }
27
- }
28
-
29
- $command = '';
30
- $patterns = array(
31
- '/\.(jsx?|tsx?|vue?|ts?)$/' => 'pnpm eslint',
32
- // '/\.(less|s?css)$/' => 'npx stylelint --fix' // 理论上暂时不用 style lint
33
- );
34
-
35
- foreach ($patterns as $pattern => $lintCommand) {
36
- $matchedPaths = preg_grep($pattern, $paths);
37
- if (count($matchedPaths) > 0) {
38
- if (strlen($command)) {
39
- $command .= ' && \\';
40
- }
41
-
42
- $command .= $lintCommand . ' ' . join(' ', $matchedPaths);
43
- }
44
- }
45
-
46
- $root = $this->getWorkingCopy()->getProjectRoot();
47
- $console = PhutilConsole::getConsole();
48
-
49
- $future = new ExecFuture($command);
50
- $future->setCWD($root . "/");
51
- list($exitcode, $stdout, $stderr) = $future->resolve();
52
- $console->writeOut($stdout);
53
- $console->writeOut($stderr);
54
- $console->writeOut("\n");
55
-
56
- if ($exitcode != 0) {
57
- $console->writeOut("All code in any code-base should look like a single person typed it, no matter how many people contributed. --idiomatic.js\n");
58
- $console->writeOut("无论有多少人在维护,所有在代码仓库中的代码理应看起来像同一个人写的。 --idiomatic.js\n");
59
- $console->writeOut("https://github.com/rwaldron/idiomatic.js/tree/master/translations/zh_CN\n");
60
- throw new Exception("Keep it in mind!");
61
- } else {
62
- $console->writeOut("All code are clean, you did a great job!\n");
63
- }
64
-
65
- return;
66
- }
67
-
68
- }
@@ -1,5 +0,0 @@
1
- import { LoginModalConfig } from '../utils/type.js';
2
- declare const ReLoginModal: ({ props }: {
3
- props: LoginModalConfig;
4
- }) => import("react/jsx-runtime.js").JSX.Element;
5
- export default ReLoginModal;
@@ -1,24 +0,0 @@
1
- import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
2
- import { useState } from 'react';
3
- import { Modal, Button } from '../compoments/index.js';
4
- import t from '../utils/i18n.js';
5
- const ReLoginModal = ({ props }) => {
6
- const { goLogin, lang, onClose: destroyModal } = props || {};
7
- const [visible, setVisible] = useState(true);
8
- const onClose = () => {
9
- setVisible(false);
10
- goLogin();
11
- destroyModal?.();
12
- };
13
- 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: {
14
- background: '#1677ff',
15
- color: '#fff',
16
- border: 'none',
17
- width: 80,
18
- height: 36,
19
- fontSize: 14,
20
- borderRadius: 8,
21
- boxShadow: '0 2px 8px rgba(22,119,255,0.08)',
22
- }, onClick: onClose, children: t('ok', lang) }) })] }));
23
- };
24
- export default ReLoginModal;
@@ -1,5 +0,0 @@
1
- import { VerifyModalConfig } from '../utils/type.js';
2
- declare const CreateMessageVerifyModal: ({ props }: {
3
- props: VerifyModalConfig;
4
- }) => import("react/jsx-runtime.js").JSX.Element;
5
- export default CreateMessageVerifyModal;
@@ -1,115 +0,0 @@
1
- import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
2
- import { useEffect, useState } from 'react';
3
- import { Modal, Input, Button, message } from '../compoments/index.js';
4
- import Api from '../utils/resource.js';
5
- import t from '../utils/i18n.js';
6
- import { axios } from '@yqg/resource';
7
- const CreateMessageVerifyModal = ({ props }) => {
8
- const [visible, setVisible] = useState(true);
9
- const [countdown, setCountdown] = useState(60);
10
- const [otp, setOtp] = useState('');
11
- const [captchaImage, setCaptchaImage] = useState('');
12
- const [captchCode, setCaptchCode] = useState('');
13
- const [captchaKey, setCaptchaKey] = useState('');
14
- const { data, http, lang, sendApi = '/admin/sms/send', config, apiResolve, apiPromiseToEmpty, onClose } = props || {};
15
- const dataObj = JSON.parse(data || '{}');
16
- const { mobile, verifyCodeKey } = dataObj || {};
17
- const getKey = async () => {
18
- try {
19
- const res = await Api.getCaptchaKey();
20
- const { body: key } = res.data || {};
21
- setCaptchaKey(key);
22
- if (key) {
23
- const image = Api.getCaptchaImgUrl(key);
24
- setCaptchaImage(image);
25
- }
26
- }
27
- catch (err) {
28
- const msg = typeof err === 'object' && err !== null && 'message' in err
29
- ? err.message
30
- : String(err);
31
- message.error(msg);
32
- }
33
- };
34
- useEffect(() => {
35
- let timer = null;
36
- if (visible && countdown > 0) {
37
- timer = setInterval(() => {
38
- setCountdown((prev) => prev - 1);
39
- }, 1000);
40
- }
41
- if (countdown === 0) {
42
- getKey();
43
- }
44
- return () => {
45
- if (timer)
46
- clearInterval(timer);
47
- };
48
- }, [visible, countdown]);
49
- const handleResend = async () => {
50
- const formData = new FormData();
51
- formData.append('captchaKey', captchaKey);
52
- formData.append('captcha', captchCode);
53
- // 重新发送验证码
54
- const res = await axios.post(sendApi, formData);
55
- const { code, detail } = res.data?.status || {};
56
- if (code !== 0) {
57
- message.error(detail || t('sendFailed', lang));
58
- return;
59
- }
60
- message.success(t('sendSuccess', lang));
61
- // 重置倒计时、验证码
62
- setCountdown(60);
63
- setOtp('');
64
- };
65
- return (_jsxs(Modal, { width: 420, visible: visible, onClose: () => {
66
- setVisible(false);
67
- apiPromiseToEmpty?.();
68
- onClose?.();
69
- }, 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) => {
70
- setOtp(val);
71
- if (val.length === 6) {
72
- try {
73
- const res = await Promise.race([
74
- new Promise((resolve, reject) => {
75
- setTimeout(() => {
76
- reject(new Error('Timeout'));
77
- }, 1000);
78
- }),
79
- new Promise((resolve, reject) => {
80
- http({
81
- ...config,
82
- headers: {
83
- ...http.defaults.headers.common,
84
- 'sms-code': val,
85
- 'sms-code-key': verifyCodeKey,
86
- 'Content-Type': config.headers['Content-Type'],
87
- }
88
- }).then(res => {
89
- resolve(res);
90
- }).catch(err => {
91
- reject(err);
92
- });
93
- })
94
- ]);
95
- if (res?.data?.status?.code === 0) {
96
- apiResolve(res);
97
- setVisible(false);
98
- }
99
- else {
100
- message.error(t('verifyFail', lang));
101
- setOtp('');
102
- }
103
- }
104
- catch (error) {
105
- console.warn('catch=>error', error);
106
- message.error(t('verifyFail', lang));
107
- setOtp('');
108
- }
109
- }
110
- } }), _jsx(Button, { disabled: countdown > 0 || !captchCode, onClick: handleResend, style: { padding: '8px' }, children: countdown > 0 ? t('countDownSecound', lang, { countdown }) : t('reSend', lang) })] }), countdown > 0 ? null :
111
- _jsxs("div", { style: { marginTop: 12, display: 'flex', alignItems: 'center' }, children: [_jsx(Input, { placeholder: t('pleaseEnterPicVerifyCode', lang), onChange: (e) => {
112
- setCaptchCode(e);
113
- }, 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) })] }));
114
- };
115
- export default CreateMessageVerifyModal;
@@ -1,2 +0,0 @@
1
- declare const _default: import("@yqg/resource").default & Record<"getCaptchaKey" | "reSendCode" | "getCaptchaImgUrl", import("@yqg/resource").CustomMethod>;
2
- export default _default;
@@ -1,7 +0,0 @@
1
- import { assign, customPost } from '@yqg/resource';
2
- const api = {
3
- getCaptchaKey: customPost('/messageVerify/admin/captcha/key'),
4
- reSendCode: customPost('/admin/sms/send'),
5
- getCaptchaImgUrl: (captchaKey) => { return `/messageVerify/admin/captcha/image/${captchaKey}`; },
6
- };
7
- export default assign(api);
File without changes