@jiangood/open-admin 2.5.8 → 2.5.9

package/package.json

@@ -36,5 +36,5 @@
     "dev": "umi dev",
     "build": "umi build"
   },
-  "version": "2.5.8"
+  "version": "2.5.9"
 }

package/src/.umi-production/appData.json

@@ -38,7 +38,7 @@
       "dev": "umi dev",
       "build": "umi build"
     },
-    "version": "2.5.8"
+    "version": "2.5.9"
   },
   "pkgPath": "/home/runner/work/open-admin/open-admin/web/package.json",
   "plugins": {
@@ -51,7 +51,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -115,7 +115,7 @@
             0
           ]
         },
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -142,10 +142,10 @@
       "time": {
         "hooks": {
           "modifyAppData": [
-            72
+            79
           ]
         },
-        "register": 20
+        "register": 21
       },
       "enableBy": "register"
     },
@@ -158,7 +158,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -195,7 +195,7 @@
             0
           ]
         },
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -208,7 +208,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "config"
     },
@@ -225,7 +225,7 @@
             0
           ]
         },
-        "register": 6
+        "register": 5
       },
       "enableBy": "register"
     },
@@ -1091,7 +1091,7 @@
       "time": {
         "hooks": {
           "onStart": [
-            1
+            0
           ]
         },
         "register": 1
@@ -1107,7 +1107,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1120,7 +1120,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 103
+        "register": 96
       },
       "enableBy": "register"
     },
@@ -1133,7 +1133,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 30
+        "register": 29
       },
       "enableBy": "config"
     },
@@ -1146,7 +1146,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 10
+        "register": 9
       },
       "enableBy": "config"
     },
@@ -1160,7 +1160,7 @@
       "time": {
         "hooks": {
           "modifyAppData": [
-            0
+            1
           ]
         },
         "register": 1
@@ -1189,7 +1189,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 2
       },
       "enableBy": "config"
     },
@@ -1202,7 +1202,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 39
+        "register": 31
       }
     },
     "./node_modules/@umijs/preset-umi/dist/features/mpa/mpa": {
@@ -1281,7 +1281,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1307,7 +1307,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "config"
     },
@@ -1320,7 +1320,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "config"
     },
@@ -1333,7 +1333,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1372,7 +1372,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       }
     },
     "./node_modules/@umijs/preset-umi/dist/features/ssr/ssr": {
@@ -1384,7 +1384,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 2
       },
       "enableBy": "config"
     },
@@ -1397,7 +1397,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 2
       },
       "enableBy": "register"
     },
@@ -1410,7 +1410,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 4
+        "register": 3
       },
       "enableBy": "register"
     },
@@ -1423,7 +1423,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 4
+        "register": 3
       },
       "enableBy": "config"
     },
@@ -1436,7 +1436,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "config"
     },
@@ -1461,7 +1461,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 26
+        "register": 20
       },
       "enableBy": "config"
     },
@@ -1565,7 +1565,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "config"
     },
@@ -1578,7 +1578,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       }
     },
     "./node_modules/@umijs/preset-umi/dist/features/hmrGuardian/hmrGuardian": {
@@ -1590,7 +1590,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 2
+        "register": 3
       }
     },
     "./node_modules/@umijs/preset-umi/dist/features/routePreloadOnLoad/routePreloadOnLoad": {
@@ -1602,7 +1602,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 32
+        "register": 28
       }
     },
     "./node_modules/@umijs/preset-umi/dist/features/forget/forget": {
@@ -1627,7 +1627,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 2
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1666,7 +1666,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 16
+        "register": 17
       }
     },
     "./node_modules/@umijs/preset-umi/dist/commands/help": {
@@ -1808,7 +1808,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1912,7 +1912,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 21
+        "register": 22
       },
       "enableBy": "register"
     },
@@ -1925,7 +1925,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1938,7 +1938,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 2
       },
       "enableBy": "register"
     },
@@ -1951,7 +1951,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1968,7 +1968,7 @@
             0
           ]
         },
-        "register": 5
+        "register": 6
       },
       "enableBy": "register"
     }
@@ -2049,6 +2049,16 @@
       "__isJSFile": true,
       "__absFile": "/home/runner/work/open-admin/open-admin/web/src/pages/account/changePassword.jsx"
     },
