@jiangood/open-admin 2.2.6 → 2.2.8

package/package.json

@@ -13,7 +13,6 @@
     "antd-img-crop": "^4.23.0",
     "axios": "^1.13.2",
     "dayjs": "^1.11.13",
-    "jsencrypt": "^3.5.4",
     "lodash": "^4.17.23",
     "qs": "^6.14.0",
     "react": "^19.0.0",
@@ -37,5 +36,5 @@
     "dev": "umi dev",
     "build": "umi build"
   },
-  "version": "2.2.6"
-}
+  "version": "2.2.8"
+}

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

@@ -15,7 +15,6 @@
       "antd-img-crop": "^4.23.0",
       "axios": "^1.13.2",
       "dayjs": "^1.11.13",
-      "jsencrypt": "^3.5.4",
       "lodash": "^4.17.23",
       "qs": "^6.14.0",
       "react": "^19.0.0",
@@ -39,7 +38,7 @@
       "dev": "umi dev",
       "build": "umi build"
     },
-    "version": "2.2.6"
+    "version": "2.2.8"
   },
   "pkgPath": "/home/runner/work/open-admin/open-admin/web/package.json",
   "plugins": {
@@ -65,7 +64,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 4
+        "register": 3
       },
       "enableBy": "register"
     },
@@ -82,7 +81,7 @@
             0
           ]
         },
-        "register": 2
+        "register": 3
       },
       "enableBy": "register"
     },
@@ -99,7 +98,7 @@
             1
           ]
         },
-        "register": 2
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -113,7 +112,7 @@
       "time": {
         "hooks": {
           "modifyRoutes": [
-            0
+            1
           ]
         },
         "register": 1
@@ -143,10 +142,10 @@
       "time": {
         "hooks": {
           "modifyAppData": [
-            58
+            61
           ]
         },
-        "register": 22
+        "register": 20
       },
       "enableBy": "register"
     },
@@ -173,10 +172,10 @@
       "time": {
         "hooks": {
           "onCheckConfig": [
-            1
+            0
           ],
           "onCheck": [
-            1
+            0
           ]
         },
         "register": 1
@@ -196,7 +195,7 @@
             0
           ]
         },
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -209,7 +208,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "config"
     },
@@ -1121,7 +1120,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 97
+        "register": 95
       },
       "enableBy": "register"
     },
@@ -1147,7 +1146,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 9
+        "register": 8
       },
       "enableBy": "config"
     },
@@ -1164,7 +1163,7 @@
             0
           ]
         },
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1177,7 +1176,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1190,7 +1189,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 2
       },
       "enableBy": "config"
     },
@@ -1203,7 +1202,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 31
+        "register": 29
       }
     },
     "./node_modules/@umijs/preset-umi/dist/features/mpa/mpa": {
@@ -1240,7 +1239,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1253,7 +1252,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "config"
     },
@@ -1267,7 +1266,7 @@
       "time": {
         "hooks": {
           "modifyConfig": [
-            1
+            0
           ]
         },
         "register": 1
@@ -1321,7 +1320,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "config"
     },
@@ -1334,7 +1333,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1373,7 +1372,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       }
     },
     "./node_modules/@umijs/preset-umi/dist/features/ssr/ssr": {
@@ -1398,7 +1397,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 155
       },
       "enableBy": "register"
     },
@@ -1411,7 +1410,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 3
+        "register": 5
       },
       "enableBy": "register"
     },
@@ -1437,7 +1436,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "config"
     },
@@ -1450,7 +1449,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 3
+        "register": 4
       }
     },
     "./node_modules/@umijs/preset-umi/dist/features/monorepo/redirect": {
@@ -1462,7 +1461,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 22
+        "register": 21
       },
       "enableBy": "config"
     },
@@ -1487,7 +1486,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       }
     },
     "./node_modules/@umijs/preset-umi/dist/features/legacy/legacy": {
@@ -1512,7 +1511,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "config"
     },
@@ -1525,7 +1524,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       }
     },
     "./node_modules/@umijs/preset-umi/dist/features/swc/swc": {
@@ -1541,7 +1540,7 @@
             0
           ]
         },
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1554,7 +1553,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 3
+        "register": 2
       }
     },
     "./node_modules/@umijs/preset-umi/dist/features/mako/mako": {
@@ -1566,7 +1565,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "config"
     },
@@ -1579,7 +1578,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       }
     },
     "./node_modules/@umijs/preset-umi/dist/features/hmrGuardian/hmrGuardian": {
@@ -1591,7 +1590,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 2
+        "register": 3
       }
     },
     "./node_modules/@umijs/preset-umi/dist/features/routePreloadOnLoad/routePreloadOnLoad": {
@@ -1603,7 +1602,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 28
+        "register": 27
       }
     },
     "./node_modules/@umijs/preset-umi/dist/features/forget/forget": {
@@ -1654,7 +1653,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 43
+        "register": 41
       },
       "enableBy": "register"
     },
