@jiangood/open-admin 3.0.15 → 3.1.1

package/src/pages/userCenter/index.jsx

@@ -1,9 +1,9 @@
 import React from "react";
 import {Button, Card, Descriptions, Form, Input, Modal} from "antd";
 import PermView from "./permView";
-import {HttpUtils, history, Page} from "../../framework";
+import {HttpClient, history, Page} from "../../framework";
 
-export default class extends React.Component {
+export default class UserCenterPage extends React.Component {
 
     formRef = React.createRef();
 
@@ -14,20 +14,21 @@ export default class extends React.Component {
     }
 
     componentDidMount() {
-        HttpUtils.get('admin/userCenter/info').then(rs => {
-            this.setState({info: rs})
+        HttpClient.get('admin/userCenter/info', null).then(rs => {
+            this.setState({info: rs.data})
         })
     }
 
     onPwdFinish = (values) => {
-        HttpUtils.post('admin/userCenter/update-pwd', values).then(() => {
+        HttpClient.post('admin/userCenter/update-pwd', values, null).then(() => {
             this.setState({changePwdOpen: false, changePwdSuccess: true});
         })
     }
 
-    pwdValidator = (rule, value) => {
-        return HttpUtils.get("admin/sysUser/pwd-strength", {password: value}, {showError: false})
-    }
+    pwdValidator = (rule, value) => HttpClient.get("admin/sysUser/pwd-strength", {password: value}, {toastError: false})
+        .catch(e => {
+            throw new Error(e.message)
+        })
 
     render() {
         const {info, changePwdOpen, changePwdSuccess} = this.state;
@@ -67,12 +68,13 @@ export default class extends React.Component {
                                extra={'请输入字母、数字、特殊字符'}
                                rules={[
                                    {required: true, message: '请输入新密码'},
+                                   {pattern: /^[\x20-\x7E]{1,64}$/, message: '密码仅支持英文、数字与常见符号，长度不超过64位'},
                                    {
                                        validator: this.pwdValidator
                                    }
                                ]}
                     >
-                        <Input.Password></Input.Password>
+                        <Input.Password maxLength={64}></Input.Password>
                     </Form.Item>
                 </Form>
             </Modal>

package/src/pages/userCenter/permView.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 import {Empty, Table, Tag} from "antd";
-import {HttpUtils, Gap} from "../../framework";
+import {HttpClient, Gap} from "../../framework";
 
 export default class PermView extends React.Component {
 
@@ -9,8 +9,8 @@ export default class PermView extends React.Component {
     }
 
     componentDidMount() {
-        HttpUtils.get('admin/userCenter/perms').then(rs => {
-            this.setState({data: rs})
+        HttpClient.get('admin/userCenter/perms', null).then(rs => {
+            this.setState({data: rs.data})
         })
     }
 
@@ -26,7 +26,7 @@ export default class PermView extends React.Component {
             },
             {
                 title: '状态', dataIndex: 'status', key: 'status', width: 140,
-                render: (status) => {
+                render: (status) => { // NOSONAR: 返回元素或占位文本，类型不同属预期
                     if (status === 'mine') {
                         return <Tag color='blue'>我的机构</Tag>;
                     }
@@ -48,7 +48,7 @@ export default class PermView extends React.Component {
             },
             {
                 title: '状态', dataIndex: 'status', key: 'status', width: 140,
-                render: (status) => {
+                render: (status) => { // NOSONAR: 返回元素或占位文本，类型不同属预期
                     if (status === 'all') {
                         return <Tag color='green'>已授权</Tag>;
                     }
@@ -66,12 +66,12 @@ export default class PermView extends React.Component {
                     <Tag color='processing'>{data.dataPermLabel || '-'}</Tag>
                 </span>
             </div>
-            {data.orgRows && data.orgRows.length
+            {data.orgRows?.length
                 ? <Table size='small' rowKey='key' columns={orgColumns} dataSource={data.orgRows}
                          pagination={false} expandable={{defaultExpandAllRows: true}}/>
                 : <Empty description='暂无机构数据'/>}
             <Gap/>
-            {data.menuRows && data.menuRows.length
+            {data.menuRows?.length
                 ? <Table size='small' rowKey='key' columns={menuColumns} dataSource={data.menuRows}
                          pagination={false} expandable={{defaultExpandAllRows: true}}/>
                 : <Empty description='暂无权限数据'/>}

package/src/framework/utils/system/HttpUtils.ts

@@ -1,97 +0,0 @@
-import axios from "axios";
-import type {AxiosRequestConfig} from "axios";
-import qs from 'qs';
-import {PageUtils} from "./PageUtils";
-import {message as messageApi} from "antd";
-import {EventBus} from "../EventBus";
-
-interface RequestOptions extends AxiosRequestConfig {
-    showError?: boolean;
-}
-
-const axiosInstance = axios.create({
-    baseURL: import.meta.env.VITE_SERVER_SERVLET_CONTEXT_PATH,
-    withCredentials: true,
-    headers: { 'Content-Type': 'application/json' },
-    paramsSerializer: (params: Record<string, unknown>) => qs.stringify(params, {indices: false})
-});
-
-export class HttpUtils {
-    static coreRequest<T = any>(config: RequestOptions, transformData = true): Promise<T> {
-        const url = config.url as string;
-        config.url = url.startsWith('admin') ? '/' + url : url;
-
-        // FormData 请求交由浏览器自动生成带 boundary 的 multipart Content-Type，
-        // 否则手动指定 Content-Type 会缺失 boundary 导致后端解析失败
-        if (typeof FormData !== 'undefined' && config.data instanceof FormData) {
-            config.headers = {...config.headers, 'Content-Type': undefined};
-        }
-
-        return new Promise<T>((resolve, reject) => {
-            axiosInstance(config).then((response) => {
-                const body = response.data;
-                let {success, message, data} = body;
-                if (success == undefined) {
-                    resolve(response as unknown as T);
-                    return;
-                }
-                if (!success) {
-                    console.error(`[HttpUtils] 请求失败: ${url}`, {code: body.code, message, data: body});
-                    if (config.showError !== false) {
-                        messageApi.error(message || '操作失败');
-                    }
-                    reject(message || '操作失败');
-                    return;
-                }
-                if (message) {
-                    messageApi.success(message);
-                }
-                resolve((transformData ? data : response) as T);
-            }).catch((e) => {
-                console.error(`[HttpUtils] 请求异常: ${url}`, e);
-                if (axios.isAxiosError(e) && e.response?.status === 401) {
-                    EventBus.emit('loginExpired');
-                    reject('登录过期');
-                    return;
-                }
-                const msg = HttpUtils.extractErrorMessage(e);
-                if (config.showError !== false) {
-                    messageApi.error(msg);
-                }
-                reject(msg);
-            });
-        });
-    }
-
-    static extractErrorMessage(e: unknown, defaultMsg = '操作失败'): string {
-        if (axios.isAxiosError(e)) {
-            const responseData = e.response?.data;
-            const status = e.response?.status;
-            if (status === 504) return '504 请求后端服务失败';
-            if (responseData && responseData.message) return responseData.message;
-            if (e.message) return e.message;
-            return defaultMsg;
-        }
-        if (e instanceof Error) return e.message || defaultMsg;
-        return defaultMsg;
-    }
-
-    static get<T = any>(url: string, params: any = null, options: Partial<RequestOptions> = {}): Promise<T> {
-        return HttpUtils.coreRequest<T>({...options, url, method: 'GET', params});
-    }
-
-    static post<T = any>(url: string, data: any = null, params: any = null, options: Partial<RequestOptions> = {}): Promise<T> {
-        return HttpUtils.coreRequest<T>({...options, url, method: 'POST', data, params});
-    }
-
-    static postForm<T = any>(url: string, data: any, options: Partial<RequestOptions> = {}): Promise<T> {
-        return HttpUtils.coreRequest<T>({
-            ...options,
-            url,
-            method: 'POST',
-            data: qs.stringify(data),
-            headers: {'Content-Type': 'application/x-www-form-urlencoded'}
-        });
-    }
-
-}

package/src/framework/utils/system/index.ts

@@ -1,4 +0,0 @@
-export * from './DictUtils'
-export * from './PermUtils'
-export * from './PageUtils'
-export * from './HttpUtils'