refactor🎨 前端按照app和api结构对应

package.json

@@ -1,6 +1,6 @@
 {
   "name": "go-admin",
-  "version": "1.3.3",
+  "version": "1.4.0",
   "description": "A magical vue admin. An out-of-box UI solution for enterprise applications. Newest development stack of vue. Lots of awesome features",
   "author": "https://github.com/wenjianzhang",
   "license": "MIT",

src/api/user.js

@@ -1,5 +1,6 @@
 import request from '@/utils/request'
 
+// login 登陆
 export function login(data) {
   return request({
     url: '/api/v1/login',
@@ -8,6 +9,15 @@ export function login(data) {
   })
 }
 
+// logout 退出
+export function logout() {
+  return request({
+    url: '/api/v1/logout',
+    method: 'post'
+  })
+}
+
+// refreshtoken 刷新token
 export function refreshtoken(data) {
   return request({
     url: '/refreshtoken',
@@ -16,6 +26,7 @@ export function refreshtoken(data) {
   })
 }
 
+// getInfo 获取用户基本信息
 export function getInfo() {
   return request({
     url: '/api/v1/getinfo',
@@ -23,10 +34,3 @@ export function getInfo() {
   })
 }
 
-export function logout() {
-  return request({
-    url: '/api/v1/logout',
-    method: 'post'
-  })
-}
-

src/main.js

@@ -15,9 +15,9 @@ import store from './store'
 import router from './router'
 import permission from './directive/permission'
 
-import { getDicts } from '@/api/system/dict/data'
+import { getDicts } from '@/api/admin/dict/data'
 import { getItems, setItems } from '@/api/table'
-import { getConfigKey } from '@/api/system/config'
+import { getConfigKey } from '@/api/admin/sys-config'
 import { parseTime, resetForm, addDateRange, selectDictLabel, download, selectItemsLabel } from '@/utils/costum'
 
 import './icons' // icon

src/store/modules/permission.js

@@ -1,5 +1,5 @@
 import { asyncRoutes, constantRoutes } from '@/router'
-import { getRoutes } from '@/api/system/role'
+import { getRoutes } from '@/api/admin/sys-role'
 import Layout from '@/layout'
 // import sysuserindex from '@/views/sysuser/index'
 

src/store/modules/system.js

@@ -1,5 +1,4 @@
 import { getSetting, updateSetting } from '@/api/login'
-// import { logout } from '@/api/user'
 import storage from '@/utils/storage'
 const state = {
   info: storage.get('app_info')

src/utils/costum.js

@@ -4,6 +4,9 @@ export function parseTime(time, pattern) {
   if (arguments.length === 0 || !time) {
     return null
   }
+  if (time.indexOf('01-01-01') > -1) {
+    return '-'
+  }
   const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
   let date
   if (typeof time === 'object') {

src/utils/index.js

@@ -12,6 +12,10 @@ export function parseTime(time, cFormat) {
   if (arguments.length === 0) {
     return null
   }
+  console.log(time_str.indexOf('01-01-01'))
+  if (time_str.indexOf('01-01-01') > -1) {
+    return '-'
+  }
   const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}'
   let date
   if (typeof time === 'object') {
@@ -40,6 +44,7 @@ export function parseTime(time, cFormat) {
     if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
     return value.toString().padStart(2, '0')
   })
+
   return time_str
 }
 

src/views/dict/data.vue → src/views/admin/dict/data.vue

@@ -150,11 +150,11 @@
 </template>
 
 <script>
-import { listData, getData, delData, addData, updateData, exportData } from '@/api/system/dict/data'
-import { listType, getType } from '@/api/system/dict/type'
+import { listData, getData, delData, addData, updateData, exportData } from '@/api/admin/dict/data'
+import { listType, getType } from '@/api/admin/dict/type'
 
 export default {
-  name: 'Data',
+  name: 'SysDictDataManage',
   data() {
     return {
       // 遮罩层

src/views/dict/index.vue → src/views/admin/dict/index.vue

@@ -166,11 +166,11 @@
 </template>
 
 <script>
-import { listType, getType, delType, addType, updateType } from '@/api/system/dict/type'
+import { listType, getType, delType, addType, updateType } from '@/api/admin/dict/type'
 import { formatJson } from '@/utils'
 
 export default {
-  name: 'Dict',
+  name: 'SysDictTypeManage',
   data() {
     return {
       // 遮罩层

src/views/sys-api/index.vue → src/views/admin/sys-api/index.vue

@@ -3,15 +3,7 @@
   <BasicLayout>
     <template #wrapper>
       <el-card class="box-card">
-        <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
-          <el-form-item label="名称" prop="name"><el-input
-            v-model="queryParams.name"
-            placeholder="请输入名称"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-          </el-form-item>
+        <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="48px">
           <el-form-item label="标题" prop="title">
             <el-input
               v-model="queryParams.title"
@@ -218,10 +210,10 @@
 </template>
 
 <script>
-import { addSysApi, delSysApi, getSysApi, listSysApi, updateSysApi } from '@/api/sys-api'
+import { addSysApi, delSysApi, getSysApi, listSysApi, updateSysApi } from '@/api/admin/sys-api'
 
 export default {
-  name: 'SysApi',
+  name: 'SysApiManage',
   components: {
   },
   data() {

src/views/config/index.vue → src/views/admin/sys-config/index.vue

@@ -163,11 +163,11 @@
 </template>
 
 <script>
-import { listConfig, getConfig, delConfig, addConfig, updateConfig } from '@/api/system/config'
+import { listConfig, getConfig, delConfig, addConfig, updateConfig } from '@/api/admin/sys-config'
 import { formatJson } from '@/utils'
 
 export default {
-  name: 'Config',
+  name: 'SysConfigManage',
   data() {
     return {
       // 遮罩层

src/views/dept/index.vue → src/views/admin/sys-dept/index.vue

@@ -31,7 +31,7 @@
               @click="handleQuery"
             >搜索</el-button>
             <el-button
-              v-permisaction="['system:sysdept:add']"
+              v-permisaction="['admin:sysDept:add']"
               class="filter-item"
               type="primary"
               icon="el-icon-plus"
@@ -66,14 +66,14 @@
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button
-                v-permisaction="['system:sysdept:edit']"
+                v-permisaction="['admin:sysDept:edit']"
                 size="mini"
                 type="text"
                 icon="el-icon-edit"
                 @click="handleUpdate(scope.row)"
               >修改</el-button>
               <el-button
-                v-permisaction="['system:sysdept:add']"
+                v-permisaction="['admin:sysDept:add']"
                 size="mini"
                 type="text"
                 icon="el-icon-plus"
@@ -81,7 +81,7 @@
               >新增</el-button>
               <el-button
                 v-if="scope.row.p_id != 0"
-                v-permisaction="['system:sysdept:remove']"
+                v-permisaction="['admin:sysDept:remove']"
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
@@ -156,12 +156,12 @@
 </template>
 
 <script>
-import { getDeptList, getDept, delDept, addDept, updateDept } from '@/api/system/dept'
+import { getDeptList, getDept, delDept, addDept, updateDept } from '@/api/admin/sys-dept'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
 export default {
-  name: 'Dept',
+  name: 'SysDeptManage',
   components: { Treeselect },
   data() {
     return {

src/views/loginlog/index.vue → src/views/admin/sys-login-log/index.vue

@@ -147,10 +147,10 @@
 </template>
 
 <script>
-import { delSysLoginlog, getSysLoginlog, listSysLoginlog } from '@/api/system/sys-login-log'
+import { delSysLoginlog, getSysLoginlog, listSysLoginlog } from '@/api/admin/sys-login-log'
 
 export default {
-  name: 'SysLoginlog',
+  name: 'SysLoginLogManage',
   components: {
   },
   data() {

src/views/menu/index.vue → src/views/admin/sys-menu/index.vue

@@ -37,6 +37,7 @@
         <el-table
           v-loading="loading"
           :data="menuList"
+          border
           row-key="menuId"
           :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
         >
@@ -48,7 +49,7 @@
           </el-table-column>
           <el-table-column prop="sort" label="排序" width="60px" />
           <el-table-column prop="permission" label="权限标识" :show-overflow-tooltip="true" />
-          <el-table-column prop="path" label="路径" :show-overflow-tooltip="true">
+          <el-table-column prop="path" label="组建路径" :show-overflow-tooltip="true">
             <template slot-scope="scope">
               <span v-if="scope.row.menuType=='A'">{{ scope.row.path }}</span>
               <span v-else>{{ scope.row.component }}</span>
@@ -102,10 +103,9 @@
           :visible.sync="open"
           direction="rtl"
           custom-class="demo-drawer"
-          size="760px"
+          size="830px"
         >
           <div class="demo-drawer__content">
-            <!-- <el-dialog :title="title" :visible.sync="open" width="600px"> -->
             <el-form ref="form" :model="form" :rules="rules" label-width="80px">
               <el-row>
                 <el-col :span="24">
@@ -193,7 +193,7 @@
                     <el-input v-model="form.permission" placeholder="请权限标识" maxlength="50" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="24">
+                <el-col :span="12">
                   <el-form-item v-if="form.menuType != 'F'" label="菜单状态">
                     <el-radio-group v-model="form.visible">
                       <el-radio
@@ -204,36 +204,32 @@
                     </el-radio-group>
                   </el-form-item>
                 </el-col>
-                <el-col>
-                  <el-transfer
-                    v-if="form.menuType == 'F' || form.menuType == 'C'"
-                    v-model="form.apis"
-                    style="text-align: left; display: inline-block"
-                    filterable
-                    :props="{
-                      key: 'id',
-                      label: 'path'
-                    }"
-                    :titles="['Source', 'Target']"
-                    :button-texts="['到左边', '到右边 ']"
-                    :format="{
-                      noChecked: '${total}',
-                      hasChecked: '${checked}/${total}'
-                    }"
-                    class="panel"
-                    :data="sysapiList"
-                    @change="handleChange"
-                  >
-                    <span slot-scope="{ option }">{{ option.id }} - {{ option.path }}</span>
-
-                  </el-transfer>
+                <el-col :span="24">
+                  <el-form-item v-if="form.menuType == 'F' || form.menuType == 'C'" label="api权限">
+                    <el-transfer
+                      v-model="form.apis"
+                      style="text-align: left; display: inline-block"
+                      filterable
+                      :props="{
+                        key: 'id',
+                        label: 'path'
+                      }"
+                      :titles="['Source', 'Target']"
+                      :button-texts="['到左边', '到右边 ']"
+                      :format="{
+                        noChecked: '${total}',
+                        hasChecked: '${checked}/${total}'
+                      }"
+                      class="panel"
+                      :data="sysapiList"
+                      @change="handleChange"
+                    >
+                      <span slot-scope="{ option }">{{ option.id }} - {{ option.path }}</span>
+                    </el-transfer>
+                  </el-form-item>
                 </el-col>
               </el-row>
             </el-form>
-            <!-- <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitForm">确 定</el-button>
-              <el-button @click="cancel">取 消</el-button>
-            </div> -->
             <div class="demo-drawer__footer">
               <el-button type="primary" @click="submitForm">确 定</el-button>
               <el-button @click="cancel">取 消</el-button>
@@ -247,15 +243,15 @@
 </template>
 
 <script>
-import { listMenu, getMenu, delMenu, addMenu, updateMenu } from '@/api/system/menu'
+import { listMenu, getMenu, delMenu, addMenu, updateMenu } from '@/api/admin/sys-menu'
+import { listSysApi } from '@/api/admin/sys-api'
 
-import { listSysApi } from '@/api/sys-api'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import IconSelect from '@/components/IconSelect'
 
 export default {
-  name: 'Menu',
+  name: 'SysMenuManage',
   components: { Treeselect, IconSelect },
   data() {
     return {

src/views/operlog/index.vue → src/views/admin/sys-oper-log/index.vue

@@ -158,11 +158,11 @@
 </template>
 
 <script>
-import { listSysOperlog, delSysOperlog, cleanOperlog } from '@/api/system/sys-opera-log'
+import { listSysOperlog, delSysOperlog, cleanOperlog } from '@/api/admin/sys-opera-log'
 import { formatJson } from '@/utils'
 
 export default {
-  name: 'Operlog',
+  name: 'SysOperLogManage',
   data() {
     return {
       // 遮罩层

src/views/post/index.vue → src/views/admin/sys-post/index.vue

@@ -161,11 +161,11 @@
 </template>
 
 <script>
-import { listPost, getPost, delPost, addPost, updatePost } from '@/api/system/post'
+import { listPost, getPost, delPost, addPost, updatePost } from '@/api/admin/sys-post'
 import { formatJson } from '@/utils'
 
 export default {
-  name: 'Post',
+  name: 'SysPostManage',
   data() {
     return {
       // 遮罩层

src/views/role/index.vue → src/views/admin/sys-role/index.vue

@@ -238,9 +238,9 @@
 </template>
 
 <script>
-import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus } from '@/api/system/role'
-import { treeselect as menuTreeselect, roleMenuTreeselect } from '@/api/system/menu'
-import { treeselect as deptTreeselect, roleDeptTreeselect } from '@/api/system/dept'
+import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus } from '@/api/admin/sys-role'
+import { treeselect as menuTreeselect, roleMenuTreeselect } from '@/api/admin/sys-menu'
+import { treeselect as deptTreeselect, roleDeptTreeselect } from '@/api/admin/sys-dept'
 import { formatJson } from '@/utils'
 
 export default {

src/views/sysuser/index.vue → src/views/admin/sys-user/index.vue

@@ -308,16 +308,18 @@
 </template>
 
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, exportUser, resetUserPwd, changeUserStatus, importTemplate } from '@/api/system/sysuser'
+import { listUser, getUser, delUser, addUser, updateUser, exportUser, resetUserPwd, changeUserStatus, importTemplate } from '@/api/admin/sys-user'
 import { getToken } from '@/utils/auth'
-import { treeselect } from '@/api/system/dept'
+
+import { listPost } from '@/api/admin/sys-post'
+import { listRole } from '@/api/admin/sys-role'
+import { treeselect } from '@/api/admin/sys-dept'
+
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import { listPost } from '@/api/system/post'
-import { listRole } from '@/api/system/role'
 
 export default {
-  name: 'User',
+  name: 'SysUserManage',
   components: { Treeselect },
   data() {
     return {
@@ -532,13 +534,7 @@ export default {
     handleAdd() {
       this.reset()
       this.getTreeselect()
-      // getUserInit().then(response => {
-      //   this.postOptions = response.data.posts
-      //   this.roleOptions = response.data.roles
-      //   this.open = true
-      //   this.title = '添加用户'
-      // this.form.password = this.initPassword
-      // })
+
       listPost({ pageSize: 1000 }).then(response => {
         this.postOptions = response.data.list
       })
@@ -552,15 +548,10 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()
-      // this.getTreeselect()
 
       const userId = row.userId || this.ids
       getUser(userId).then(response => {
         this.form = response.data
-        // this.postOptions = response.posts
-        // this.roleOptions = response.roles
-        // this.form.postIds = response.postIds[0]
-        // this.form.roleIds = response.roleIds[0]
         this.open = true
         this.title = '修改用户'
         this.form.password = ''

src/views/syscategory/index.vue → src/views/cms/sys-category/index.vue

@@ -37,7 +37,7 @@
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
             <el-button
-              v-permisaction="['admin:cms:add']"
+              v-permisaction="['cms:sysCategory:add']"
               type="primary"
               icon="el-icon-plus"
               size="mini"
@@ -47,7 +47,7 @@
           </el-col>
           <el-col :span="1.5">
             <el-button
-              v-permisaction="['admin:cms:edit']"
+              v-permisaction="['cms:sysCategory:edit']"
               type="success"
               icon="el-icon-edit"
               size="mini"
@@ -58,7 +58,7 @@
           </el-col>
           <el-col :span="1.5">
             <el-button
-              v-permisaction="['admin:cms:remove']"
+              v-permisaction="['cms:sysCategory:remove']"
               type="danger"
               icon="el-icon-delete"
               size="mini"
@@ -103,7 +103,7 @@
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button
-                v-permisaction="['admin:cms:edit']"
+                v-permisaction="['cms:sysCategory:edit']"
                 size="mini"
                 type="text"
                 icon="el-icon-edit"
@@ -111,7 +111,7 @@
               >修改
               </el-button>
               <el-button
-                v-permisaction="['admin:cms:remove']"
+                v-permisaction="['cms:sysCategory:remove']"
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
@@ -181,11 +181,11 @@
 </template>
 
 <script>
-import { addSysCategory, delSysCategory, getSysCategory, listSysCategory, updateSysCategory } from '@/api/syscategory'
+import { addSysCategory, delSysCategory, getSysCategory, listSysCategory, updateSysCategory } from '@/api/cms/sys-category'
 import FileChoose from '@/components/FileChoose'
 
 export default {
-  name: 'SysCategory',
+  name: 'SysCategoryManage',
   components: {
     FileChoose
   },

src/views/syscontent/create.vue → src/views/cms/sys-content/create.vue

@@ -66,8 +66,8 @@
 </template>
 
 <script>
-import { addSysContent } from '@/api/syscontent'
-import { listSysCategory } from '@/api/syscategory'
+import { addSysContent } from '@/api/cms/sys-content'
+import { listSysCategory } from '@/api/cms/sys-category'
 
 // import FileChoose from '@/components/FileChoose'
 import Tinymce from '@/components/Tinymce'
@@ -76,7 +76,7 @@ const defaultForm = {
   status: 'draft'
 }
 export default {
-  name: 'CreateArticle',
+  name: 'SysContentCreate',
   components: {
     // FileChoose,
     Tinymce

src/views/syscontent/edit.vue → src/views/cms/sys-content/edit.vue

@@ -65,15 +65,15 @@
 </template>
 
 <script>
-import { getSysContent, updateSysContent } from '@/api/syscontent'
-import { listSysCategory } from '@/api/syscategory'
+import { getSysContent, updateSysContent } from '@/api/cms/sys-content'
+import { listSysCategory } from '@/api/cms/sys-category'
 
 import Tinymce from '@/components/Tinymce'
 const defaultForm = {
   status: 'draft'
 }
 export default {
-  name: 'CreateArticle',
+  name: 'SysContentEdit',
   components: {
     Tinymce
   },

src/views/syscontent/index.vue → src/views/cms/sys-content/index.vue

@@ -143,13 +143,11 @@
 </template>
 
 <script>
-import { delSysContent, listSysContent } from '@/api/syscontent'
-import { listSysCategory } from '@/api/syscategory'
+import { delSysContent, listSysContent } from '@/api/cms/sys-content'
+import { listSysCategory } from '@/api/cms/sys-category'
 
-// import FileChoose from '@/components/FileChoose'
-// import RictText from '@/components/richtext'
 export default {
-  name: 'SysContent',
+  name: 'SysContentManage',
   components: {
   },
   data() {

src/views/sysjob/index.vue → src/views/job/sys-job/index.vue

@@ -320,10 +320,10 @@
 </template>
 
 <script>
-import { addSysJob, delSysJob, getSysJob, listSysJob, updateSysJob, removeJob, startJob } from '@/api/sysjob'
+import { addSysJob, delSysJob, getSysJob, listSysJob, updateSysJob, removeJob, startJob } from '@/api/job/sys-job'
 
 export default {
-  name: 'Config',
+  name: 'SysJobManage',
   components: {
 
   },

src/views/sysjob/log.vue → src/views/job/sys-job/log.vue

@@ -31,7 +31,7 @@
 
 import { unWsLogout } from '@/api/ws'
 export default {
-  name: 'Test',
+  name: 'SysJobLogManage',
   data() {
     return {
       websock: null,

src/views/profile/index.vue

@@ -64,7 +64,7 @@
 import userAvatar from './userAvatar'
 import userInfo from './userInfo'
 import resetPwd from './resetPwd'
-import { getUserProfile } from '@/api/system/sysuser'
+import { getUserProfile } from '@/api/admin/sys-user'
 
 export default {
   name: 'Profile',

src/views/profile/resetPwd.vue

@@ -17,7 +17,7 @@
 </template>
 
 <script>
-import { updateUserPwd } from '@/api/system/sysuser'
+import { updateUserPwd } from '@/api/admin/sys-user'
 
 export default {
   data() {

src/views/profile/userAvatar.vue

@@ -54,7 +54,7 @@
 <script>
 import store from '@/store'
 import { VueCropper } from 'vue-cropper'
-import { uploadAvatar } from '@/api/system/sysuser'
+import { uploadAvatar } from '@/api/admin/sys-user'
 
 export default {
   components: { VueCropper },

src/views/profile/userInfo.vue

@@ -23,7 +23,7 @@
 </template>
 
 <script>
-import { updateUser } from '@/api/system/sysuser'
+import { updateUser } from '@/api/admin/sys-user'
 
 export default {
   props: {

src/views/tools/gen/editTable.vue

@@ -176,7 +176,7 @@
 <script>
 import { getGenTable, updateGenTable, getTableTree } from '@/api/tools/gen'
 // import { listTable } from '@/api/tools/gen'
-import { optionselect as getDictOptionselect } from '@/api/system/dict/type'
+import { optionselect as getDictOptionselect } from '@/api/admin/dict/type'
 import basicInfoForm from './basicInfoForm'
 import genInfoForm from './genInfoForm'
 export default {