feat(*): permissions

change auth to permission

Author: vanoneang

src/components/base/table/lin-table.vue

@@ -41,7 +41,7 @@
             plain
             :key="index"
             size="mini"
-            v-auth="{ auth: item.auth ? item.auth : '', type: 'disabled' }"
+            v-permission="{ permission: item.permission ? item.permission : '', type: 'disabled' }"
             @click.native.prevent.stop="buttonMethods(item.func, scope.$index, scope.row)"
             >{{ item.name }}</el-button
           >

src/components/layout/NavBar.vue

@@ -4,7 +4,7 @@
       <breadcrumb />
       <!-- 暂时放这里 -->
       <div class="right-info">
-        <notify v-auth="'消息推送'" v-show="false" />
+        <notify v-permission="'消息推送'" v-show="false" />
         <clear-tab></clear-tab>
         <screenfull /> <user></user>
       </div>

src/components/layout/User.vue

@@ -317,7 +317,7 @@ export default {
             },
           })
             .then(res => {
-              if (res.error_code === 0) {
+              if (res.error_code < 100) {
                 this.$message({
                   type: 'success',
                   message: '更新昵称成功',

src/config/stage/center.js

@@ -6,7 +6,7 @@ const centerRouter = {
   icon: 'iconfont icon-tushuguanli',
   filePath: 'views/center/', // 文件路径
   order: null,
-  inNav: true,
+  inNav: false,
 }
 
 export default centerRouter

src/lin/directives/authorize.js

@@ -2,7 +2,7 @@ import Vue from 'vue'
 import store from '@/store'
 
 function isAllowed(permission, user, permissions) {
-  if (user.isSuper) {
+  if (user.admin) {
     return true
   }
   if (typeof permission === 'string') {
@@ -14,21 +14,21 @@ function isAllowed(permission, user, permissions) {
   return false
 }
 
-Vue.directive('auth', {
+Vue.directive('permission', {
   bind(el, binding) {
-    let auth
+    let permission
     let type
     if (Object.prototype.toString.call(binding.value) === '[object Object]') {
       // eslint-disable-next-line prefer-destructuring
-      auth = binding.value.auth
+      permission = binding.value.permission
       // eslint-disable-next-line prefer-destructuring
       type = binding.value.type
     } else {
-      auth = binding.value
+      permission = binding.value
     }
-    const isAllow = isAllowed(auth, store.state.user || {}, store.state.permissions)
+    const isAllow = isAllowed(permission, store.state.user || {}, store.state.permissions)
     const element = el
-    if (!isAllow && auth) {
+    if (!isAllow && permission) {
       if (type) {
         element.disabled = true
         element.style.opacity = 0.4
@@ -40,4 +40,4 @@ Vue.directive('auth', {
   },
 })
 
-export default Vue.directive('auth')
+export default Vue.directive('permission')

src/lin/mixin/index.js

@@ -10,15 +10,15 @@ const globalMixin = {
           /* eslint-disable no-unused-expressions */
           window.history.length > 1 ? this.$router.go(-1) : this.$router.push('/')
         },
-        isAllowed(_auth) {
+        isAllowed(_permission) {
           /* eslint-disable no-restricted-syntax */
           /* eslint-disable guard-for-in */
           const { permissions } = this.user
           for (const mod of permissions) {
             for (const item in mod) {
               for (const a of mod[item]) {
-                // console.log(a.auth)
-                if (a.permission === _auth) {
+                // console.log(a.permission)
+                if (a.permission === _permission) {
                   return true
                 }
                 // console.log(a.module)

src/lin/models/admin.js

@@ -31,7 +31,7 @@ export default class Admin {
     }
   }
 
-  static getAllAuths() {
+  static getAllPermissions() {
     return get('cms/admin/permission')
   }
 
@@ -62,7 +62,7 @@ export default class Admin {
     return this.getAdminUsers({})
   }
 
-  async getGroupsWithAuths({ count = this.uCount, page = this.uPag }) {
+  async getGroupsWithPermissions({ count = this.uCount, page = this.uPag }) {
     const res = await get('cms/admin/groups', {
       count,
       page,
@@ -72,12 +72,12 @@ export default class Admin {
 
   async nextGroupsPage() {
     await this.increseGpage()
-    return this.getGroupsWithAuths({})
+    return this.getGroupsWithPermissions({})
   }
 
   async preGroupsPage() {
     await this.decreseGpage()
-    return this.getGroupsWithAuths({})
+    return this.getGroupsWithPermissions({})
   }
 
   static async getAllGroups() {
@@ -125,7 +125,7 @@ export default class Admin {
     return res
   }
 
-  static async dispatchAuths(group_id, permission_ids) {
+  static async dispatchPermissions(group_id, permission_ids) {
     const res = await post('cms/admin/permission/dispatch/batch', {
       group_id,
       permission_ids,
@@ -141,7 +141,7 @@ export default class Admin {
     return res
   }
 
-  static async removeAuths(group_id, permission_ids) {
+  static async removePermissions(group_id, permission_ids) {
     const res = await post('cms/admin/permission/remove', {
       group_id,
       permission_ids,

src/lin/models/user.js

@@ -1,37 +1,8 @@
 import { post, get, put } from '@/lin/plugins/axios'
 import { saveTokens } from '../utils/token'
+import store from '@/store'
 
 export default class User {
-  // 昵称
-  nickname = null
-
-  // 邮箱
-  email = null
-
-  avatar = null // 头像
-
-  // 所属分组信息
-  groups = []
-
-  // 用户名
-  username = null
-
-  // 是否为超级管理员
-  isSuper = null
-
-  // 拥有的权限
-  permissions = []
-
-  constructor(nickname, username, admin, groups, permissions, email, avatar) {
-    this.email = email
-    this.groups = groups
-    this.username = username
-    this.avatar = avatar
-    this.isSuper = admin
-    this.permissions = permissions || []
-    this.nickname = nickname
-  }
-
   /**
    * 分配用户
    * @param {object} data 注册信息
@@ -59,15 +30,17 @@ export default class User {
    */
   static async getInformation() {
     const info = await get('cms/user/information')
-    return new User(info.nickname, info.username, info.admin, info.groups, info.permissions, info.email, info.avatar)
+    const storeUser = store.getters.user === null ? {} : store.getters.user
+    return Object.assign({ ...storeUser }, info)
   }
 
   /**
    * 获取当前用户信息和所拥有的权限
    */
   static async getPermissions() {
     const info = await get('cms/user/permissions')
-    return new User(info.nickname, info.username, info.admin, info.groups, info.permissions, info.email, info.avatar)
+    const storeUser = store.getters.user === null ? {} : store.getters.user
+    return Object.assign({ ...storeUser }, info)
   }
 
   /**

src/lin/plugins/axios.js

@@ -84,7 +84,7 @@ _axios.interceptors.request.use(
       /* eslint-disable-next-line */
       console.warn(`其他请求类型: ${reqConfig.method}, 暂无自动处理`)
     }
-    // step2: auth 处理
+    // step2: permission 处理
     if (reqConfig.url === 'cms/user/refresh') {
       const refreshToken = getToken('refresh_token')
       if (refreshToken) {

src/lin/utils/util.js

@@ -189,13 +189,13 @@ Utils.deepClone = data => cloneDeep(data)
 /**
  * 判断权限
  */
-Utils.hasPermission = (auths, route, user) => {
+Utils.hasPermission = (permissions, route, user) => {
   // eslint-disable-line
-  if (user && user.isSuper) {
+  if (user && user.admin) {
     return true
   }
   if (route.permission) {
-    return auths.some(auth => route.permission.indexOf(auth) > -1)
+    return permissions.some(permission => route.permission.indexOf(permission) > -1)
   }
   return true
 }