@@ -1667,7 +1666,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 17
+        "register": 14
       }
     },
     "./node_modules/@umijs/preset-umi/dist/commands/help": {
@@ -1692,7 +1691,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1705,7 +1704,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1718,7 +1717,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1731,7 +1730,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1757,7 +1756,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1874,7 +1873,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 1
+        "register": 0
       },
       "enableBy": "register"
     },
@@ -1913,7 +1912,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 22
+        "register": 21
       },
       "enableBy": "register"
     },
@@ -1926,7 +1925,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 0
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1939,7 +1938,7 @@
       "config": {},
       "time": {
         "hooks": {},
-        "register": 2
+        "register": 1
       },
       "enableBy": "register"
     },
@@ -1966,7 +1965,7 @@
       "time": {
         "hooks": {
           "modifyConfig": [
-            0
+            1
           ]
         },
         "register": 6
@@ -2206,7 +2205,7 @@
       "parentId": "@@/global-layout",
       "file": "login.jsx",
       "absPath": "/login",
-      "__content": "import React from 'react';\nimport {Button, Form, Input, message, Space} from 'antd';\nimport {LockOutlined, SafetyCertificateOutlined, UserOutlined, WarningOutlined} from '@ant-design/icons';\nimport {JSEncrypt} from \"jsencrypt\";\nimport {history} from 'umi';\nimport {EventBusUtils, HttpUtils, PageUtils, MessageUtils, SysUtils} from \"../framework/utils\";\n\nimport \"./login.less\"\n\nfunction getRedirect() {\n    let redirect = PageUtils.currentParams()['redirect'];\n    if (redirect) {\n        redirect = decodeURIComponent(redirect)\n    } else {\n        redirect = '/'\n    }\n    return redirect;\n}\n\nfunction postLogin(values) {\n    return new Promise((resolve, reject) => {\n        HttpUtils.post('/admin/auth/login', values).then(rs => {\n            EventBusUtils.emit('loginSuccess')\n            history.push(getRedirect())\n            resolve(rs)\n        }).catch(e => {\n            console.error('[Login] 登录失败:', e);\n            reject(e)\n        })\n    })\n}\n\nexport default class extends React.Component {\n\n    state = {\n        logging: false,\n        siteInfo: {},\n        random: Math.random()\n    }\n\n    async componentDidMount() {\n        const siteInfo = SysUtils.getSiteInfo()\n        if (siteInfo && siteInfo.rsaPublicKey) {\n            this.setState({siteInfo})\n            return\n        }\n        // localStorage 中无站点信息，从服务端重新加载\n        try {\n            const rs = await HttpUtils.get('/admin/public/site-info')\n            SysUtils.setSiteInfo(rs)\n            this.setState({siteInfo: rs})\n        } catch (e) {\n            console.error('[Login] 加载站点信息失败:', e);\n            message.error('加载站点信息失败，请刷新页面重试')\n        }\n    }\n\n    submit = values => {\n        this.setState({logging: true})\n\n        const pubkey = this.state.siteInfo.rsaPublicKey;\n        if (!pubkey) {\n            message.error(\"未获取密钥，请刷新浏览器再试\")\n            this.setState({logging: false})\n            return\n        }\n        const crypt = new JSEncrypt();\n        crypt.setPublicKey(pubkey);\n        values.password = crypt.encrypt(values.password)\n\n        postLogin(values).finally(() => {\n            this.setState({logging: false})\n        })\n    }\n\n    render() {\n        const {siteInfo} = this.state\n\n        const pageStyle = {\n            backgroundImage: `url(\"${SysUtils.contextPath('/admin/public/login_bg.jpg')}\")`\n        }\n        if (siteInfo.loginBackground) {\n            const url = SysUtils.contextPath('/admin/sysFile/preview/' + siteInfo.loginBackground);\n            pageStyle.backgroundImage = 'url(\"' + url + '\")'\n        }\n\n        return (\n            <section className='login-page' style={pageStyle}>\n                <div className=\"login-content\">\n                    <h1>{siteInfo.title}</h1>\n                    {this.getForm(siteInfo)}\n                    {this.renderFormBottom()}\n                </div>\n            </section>\n        );\n    }\n\n    getForm = siteInfo => {\n        const form = (\n            <Form\n                name=\"normal_login\"\n                className=\"login-form\"\n                initialValues={{remember: true}}\n                onFinish={this.submit}\n                requiredMark={false}\n                colon={false}\n            >\n                <Form.Item name=\"username\" rules={[{required: true, message: '请输入用户名!'}]}>\n                    <Input size='large' prefix={<UserOutlined/>} placeholder=\"用户名\" autoComplete=\"off\"/>\n                </Form.Item>\n                <Form.Item name=\"password\" rules={[{required: true, message: '请输入密码!'}]}>\n                    <Input autoComplete=\"off\" prefix={<LockOutlined/>} type=\"password\" placeholder=\"密码\"\n                           size='large'\n                    />\n                </Form.Item>\n\n                {siteInfo.captcha && (\n                    <Form.Item name='captchaCode' rules={[{required: true}]}>\n                        <Space style={{alignItems: 'center'}}>\n                            <Input size='large' placeholder='验证码' prefix={<SafetyCertificateOutlined/>}/>\n                            <img height={36} width={100}\n                                 src={SysUtils.contextPath(\"/admin/auth/captcha-image?_random=\" + this.state.random)}\n                                 onClick={() => this.setState({random: Math.random()})}/>\n                        </Space>\n                    </Form.Item>\n                )}\n\n                <Form.Item style={{marginTop: 10}}>\n                    <Button loading={this.state.logging} type=\"primary\" htmlType=\"submit\"\n                            block size='large'>\n                        登录\n                    </Button>\n                </Form.Item>\n            </Form>\n        );\n\n        if (this.props.formRender) {\n            return this.props.formRender(form);\n        }\n        return form;\n    };\n\n    renderFormBottom() {\n        const siteInfo = this.state.siteInfo;\n        if (siteInfo.loginBoxBottomTip) {\n            return (\n                <div style={{color: 'white', marginTop: 50, fontSize: '14px', textAlign: 'center'}}>\n                    <WarningOutlined/> {siteInfo.loginBoxBottomTip}\n                </div>\n            )\n        }\n    }\n}\n",
+      "__content": "import React from 'react';\nimport {Button, Form, Input, message, Space} from 'antd';\nimport {LockOutlined, SafetyCertificateOutlined, UserOutlined, WarningOutlined} from '@ant-design/icons';\nimport {history} from 'umi';\nimport {EventBusUtils, HttpUtils, PageUtils, MessageUtils, SysUtils} from \"../framework/utils\";\n\nimport \"./login.less\"\n\nfunction getRedirect() {\n    let redirect = PageUtils.currentParams()['redirect'];\n    if (redirect) {\n        redirect = decodeURIComponent(redirect)\n    } else {\n        redirect = '/'\n    }\n    return redirect;\n}\n\nfunction postLogin(values) {\n    return new Promise((resolve, reject) => {\n        HttpUtils.post('/admin/auth/login', values).then(rs => {\n            EventBusUtils.emit('loginSuccess')\n            history.push(getRedirect())\n            resolve(rs)\n        }).catch(e => {\n            console.error('[Login] 登录失败:', e);\n            reject(e)\n        })\n    })\n}\n\nfunction encodePassword(pwd) {\n    const chars = [];\n    for (let i = 0; i < pwd.length; i++)\n        chars.push(pwd.charCodeAt(i) + i + 2);\n    return btoa(String.fromCharCode(...chars));\n}\n\nexport default class extends React.Component {\n\n    state = {\n        logging: false,\n        siteInfo: {},\n        random: Math.random()\n    }\n\n    async componentDidMount() {\n        const siteInfo = SysUtils.getSiteInfo()\n        if (siteInfo && siteInfo.title) {\n            this.setState({siteInfo})\n            return\n        }\n        // localStorage 中无站点信息，从服务端重新加载\n        try {\n            const rs = await HttpUtils.get('/admin/public/site-info')\n            SysUtils.setSiteInfo(rs)\n            this.setState({siteInfo: rs})\n        } catch (e) {\n            console.error('[Login] 加载站点信息失败:', e);\n            message.error('加载站点信息失败，请刷新页面重试')\n        }\n    }\n\n    submit = values => {\n        this.setState({logging: true})\n        values.password = encodePassword(values.password)\n        postLogin(values).finally(() => {\n            this.setState({logging: false})\n        })\n    }\n\n    render() {\n        const {siteInfo} = this.state\n\n        const pageStyle = {\n            backgroundImage: `url(\"${SysUtils.contextPath('/admin/public/login_bg.jpg')}\")`\n        }\n        if (siteInfo.loginBackground) {\n            const url = SysUtils.contextPath('/admin/sysFile/preview/' + siteInfo.loginBackground);\n            pageStyle.backgroundImage = 'url(\"' + url + '\")'\n        }\n\n        return (\n            <section className='login-page' style={pageStyle}>\n                <div className=\"login-content\">\n                    <h1>{siteInfo.title}</h1>\n                    {this.getForm(siteInfo)}\n                    {this.renderFormBottom()}\n                </div>\n            </section>\n        );\n    }\n\n    getForm = siteInfo => {\n        const form = (\n            <Form\n                name=\"normal_login\"\n                className=\"login-form\"\n                initialValues={{remember: true}}\n                onFinish={this.submit}\n                requiredMark={false}\n                colon={false}\n            >\n                <Form.Item name=\"username\" rules={[{required: true, message: '请输入用户名!'}]}>\n                    <Input size='large' prefix={<UserOutlined/>} placeholder=\"用户名\" autoComplete=\"off\"/>\n                </Form.Item>\n                <Form.Item name=\"password\" rules={[{required: true, message: '请输入密码!'}]}>\n                    <Input autoComplete=\"off\" prefix={<LockOutlined/>} type=\"password\" placeholder=\"密码\"\n                           size='large'\n                    />\n                </Form.Item>\n\n                {siteInfo.captcha && (\n                    <Form.Item name='captchaCode' rules={[{required: true}]}>\n                        <Space style={{alignItems: 'center'}}>\n                            <Input size='large' placeholder='验证码' prefix={<SafetyCertificateOutlined/>}/>\n                            <img height={36} width={100}\n                                 src={SysUtils.contextPath(\"/admin/auth/captcha-image?_random=\" + this.state.random)}\n                                 onClick={() => this.setState({random: Math.random()})}/>\n                        </Space>\n                    </Form.Item>\n                )}\n\n                <Form.Item style={{marginTop: 10}}>\n                    <Button loading={this.state.logging} type=\"primary\" htmlType=\"submit\"\n                            block size='large'>\n                        登录\n                    </Button>\n                </Form.Item>\n            </Form>\n        );\n\n        if (this.props.formRender) {\n            return this.props.formRender(form);\n        }\n        return form;\n    };\n\n    renderFormBottom() {\n        const siteInfo = this.state.siteInfo;\n        if (siteInfo.loginBoxBottomTip) {\n            return (\n                <div style={{color: 'white', marginTop: 50, fontSize: '14px', textAlign: 'center'}}>\n                    <WarningOutlined/> {siteInfo.loginBoxBottomTip}\n                </div>\n            )\n        }\n    }\n}\n",
       "__isJSFile": true,
       "__absFile": "/home/runner/work/open-admin/open-admin/web/src/pages/login.jsx"
     },