+    "system/article/index": {
+      "path": "system/article",
+      "id": "system/article/index",
+      "parentId": "@@/global-layout",
+      "file": "system/article/index.jsx",
+      "absPath": "/system/article",
+      "__content": "import {PlusOutlined} from '@ant-design/icons'\nimport {Button, Form, Input, InputNumber, Modal, Popconfirm} from 'antd'\nimport React from 'react'\nimport {\n    DictUtils,\n    FieldBoolean,\n    FieldDictSelect,\n    FieldEditor,\n    HttpUtils,\n    Page,\n    PermActions,\n    ProTable\n} from \"../../../framework\";\n\nconst {TextArea} = Input;\n\nexport default class extends React.Component {\n\n    state = {\n        formValues: {},\n        formOpen: false,\n    }\n\n    formRef = React.createRef()\n    tableRef = React.createRef()\n\n    handleAdd = () => {\n        this.setState({formOpen: true, formValues: {}})\n    }\n\n    handleEdit = record => {\n        this.setState({formOpen: true, formValues: record})\n    }\n\n    onFinish = values => {\n        const isNew = !values.id;\n        const url = isNew ? 'admin/article/create' : 'admin/article/update';\n        HttpUtils.post(url, values).then(rs => {\n            this.setState({formOpen: false})\n            this.tableRef.current.reload()\n        })\n    }\n\n    handleDelete = record => {\n        HttpUtils.post('admin/article/delete', {id: record.id}).then(rs => {\n            this.tableRef.current.reload()\n        })\n    }\n\n    columns = [\n        {\n            title: '编码',\n            dataIndex: 'code',\n        },\n        {\n            title: '标题',\n            dataIndex: 'title',\n        },\n        {\n            title: '显示位置',\n            dataIndex: 'position',\n            render(v) {\n                return DictUtils.dictLabel('articlePosition', v) || v\n            },\n        },\n        {\n            title: '排序',\n            dataIndex: 'seq',\n        },\n        {\n            title: '启用',\n            dataIndex: 'enabled',\n            render(v) {\n                return v == null ? null : (v ? '是' : '否')\n            },\n        },\n        {\n            title: '操作',\n            dataIndex: 'option',\n            render: (_, record) => {\n                return (\n                    <PermActions>\n                        <Button size='small' perm='article:update' onClick={() => this.handleEdit(record)}>编辑</Button>\n                        <Popconfirm perm='article:delete' title='确定删除?' onConfirm={() => this.handleDelete(record)}>\n                            <Button size='small'>删除</Button>\n                        </Popconfirm>\n                    </PermActions>\n                );\n            },\n        },\n    ]\n\n    render() {\n        return <Page\n            title=\"文章管理\"\n            description=\"管理系统文章，如关于、帮助等页面\"\n            actions={<Button perm='article:create' type='primary' icon={<PlusOutlined/>} onClick={this.handleAdd}>新增</Button>}\n        >\n            <ProTable\n                actionRef={this.tableRef}\n                request={(params) => HttpUtils.get('admin/article/page', params)}\n                columns={this.columns}\n            >\n                <Form.Item label='编码' name='code'>\n                    <Input/>\n                </Form.Item>\n                <Form.Item label='标题' name='title'>\n                    <Input/>\n                </Form.Item>\n            </ProTable>\n\n            <Modal title='文章'\n                   open={this.state.formOpen}\n                   onOk={() => this.formRef.current.submit()}\n                   onCancel={() => this.setState({formOpen: false})}\n                   destroyOnHidden\n                   width={800}\n            >\n                <Form ref={this.formRef} labelCol={{flex: '100px'}}\n                      initialValues={this.state.formValues}\n                      onFinish={this.onFinish}\n                >\n                    <Form.Item name='id' noStyle></Form.Item>\n\n                    <Form.Item label='编码' name='code' rules={[{required: true}]}>\n                        <Input disabled={!!this.state.formValues.id}/>\n                    </Form.Item>\n\n                    <Form.Item label='标题' name='title' rules={[{required: true}]}>\n                        <Input/>\n                    </Form.Item>\n\n                    <Form.Item label='内容' name='content'>\n                        <FieldEditor />\n                    </Form.Item>\n\n                    <Form.Item label='显示位置' name='position' rules={[{required: true}]}>\n                        <FieldDictSelect typeCode='articlePosition'/>\n                    </Form.Item>\n\n                    <Form.Item label='排序' name='seq'>\n                        <InputNumber/>\n                    </Form.Item>\n\n                    <Form.Item label='启用' name='enabled'>\n                        <FieldBoolean/>\n                    </Form.Item>\n                </Form>\n            </Modal>\n        </Page>\n    }\n}\n",
+      "__isJSFile": true,
+      "__absFile": "/home/runner/work/open-admin/open-admin/web/src/pages/system/article/index.jsx"
+    },
     "system/role/rolePerm": {
       "path": "system/role/rolePerm",
       "id": "system/role/rolePerm",
@@ -2145,7 +2155,7 @@
       "parentId": "@@/global-layout",
       "file": "forceUpdatePwd.jsx",
       "absPath": "/forceUpdatePwd",
-      "__content": "import React from \"react\";\nimport {Button, Form, Input, message} from \"antd\";\nimport {history} from 'umi'\nimport {HttpUtils, PageUtils, GlobalData} from \"../framework\";\n\nexport default class extends React.Component {\n\n    state = {\n        checking: true\n    }\n\n    async componentDidMount() {\n        try {\n            const rs = await HttpUtils.get('/admin/public/user-info', null, {showError: false});\n            if (!rs.login) {\n                PageUtils.redirectToLogin();\n                return;\n            }\n            GlobalData.setLoginInfo(rs.loginInfo);\n            this.setState({checking: false});\n        } catch (e) {\n            PageUtils.redirectToLogin();\n        }\n    }\n\n    onFinish = (values) => {\n        HttpUtils.post('admin/userCenter/update-pwd', values).then(() => {\n            message.success('修改密码成功，请重新登录');\n            history.push('/login');\n        })\n    }\n\n    validator = (rule, value) => {\n        return new Promise((resolve, reject) => {\n            HttpUtils.get(\"admin/sysUser/pwd-strength\", {password: value}).then(response => {\n                const rs = response.data\n                if (!rs.success) {\n                    reject(rs.message)\n                }\n                resolve()\n            })\n        })\n    }\n\n    render() {\n        if (this.state.checking) return null;\n\n        return (\n            <div style={{\n                display: 'flex',\n                justifyContent: 'center',\n                alignItems: 'center',\n                minHeight: '100vh',\n                background: '#f0f2f5'\n            }}>\n                <div style={{\n                    background: '#fff',\n                    padding: '40px',\n                    borderRadius: '8px',\n                    boxShadow: '0 2px 8px rgba(0,0,0,0.1)',\n                    maxWidth: 400,\n                    width: '100%'\n                }}>\n                    <h2 style={{textAlign: 'center', marginBottom: 24}}>修改密码</h2>\n                    <p style={{textAlign: 'center', color: '#999', marginBottom: 24}}>\n                        首次登录或密码已被重置，请修改密码后重新登录\n                    </p>\n                    <Form onFinish={this.onFinish}>\n                        <Form.Item name='newPassword'\n                                   label='新密码'\n                                   extra={'请输入字母、数字、特殊字符'}\n                                   rules={[\n                                       {required: true, message: '请输入新密码'},\n                                       {validator: this.validator}\n                                   ]}\n                        >\n                            <Input.Password/>\n                        </Form.Item>\n                        <Form.Item style={{marginTop: 40}}>\n                            <Button type=\"primary\" htmlType=\"submit\" block size='large'>\n                                确定\n                            </Button>\n                        </Form.Item>\n                    </Form>\n                </div>\n            </div>\n        )\n    }\n}\n",
+      "__content": "import React from \"react\";\nimport {Button, Form, Input, message} from \"antd\";\nimport {history} from 'umi'\nimport {HttpUtils, PageUtils, GlobalData} from \"../framework\";\n\nexport default class extends React.Component {\n\n    state = {\n        checking: true\n    }\n\n    async componentDidMount() {\n        try {\n            const rs = await HttpUtils.get('/admin/public/user-info', null, {showError: false});\n            if (!rs.login) {\n                PageUtils.redirectToLogin();\n                return;\n            }\n            GlobalData.setLoginInfo(rs.loginInfo);\n            this.setState({checking: false});\n        } catch (e) {\n            PageUtils.redirectToLogin();\n        }\n    }\n\n    onFinish = (values) => {\n        HttpUtils.post('admin/userCenter/update-pwd', values).then(() => {\n            message.success('修改密码成功，请重新登录');\n            history.push('/login');\n        })\n    }\n\n    validator = (rule, value) => {\n        return HttpUtils.get(\"admin/sysUser/pwd-strength\", {password: value})\n    }\n\n    render() {\n        if (this.state.checking) return null;\n\n        return (\n            <div style={{\n                display: 'flex',\n                justifyContent: 'center',\n                alignItems: 'center',\n                minHeight: '100vh',\n                background: '#f0f2f5'\n            }}>\n                <div style={{\n                    background: '#fff',\n                    padding: '40px',\n                    borderRadius: '8px',\n                    boxShadow: '0 2px 8px rgba(0,0,0,0.1)',\n                    maxWidth: 400,\n                    width: '100%'\n                }}>\n                    <h2 style={{textAlign: 'center', marginBottom: 24}}>修改密码</h2>\n                    <p style={{textAlign: 'center', color: '#999', marginBottom: 24}}>\n                        首次登录或密码已被重置，请修改密码后重新登录\n                    </p>\n                    <Form onFinish={this.onFinish}>\n                        <Form.Item name='newPassword'\n                                   label='新密码'\n                                   extra={'请输入字母、数字、特殊字符'}\n                                   rules={[\n                                       {required: true, message: '请输入新密码'},\n                                       {validator: this.validator}\n                                   ]}\n                        >\n                            <Input.Password/>\n                        </Form.Item>\n                        <Form.Item style={{marginTop: 40}}>\n                            <Button type=\"primary\" htmlType=\"submit\" block size='large'>\n                                确定\n                            </Button>\n                        </Form.Item>\n                    </Form>\n                </div>\n            </div>\n        )\n    }\n}\n",
       "__isJSFile": true,
       "__absFile": "/home/runner/work/open-admin/open-admin/web/src/pages/forceUpdatePwd.jsx"
     },
