@jiangood/open-admin 3.1.10 → 3.1.12

package/src/pages/login.jsx

@@ -0,0 +1,157 @@
+import React from 'react';
+import {Button, Form, Input} from 'antd';
+import {LockOutlined, SafetyCertificateOutlined, UserOutlined, WarningOutlined} from '@ant-design/icons';
+import {EventBus, HttpClient, GlobalData, getMessageApi, history} from "../framework";
+
+import "./login.less"
+
+export const pageMeta = {
+    requiresAuth: false,
+    layout: 'blank',
+    title: '登录',
+};
+
+function getRedirect(query) {
+    let redirect = query?.redirect;
+    if (!redirect) {
+        redirect = '/'
+    }
+    return redirect;
+}
+
+function postLogin(values, query, success, error) {
+    HttpClient.post('/admin/auth/login', values, null, {toastError: false}).then(rs => {
+        EventBus.emit('loginSuccess')
+        history.push(getRedirect(query))
+        success?.(rs)
+    }).catch(e => {
+        console.error('[Login] 登录失败:', e);
+        getMessageApi().error(HttpClient.errToMsg(e))
+        error?.(e)
+    })
+}
+
+function encodePassword(pwd) {
+    const chars = [];
+    for (let i = 0; i < pwd.length; i++)
+        chars.push(pwd.codePointAt(i) + i + 2);
+    return btoa(String.fromCodePoint(...chars));
+}
+
+export default class LoginPage extends React.Component {
+
+    state = {
+        logging: false,
+        siteInfo: {},
+        /* logo.png 缺失或加载失败时，回退到矢量标记，避免首屏出现破损图 */
+        logoError: false
+    }
+
+    componentDidMount() {
+        const siteInfo = GlobalData.getSiteInfo()
+        if (siteInfo?.title) {
+            this.setState({siteInfo})
+            return
+        }
+        // localStorage 中无站点信息，从服务端重新加载
+        HttpClient.get('/admin/public/site-info', null, {toastError: false}).then(rs => {
+            GlobalData.setSiteInfo(rs.data)
+            this.setState({siteInfo: rs.data})
+        }).catch(() => {
+            console.error('[Login] 加载站点信息失败');
+            getMessageApi().error('加载站点信息失败，请刷新页面重试')
+        })
+    }
+
+    submit = values => {
+        this.setState({logging: true})
+        try {
+            values.password = encodePassword(values.password)
+        } catch (e) {
+            console.error('[Login] 密码编码失败:', e);
+            this.setState({logging: false})
+            getMessageApi().error('密码含不支持字符，请联系管理员重置')
+            return
+        }
+        postLogin(values, this.props.location?.query, () => {
+            this.setState({logging: false})
+        }, () => {
+            this.setState({logging: false})
+        })
+    }
+
+    render() {
+        const pageStyle = {
+            backgroundImage: `url("./login_bg.jpg")`
+        }
+
+        return (
+            <section className='login-page' style={pageStyle}>
+                <div className="login-content">
+                    {this.renderBrand()}
+                    {this.getForm()}
+                    {this.renderFormBottom()}
+                </div>
+            </section>
+        );
+    }
+
+    renderBrand() {
+        const {siteInfo = {}, logoError} = this.state
+        return (
+            <div className="login-brand">
+                <span className="login-brand-logo">
+                    {logoError
+                        ? <SafetyCertificateOutlined/>
+                        : <img src="./logo.png" alt="" onError={() => this.setState({logoError: true})}/>}
+                </span>
+                {siteInfo.title && <h1>{siteInfo.title}</h1>}
+            </div>
+        )
+    }
+
+    getForm = () => {
+        const form = (
+            <Form
+                name="normal_login"
+                className="login-form"
+                initialValues={{remember: true}}
+                onFinish={this.submit}
+                requiredMark={false}
+                colon={false}
+            >
+                <Form.Item name="username" rules={[{required: true, message: '请输入用户名!'}]}>
+                    <Input size='large' prefix={<UserOutlined/>} placeholder="用户名" autoComplete="username"/>
+                </Form.Item>
+                <Form.Item name="password" rules={[{required: true, message: '请输入密码!'}]}>
+                    <Input.Password autoComplete="current-password" prefix={<LockOutlined/>} placeholder="密码"
+                           size='large'
+                    />
+                </Form.Item>
+
+                <Form.Item className="login-submit">
+                    <Button loading={this.state.logging} type="primary" htmlType="submit"
+                            block size='large'>
+                        登录
+                    </Button>
+                </Form.Item>
+            </Form>
+        );
+
+        if (this.props.formRender) {
+            return this.props.formRender(form);
+        }
+        return form;
+    };
+
+    renderFormBottom() {
+        const siteInfo = this.state.siteInfo || {};
+        if (siteInfo.loginBoxBottomTip) {
+            return (
+                <div className="login-bottom-tip">
+                    <WarningOutlined/> {siteInfo.loginBoxBottomTip}
+                </div>
+            )
+        }
+    }
+}

