From 32bb1b7b89f33e868e1e0fe5ed776d7705990fb4 Mon Sep 17 00:00:00 2001
From: Mrtangl <1807746833@qq.com>
Date: Tue, 12 Apr 2022 18:36:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=20=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E5=8F=B0=20=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/api/auth.ts                      |  13 +-
 admin/src/api/setting.ts                   |   6 +-
 admin/src/api/user.ts                      |   8 +-
 admin/src/api/workbench.ts                 |   2 +-
 admin/src/components/editor/index copy.vue | 237 ---------------------
 admin/src/layout/components/perm.vue       |  10 +-
 admin/src/store/modules/permission.ts      |  18 +-
 admin/src/store/modules/user.ts            |   4 +-
 admin/src/utils/request.ts                 |  12 ++
 admin/src/views/permission/admin/index.vue |  38 ++--
 admin/src/views/permission/role/index.vue  |   6 +-
 11 files changed, 65 insertions(+), 289 deletions(-)
 delete mode 100644 admin/src/components/editor/index copy.vue

diff --git a/admin/src/api/auth.ts b/admin/src/api/auth.ts
index 5852385a..24770177 100644
--- a/admin/src/api/auth.ts
+++ b/admin/src/api/auth.ts
@@ -2,30 +2,31 @@ import request from '@/utils/request'
 import { terminal } from '@/config/app'
 
 export function adminLists(params: any) {
-    return request.get('/auth.admin/lists', { params })
+    return request.get('/system/admin/lists', { params })
 }
 
 // 管理员添加
 export function apiAdminAdd(params: any) {
-    return request.post('/auth.admin/add', params)
+    return request.post('/system/admin/add', params)
 }
 
 export function apiAdminEdit(params: any) {
-    return request.post('/auth.admin/edit', params)
+    return request.post('/system/admin/edit', params)
 }
 
 // 管理员删除
 export function apiAdminDelete(params: { id: number }) {
-    return request.post('/auth.admin/delete', params)
+    return request.post('/system/admin/del', params)
 }
 
 // 管理员详情
 export function apiAdminDetail(params: any) {
-    return request.get('/auth.admin/detail', { params })
+    return request.get('/system/admin/detail', { params })
 }
