Fixed router

Author: LyricTian

src/pages/Menu/MenuCard.js

@@ -73,7 +73,7 @@ class MenuCard extends PureComponent {
     return (
       <Modal
         title={formTitle}
-        width={850}
+        width={900}
         visible={formVisible}
         maskClosable={false}
         confirmLoading={submitting}

src/pages/Menu/MenuResource/AddDialog.js

@@ -1,5 +1,5 @@
 import React, { PureComponent } from 'react';
-import { Modal, Form, Input } from 'antd';
+import { Modal, Form, Input, Row, Col, Tooltip, Icon } from 'antd';
 
 @Form.create()
 class AddDialog extends PureComponent {
@@ -38,8 +38,8 @@ class AddDialog extends PureComponent {
 
     return (
       <Modal
-        title="资源模板"
-        width={400}
+        title="菜单资源模板"
+        width={450}
         visible={visible}
         maskClosable={false}
         destroyOnClose
@@ -50,24 +50,42 @@ class AddDialog extends PureComponent {
       >
         <Form>
           <Form.Item {...formItemLayout} label="资源名">
-            {getFieldDecorator('name', {
-              rules: [
-                {
-                  required: true,
-                  message: '请输入资源名',
-                },
-              ],
-            })(<Input placeholder="请输入资源名" />)}
+            <Row>
+              <Col span={20}>
+                {getFieldDecorator('name', {
+                  rules: [
+                    {
+                      required: true,
+                      message: '请输入资源名',
+                    },
+                  ],
+                })(<Input placeholder="请输入资源名" />)}
+              </Col>
+              <Col span={4} style={{ textAlign: 'center' }}>
+                <Tooltip title="例：用户数据">
+                  <Icon type="question-circle" />
+                </Tooltip>
+              </Col>
+            </Row>
           </Form.Item>
           <Form.Item {...formItemLayout} label="资源路由">
-            {getFieldDecorator('router', {
-              rules: [
-                {
-                  required: true,
-                  message: '请输入资源路由',
-                },
-              ],
-            })(<Input placeholder="请输入资源路由" />)}
+            <Row>
+              <Col span={20}>
+                {getFieldDecorator('router', {
+                  rules: [
+                    {
+                      required: true,
+                      message: '请输入资源路由',
+                    },
+                  ],
+                })(<Input placeholder="请输入资源路由" />)}
+              </Col>
+              <Col span={4} style={{ textAlign: 'center' }}>
+                <Tooltip title="例：/api/v1/users">
+                  <Icon type="question-circle" />
+                </Tooltip>
+              </Col>
+            </Row>
           </Form.Item>
         </Form>
       </Modal>

src/services/login.js

@@ -2,17 +2,17 @@ import request, { baseURL } from '../utils/request';
 
 // 验证码ID
 export async function captchaID() {
-  return request(`/v1/login/captchaid`);
+  return request(`/v1/pub/login/captchaid`);
 }
 
 // 图形验证码
 export function captcha(id) {
-  return `${baseURL}/v1/login/captcha?id=${id}`;
+  return `${baseURL}/v1/pub/login/captcha?id=${id}`;
 }
 
 // 登录
 export async function login(params) {
-  return request(`/v1/login`, {
+  return request(`/v1/pub/login`, {
     method: 'POST',
     body: params,
     notNotify: true,
@@ -21,25 +21,25 @@ export async function login(params) {
 
 // 退出
 export async function logout() {
-  return request(`/v1/login/exit`, {
+  return request(`/v1/pub/login/exit`, {
     method: 'POST',
   });
 }
 
 // 更新个人密码
 export async function updatePwd(params) {
-  return request(`/v1/current/password`, {
+  return request(`/v1/pub/current/password`, {
     method: 'PUT',
     body: params,
   });
 }
 
 // 获取当前用户信息
 export async function getCurrentUser() {
-  return request(`/v1/current/user`);
+  return request(`/v1/pub/current/user`);
 }
 
 // 查询当前用户菜单树
 export async function queryMenuTree() {
-  return request(`/v1/current/menutree`);
+  return request(`/v1/pub/current/menutree`);
 }

src/utils/request.js

@@ -25,7 +25,7 @@ async function getAccessToken() {
   if (checkAccessTokenExpires(tokenInfo.expires_at) === 0) {
     return axios
       .request({
-        url: `${baseURL}/v1/refresh_token`,
+        url: `${baseURL}/v1/pub/refresh_token`,
         method: 'POST',
         headers: {
           Authorization: `${tokenInfo.token_type} ${tokenInfo.access_token}`,