package/src/layouts/admin/index.jsx

@@ -117,8 +117,8 @@ export default class extends React.Component {
         if (leafRootNodes.length > 0) {
             const defaultGroup = {
                 key: '_default_group',
-                label: '默认',
-                title: '默',
+                label: '业务模块',
+                title: '业',
                 icon: <NamedIcon name="AppstoreOutlined" style={{fontSize: 12}}/>,
                 children: leafRootNodes,
                 type: 'directory',

package/src/pages/login.jsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import {Button, Form, Input, message, Space} from 'antd';
 import {LockOutlined, SafetyCertificateOutlined, UserOutlined, WarningOutlined} from '@ant-design/icons';
-import {JSEncrypt} from "jsencrypt";
 import {history} from 'umi';
 import {EventBusUtils, HttpUtils, PageUtils, MessageUtils, SysUtils} from "../framework/utils";
 
@@ -30,6 +29,13 @@ function postLogin(values) {
     })
 }
 
+function encodePassword(pwd) {
+    const chars = [];
+    for (let i = 0; i < pwd.length; i++)
+        chars.push(pwd.charCodeAt(i) + i + 2);
+    return btoa(String.fromCharCode(...chars));
+}
+
 export default class extends React.Component {
 
     state = {
@@ -40,7 +46,7 @@ export default class extends React.Component {
 
     async componentDidMount() {
         const siteInfo = SysUtils.getSiteInfo()
-        if (siteInfo && siteInfo.rsaPublicKey) {
+        if (siteInfo && siteInfo.title) {
             this.setState({siteInfo})
             return
         }
@@ -57,17 +63,7 @@ export default class extends React.Component {
 
     submit = values => {
         this.setState({logging: true})
-
-        const pubkey = this.state.siteInfo.rsaPublicKey;
-        if (!pubkey) {
-            message.error("未获取密钥，请刷新浏览器再试")
-            this.setState({logging: false})
-            return
-        }
-        const crypt = new JSEncrypt();
-        crypt.setPublicKey(pubkey);
-        values.password = crypt.encrypt(values.password)
-
+        values.password = encodePassword(values.password)
         postLogin(values).finally(() => {
             this.setState({logging: false})
         })