@@ -2159,13 +2169,23 @@
       "__isJSFile": true,
       "__absFile": "/home/runner/work/open-admin/open-admin/web/src/pages/account/index.jsx"
     },
+    "article/$code": {
+      "path": "article/:code",
+      "id": "article/$code",
+      "parentId": "@@/global-layout",
+      "file": "article/$code.jsx",
+      "absPath": "/article/:code",
+      "__content": "import React from \"react\";\nimport {HttpUtils, Page, PageUtils} from \"../../framework\";\n\nexport default class extends React.Component {\n\n    state = {\n        article: null,\n        loading: true,\n    }\n\n    componentDidMount() {\n        const code = PageUtils.currentPathnameLastPart()\n        if (code) {\n            HttpUtils.get('admin/article/getByCode', {code}).then(rs => {\n                this.setState({article: rs, loading: false})\n            }).catch(() => {\n                this.setState({loading: false})\n            })\n        } else {\n            this.setState({loading: false})\n        }\n    }\n\n    render() {\n        const {article, loading} = this.state\n\n        if (loading) {\n            return <Page title=\"加载中...\">\n                <div>加载中...</div>\n            </Page>\n        }\n\n        if (!article) {\n            return <Page title=\"文章不存在\">\n                <div>文章不存在或已禁用</div>\n            </Page>\n        }\n\n        return <Page title={article.title}>\n            <div dangerouslySetInnerHTML={{__html: article.content}}/>\n        </Page>\n    }\n}\n",
+      "__isJSFile": true,
+      "__absFile": "/home/runner/work/open-admin/open-admin/web/src/pages/article/$code.jsx"
+    },
     "about": {
       "path": "about",
       "id": "about",
       "parentId": "@@/global-layout",
       "file": "about.jsx",
       "absPath": "/about",
-      "__content": "import React from \"react\";\nimport {Page} from \"../framework\";\n\nexport default class extends React.Component {\n\n    render() {\n        return <Page title=\"关于\" description=\"了解系统版本与相关信息\">\n            <h1>关于</h1>\n        </Page>\n    }\n}\n",
+      "__content": "import React from \"react\";\nimport {history} from \"umi\";\nimport {Page} from \"../framework\";\n\nexport default class extends React.Component {\n\n    componentDidMount() {\n        history.push('/article/about')\n    }\n\n    render() {\n        return <Page title=\"关于系统\">\n            <div>跳转中...</div>\n        </Page>\n    }\n}\n",
       "__isJSFile": true,
       "__absFile": "/home/runner/work/open-admin/open-admin/web/src/pages/about.jsx"
     },

