From 54aadb4144ccd2218e57113318ae821057d5bf8d Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Mon, 21 Jan 2019 17:40:26 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mock/menu.js         | 13 +++++++++++--
 mock/role.js         |  9 ---------
 src/app.js           |  2 +-
 src/services/menu.js |  8 ++++++--
 src/services/role.js |  4 ----
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/mock/menu.js b/mock/menu.js
index fdc3f2d..23d10c4 100644
--- a/mock/menu.js
+++ b/mock/menu.js
@@ -845,6 +845,14 @@ function getFakeGrantTree(req, res) {
   return res.json(json);
 }
 
+function getFakeAuthRoutes(req, res) {
+  const json = { code: 200, success: true, msg: '操作成功' };
+  json.data = {
+    '/form/advanced-form': { authority: ['admin', 'user'] },
+  };
+  return res.json(json);
+}
+
 function fakeSuccess(req, res) {
   const json = { code: 200, success: true, msg: '操作成功' };
   return res.json(json);
@@ -861,8 +869,9 @@ const proxy = {
   'GET /api/blade-system/menu/list': getFakeList,
   'GET /api/blade-system/menu/detail': getFakeDetail,
   'GET /api/blade-system/menu/tree': getFakeTree,
-  'GET /api/blade-system/menu/grantTree': getFakeGrantTree,
-  'GET /api/blade-system/menu/roleTreeKeys': getFakeRoleTreeKeys,
+  'GET /api/blade-system/menu/grant-tree': getFakeGrantTree,
+  'GET /api/blade-system/menu/role-tree-keys': getFakeRoleTreeKeys,
+  'GET /api/blade-system/menu/auth-routes': getFakeAuthRoutes,
   'POST /api/blade-system/menu/submit': fakeSuccess,
   'POST /api/blade-system/menu/remove': fakeSuccess,
 };
diff --git a/mock/role.js b/mock/role.js
index d5d05ec..96e80e1 100644
--- a/mock/role.js
+++ b/mock/role.js
@@ -83,14 +83,6 @@ function getFakeTree(req, res) {
   return res.json(json);
 }
 
-function getFakeRoutes(req, res) {
-  const json = { code: 200, success: true, msg: '操作成功' };
-  json.data = {
-    '/form/advanced-form': { authority: ['admin', 'user'] },
-  };
-  return res.json(json);
-}
-
 function fakeSuccess(req, res) {
   const json = { code: 200, success: true, msg: '操作成功' };
   return res.json(json);
@@ -100,7 +92,6 @@ const proxy = {
   'GET /api/blade-system/role/list': getFakeList,
   'GET /api/blade-system/role/detail': getFakeDetail,
   'GET /api/blade-system/role/tree': getFakeTree,
-  'GET /api/blade-system/role/auth-routes': getFakeRoutes,
   'POST /api/blade-system/role/submit': fakeSuccess,
   'POST /api/blade-system/role/remove': fakeSuccess,
   'POST /api/blade-system/role/grant': fakeSuccess,
diff --git a/src/app.js b/src/app.js
index 27ff35d..248a2ee 100644
--- a/src/app.js
+++ b/src/app.js
@@ -1,4 +1,4 @@
-import { routesAuthority } from './services/role';
+import { routesAuthority } from './services/menu';
 
 export const dva = {
   config: {
diff --git a/src/services/menu.js b/src/services/menu.js
index dc6144a..075cce0 100644
--- a/src/services/menu.js
+++ b/src/services/menu.js
@@ -21,11 +21,11 @@ export async function tree(params) {
 }
 
 export async function grantTree(params) {
-  return request(`/api/blade-system/menu/grantTree?${stringify(params)}`);
+  return request(`/api/blade-system/menu/grant-tree?${stringify(params)}`);
 }
 
 export async function roleTreeKeys(params) {
-  return request(`/api/blade-system/menu/roleTreeKeys?${stringify(params)}`);
+  return request(`/api/blade-system/menu/role-tree-keys?${stringify(params)}`);
 }
 
 export async function remove(params) {
@@ -45,3 +45,7 @@ export async function submit(params) {
 export async function detail(params) {
   return request(`/api/blade-system/menu/detail?${stringify(params)}`);
 }
+
+export async function routesAuthority() {
+  return request('/api/blade-system/menu/auth-routes');
+}
diff --git a/src/services/role.js b/src/services/role.js
index 2cdfcaf..e1cd02d 100644
--- a/src/services/role.js
+++ b/src/services/role.js
@@ -12,10 +12,6 @@ export async function tree(params) {
   return request(`/api/blade-system/role/tree?${stringify(params)}`);
 }
 
-export async function routesAuthority() {
-  return request('/api/blade-system/role/auth-routes');
-}
-
 export async function grant(params) {
   return request('/api/blade-system/role/grant', {
     method: 'POST',