package/src/pages/{public/login.less → login.less}

@@ -128,6 +128,9 @@
     height: 46px;
     padding: 0 14px;
     border-radius: var(--login-field-radius);
+    /* antd v6 给内部 input 声明了 `color: inherit`，文字色由容器决定。
+       容器必须显式给浅色，否则会继承 antd 浅色主题的 colorText（黑字压在深色玻璃上不可读） */
+    color: var(--login-text);
     background-color: var(--login-field-bg);
     border: 1px solid var(--login-hairline);
     box-shadow: none;
@@ -154,10 +157,22 @@
     /* 密码可见性切换按钮 */
     .ant-input-suffix {
       color: rgba(255, 255, 255, 0.55);
+
+      /* antd 给密码图标单独着色（colorIcon），不跟随 .ant-input-suffix，需显式覆盖 */
+      .ant-input-password-icon {
+        color: inherit;
+
+        &:hover {
+          color: var(--login-text);
+        }
+      }
     }
   }
 
-  .ant-input {
+  /* antd v6 的 `> input.ant-input { color: inherit }` 特异性为 0,2,1，
+     会压过 .login-form .ant-input（0,2,0）；这里提升特异性后显式上色，
+     避免 antd 调整内部选择器时文字色再次失效 */
+  .login-page & .ant-input {
     color: var(--login-text);
     font-size: 15px;
     background: transparent;

package/src/pages/public/login.jsx

@@ -1,151 +1,17 @@
-import React from 'react';
-import {Button, Form, Input} from 'antd';
-import {LockOutlined, SafetyCertificateOutlined, UserOutlined, WarningOutlined} from '@ant-design/icons';
-import {EventBus, HttpClient, GlobalData, getMessageApi, history} from "../../framework";
-
-import "./login.less"
-
-function getRedirect(query) {
-    let redirect = query?.redirect;
-    if (!redirect) {
-        redirect = '/'
-    }
-    return redirect;
-}
-
-function postLogin(values, query, success, error) {
-    HttpClient.post('/admin/auth/login', values, null, {toastError: false}).then(rs => {
-        EventBus.emit('loginSuccess')
-        history.push(getRedirect(query))
-        success?.(rs)
-    }).catch(e => {
-        console.error('[Login] 登录失败:', e);
-        getMessageApi().error(HttpClient.errToMsg(e))
-        error?.(e)
-    })
-}
-
-function encodePassword(pwd) {
-    const chars = [];
-    for (let i = 0; i < pwd.length; i++)
-        chars.push(pwd.codePointAt(i) + i + 2);
-    return btoa(String.fromCodePoint(...chars));
-}
-
-export default class LoginPage extends React.Component {
-
-    state = {
-        logging: false,
-        siteInfo: {},
-        /* logo.png 缺失或加载失败时，回退到矢量标记，避免首屏出现破损图 */
-        logoError: false
-    }
-
+import React from "react";
+import {history, LOGIN_PATH} from "../../framework";
+
+/**
+ * 旧版登录地址兼容：/public/login?redirect=... → /login?redirect=...
+ * 保留一个版本后删除
+ */
+export default class LegacyLoginRedirect extends React.Component {
     componentDidMount() {
-        const siteInfo = GlobalData.getSiteInfo()
-        if (siteInfo?.title) {
-            this.setState({siteInfo})
-            return
-        }
-        // localStorage 中无站点信息，从服务端重新加载
-        HttpClient.get('/admin/public/site-info', null, {toastError: false}).then(rs => {
-            GlobalData.setSiteInfo(rs.data)
-            this.setState({siteInfo: rs.data})
-        }).catch(() => {
-            console.error('[Login] 加载站点信息失败');
-            getMessageApi().error('加载站点信息失败，请刷新页面重试')
-        })
-    }
-
-    submit = values => {
-        this.setState({logging: true})
-        try {
-            values.password = encodePassword(values.password)
-        } catch (e) {
-            console.error('[Login] 密码编码失败:', e);
-            this.setState({logging: false})
-            getMessageApi().error('密码含不支持字符，请联系管理员重置')
-            return
-        }
-        postLogin(values, this.props.location?.query, () => {
-            this.setState({logging: false})
-        }, () => {
-            this.setState({logging: false})
-        })
+        const search = this.props.location?.search || '';
+        history.replace(LOGIN_PATH + search);
     }
 
     render() {
-        const pageStyle = {
-            backgroundImage: `url("./login_bg.jpg")`
-        }
-
-        return (
-            <section className='login-page' style={pageStyle}>
-                <div className="login-content">
-                    {this.renderBrand()}
-                    {this.getForm()}
-                    {this.renderFormBottom()}
-                </div>
-            </section>
-        );
-    }
-
-    renderBrand() {
-        const {siteInfo = {}, logoError} = this.state
-        return (
-            <div className="login-brand">
-                <span className="login-brand-logo">
-                    {logoError
-                        ? <SafetyCertificateOutlined/>
-                        : <img src="./logo.png" alt="" onError={() => this.setState({logoError: true})}/>}
-                </span>
-                {siteInfo.title && <h1>{siteInfo.title}</h1>}
-            </div>
-        )
-    }
-
-    getForm = () => {
-        const form = (
-            <Form
-                name="normal_login"
-                className="login-form"
-                initialValues={{remember: true}}
-                onFinish={this.submit}
-                requiredMark={false}
-                colon={false}
-            >
-                <Form.Item name="username" rules={[{required: true, message: '请输入用户名!'}]}>
-                    <Input size='large' prefix={<UserOutlined/>} placeholder="用户名" autoComplete="username"/>
-                </Form.Item>
-                <Form.Item name="password" rules={[{required: true, message: '请输入密码!'}]}>
-                    <Input.Password autoComplete="current-password" prefix={<LockOutlined/>} placeholder="密码"
-                           size='large'
-                    />
-                </Form.Item>
-
-                <Form.Item className="login-submit">
-                    <Button loading={this.state.logging} type="primary" htmlType="submit"
-                            block size='large'>
-                        登录
-                    </Button>
-                </Form.Item>
-            </Form>
-        );
-
-        if (this.props.formRender) {
-            return this.props.formRender(form);
-        }
-        return form;
-    };
-
-    renderFormBottom() {
-        const siteInfo = this.state.siteInfo || {};
-        if (siteInfo.loginBoxBottomTip) {
-            return (
-                <div className="login-bottom-tip">
-                    <WarningOutlined/> {siteInfo.loginBoxBottomTip}
-                </div>
-            )
-        }
+        return null;
     }
 }

package/src/pages/standalone/{forceUpdatePwd.jsx → force-update-pwd.jsx}

@@ -1,17 +1,23 @@
 import React from "react";
 import {Button, Form, Input} from "antd";
-import {getMessageApi, getToken, HttpClient, history} from "../../framework";
+import {getMessageApi, getToken, HttpClient, history, LOGIN_PATH} from "../../framework";
+
+export const pageMeta = {
+    requiresAuth: true,
+    layout: 'blank',
+    title: '修改密码',
+};
 
 export default class ForceUpdatePwdPage extends React.Component {
 
     onFinish = (values) => {
-        HttpClient.post('admin/userCenter/update-pwd', values, null).then(() => {
+        HttpClient.post('admin/user-center/update-pwd', values, null).then(() => {
             getMessageApi().success('修改密码成功，请重新登录');
-            history.push('/public/login');
+            history.push(LOGIN_PATH);
         })
     }
 
-    validator = (rule, value) => HttpClient.get("admin/sysUser/pwd-strength", {password: value}, {toastError: false})
+    validator = (rule, value) => HttpClient.get("admin/sys-user/pwd-strength", {password: value}, {toastError: false})
         .catch(e => {
             throw new Error(e.message)
         })

package/src/pages/system/article/index.jsx

@@ -36,7 +36,7 @@ export default class ArticleListPage extends React.Component {
     }
 
     handlePreview = record => {
-        PageUtils.open('/article/' + record.code, record.title)
+        PageUtils.open('/article/' + record.code)
     }
 
     onFinish = async values => {