package/src/.umi-production/core/route.tsx

@@ -19,12 +19,13 @@ if (process.env.NODE_ENV === 'development') {
 import React from 'react';
 
 export async function getRoutes() {
-  const routes = {"404":{"path":"*","id":"404","parentId":"@@/global-layout"},"account/changePassword":{"path":"account/changePassword","id":"account/changePassword","parentId":"@@/global-layout"},"system/role/rolePerm":{"path":"system/role/rolePerm","id":"system/role/rolePerm","parentId":"@@/global-layout"},"system/user/userPerm":{"path":"system/user/userPerm","id":"system/user/userPerm","parentId":"@@/global-layout"},"system/dict/index":{"path":"system/dict","id":"system/dict/index","parentId":"@@/global-layout"},"system/file/index":{"path":"system/file","id":"system/file/index","parentId":"@@/global-layout"},"system/role/index":{"path":"system/role","id":"system/role/index","parentId":"@@/global-layout"},"system/user/index":{"path":"system/user","id":"system/user/index","parentId":"@@/global-layout"},"system/job/index":{"path":"system/job","id":"system/job/index","parentId":"@@/global-layout"},"system/log/index":{"path":"system/log","id":"system/log/index","parentId":"@@/global-layout"},"system/org/index":{"path":"system/org","id":"system/org/index","parentId":"@@/global-layout"},"forceUpdatePwd":{"path":"forceUpdatePwd","id":"forceUpdatePwd","parentId":"@@/global-layout"},"account/index":{"path":"account","id":"account/index","parentId":"@@/global-layout"},"about":{"path":"about","id":"about","parentId":"@@/global-layout"},"index":{"path":"/","id":"index","parentId":"@@/global-layout"},"login":{"path":"login","id":"login","parentId":"@@/global-layout"},"@@/global-layout":{"id":"@@/global-layout","path":"/","isLayout":true}} as const;
+  const routes = {"404":{"path":"*","id":"404","parentId":"@@/global-layout"},"account/changePassword":{"path":"account/changePassword","id":"account/changePassword","parentId":"@@/global-layout"},"system/article/index":{"path":"system/article","id":"system/article/index","parentId":"@@/global-layout"},"system/role/rolePerm":{"path":"system/role/rolePerm","id":"system/role/rolePerm","parentId":"@@/global-layout"},"system/user/userPerm":{"path":"system/user/userPerm","id":"system/user/userPerm","parentId":"@@/global-layout"},"system/dict/index":{"path":"system/dict","id":"system/dict/index","parentId":"@@/global-layout"},"system/file/index":{"path":"system/file","id":"system/file/index","parentId":"@@/global-layout"},"system/role/index":{"path":"system/role","id":"system/role/index","parentId":"@@/global-layout"},"system/user/index":{"path":"system/user","id":"system/user/index","parentId":"@@/global-layout"},"system/job/index":{"path":"system/job","id":"system/job/index","parentId":"@@/global-layout"},"system/log/index":{"path":"system/log","id":"system/log/index","parentId":"@@/global-layout"},"system/org/index":{"path":"system/org","id":"system/org/index","parentId":"@@/global-layout"},"forceUpdatePwd":{"path":"forceUpdatePwd","id":"forceUpdatePwd","parentId":"@@/global-layout"},"account/index":{"path":"account","id":"account/index","parentId":"@@/global-layout"},"article/$code":{"path":"article/:code","id":"article/$code","parentId":"@@/global-layout"},"about":{"path":"about","id":"about","parentId":"@@/global-layout"},"index":{"path":"/","id":"index","parentId":"@@/global-layout"},"login":{"path":"login","id":"login","parentId":"@@/global-layout"},"@@/global-layout":{"id":"@@/global-layout","path":"/","isLayout":true}} as const;
   return {
     routes,
     routeComponents: {
 '404': React.lazy(() => import(/* webpackChunkName: "src__pages__404" */'../../../src/pages/404.jsx')),
 'account/changePassword': React.lazy(() => import(/* webpackChunkName: "src__pages__account__changePassword" */'../../../src/pages/account/changePassword.jsx')),
+'system/article/index': React.lazy(() => import(/* webpackChunkName: "src__pages__system__article__index" */'../../../src/pages/system/article/index.jsx')),
 'system/role/rolePerm': React.lazy(() => import(/* webpackChunkName: "src__pages__system__role__rolePerm" */'../../../src/pages/system/role/rolePerm.jsx')),
 'system/user/userPerm': React.lazy(() => import(/* webpackChunkName: "src__pages__system__user__userPerm" */'../../../src/pages/system/user/userPerm.jsx')),
 'system/dict/index': React.lazy(() => import(/* webpackChunkName: "src__pages__system__dict__index" */'../../../src/pages/system/dict/index.jsx')),
@@ -36,6 +37,7 @@ export async function getRoutes() {
 'system/org/index': React.lazy(() => import(/* webpackChunkName: "src__pages__system__org__index" */'../../../src/pages/system/org/index.jsx')),
 'forceUpdatePwd': React.lazy(() => import(/* webpackChunkName: "src__pages__forceUpdatePwd" */'../../../src/pages/forceUpdatePwd.jsx')),
 'account/index': React.lazy(() => import(/* webpackChunkName: "src__pages__account__index" */'../../../src/pages/account/index.jsx')),
+'article/$code': React.lazy(() => import(/* webpackChunkName: "src__pages__article__$code" */'../../../src/pages/article/$code.jsx')),
 'about': React.lazy(() => import(/* webpackChunkName: "src__pages__about" */'../../../src/pages/about.jsx')),
 'index': React.lazy(() => import(/* webpackChunkName: "src__pages__index" */'../../../src/pages/index.jsx')),
 'login': React.lazy(() => import(/* webpackChunkName: "src__pages__login" */'../../../src/pages/login.jsx')),

package/src/framework/GlobalData.d.ts

@@ -5,4 +5,6 @@ export class GlobalData {
     static getLoginInfo(): object;
     static setDictInfo(data: object | null): void;
     static getDictInfo(): object | null;
+    static setSiteArticles(data: object): void;
+    static getSiteArticles(): object;
 }

package/src/framework/GlobalData.js

@@ -3,6 +3,7 @@ import {StorageUtils} from './utils/StorageUtils';
 const SITE_INFO_KEY = "siteInfo";
 const LOGIN_INFO_KEY = "loginInfo";
 const DICT_INFO_KEY = "dictInfo";
+const SITE_ARTICLES_KEY = "siteArticles";
 
 export class GlobalData {
     static setSiteInfo(data) {
@@ -28,6 +29,14 @@ export class GlobalData {
     static getDictInfo() {
         return StorageUtils.get(DICT_INFO_KEY);
     }
+
+    static setSiteArticles(data) {
+        StorageUtils.set(SITE_ARTICLES_KEY, data);
+    }
+
+    static getSiteArticles() {
+        return StorageUtils.get(SITE_ARTICLES_KEY) || {};
+    }
 }
 
-export { SITE_INFO_KEY, LOGIN_INFO_KEY, DICT_INFO_KEY };
+export { SITE_INFO_KEY, LOGIN_INFO_KEY, DICT_INFO_KEY, SITE_ARTICLES_KEY };

package/src/layouts/admin/HeaderRight.jsx

@@ -1,21 +1,30 @@
 import {Avatar, Dropdown} from "antd";
 import React from "react";
 import {history} from "umi";
-import {DeviceUtils, HttpUtils, MessageUtils, PageUtils, GlobalData} from "../../framework";
+import {DeviceUtils, HttpUtils, MessageUtils, PageUtils, GlobalData, ThemeUtils} from "../../framework";
 
 export class HeaderRight extends React.Component {
 
     state = {
-        isMobileDevice: false
+        isMobileDevice: false,
+        dropdownArticles: [],
+        headerArticles: [],
     };
 
     componentDidMount() {
         if (DeviceUtils.isMobileDevice()) {
             this.setState({isMobileDevice: true})
         }
+        this.loadArticles()
     }
 
-
+    loadArticles = () => {
+        const siteArticles = GlobalData.getSiteArticles();
+        this.setState({
+            dropdownArticles: siteArticles['HEADER_AVATAR_DROPDOWN'] || [],
+            headerArticles: siteArticles['HEADER_RIGHT'] || [],
+        })
+    }
 
     logout = () => {
         HttpUtils.post('admin/auth/logout').then(async () => {
@@ -36,8 +45,13 @@ export class HeaderRight extends React.Component {
         PageUtils.open('/account', '个人中心')
     }
 
+    openArticle = (code, title) => {
+        PageUtils.open('/article/' + code, title)
+    }
+
     render() {
         const info = GlobalData.getLoginInfo()
+        const {dropdownArticles, headerArticles} = this.state
 
         if (this.state.isMobileDevice) {
             return <div className='header-right'>
@@ -45,41 +59,46 @@ export class HeaderRight extends React.Component {
             </div>
         }
 
+        const articleItems = dropdownArticles.map(a => ({
+            key: 'article:' + a.code,
+            label: a.title,
+        }))
+
+        const menuItems = [
+            {key: 'account', label: '个人中心'},
+            ...articleItems,
+            {key: 'logout', label: '退出登录'},
+        ]
+
         return <div className='header-right'>
+            {headerArticles.map(a => (
+                <div key={a.code} className='item' style={{cursor: 'pointer'}}
+                     onClick={() => this.openArticle(a.code, a.title)}>
+                    {a.title}
+                </div>
+            ))}
 
             <Dropdown menu={{
                 onClick: ({key}) => {
-                    switch (key) {
-                        case 'account':
-                            this.account()
-                            break;
-                        case 'logout':
-                            this.logout();
-                            break;
-                        case 'about':
-                            this.about()
-                            break
+                    if (key === 'account') {
+                        this.account()
+                    } else if (key === 'logout') {
+                        this.logout();
+                    } else if (key.startsWith('article:')) {
+                        const code = key.substring(8)
+                        const article = dropdownArticles.find(a => a.code === code)
+                        this.openArticle(code, article ? article.title : code)
                     }
                 },
-                items: [
-                    {key: 'account', label: '个人中心'},
-                    {key: 'about', label: '关于系统'},
-                    {key: 'logout', label: '退出登录'},
-                ]
+                items: menuItems,
             }}>
                 <div className='item' style={{cursor: 'pointer'}}>
-                    <Avatar size="small" style={{backgroundColor: '#1677ff', verticalAlign: 'middle'}}>
+                    <Avatar size="default" style={{backgroundColor: ThemeUtils.getColor('primary-color')}}>
                         {info.name?.charAt(0)}
                     </Avatar>
                     <span style={{marginLeft: 8}}>{info.name}</span>
                 </div>
             </Dropdown>
-
         </div>
     }
-
-
-    about = () => {
-        history.push("/about")
-    }
 }

package/src/layouts/admin/index.jsx

@@ -30,6 +30,7 @@ export default class extends React.Component {
 
         siteInfo: {},
 
+        headerLeftArticles: [],
     }
 
 
@@ -42,6 +43,9 @@ export default class extends React.Component {
         this.setState({siteInfo, loginInfo})
 
         this.initMenu()
+
+        const siteArticles = GlobalData.getSiteArticles();
+        this.setState({headerLeftArticles: siteArticles['HEADER_LEFT'] || []})
     }
 
 
@@ -172,7 +176,7 @@ export default class extends React.Component {
     render() {
         const {siteInfo, loginInfo} = this.state
 
-        return <Layout className='main-layout' style={{'--primary-color': ThemeUtils.getColor("primary-color"), '--primary-color-click': ThemeUtils.getColor("primary-color-click")}}>
+        return <Layout className='main-layout' style={{'--primary-color': ThemeUtils.getColor("primary-color"), '--primary-color-click': ThemeUtils.getColor("primary-color-click"), '--primary-color-hover': ThemeUtils.getColor("primary-color-hover")}}>
              <Sider id='left-sider'
                    width={180}
                    collapsible
@@ -191,6 +195,10 @@ export default class extends React.Component {
             <Layout style={{flex: 1, overflow: 'hidden'}}>
                 <Header className='header'>
                     {this.renderTopMenu()}
+                    {this.state.headerLeftArticles.map(a => (
+                        <div key={a.code} className='item' style={{cursor: 'pointer', padding: '0 12px', whiteSpace: 'nowrap'}}
+                             onClick={() => PageUtils.open('/article/' + a.code, a.title)}>{a.title}</div>
+                    ))}
                     <HeaderRight/>
                 </Header>
 

package/src/layouts/admin/index.less

@@ -7,6 +7,7 @@
     display: flex;
     align-items: center;
     background-color: #fff;
+    border-bottom: 1px solid #e8e8e8;
 
     .top-nav {
       flex: 1;
@@ -45,11 +46,13 @@
       flex-shrink: 0;
 
       .item {
+        display: inline-flex;
+        align-items: center;
         padding: 0 0.5rem;
         cursor: pointer;
 
         &:hover {
-          background: var(--primary-color-click, #124B93);
+          background: var(--primary-color-hover, #4990CD);
           color: white;
         }
       }

package/src/layouts/index.jsx

@@ -85,6 +85,7 @@ export function Layouts() {
             HttpUtils.get('/admin/public/user-info').then(data => {
                 GlobalData.setDictInfo(data.dictInfo);
                 GlobalData.setLoginInfo(data.loginInfo);
+                GlobalData.setSiteArticles(data.siteArticles);
 
                 if (data.needUpdatePwd && pathname !== '/forceUpdatePwd') {
                     history.push('/forceUpdatePwd');

package/src/pages/about.jsx

@@ -1,11 +1,16 @@
 import React from "react";
+import {history} from "umi";
 import {Page} from "../framework";
 
 export default class extends React.Component {
 
+    componentDidMount() {
+        history.push('/article/about')
+    }
+
     render() {
-        return <Page title="关于" description="了解系统版本与相关信息">
-            <h1>关于</h1>
+        return <Page title="关于系统">
+            <div>跳转中...</div>
         </Page>
     }
 }

package/src/pages/article/$code.jsx

@@ -0,0 +1,43 @@
+import React from "react";
+import {HttpUtils, Page, PageUtils} from "../../framework";
+
+export default class extends React.Component {
+
+    state = {
+        article: null,
+        loading: true,
+    }
+
+    componentDidMount() {
+        const code = PageUtils.currentPathnameLastPart()
+        if (code) {
+            HttpUtils.get('admin/article/getByCode', {code}).then(rs => {
+                this.setState({article: rs, loading: false})
+            }).catch(() => {
+                this.setState({loading: false})
+            })
+        } else {
+            this.setState({loading: false})
+        }
+    }
+
+    render() {
+        const {article, loading} = this.state
+
+        if (loading) {
+            return <Page title="加载中...">
+                <div>加载中...</div>
+            </Page>
+        }
+
+        if (!article) {
+            return <Page title="文章不存在">
+                <div>文章不存在或已禁用</div>
+            </Page>
+        }
+
+        return <Page title={article.title}>
+            <div dangerouslySetInnerHTML={{__html: article.content}}/>
+        </Page>
+    }
+}

package/src/pages/forceUpdatePwd.jsx

@@ -31,15 +31,7 @@ export default class extends React.Component {
     }
 
     validator = (rule, value) => {
-        return new Promise((resolve, reject) => {
-            HttpUtils.get("admin/sysUser/pwd-strength", {password: value}).then(response => {
-                const rs = response.data
-                if (!rs.success) {
-                    reject(rs.message)
-                }
-                resolve()
-            })
-        })
+        return HttpUtils.get("admin/sysUser/pwd-strength", {password: value})
     }
 
     render() {

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

@@ -0,0 +1,152 @@
+import {PlusOutlined} from '@ant-design/icons'
+import {Button, Form, Input, InputNumber, Modal, Popconfirm} from 'antd'
+import React from 'react'
+import {
+    DictUtils,
+    FieldBoolean,
+    FieldDictSelect,
+    FieldEditor,
+    HttpUtils,
+    Page,
+    PermActions,
+    ProTable
+} from "../../../framework";
+
+const {TextArea} = Input;
+
+export default class extends React.Component {
+
+    state = {
+        formValues: {},
+        formOpen: false,
+    }
+
+    formRef = React.createRef()
+    tableRef = React.createRef()
+
+    handleAdd = () => {
+        this.setState({formOpen: true, formValues: {}})
+    }
+
+    handleEdit = record => {
+        this.setState({formOpen: true, formValues: record})
+    }
+
+    onFinish = values => {
+        const isNew = !values.id;
+        const url = isNew ? 'admin/article/create' : 'admin/article/update';
+        HttpUtils.post(url, values).then(rs => {
+            this.setState({formOpen: false})
+            this.tableRef.current.reload()
+        })
+    }
+
+    handleDelete = record => {
+        HttpUtils.post('admin/article/delete', {id: record.id}).then(rs => {
+            this.tableRef.current.reload()
+        })
+    }
+
+    columns = [
+        {
+            title: '编码',
+            dataIndex: 'code',
+        },
+        {
+            title: '标题',
+            dataIndex: 'title',
+        },
+        {
+            title: '显示位置',
+            dataIndex: 'position',
+            render(v) {
+                return DictUtils.dictLabel('articlePosition', v) || v
+            },
+        },
+        {
+            title: '排序',
+            dataIndex: 'seq',
+        },
+        {
+            title: '启用',
+            dataIndex: 'enabled',
+            render(v) {
+                return v == null ? null : (v ? '是' : '否')
+            },
+        },
+        {
+            title: '操作',
+            dataIndex: 'option',
+            render: (_, record) => {
+                return (
+                    <PermActions>
+                        <Button size='small' perm='article:update' onClick={() => this.handleEdit(record)}>编辑</Button>
+                        <Popconfirm perm='article:delete' title='确定删除?' onConfirm={() => this.handleDelete(record)}>
+                            <Button size='small'>删除</Button>
+                        </Popconfirm>
+                    </PermActions>
+                );
+            },
+        },
+    ]
+
+    render() {
+        return <Page
+            title="文章管理"
+            description="管理系统文章，如关于、帮助等页面"
+            actions={<Button perm='article:create' type='primary' icon={<PlusOutlined/>} onClick={this.handleAdd}>新增</Button>}
+        >
+            <ProTable
+                actionRef={this.tableRef}
+                request={(params) => HttpUtils.get('admin/article/page', params)}
+                columns={this.columns}
+            >
+                <Form.Item label='编码' name='code'>
+                    <Input/>
+                </Form.Item>
+                <Form.Item label='标题' name='title'>
+                    <Input/>
+                </Form.Item>
+            </ProTable>
+
+            <Modal title='文章'
+                   open={this.state.formOpen}
+                   onOk={() => this.formRef.current.submit()}
+                   onCancel={() => this.setState({formOpen: false})}
+                   destroyOnHidden
+                   width={800}
+            >
+                <Form ref={this.formRef} labelCol={{flex: '100px'}}
+                      initialValues={this.state.formValues}
+                      onFinish={this.onFinish}
+                >
+                    <Form.Item name='id' noStyle></Form.Item>
+
+                    <Form.Item label='编码' name='code' rules={[{required: true}]}>
+                        <Input disabled={!!this.state.formValues.id}/>
+                    </Form.Item>
+
+                    <Form.Item label='标题' name='title' rules={[{required: true}]}>
+                        <Input/>
+                    </Form.Item>
+
+                    <Form.Item label='内容' name='content'>
+                        <FieldEditor />
+                    </Form.Item>
+
+                    <Form.Item label='显示位置' name='position' rules={[{required: true}]}>
+                        <FieldDictSelect typeCode='articlePosition'/>
+                    </Form.Item>
+
+                    <Form.Item label='排序' name='seq'>
+                        <InputNumber/>
+                    </Form.Item>
+
+                    <Form.Item label='启用' name='enabled'>
+                        <FieldBoolean/>
+                    </Form.Item>
+                </Form>
+            </Modal>
+        </Page>
+    }
+}