+
 // 角色列表
 export function apiRoleLists(params: any) {
-    return request.get('/auth.role/lists', { params })
+    return request.get('/system/role/lists', { params })
 }
 // 添加角色
 export function apiRoleAdd(params: any) {
diff --git a/admin/src/api/setting.ts b/admin/src/api/setting.ts
index 4fec4b41..5169a17f 100644
--- a/admin/src/api/setting.ts
+++ b/admin/src/api/setting.ts
@@ -11,7 +11,7 @@ export function apiSetCopyright(params: any) {
 
 // 获取网站信息
 export function apiGetWebsite() {
-    return request.get('/setting.web.web_setting/getWebsite')
+    return request.get('/setting/website')
 }
 // 设置网站信息
 export function apiSetWebsite(params: any) {
@@ -64,8 +64,6 @@ export function apiLoginConfigSet(params: any) {
 }
 /** E 用户设置 **/
 
-
-
 // 获取系统日志列表
 export function apiSystemLogLists(params: any) {
     return request.get('/setting.system.log/lists', { params })
@@ -84,4 +82,4 @@ export function apiAuthAdminEditSelf(params: any) {
 // 获取管理员信息
 export function apiAuthAdminMySelf() {
     return request.post('/auth.admin/mySelf')
-}
\ No newline at end of file
+}
diff --git a/admin/src/api/user.ts b/admin/src/api/user.ts
index 1313a0e0..44507b59 100644
--- a/admin/src/api/user.ts
+++ b/admin/src/api/user.ts
@@ -2,16 +2,16 @@ import request from '@/utils/request'
 import { terminal } from '@/config/app'
 
 // 登录
-export function apiLogin(params: { account: string; password: string }) {
-    return request.post('/login/account', { ...params, terminal })
+export function apiLogin(params: { username: string; password: string }) {
+    return request.post('/system/login', { ...params, terminal })
 }
 
 // 退出登录
 export function apiLogout() {
-    return request.post('/login/logout')
+    return request.post('/system/logout')
 }
 
 // 用户信息
 export function apiUserInfo() {
-    return request.get('/auth.admin/mySelf')
+    return request.get('/system/admin/self')
 }
diff --git a/admin/src/api/workbench.ts b/admin/src/api/workbench.ts
index 689582cb..ad886eb2 100644
--- a/admin/src/api/workbench.ts
+++ b/admin/src/api/workbench.ts
@@ -2,5 +2,5 @@ import request from '@/utils/request'
 
 // 工作台主页
 export function apiWorkbench() {
-    return request.get('/Workbench/index')
+    return request.get('/index/console')
 }
diff --git a/admin/src/components/editor/index copy.vue b/admin/src/components/editor/index copy.vue
deleted file mode 100644
index 2c4a9016..00000000
--- a/admin/src/components/editor/index copy.vue	
+++ /dev/null
@@ -1,237 +0,0 @@
-<template>
-    <div class="cl-editor-quill">
-        <div ref="editorRef" class="editor" :style="style"></div>
-        <material-select ref="materialRef" :hidden="true" :limit="-1" @change="filesChange" />
-    </div>
-</template>
-
-<script setup lang="ts">
-    import { computed, defineComponent, onMounted, onUnmounted, ref, toRefs, watch } from 'vue'
-    import Quill from 'quill'
-    import 'quill/dist/quill.snow.css'
-    import MaterialSelect from '@/components/material-select/index.vue'
-    interface Props {
-        // 绑定的值
-        modelValue: string
-        // 编辑器的参数
-        options?: Record<any, any>
-        // 编辑器的宽度
-        width?: number | string
-        // 编辑器的高
-        height?: number | string
-        minHeight?: number | string
-    }
-
-    const props = withDefaults(defineProps<Props>(), {
-        options: () => ({}),
-        width: '100%',
-        height: '100%',
-    })
-
-    const emit = defineEmits<{
-        (event: 'update:modelValue', val: string): void
-        (event: 'load', quill: any): void
-    }>()
-
-    let quill: any = null
-
-    const editorRef = ref()
-    const materialRef = ref()
-
-    // 文本内容
-    const content = ref('')
-
-    // 光标位置
-    const cursorIndex = ref(0)
-
-    // 图片上传处理
-    const uploadFileHandler = () => {
-        const selection = quill.getSelection()
-        if (selection) {
-            cursorIndex.value = selection.index
-        }
-
-        materialRef.value.showPopup()
-    }
-    // 图片插入
-    const filesChange = (files: any[]) => {
-        if (files.length > 0) {
-            // 批量插入图片
-            files.forEach((file, i) => {
-                quill.insertEmbed(cursorIndex.value + i, 'image', file, Quill.sources.USER)
-            })
-
-            // 移动光标到图片后一位
-            quill.setSelection(cursorIndex.value + files.length)
-        }
-    }
-
-    // 设置内容
-    const setContent = (val: string) => {
-        quill.root.innerHTML = val || ''
-    }
-
-    // 编辑框样式
-    const style = computed<any>(() => {
-        return {
-            height: typeof props.height == 'string' ? props.height : `${props.height}px`,
-            width: typeof props.width == 'string' ? props.width : `${props.width}px`,
-        }
-    })
-
-    // 监听绑定值
-    watch(
-        () => props.modelValue,
-        (val: string) => {
-            if (val) {
-                if (val !== content.value) {
-                    setContent(val)
-                }
-            } else {
-                setContent('')
-            }
-        }
-    )
-
-    onMounted(() => {
-        // 实例化
-        quill = new Quill(editorRef.value, {
-            theme: 'snow',
-            placeholder: '输入内容',
-            modules: {
-                toolbar: [
-                    ['bold', 'italic', 'underline', 'strike'],
-                    ['blockquote', 'code-block'],
-                    [{ header: 1 }, { header: 2 }],
-                    [{ list: 'ordered' }, { list: 'bullet' }],
-                    [{ script: 'sub' }, { script: 'super' }],
-                    [{ indent: '-1' }, { indent: '+1' }],
-                    [{ direction: 'rtl' }],
-                    [{ size: ['small', false, 'large', 'huge'] }],
-                    [{ header: [1, 2, 3, 4, 5, 6, false] }],
-                    [{ color: [] }, { background: [] }],
-                    [{ font: [] }],
-                    [{ align: [] }],
-                    ['clean'],
-                    ['link', 'image'],
-                ],
-            },
-            ...props.options,
-        })
-
-        // 添加图片工具
-        quill.getModule('toolbar').addHandler('image', uploadFileHandler)
-
-        // 监听输入
-        quill.on('text-change', () => {
-            content.value = quill.root.innerHTML
-            emit('update:modelValue', content.value)
-        })
-
-        setContent(props.modelValue)
-
-        // 加载回调
-        emit('load', quill)
-    })
-</script>
-
-<style lang="scss">
-    .cl-editor-quill {
-        background-color: #fff;
-
-        .ql-snow {
-            line-height: 22px !important;
-        }
-        #quill-upload-btn {
-            display: none;
-        }
-
-        .ql-snow {
-            border: 1px solid #dcdfe6;
-        }
-
-        .ql-snow .ql-tooltip[data-mode='link']::before {
-            content: '请输入链接地址:';
-        }
-
-        .ql-snow .ql-tooltip.ql-editing a.ql-action::after {
-            border-right: 0px;
-            content: '保存';
-            padding-right: 0px;
-        }
-
-        .ql-snow .ql-tooltip[data-mode='video']::before {
-            content: '请输入视频地址:';
-        }
-
-        .ql-snow .ql-picker.ql-size .ql-picker-label::before,
-        .ql-snow .ql-picker.ql-size .ql-picker-item::before {
-            content: '14px';
-        }
-
-        .ql-snow .ql-picker.ql-size .ql-picker-label[data-value='small']::before,
-        .ql-snow .ql-picker.ql-size .ql-picker-item[data-value='small']::before {
-            content: '10px';
-        }
-
-        .ql-snow .ql-picker.ql-size .ql-picker-label[data-value='large']::before,
-        .ql-snow .ql-picker.ql-size .ql-picker-item[data-value='large']::before {
-            content: '18px';
-        }
-
-        .ql-snow .ql-picker.ql-size .ql-picker-label[data-value='huge']::before,
-        .ql-snow .ql-picker.ql-size .ql-picker-item[data-value='huge']::before {
-            content: '32px';
-        }
-
-        .ql-snow .ql-picker.ql-header .ql-picker-label::before,
-        .ql-snow .ql-picker.ql-header .ql-picker-item::before {
-            content: '文本';
-        }
-
-        .ql-snow .ql-picker.ql-header .ql-picker-label[data-value='1']::before,
-        .ql-snow .ql-picker.ql-header .ql-picker-item[data-value='1']::before {
-            content: '标题1';
-        }
-
-        .ql-snow .ql-picker.ql-header .ql-picker-label[data-value='2']::before,
-        .ql-snow .ql-picker.ql-header .ql-picker-item[data-value='2']::before {
-            content: '标题2';
-        }
-
-        .ql-snow .ql-picker.ql-header .ql-picker-label[data-value='3']::before,
-        .ql-snow .ql-picker.ql-header .ql-picker-item[data-value='3']::before {
-            content: '标题3';
-        }
-
-        .ql-snow .ql-picker.ql-header .ql-picker-label[data-value='4']::before,
-        .ql-snow .ql-picker.ql-header .ql-picker-item[data-value='4']::before {
-            content: '标题4';
-        }
-
-        .ql-snow .ql-picker.ql-header .ql-picker-label[data-value='5']::before,
-        .ql-snow .ql-picker.ql-header .ql-picker-item[data-value='5']::before {
-            content: '标题5';
-        }
-
-        .ql-snow .ql-picker.ql-header .ql-picker-label[data-value='6']::before,
-        .ql-snow .ql-picker.ql-header .ql-picker-item[data-value='6']::before {
-            content: '标题6';
-        }
-
-        .ql-snow .ql-picker.ql-font .ql-picker-label::before,
-        .ql-snow .ql-picker.ql-font .ql-picker-item::before {
-            content: '标准字体';
-        }
-
-        .ql-snow .ql-picker.ql-font .ql-picker-label[data-value='serif']::before,
-        .ql-snow .ql-picker.ql-font .ql-picker-item[data-value='serif']::before {
-            content: '衬线字体';
-        }
-
-        .ql-snow .ql-picker.ql-font .ql-picker-label[data-value='monospace']::before,
-        .ql-snow .ql-picker.ql-font .ql-picker-item[data-value='monospace']::before {
-            content: '等宽字体';
-        }
-    }
-</style>
diff --git a/admin/src/layout/components/perm.vue b/admin/src/layout/components/perm.vue
index 00d07756..43806e5b 100644
--- a/admin/src/layout/components/perm.vue
+++ b/admin/src/layout/components/perm.vue
@@ -1,14 +1,16 @@
 <template>
-    <div v-if="permission" class="perm">
-        <template v-if="hasPermission">
+    <!-- <div v-if="permission" class="perm"> -->
+    <div class="perm">
+        <!-- <template v-if="hasPermission"> -->
+        <template>
             <router-view></router-view>
         </template>
-        <template v-else>
+        <!-- <template v-else>
             <div class="no-perm flex flex-col flex-center">
                 <img src="@/assets/images/no_perm.png" />
                 <div class="muted">暂无查看权限</div>
             </div>
-        </template>
+        </template> -->
     </div>
 </template>
 
diff --git a/admin/src/store/modules/permission.ts b/admin/src/store/modules/permission.ts
index a6be6bf0..0f678005 100644
--- a/admin/src/store/modules/permission.ts
+++ b/admin/src/store/modules/permission.ts
@@ -30,14 +30,16 @@ const permission: Module<PermissionModule, any> = {
     actions: {
         getPermission({ commit }) {
             return new Promise((resolve, reject) => {
-                apiConfigGetAuth()
-                    .then(data => {
-                        commit('setPermission', data)
-                        resolve(data)
-                    })
-                    .catch(err => {
-                        reject(err)
-                    })
+                // apiConfigGetAuth()
+                //     .then(data => {
+                //         commit('setPermission', data)
+                //         resolve(data)
+                //     })
+                //     .catch(err => {
+                //         reject(err)
+                //     })
+
+                resolve({})
             })
         }
     }
diff --git a/admin/src/store/modules/user.ts b/admin/src/store/modules/user.ts
index 3554ad0d..fadd1884 100644
--- a/admin/src/store/modules/user.ts
+++ b/admin/src/store/modules/user.ts
@@ -25,9 +25,11 @@ const user: Module<UserModule, any> = {
         // 登录
         login({ commit }, data) {
             const { account, password } = data
+            console.log(data, '----------------------')
+
             return new Promise((resolve, reject) => {
                 apiLogin({
-                    account: account.trim(),
+                    username: account,
                     password: password
                 })
                     .then((data: any) => {
diff --git a/admin/src/utils/request.ts b/admin/src/utils/request.ts
index 518b4218..f2c7fbbe 100644
--- a/admin/src/utils/request.ts
+++ b/admin/src/utils/request.ts
@@ -69,8 +69,20 @@ request.interceptors.response.use(
             case 200:
                 return eventResponse.success(response.data)
             case 300:
+            case 310:
+            case 311:
+            case 312:
+            case 313:
+            case 314:
+            case 403:
+            case 404:
+            case 500:
                 return eventResponse.error(response.data)
             case -1:
+            case 330:
+            case 331:
+            case 332:
+            case 333:
                 return eventResponse.redirect()
             case 2:
                 return eventResponse.page(response.data)
diff --git a/admin/src/views/permission/admin/index.vue b/admin/src/views/permission/admin/index.vue
index a5cf2b04..b8d59c77 100644
--- a/admin/src/views/permission/admin/index.vue
+++ b/admin/src/views/permission/admin/index.vue
@@ -3,13 +3,13 @@
         <el-card shadow="never">
             <el-form class="ls-form" :model="formData" label-width="80px" size="small" inline>
                 <el-form-item label="账号：">
-                    <el-input v-model="formData.account" class="ls-input" />
+                    <el-input v-model="formData.username" class="ls-input" />
                 </el-form-item>
                 <el-form-item label="名称：">
-                    <el-input v-model="formData.name" class="ls-input" />
+                    <el-input v-model="formData.nickname" class="ls-input" />
                 </el-form-item>
                 <el-form-item label="角色：">
-                    <el-select v-model="formData.role_id" placeholder="全部">
+                    <el-select v-model="formData.role" placeholder="全部">
                         <el-option
                             v-for="(item, index) in roleList"
                             :key="index"
@@ -38,32 +38,28 @@
                             <el-avatar :size="50" :src="row.avatar"></el-avatar>
                         </template>
                     </el-table-column>
-                    <el-table-column label="账号" prop="account" min-width="100"></el-table-column>
-                    <el-table-column label="名称" prop="name" min-width="100"></el-table-column>
-                    <el-table-column
-                        label="角色"
-                        prop="role_name"
-                        min-width="100"
-                    ></el-table-column>
+                    <el-table-column label="账号" prop="username" min-width="100"></el-table-column>
+                    <el-table-column label="名称" prop="nickname" min-width="100"></el-table-column>
+                    <el-table-column label="角色" prop="role" min-width="100"></el-table-column>
                     <el-table-column
                         label="创建时间"
-                        prop="create_time"
+                        prop="createTime"
                         min-width="150"
                     ></el-table-column>
                     <el-table-column
                         label="最近登录时间"
-                        prop="login_time"
+                        prop="lastLoginTime"
                         min-width="150"
                     ></el-table-column>
                     <el-table-column
                         label="最近登录IP"
-                        prop="login_ip"
+                        prop="lastLoginIp"
                         min-width="100"
                     ></el-table-column>
                     <el-table-column label="状态" min-width="100">
                         <template #default="{ row }">
                             <el-switch
-                                v-model="row.disable"
+                                v-model="row.isDisable"
                                 :active-value="0"
                                 :inactive-value="1"
                                 @change="changeStatus(row)"
@@ -117,9 +113,9 @@ export default defineComponent({
     setup() {
         // 表单数据
         const formData = reactive({
-            account: '',
-            name: '',
-            role_id: ''
+            username: '',
+            nickname: '',
+            role: ''
         })
         const roleList: Ref<any[]> = ref([])
         const { pager, requestApi, resetParams, resetPage } = usePages({
@@ -129,10 +125,10 @@ export default defineComponent({
         const changeStatus = (data: any) => {
             apiAdminEdit({
                 id: data.id,
-                account: data.account,
-                name: data.name,
-                role_id: data.role_id,
-                disable: data.disable,
+                username: data.username,
+                nickname: data.nickname,
+                role: data.role,
+                isDisable: data.isDisable,
                 multipoint_login: data.multipoint_login
             }).finally(() => {
                 requestApi()
diff --git a/admin/src/views/permission/role/index.vue b/admin/src/views/permission/role/index.vue
index a91535e7..d7ac59d2 100644
--- a/admin/src/views/permission/role/index.vue
+++ b/admin/src/views/permission/role/index.vue
@@ -9,9 +9,9 @@
                     <el-table :data="pager.lists" size="medium">
                         <el-table-column prop="id" label="ID"></el-table-column>
                         <el-table-column prop="name" label="名称"></el-table-column>
-                        <el-table-column prop="desc" label="备注"></el-table-column>
+                        <el-table-column prop="remark" label="备注"></el-table-column>
                         <el-table-column prop label="权限"></el-table-column>
-                        <el-table-column prop="create_time" label="创建时间"></el-table-column>
+                        <el-table-column prop="createTime" label="创建时间"></el-table-column>
                         <el-table-column prop label="操作">
                             <template #default="{ row }">
                                 <!-- 编辑 -->
@@ -64,7 +64,7 @@ export default defineComponent({
         const formData = reactive({
             id: 0, // 角色id
             name: '', // 角色名称
-            desc: '', // 备注
+            remark: '', // 备注
             create_time: '', // 创建时间
             num: 0 // 使用该角色的人数
         })