Merge branch 'develop' into 'master'

fix: 修改权限校验

See merge request admin-manager/dc!30

src/utils/authority.js

@@ -1,30 +1,31 @@
 // use localStorage to store the authority info, which might be sent from server in actual project.
-export function getAuthority(str) {
+import getRealUrl from '@/utils/getRealUrl'
+export function getAuthority (str) {
   const authorityString =
-    typeof str === 'undefined' ? localStorage.getItem('antd-pro-authority') : str;
+    typeof str === 'undefined' ? localStorage.getItem('antd-pro-authority') : str
   // authorityString could be admin, "admin", ["admin"]
-  let authority;
+  let authority
   try {
     if (authorityString) {
-      authority = JSON.parse(authorityString);
+      authority = JSON.parse(authorityString)
     }
   } catch (e) {
-    authority = authorityString;
+    authority = authorityString
   }
   if (typeof authority === 'string') {
-    return [authority];
+    return [authority]
   }
   if (!authority) {
-    return ['admin'];
+    return ['admin']
   }
-  return authority;
+  return authority
 }
 
-export function setAuthority(authority) {
-  const proAuthority = typeof authority === 'string' ? [authority] : authority;
-  return localStorage.setItem('antd-pro-authority', JSON.stringify(proAuthority));
+export function setAuthority (authority) {
+  const proAuthority = typeof authority === 'string' ? [authority] : authority
+  return localStorage.setItem('antd-pro-authority', JSON.stringify(proAuthority))
 }
 
-export function validateAuthority(data, authority) {
-  return data.indexOf(authority) > -1;
+export function validateAuthority (data, authority) {
+  return data.indexOf(getRealUrl(authority)) > -1
 }