From b62fbd93d21d378d3584143113d43e68b12f983f Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Wed, 4 May 2022 01:04:54 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=9F=E2=80=8D=E2=99=80=20=E9=87=8D?= =?UTF-8?q?=E6=9E=84=E5=89=8D=E7=AB=AF=E6=A1=86=E6=9E=B6=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E9=80=82=E9=85=8D=E5=90=8E=E7=AB=AF=E6=A1=86=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kicc-ui/src/api/common/base/constant/index.ts | 6 ++ kicc-ui/src/api/common/base/entity/index.ts | 36 ++++++++++++ kicc-ui/src/api/common/base/enums/index.ts | 6 ++ .../src/api/common/base/exception/index.ts | 7 +++ kicc-ui/src/api/common/data/constant/index.ts | 6 ++ kicc-ui/src/api/common/data/entity/index.ts | 34 +++++++++++ kicc-ui/src/api/common/data/enums/index.ts | 6 ++ kicc-ui/src/api/controller/sys/menu.ts | 11 ---- .../src/api/controller/sys/model/menuModel.ts | 12 ---- .../api/controller/sys/model/uploadModel.ts | 5 -- kicc-ui/src/api/controller/sys/upload.ts | 22 ------- .../api/controller/system/model/deptModel.ts | 23 -------- .../api/controller/system/model/menuModel.ts | 24 -------- .../api/controller/system/model/roleModel.ts | 18 ------ .../api/controller/system/model/userModel.ts | 28 --------- kicc-ui/src/api/model/index.ts | 57 ------------------- .../src/api/platform/core/controller/menu.ts | 14 +++++ .../api/platform/core/controller/upload.ts | 15 +++++ .../sys => platform/core/controller}/user.ts | 35 ++++++------ kicc-ui/src/api/platform/core/entity/menu.ts | 12 ++++ .../src/api/platform/core/entity/upload.ts | 14 +++++ .../core/entity/user.ts} | 56 +++++++++--------- .../system/controller}/client.ts | 2 +- .../system/controller}/config.ts | 4 +- .../system/controller}/dept.ts | 5 +- .../system/controller}/dict.ts | 4 +- .../system/controller}/dictdata.ts | 2 +- .../system/controller}/log.ts | 2 +- .../system/controller}/menu.ts | 8 +-- .../system/controller}/role.ts | 4 +- .../system/controller}/user.ts | 9 +-- .../system/entity}/clientModel.ts | 8 ++- .../system/entity}/configModel.ts | 10 +++- .../src/api/platform/system/entity/dept.ts | 30 ++++++++++ .../system/entity}/dictDataModel.ts | 10 +++- .../system/entity}/dictModel.ts | 8 ++- .../system/entity}/logModel.ts | 8 ++- .../src/api/platform/system/entity/menu.ts | 31 ++++++++++ .../src/api/platform/system/entity/role.ts | 25 ++++++++ .../src/api/platform/system/entity/user.ts | 16 ++++++ kicc-ui/src/components/Upload/src/typing.ts | 4 +- kicc-ui/src/store/modules/permission.ts | 4 +- kicc-ui/src/store/modules/user.ts | 38 ++++++------- kicc-ui/src/utils/cache/persistent.ts | 5 +- kicc-ui/src/utils/cipher.ts | 2 +- kicc-ui/src/utils/http/axios/Axios.ts | 26 +++------ kicc-ui/src/utils/http/axios/axiosCancel.ts | 20 ++----- .../src/utils/http/axios/axiosTransform.ts | 33 ++++------- kicc-ui/src/utils/http/axios/helper.ts | 4 +- kicc-ui/src/utils/http/axios/index.ts | 28 +++------ kicc-ui/src/views/sys/lock/LockPage.vue | 8 +-- kicc-ui/src/views/sys/login/LoginForm.vue | 2 +- .../src/views/system/client/ClientDrawer.vue | 2 +- kicc-ui/src/views/system/client/index.vue | 2 +- .../src/views/system/config/ConfigModal.vue | 2 +- kicc-ui/src/views/system/config/index.vue | 2 +- kicc-ui/src/views/system/dept/DeptModal.vue | 2 +- kicc-ui/src/views/system/dept/index.vue | 2 +- .../src/views/system/dict/DictDataModal.vue | 2 +- .../src/views/system/dict/DictDataTable.vue | 2 +- kicc-ui/src/views/system/dict/DictModal.vue | 2 +- kicc-ui/src/views/system/dict/index.vue | 2 +- kicc-ui/src/views/system/log/index.vue | 2 +- kicc-ui/src/views/system/menu/MenuModal.vue | 2 +- kicc-ui/src/views/system/menu/index.vue | 2 +- kicc-ui/src/views/system/role/RoleDrawer.vue | 4 +- kicc-ui/src/views/system/role/index.vue | 2 +- kicc-ui/src/views/system/role/role.data.ts | 2 +- kicc-ui/src/views/system/user/DeptTree.vue | 2 +- .../src/views/system/user/ResetPwdModal.vue | 2 +- kicc-ui/src/views/system/user/UserModal.vue | 4 +- kicc-ui/src/views/system/user/index.vue | 2 +- kicc-ui/src/views/system/user/user.data.ts | 4 +- kicc-ui/types/axios.d.ts | 7 ++- kicc-ui/types/store.d.ts | 31 +--------- 75 files changed, 454 insertions(+), 439 deletions(-) create mode 100644 kicc-ui/src/api/common/base/constant/index.ts create mode 100644 kicc-ui/src/api/common/base/entity/index.ts create mode 100644 kicc-ui/src/api/common/base/enums/index.ts create mode 100644 kicc-ui/src/api/common/base/exception/index.ts create mode 100644 kicc-ui/src/api/common/data/constant/index.ts create mode 100644 kicc-ui/src/api/common/data/entity/index.ts create mode 100644 kicc-ui/src/api/common/data/enums/index.ts delete mode 100644 kicc-ui/src/api/controller/sys/menu.ts delete mode 100644 kicc-ui/src/api/controller/sys/model/menuModel.ts delete mode 100644 kicc-ui/src/api/controller/sys/model/uploadModel.ts delete mode 100644 kicc-ui/src/api/controller/sys/upload.ts delete mode 100644 kicc-ui/src/api/controller/system/model/deptModel.ts delete mode 100644 kicc-ui/src/api/controller/system/model/menuModel.ts delete mode 100644 kicc-ui/src/api/controller/system/model/roleModel.ts delete mode 100644 kicc-ui/src/api/controller/system/model/userModel.ts delete mode 100644 kicc-ui/src/api/model/index.ts create mode 100644 kicc-ui/src/api/platform/core/controller/menu.ts create mode 100644 kicc-ui/src/api/platform/core/controller/upload.ts rename kicc-ui/src/api/{controller/sys => platform/core/controller}/user.ts (52%) create mode 100644 kicc-ui/src/api/platform/core/entity/menu.ts create mode 100644 kicc-ui/src/api/platform/core/entity/upload.ts rename kicc-ui/src/api/{controller/sys/model/userModel.ts => platform/core/entity/user.ts} (51%) rename kicc-ui/src/api/{controller/system => platform/system/controller}/client.ts (94%) rename kicc-ui/src/api/{controller/system => platform/system/controller}/config.ts (89%) rename kicc-ui/src/api/{controller/system => platform/system/controller}/dept.ts (85%) rename kicc-ui/src/api/{controller/system => platform/system/controller}/dict.ts (90%) rename kicc-ui/src/api/{controller/system => platform/system/controller}/dictdata.ts (94%) rename kicc-ui/src/api/{controller/system => platform/system/controller}/log.ts (82%) rename kicc-ui/src/api/{controller/system => platform/system/controller}/menu.ts (80%) rename kicc-ui/src/api/{controller/system => platform/system/controller}/role.ts (84%) rename kicc-ui/src/api/{controller/system => platform/system/controller}/user.ts (77%) rename kicc-ui/src/api/{controller/system/model => platform/system/entity}/clientModel.ts (81%) rename kicc-ui/src/api/{controller/system/model => platform/system/entity}/configModel.ts (78%) create mode 100644 kicc-ui/src/api/platform/system/entity/dept.ts rename kicc-ui/src/api/{controller/system/model => platform/system/entity}/dictDataModel.ts (68%) rename kicc-ui/src/api/{controller/system/model => platform/system/entity}/dictModel.ts (75%) rename kicc-ui/src/api/{controller/system/model => platform/system/entity}/logModel.ts (78%) create mode 100644 kicc-ui/src/api/platform/system/entity/menu.ts create mode 100644 kicc-ui/src/api/platform/system/entity/role.ts create mode 100644 kicc-ui/src/api/platform/system/entity/user.ts diff --git a/kicc-ui/src/api/common/base/constant/index.ts b/kicc-ui/src/api/common/base/constant/index.ts new file mode 100644 index 00000000..fd9ba279 --- /dev/null +++ b/kicc-ui/src/api/common/base/constant/index.ts @@ -0,0 +1,6 @@ +/** + * @program: kicc-ui + * @description: 基础相关常量 + * @author: entfrm开发团队-王翔 + * @create: 2022/4/8 + */ diff --git a/kicc-ui/src/api/common/base/entity/index.ts b/kicc-ui/src/api/common/base/entity/index.ts new file mode 100644 index 00000000..19c1d543 --- /dev/null +++ b/kicc-ui/src/api/common/base/entity/index.ts @@ -0,0 +1,36 @@ +/** + * @program: kicc-ui + * @description: 基础相关实体类 + * 类型定义 + * @author: entfrm开发团队-王翔 + * @create: 2022/4/8 + */ + +/** 扩展安全框架用户信息 */ +export interface KiccUser { + id: string; + username: string; + password: string; + deptId: string; + phone: string; + enabled: boolean; + tenantId: string; + authorities: Recordable[]; + accountNonLocked: boolean; + accountNonExpired: boolean; + credentialsNonExpired: boolean; + [key: string]: any; +} + +/** 基础模型 */ +export interface BaseEntity { + tenantId: string; + currentUser: KiccUser; + sqlFilter: string; +} + +/** 结果集模型 */ +export interface ResultVo { + result: T; + extend: T; +} diff --git a/kicc-ui/src/api/common/base/enums/index.ts b/kicc-ui/src/api/common/base/enums/index.ts new file mode 100644 index 00000000..6bd81c72 --- /dev/null +++ b/kicc-ui/src/api/common/base/enums/index.ts @@ -0,0 +1,6 @@ +/** + * @program: kicc-ui + * @description: 基础相关枚举 + * @author: entfrm开发团队-王翔 + * @create: 2022/4/8 + */ diff --git a/kicc-ui/src/api/common/base/exception/index.ts b/kicc-ui/src/api/common/base/exception/index.ts new file mode 100644 index 00000000..acee37da --- /dev/null +++ b/kicc-ui/src/api/common/base/exception/index.ts @@ -0,0 +1,7 @@ +/** + * @program: kicc-ui + * @description: 基础相关异常 + * 类型定义 + * @author: entfrm开发团队-王翔 + * @create: 2022/4/8 + */ diff --git a/kicc-ui/src/api/common/data/constant/index.ts b/kicc-ui/src/api/common/data/constant/index.ts new file mode 100644 index 00000000..9e68bae7 --- /dev/null +++ b/kicc-ui/src/api/common/data/constant/index.ts @@ -0,0 +1,6 @@ +/** + * @program: kicc-ui + * @description: 数据相关常量 + * @author: entfrm开发团队-王翔 + * @create: 2022/4/8 + */ diff --git a/kicc-ui/src/api/common/data/entity/index.ts b/kicc-ui/src/api/common/data/entity/index.ts new file mode 100644 index 00000000..3a29f4d4 --- /dev/null +++ b/kicc-ui/src/api/common/data/entity/index.ts @@ -0,0 +1,34 @@ +/** + * @program: kicc-ui + * @description: 数据相关实体类 + * 类型定义 + * @author: entfrm开发团队-王翔 + * @create: 2022/4/8 + */ + +/** 分页模型 */ +export interface Page { + size: number; + current: number; + total: number; + [key: string]: any; +} + +/** 通用模型 */ +export interface CommonEntity { + createById: string; + createByName: string; + createTime: string; + updateById: string; + updateByName: string; + updateTime: string; + remarks: string; +} + +/** 树结构模型 */ +export interface TreeEntity { + parentId: string; + name: string; + sort: number; + children: T[] +} diff --git a/kicc-ui/src/api/common/data/enums/index.ts b/kicc-ui/src/api/common/data/enums/index.ts new file mode 100644 index 00000000..41882033 --- /dev/null +++ b/kicc-ui/src/api/common/data/enums/index.ts @@ -0,0 +1,6 @@ +/** + * @program: kicc-ui + * @description: 数据相关枚举 + * @author: entfrm开发团队-王翔 + * @create: 2022/4/8 + */ diff --git a/kicc-ui/src/api/controller/sys/menu.ts b/kicc-ui/src/api/controller/sys/menu.ts deleted file mode 100644 index 71f02010..00000000 --- a/kicc-ui/src/api/controller/sys/menu.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { defHttp } from '/@/utils/http/axios'; -import { getMenuListResultModel } from './model/menuModel'; - -enum Api { - GetMenuList = '/system_proxy/system/menu/menuRoute', -} - -/** 获取用户菜单 */ -export const getMenuList = () => { - return defHttp.get({ url: Api.GetMenuList }); -}; diff --git a/kicc-ui/src/api/controller/sys/model/menuModel.ts b/kicc-ui/src/api/controller/sys/model/menuModel.ts deleted file mode 100644 index 5ef2094c..00000000 --- a/kicc-ui/src/api/controller/sys/model/menuModel.ts +++ /dev/null @@ -1,12 +0,0 @@ -import type { RouteMeta } from 'vue-router'; -export interface RouteItem { - path: string; - component: any; - meta: RouteMeta; - name?: string; - redirect?: string; - children?: RouteItem[]; -} - -/** 获取菜单路由 */ -export type getMenuListResultModel = RouteItem[]; diff --git a/kicc-ui/src/api/controller/sys/model/uploadModel.ts b/kicc-ui/src/api/controller/sys/model/uploadModel.ts deleted file mode 100644 index d770c642..00000000 --- a/kicc-ui/src/api/controller/sys/model/uploadModel.ts +++ /dev/null @@ -1,5 +0,0 @@ -export interface UploadApiResult { - message: string; - code: number; - url: string; -} diff --git a/kicc-ui/src/api/controller/sys/upload.ts b/kicc-ui/src/api/controller/sys/upload.ts deleted file mode 100644 index 1f1b4389..00000000 --- a/kicc-ui/src/api/controller/sys/upload.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { UploadApiResult } from './model/uploadModel'; -import { defHttp } from '/@/utils/http/axios'; -import { UploadFileParams } from '/#/axios'; -import { useGlobSetting } from '/@/hooks/setting'; - -const { uploadUrl = '' } = useGlobSetting(); - -/** - * @description: Upload interface - */ -export function uploadApi( - params: UploadFileParams, - onUploadProgress: (progressEvent: ProgressEvent) => void -) { - return defHttp.uploadFile( - { - url: uploadUrl, - onUploadProgress, - }, - params - ); -} diff --git a/kicc-ui/src/api/controller/system/model/deptModel.ts b/kicc-ui/src/api/controller/system/model/deptModel.ts deleted file mode 100644 index b5481e03..00000000 --- a/kicc-ui/src/api/controller/system/model/deptModel.ts +++ /dev/null @@ -1,23 +0,0 @@ -// 引入基础包 -import { Page, R, CommonEntity } from '/@/api/model'; - -// 查询参数 -export type DeptDto = Page & Dept; - -// 部门对象 -export interface Dept extends CommonEntity { - deptId: string; - code: string; - name: string; - parentId: string; - sort: number; - contacts: string; - phone: string; - address: string; - email: string; - status: string; - [key: string]: any; -} - -// 响应模型 -export type DeptVo = R; diff --git a/kicc-ui/src/api/controller/system/model/menuModel.ts b/kicc-ui/src/api/controller/system/model/menuModel.ts deleted file mode 100644 index 5da65555..00000000 --- a/kicc-ui/src/api/controller/system/model/menuModel.ts +++ /dev/null @@ -1,24 +0,0 @@ -// 引入基础包 -import { Page, R, CommonEntity } from '/@/api/model'; - -// 查询参数 -export type MenuDto = Page & Menu; - -// 菜单对象 -export interface Menu extends CommonEntity { - id: string; - name: string; - parentId: string; - type: string; - path: string; - component: string; - permission: string; - icon: string; - keepAlive: string; - hideMenu: string; - sort: string; - [key: string]: any; -} - -// 响应模型 -export type MenuVo = R; diff --git a/kicc-ui/src/api/controller/system/model/roleModel.ts b/kicc-ui/src/api/controller/system/model/roleModel.ts deleted file mode 100644 index c0d7c3c9..00000000 --- a/kicc-ui/src/api/controller/system/model/roleModel.ts +++ /dev/null @@ -1,18 +0,0 @@ -// 引入基础包 -import { CommonEntity, Page, R } from '/@/api/model'; - -// 查询参数 -export type RoleDto = Page & Role; - -// 角色对象 -export interface Role extends CommonEntity { - id: string; - name: string; - code: string; - sort: string; - status: string; - [key: string]: any; -} - -// 响应模型 -export type RoleVo = R; diff --git a/kicc-ui/src/api/controller/system/model/userModel.ts b/kicc-ui/src/api/controller/system/model/userModel.ts deleted file mode 100644 index 9c372a6f..00000000 --- a/kicc-ui/src/api/controller/system/model/userModel.ts +++ /dev/null @@ -1,28 +0,0 @@ -// 引入基础包 -import { CommonEntity, Page, R } from '/@/api/model'; - -// 查询参数 -export type UserDto = Page & User; - -// 用户对象 -export interface User extends CommonEntity { - id: string; - userName: string; - nickName: string; - password: string; - deptId: string; - deptName: string; - email: string; - phone: string; - sex: string; - avatar: string; - loginIp: string; - loginTime: string; - status: string; - roleIds: string[]; - permissions: string[]; - [key: string]: any; -} - -// 响应模型 -export type UserVo = R; diff --git a/kicc-ui/src/api/model/index.ts b/kicc-ui/src/api/model/index.ts deleted file mode 100644 index 07f3ba1c..00000000 --- a/kicc-ui/src/api/model/index.ts +++ /dev/null @@ -1,57 +0,0 @@ - -/** 分页模型 */ -export interface Page { - size: number; - current: number; - total: number; - [key: string]: any; -} - -/** 响应信息主体 */ -export interface R { - code: number; - msg: string; - total: number; - data: T; -} - -/** 扩展安全框架用户信息 */ -export interface KiccUser { - tenantId: string; - id: string; - deptId: string; - phone: string; - [key: string]: any; -} - -/** 基础模型 */ -export interface BaseEntity { - tenantId: string; - currentUser: KiccUser; - sqlFilter: string; -} - -/** 通用模型 */ -export interface CommonEntity { - createById: string; - createByName: string; - createTime: string; - updateById: string; - updateByName: string; - updateTime: string; - remarks: string; -} - -/** 树结构模型 */ -export interface TreeEntity { - parentId: string; - name: string; - sort: number; - children: T[] -} - -/** 结果集模型 */ -export interface ResultVo { - result: T; - extend: T; -} diff --git a/kicc-ui/src/api/platform/core/controller/menu.ts b/kicc-ui/src/api/platform/core/controller/menu.ts new file mode 100644 index 00000000..0ff1843b --- /dev/null +++ b/kicc-ui/src/api/platform/core/controller/menu.ts @@ -0,0 +1,14 @@ +/** + * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致 + * Copyright © 2020-2022 entfrm All rights reserved. + * author entfrm开发团队-王翔 + */ +import { defHttp } from '/@/utils/http/axios'; +import { MenuRouteResult } from '../entity/menu'; + +enum Api { + list = '/system_proxy/system/menu/menuRoute', +} + +/** 获取用户菜单 */ +export const listMenuRoute = () => defHttp.get({ url: Api.list }); diff --git a/kicc-ui/src/api/platform/core/controller/upload.ts b/kicc-ui/src/api/platform/core/controller/upload.ts new file mode 100644 index 00000000..7eab729e --- /dev/null +++ b/kicc-ui/src/api/platform/core/controller/upload.ts @@ -0,0 +1,15 @@ +/** + * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致 + * Copyright © 2020-2022 entfrm All rights reserved. + * author entfrm开发团队-王翔 + */ +import { UploadResult } from '../entity/upload'; +import { defHttp } from '/@/utils/http/axios'; +import { UploadFileParams } from '/#/axios'; +import { useGlobSetting } from '/@/hooks/setting'; + +const { uploadUrl = '' } = useGlobSetting(); + +/** 通用OSS上传 */ +export const commonUpload = (params: UploadFileParams, onUploadProgress: (progressEvent: ProgressEvent) => void) => + defHttp.uploadFile({ url: uploadUrl, onUploadProgress }, params); diff --git a/kicc-ui/src/api/controller/sys/user.ts b/kicc-ui/src/api/platform/core/controller/user.ts similarity index 52% rename from kicc-ui/src/api/controller/sys/user.ts rename to kicc-ui/src/api/platform/core/controller/user.ts index 908ae4ab..27002e20 100644 --- a/kicc-ui/src/api/controller/sys/user.ts +++ b/kicc-ui/src/api/platform/core/controller/user.ts @@ -1,11 +1,16 @@ -import {defHttp} from '/@/utils/http/axios'; -import {GetCaptchaModel, GetUserInfoModel, LoginParams, LoginResultModel,} from './model/userModel'; -import {encryptionLogin} from '/@/utils/cipher'; +/** + * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致 + * Copyright © 2020-2022 entfrm All rights reserved. + * author entfrm开发团队-王翔 + */ +import { defHttp } from '/@/utils/http/axios'; +import { Captcha, User, LoginParams, TokenEnhancer } from '../entity/user'; +import { encryptionLogin } from '/@/utils/cipher'; import qs from 'qs'; -import {RequestOptions} from "/#/axios"; -import {useGlobSetting} from "/@/hooks/setting"; -const globSetting = useGlobSetting(); +import { RequestOptions } from "/#/axios"; +import { useGlobSetting } from "/@/hooks/setting"; +const globSetting = useGlobSetting(); enum Api { login = '/auth_proxy/oauth/token', logout = '/auth_proxy/token/logout', @@ -14,7 +19,7 @@ enum Api { } /** 用户登录接口 */ -export function login(params: LoginParams, options?: boolean | RequestOptions) { +export const login = (params: LoginParams, options?: boolean | RequestOptions) => { // 非对称密钥ASE加密处理 const user = encryptionLogin({ data: params, @@ -30,7 +35,7 @@ export function login(params: LoginParams, options?: boolean | RequestOptions) { const scope = 'server'; const data = qs.stringify({'username': username, 'password': password}); - return defHttp.post({ + return defHttp.post({ url: Api.login, headers: { 'Content-Type': 'application/x-www-form-urlencoded; charset=utf-8' @@ -38,19 +43,13 @@ export function login(params: LoginParams, options?: boolean | RequestOptions) { params: { code, realKey, grant_type, scope }, data: data }, options); -} +}; /** 获取当前用户信息 */ -export function getUserInfo() { - return defHttp.get({ url: Api.getUserInfo }); -} +export const getUserInfo = () => defHttp.get({ url: Api.getUserInfo }); /** 登出 */ -export function logout() { - return defHttp.delete({ url: Api.logout }); -} +export const logout = () => defHttp.delete({ url: Api.logout }); /** 获取验证码 */ -export function getCaptcha() { - return defHttp.get({ url: `${Api.getCaptcha}?key=${Date.now()}` }); -} +export const getCaptcha = () => defHttp.get({ url: `${Api.getCaptcha}?key=${Date.now()}` }); diff --git a/kicc-ui/src/api/platform/core/entity/menu.ts b/kicc-ui/src/api/platform/core/entity/menu.ts new file mode 100644 index 00000000..0fc41a27 --- /dev/null +++ b/kicc-ui/src/api/platform/core/entity/menu.ts @@ -0,0 +1,12 @@ +/** + * @program: kicc-ui + * @description: 菜单路由实体类 + * 类型定义 + * @author: entfrm开发团队-王翔 + * @create: 2022/4/8 + */ + +import {AppRouteRecordRaw} from "/@/router/types"; + +/** 菜单路由响应对象 */ +export type MenuRouteResult = AppRouteRecordRaw[]; diff --git a/kicc-ui/src/api/platform/core/entity/upload.ts b/kicc-ui/src/api/platform/core/entity/upload.ts new file mode 100644 index 00000000..6cebc0a0 --- /dev/null +++ b/kicc-ui/src/api/platform/core/entity/upload.ts @@ -0,0 +1,14 @@ +/** + * @program: kicc-ui + * @description: 文件上传实体类 + * 类型定义 + * @author: entfrm开发团队-王翔 + * @create: 2022/4/8 + */ + +/** oss上传返回结果对象 */ +export interface UploadResult { + message: string; + code: number; + url: string; +} diff --git a/kicc-ui/src/api/controller/sys/model/userModel.ts b/kicc-ui/src/api/platform/core/entity/user.ts similarity index 51% rename from kicc-ui/src/api/controller/sys/model/userModel.ts rename to kicc-ui/src/api/platform/core/entity/user.ts index 36d29593..f3465753 100644 --- a/kicc-ui/src/api/controller/sys/model/userModel.ts +++ b/kicc-ui/src/api/platform/core/entity/user.ts @@ -1,34 +1,25 @@ /** - * @description: Login interface parameters + * @program: kicc-ui + * @description: 核心用户实体类 + * 类型定义 + * @author: entfrm开发团队-王翔 + * @create: 2022/4/8 */ +import { CommonEntity } from "/@/api/common/data/entity"; +import { KiccUser } from "/@/api/common/base/entity"; + +/** 登录参数对象 */ export interface LoginParams { username: string; password: string; realKey?: string; code?: string; -} - -export interface UserInfo { - accountNonExpired: boolean; - accountNonLocked: boolean; - authorities: string[]; - credentialsNonExpired: boolean; - deptId: string; - enabled: boolean; - id: string; - password?: string; - phone: string; - tenantId: string; - username: string; [key: string]: any; } - -/** - * @description: Login interface return value - */ -export interface LoginResultModel { +/** 令牌增强输出对象 */ +export interface TokenEnhancer { access_token: string; clientId: string; expires_in: number; @@ -36,13 +27,11 @@ export interface LoginResultModel { refresh_token: string; scope: string; token_type: string; - user_info: UserInfo; + user_info: KiccUser; } -/** - * @description: Get user information return value - */ -export interface GetUserInfoModel { +/** 用户对象 */ +export interface User extends CommonEntity { // 用户id id: string; // 用户名 @@ -63,16 +52,29 @@ export interface GetUserInfoModel { roleIds: string[]; // 手机号 phone: string; + // 用户密码 + password: string; + // 用户性别 + sex: string; + // 最后登陆IP + loginIp: string; + // 最后登陆时间 + loginTime: string; + // 用户状态 + status: string; // 备注信息 remarks: string; // 多租户ID tenantId: string; + // 指定登录后首页跳转 + homePath?: string; [key: string]: any; } -export interface GetCaptchaModel { +/** 验证码对象 */ +export interface Captcha { // 验证码地址 img: string; - // 惟一key + // redis拿取验证码唯一key realKey: string; } diff --git a/kicc-ui/src/api/controller/system/client.ts b/kicc-ui/src/api/platform/system/controller/client.ts similarity index 94% rename from kicc-ui/src/api/controller/system/client.ts rename to kicc-ui/src/api/platform/system/controller/client.ts index 13e1866d..9ba5c384 100644 --- a/kicc-ui/src/api/controller/system/client.ts +++ b/kicc-ui/src/api/platform/system/controller/client.ts @@ -1,4 +1,4 @@ -import { ClientParams, ClientListGetResultModel, ClientListItem } from './model/clientModel'; +import { ClientParams, ClientListGetResultModel, ClientListItem } from '../entity/clientModel'; import { defHttp } from '/@/utils/http/axios'; enum Api { diff --git a/kicc-ui/src/api/controller/system/config.ts b/kicc-ui/src/api/platform/system/controller/config.ts similarity index 89% rename from kicc-ui/src/api/controller/system/config.ts rename to kicc-ui/src/api/platform/system/controller/config.ts index a5fb7bab..744ccf21 100644 --- a/kicc-ui/src/api/controller/system/config.ts +++ b/kicc-ui/src/api/platform/system/controller/config.ts @@ -1,4 +1,4 @@ -import { ConfigParams, Config, ConfigResult } from './model/configModel' +import { ConfigParams, Config, ConfigResult } from '../entity/configModel' import { defHttp } from '/@/utils/http/axios'; import {isDef} from "/@/utils/is"; @@ -22,4 +22,4 @@ export const set = (params: Config) => { } export const remove = (params: {ids: string}) => - defHttp.delete({ url: Api.Remove + `/${params.ids}` }); \ No newline at end of file + defHttp.delete({ url: Api.Remove + `/${params.ids}` }); diff --git a/kicc-ui/src/api/controller/system/dept.ts b/kicc-ui/src/api/platform/system/controller/dept.ts similarity index 85% rename from kicc-ui/src/api/controller/system/dept.ts rename to kicc-ui/src/api/platform/system/controller/dept.ts index c8d8dbef..e9530c3d 100644 --- a/kicc-ui/src/api/controller/system/dept.ts +++ b/kicc-ui/src/api/platform/system/controller/dept.ts @@ -3,8 +3,7 @@ * Copyright © 2020-2022 entfrm All rights reserved. * author entfrm开发团队-王翔 */ - -import { DeptDto, Dept } from './model/deptModel'; +import { DeptParams, Dept } from '/@/api/platform/system/entity/dept'; import { defHttp } from '/@/utils/http/axios'; enum Api { @@ -16,7 +15,7 @@ enum Api { } // 查询部门列表 -export const listDept = (params?: Partial) => defHttp.get({ url: Api.list, params }); +export const listDept = (params?: Partial) => defHttp.get({ url: Api.list, params }); // 新增部门 export const addDept = (params: Partial) => defHttp.post({ url: Api.add, data: params }); diff --git a/kicc-ui/src/api/controller/system/dict.ts b/kicc-ui/src/api/platform/system/controller/dict.ts similarity index 90% rename from kicc-ui/src/api/controller/system/dict.ts rename to kicc-ui/src/api/platform/system/controller/dict.ts index 1e7e4de1..9447f5dc 100644 --- a/kicc-ui/src/api/controller/system/dict.ts +++ b/kicc-ui/src/api/platform/system/controller/dict.ts @@ -1,4 +1,4 @@ -import { DictParams, DictResult, Dict } from './model/dictModel'; +import { DictParams, DictResult, Dict } from '../entity/dictModel'; import { defHttp } from '/@/utils/http/axios'; import {isDef} from "/@/utils/is"; @@ -51,4 +51,4 @@ export const remove = (params: {id: string}) => * @param params */ export const changeStatus = (params: Dict) => - defHttp.get({url: Api.ChangeStatus, params}); \ No newline at end of file + defHttp.get({url: Api.ChangeStatus, params}); diff --git a/kicc-ui/src/api/controller/system/dictdata.ts b/kicc-ui/src/api/platform/system/controller/dictdata.ts similarity index 94% rename from kicc-ui/src/api/controller/system/dictdata.ts rename to kicc-ui/src/api/platform/system/controller/dictdata.ts index c0c615b1..1c31eeff 100644 --- a/kicc-ui/src/api/controller/system/dictdata.ts +++ b/kicc-ui/src/api/platform/system/controller/dictdata.ts @@ -1,4 +1,4 @@ -import {DictDataParams, DictDataResult, DictData} from './model/dictDataModel'; +import {DictDataParams, DictDataResult, DictData} from '../entity/dictDataModel'; import {defHttp} from '/@/utils/http/axios'; import {isDef} from "/@/utils/is"; diff --git a/kicc-ui/src/api/controller/system/log.ts b/kicc-ui/src/api/platform/system/controller/log.ts similarity index 82% rename from kicc-ui/src/api/controller/system/log.ts rename to kicc-ui/src/api/platform/system/controller/log.ts index 7ac83adf..cbda8db2 100644 --- a/kicc-ui/src/api/controller/system/log.ts +++ b/kicc-ui/src/api/platform/system/controller/log.ts @@ -1,4 +1,4 @@ -import { LogParams, LogListGetResultModel } from './model/logModel'; +import { LogParams, LogListGetResultModel } from '../entity/logModel'; import { defHttp } from '/@/utils/http/axios'; enum Api { diff --git a/kicc-ui/src/api/controller/system/menu.ts b/kicc-ui/src/api/platform/system/controller/menu.ts similarity index 80% rename from kicc-ui/src/api/controller/system/menu.ts rename to kicc-ui/src/api/platform/system/controller/menu.ts index 7ccba131..d5044d2c 100644 --- a/kicc-ui/src/api/controller/system/menu.ts +++ b/kicc-ui/src/api/platform/system/controller/menu.ts @@ -3,8 +3,8 @@ * Copyright © 2020-2022 entfrm All rights reserved. * author entfrm开发团队-王翔 */ -import { MenuDto, Menu } from './model/menuModel'; -import { ResultVo } from '../../model'; +import { MenuParams, Menu } from '/@/api/platform/system/entity/menu'; +import { ResultVo } from '/@/api/common/base/entity'; import { defHttp } from '/@/utils/http/axios'; enum Api { @@ -17,7 +17,7 @@ enum Api { } /** 查询菜单列表 */ -export const listMenu = (params?: Partial) => defHttp.get({ url: Api.list, params }); +export const listMenu = (params?: Partial) => defHttp.get({ url: Api.list, params }); /** 新增菜单 */ export const addMenu = (params: Partial) => defHttp.post({ url: Api.add, data: params }); @@ -32,4 +32,4 @@ export const getMenu = (id: string) => defHttp.get({ url: `${Api.get}/${id export const delMenu = (id: string) => defHttp.delete({ url: `${Api.del}/${id}` }); /** 通过角色编号查询菜单编号 */ -export const getRoleMenuIds = (roleId : string) => defHttp.get>({ url: `${Api.roleMenuIds}/${roleId}`}); +export const getRoleMenuIds = (roleId : string) => defHttp.get({ url: `${Api.roleMenuIds}/${roleId}`}); diff --git a/kicc-ui/src/api/controller/system/role.ts b/kicc-ui/src/api/platform/system/controller/role.ts similarity index 84% rename from kicc-ui/src/api/controller/system/role.ts rename to kicc-ui/src/api/platform/system/controller/role.ts index 17a3e54e..94c965fe 100644 --- a/kicc-ui/src/api/controller/system/role.ts +++ b/kicc-ui/src/api/platform/system/controller/role.ts @@ -3,7 +3,7 @@ * Copyright © 2020-2022 entfrm All rights reserved. * author entfrm开发团队-王翔 */ -import { Role, RoleDto, RoleVo } from './model/roleModel'; +import { Role, RoleParams, RoleResult } from '/@/api/platform/system/entity/role'; import { defHttp } from '/@/utils/http/axios'; enum Api { @@ -16,7 +16,7 @@ enum Api { } /** 查询角色列表 */ -export const listRole = (params?: Partial) => defHttp.get({ url: Api.list, params }, { isReturnResultResponse: true }); +export const listRole = (params?: Partial) => defHttp.get({ url: Api.list, params }, { isReturnResultResponse: true }); /** 新增角色 */ export const addRole = (params: Partial) => defHttp.post({ url: Api.add, data: params }); diff --git a/kicc-ui/src/api/controller/system/user.ts b/kicc-ui/src/api/platform/system/controller/user.ts similarity index 77% rename from kicc-ui/src/api/controller/system/user.ts rename to kicc-ui/src/api/platform/system/controller/user.ts index 429a4392..a0158838 100644 --- a/kicc-ui/src/api/controller/system/user.ts +++ b/kicc-ui/src/api/platform/system/controller/user.ts @@ -3,9 +3,10 @@ * Copyright © 2020-2022 entfrm All rights reserved. * author entfrm开发团队-王翔 */ -import { User, UserDto, UserVo } from './model/userModel'; +import { UserParams, UserResult } from '/@/api/platform/system/entity/user'; +import { User } from "/@/api/platform/core/entity/user"; import { defHttp } from '/@/utils/http/axios'; -import { ResultVo } from "/@/api/model"; +import { ResultVo } from '/@/api/common/base/entity'; enum Api { list = '/system_proxy/system/user/list', @@ -19,7 +20,7 @@ enum Api { } /** 查询用户列表 */ -export const listUser = (params?: Partial) => defHttp.get({ url: Api.list, params }, { isReturnResultResponse: true }); +export const listUser = (params?: Partial) => defHttp.get({ url: Api.list, params }, { isReturnResultResponse: true }); /** 新增用户 */ export const addUser = (params: Partial) => defHttp.post({ url: Api.add, data: params }); @@ -28,7 +29,7 @@ export const addUser = (params: Partial) => defHttp.post({ url: Api.add, d export const editUser = (params: Partial) => defHttp.put({ url: Api.edit, data: params }); /** 查询用户详细 */ -export const getUser = (id: string) => defHttp.get>({ url: `${Api.get}/${id}` }); +export const getUser = (id: string) => defHttp.get({ url: `${Api.get}/${id}` }); /** 删除用户 */ export const delUser = (id: string) => defHttp.delete({ url: `${Api.del}/${id}` }); diff --git a/kicc-ui/src/api/controller/system/model/clientModel.ts b/kicc-ui/src/api/platform/system/entity/clientModel.ts similarity index 81% rename from kicc-ui/src/api/controller/system/model/clientModel.ts rename to kicc-ui/src/api/platform/system/entity/clientModel.ts index 777706d5..f3668daf 100644 --- a/kicc-ui/src/api/controller/system/model/clientModel.ts +++ b/kicc-ui/src/api/platform/system/entity/clientModel.ts @@ -1,4 +1,10 @@ -// 引入基础包 +/** + * @program: kicc-ui + * @description: 文件上传实体类 + * 类型定义 + * @author: entfrm开发团队-王翔 + * @create: 2022/4/8 + */ import { Page, R } from '/@/api/model'; // 定义查询参数 diff --git a/kicc-ui/src/api/controller/system/model/configModel.ts b/kicc-ui/src/api/platform/system/entity/configModel.ts similarity index 78% rename from kicc-ui/src/api/controller/system/model/configModel.ts rename to kicc-ui/src/api/platform/system/entity/configModel.ts index d8b3c1e5..68bf89af 100644 --- a/kicc-ui/src/api/controller/system/model/configModel.ts +++ b/kicc-ui/src/api/platform/system/entity/configModel.ts @@ -1,4 +1,10 @@ -// 引入基础包 +/** + * @program: kicc-ui + * @description: 文件上传实体类 + * 类型定义 + * @author: entfrm开发团队-王翔 + * @create: 2022/4/8 + */ import { Page, R, CommonEntity } from '/@/api/model'; export type ConfigParams = { @@ -54,4 +60,4 @@ export interface Config extends CommonEntity { } -export type ConfigResult = R; \ No newline at end of file +export type ConfigResult = R; diff --git a/kicc-ui/src/api/platform/system/entity/dept.ts b/kicc-ui/src/api/platform/system/entity/dept.ts new file mode 100644 index 00000000..08716d4b --- /dev/null +++ b/kicc-ui/src/api/platform/system/entity/dept.ts @@ -0,0 +1,30 @@ +/** + * @program: kicc-ui + * @description: 部门实体类 + * 类型定义 + * @author: entfrm开发团队-王翔 + * @create: 2022/4/8 + */ +import { R } from '/#/axios'; +import { CommonEntity, Page } from '/@/api/common/data/entity'; + +/** 部门查询参数 */ +export type DeptParams = Page & Dept; + +/** 部门对象 */ +export interface Dept extends CommonEntity { + deptId: string; + code: string; + name: string; + parentId: string; + sort: number; + contacts: string; + phone: string; + address: string; + email: string; + status: string; + [key: string]: any; +} + +/** 部门响应对象 */ +export type DeptResult = R; diff --git a/kicc-ui/src/api/controller/system/model/dictDataModel.ts b/kicc-ui/src/api/platform/system/entity/dictDataModel.ts similarity index 68% rename from kicc-ui/src/api/controller/system/model/dictDataModel.ts rename to kicc-ui/src/api/platform/system/entity/dictDataModel.ts index 65fa7b86..4987651d 100644 --- a/kicc-ui/src/api/controller/system/model/dictDataModel.ts +++ b/kicc-ui/src/api/platform/system/entity/dictDataModel.ts @@ -1,4 +1,10 @@ -// 引入基础包 +/** + * @program: kicc-ui + * @description: 文件上传实体类 + * 类型定义 + * @author: entfrm开发团队-王翔 + * @create: 2022/4/8 + */ import {CommonEntity, Page, R} from '/@/api/model'; // 定义查询参数 @@ -21,4 +27,4 @@ export interface DictData extends CommonEntity { } // 根据字典对象生成响应模型 -export type DictDataResult = R; \ No newline at end of file +export type DictDataResult = R; diff --git a/kicc-ui/src/api/controller/system/model/dictModel.ts b/kicc-ui/src/api/platform/system/entity/dictModel.ts similarity index 75% rename from kicc-ui/src/api/controller/system/model/dictModel.ts rename to kicc-ui/src/api/platform/system/entity/dictModel.ts index 2891bdfa..b59dfb58 100644 --- a/kicc-ui/src/api/controller/system/model/dictModel.ts +++ b/kicc-ui/src/api/platform/system/entity/dictModel.ts @@ -1,4 +1,10 @@ -// 引入基础包 +/** + * @program: kicc-ui + * @description: 文件上传实体类 + * 类型定义 + * @author: entfrm开发团队-王翔 + * @create: 2022/4/8 + */ import {CommonEntity, Page, R} from '/@/api/model'; // 定义查询参数 diff --git a/kicc-ui/src/api/controller/system/model/logModel.ts b/kicc-ui/src/api/platform/system/entity/logModel.ts similarity index 78% rename from kicc-ui/src/api/controller/system/model/logModel.ts rename to kicc-ui/src/api/platform/system/entity/logModel.ts index 22b60c66..e86c98cf 100644 --- a/kicc-ui/src/api/controller/system/model/logModel.ts +++ b/kicc-ui/src/api/platform/system/entity/logModel.ts @@ -1,4 +1,10 @@ -// 引入基础包 +/** + * @program: kicc-ui + * @description: 文件上传实体类 + * 类型定义 + * @author: entfrm开发团队-王翔 + * @create: 2022/4/8 + */ import { Page, R } from '/@/api/model'; // 定义查询参数 diff --git a/kicc-ui/src/api/platform/system/entity/menu.ts b/kicc-ui/src/api/platform/system/entity/menu.ts new file mode 100644 index 00000000..dc1d7885 --- /dev/null +++ b/kicc-ui/src/api/platform/system/entity/menu.ts @@ -0,0 +1,31 @@ +/** + * @program: kicc-ui + * @description: 菜单实体类 + * 类型定义 + * @author: entfrm开发团队-王翔 + * @create: 2022/4/8 + */ +import { R } from '/#/axios'; +import { CommonEntity, Page } from '/@/api/common/data/entity'; + +/** 菜单查询参数 */ +export type MenuParams = Page & Menu; + +/** 菜单对象 */ +export interface Menu extends CommonEntity { + id: string; + name: string; + parentId: string; + type: string; + path: string; + component: string; + permission: string; + icon: string; + keepAlive: string; + hideMenu: string; + sort: string; + [key: string]: any; +} + +/** 菜单响应对象 */ +export type MenuResult = R; diff --git a/kicc-ui/src/api/platform/system/entity/role.ts b/kicc-ui/src/api/platform/system/entity/role.ts new file mode 100644 index 00000000..2aed75e8 --- /dev/null +++ b/kicc-ui/src/api/platform/system/entity/role.ts @@ -0,0 +1,25 @@ +/** + * @program: kicc-ui + * @description: 角色实体类 + * 类型定义 + * @author: entfrm开发团队-王翔 + * @create: 2022/4/8 + */ +import { R } from '/#/axios'; +import { CommonEntity, Page } from '/@/api/common/data/entity'; + +/** 角色查询参数 */ +export type RoleParams = Page & Role; + +/** 角色对象 */ +export interface Role extends CommonEntity { + id: string; + name: string; + code: string; + sort: string; + status: string; + [key: string]: any; +} + +/** 角色响应对象 */ +export type RoleResult = R; diff --git a/kicc-ui/src/api/platform/system/entity/user.ts b/kicc-ui/src/api/platform/system/entity/user.ts new file mode 100644 index 00000000..7a2d3932 --- /dev/null +++ b/kicc-ui/src/api/platform/system/entity/user.ts @@ -0,0 +1,16 @@ +/** + * @program: kicc-ui + * @description: 用户实体类 + * 类型定义 + * @author: entfrm开发团队-王翔 + * @create: 2022/4/8 + */ +import { R } from '/#/axios'; +import { Page } from '/@/api/common/data/entity'; +import { User } from "/@/api/platform/core/entity/user"; + +/** 用户查询参数 */ +export type UserParams = Page & User; + +/** 用户响应对象 */ +export type UserResult = R; diff --git a/kicc-ui/src/components/Upload/src/typing.ts b/kicc-ui/src/components/Upload/src/typing.ts index 147e92d7..72eaea12 100644 --- a/kicc-ui/src/components/Upload/src/typing.ts +++ b/kicc-ui/src/components/Upload/src/typing.ts @@ -1,4 +1,4 @@ -import { UploadApiResult } from '/@/api/controller/sys/model/uploadModel'; +import { UploadResult } from '/@/api/platform/core/entity/upload'; export enum UploadResultStatus { SUCCESS = 'success', @@ -14,7 +14,7 @@ export interface FileItem { percent: number; file: File; status?: UploadResultStatus; - responseData?: UploadApiResult; + responseData?: UploadResult; uuid: string; } diff --git a/kicc-ui/src/store/modules/permission.ts b/kicc-ui/src/store/modules/permission.ts index 1535b06d..67e88b32 100644 --- a/kicc-ui/src/store/modules/permission.ts +++ b/kicc-ui/src/store/modules/permission.ts @@ -14,7 +14,7 @@ import { useUserStore } from './user'; import { transformObjToRoute } from '/@/router/helper/routeHelper'; import { transformRouteToMenu } from '/@/router/helper/menuHelper'; import { filter } from '/@/utils/helper/treeHelper'; -import { getMenuList } from '/@/api/controller/sys/menu'; +import { listMenuRoute } from '/@/api/platform/core/controller/menu'; import { useMessage } from '/@/hooks/web/useMessage'; import { PageEnum } from '/@/enums/pageEnum'; @@ -111,7 +111,7 @@ export const usePermissionStore = defineStore({ /** 构建菜单与路由 */ let routeList: AppRouteRecordRaw[] = []; try { - routeList = (await getMenuList()) as AppRouteRecordRaw[]; + routeList = await listMenuRoute(); transformObjToRoute(routeList); const menuList = transformRouteToMenu(routeList); this.setMenuList(menuList); diff --git a/kicc-ui/src/store/modules/user.ts b/kicc-ui/src/store/modules/user.ts index 1e4ad263..989fc17d 100644 --- a/kicc-ui/src/store/modules/user.ts +++ b/kicc-ui/src/store/modules/user.ts @@ -5,23 +5,22 @@ * @create: 2022/4/9 */ -import type {UserInfo} from '/#/store'; -import {defineStore} from 'pinia'; -import {store} from '/@/store'; -import {PageEnum} from '/@/enums/pageEnum'; -import {ACCESS_TOKEN_KEY, PERMISSIONS_KEY, REFRESH_TOKEN_KEY, ROLE_IDS_KEY, USER_INFO_KEY} from '/@/enums/cacheEnum'; -import {getAuthCache, setAuthCache} from '/@/utils/auth'; -import {GetUserInfoModel, LoginParams} from '/@/api/controller/sys/model/userModel'; -import {logout, getUserInfo, login} from '/@/api/controller/sys/user'; -import {useI18n} from '/@/hooks/web/useI18n'; -import {useMessage} from '/@/hooks/web/useMessage'; -import {router} from '/@/router'; -import {usePermissionStore} from '/@/store/modules/permission'; -import {RouteRecordRaw} from 'vue-router'; +import { defineStore } from 'pinia'; +import { store } from '/@/store'; +import { PageEnum } from '/@/enums/pageEnum'; +import { ACCESS_TOKEN_KEY, PERMISSIONS_KEY, REFRESH_TOKEN_KEY, ROLE_IDS_KEY, USER_INFO_KEY } from '/@/enums/cacheEnum'; +import { getAuthCache, setAuthCache } from '/@/utils/auth'; +import { User, LoginParams } from '/@/api/platform/core/entity/user'; +import { logout, getUserInfo, login } from '/@/api/platform/core/controller/user'; +import { useI18n } from '/@/hooks/web/useI18n'; +import { useMessage } from '/@/hooks/web/useMessage'; +import { router } from '/@/router'; +import { usePermissionStore } from '/@/store/modules/permission'; +import { RouteRecordRaw } from 'vue-router'; import defaultAvatar from '/@/assets/images/defaultAvatar.jpg'; interface UserState { - userInfo: Nullable; + userInfo: Nullable; sessionTimeout: boolean; roleIds: string[]; permissions: string[]; @@ -33,7 +32,7 @@ export const useUserStore = defineStore({ id: 'app-user', state: (): UserState => ({ // 用户信息 - userInfo: getAuthCache(USER_INFO_KEY), + userInfo: getAuthCache(USER_INFO_KEY), // 登录是否过期 sessionTimeout: false, // 角色ID用于权限校验 @@ -46,7 +45,7 @@ export const useUserStore = defineStore({ refresh_token: getAuthCache(REFRESH_TOKEN_KEY), }), getters: { - getUserInfo(): UserInfo { + getUserInfo(): User { return this.userInfo! || {}; }, getAccessToken(): string { @@ -82,7 +81,7 @@ export const useUserStore = defineStore({ this.refresh_token = refreshToken; setAuthCache(REFRESH_TOKEN_KEY, refreshToken); }, - setUserInfo(userInfo: UserInfo) { + setUserInfo(userInfo: User) { this.userInfo = userInfo; setAuthCache(USER_INFO_KEY, userInfo); }, @@ -98,7 +97,7 @@ export const useUserStore = defineStore({ this.permissions = []; }, /** 登录 */ - async login(params: LoginParams & { goHome?: boolean; unLock?: boolean; }): Promise { + async login(params: LoginParams): Promise { try { const { goHome = true, unLock = false, ...loginParams } = params; const data = await login(loginParams, unLock && { @@ -132,7 +131,8 @@ export const useUserStore = defineStore({ return Promise.reject(error); } }, - async getUserInfoAction(): Promise { + /** 获取用户信息 */ + async getUserInfoAction(): Promise { const userInfo = await getUserInfo(); userInfo.avatar || (userInfo.avatar = defaultAvatar); // 存储用户扩展信息,便于鉴权 diff --git a/kicc-ui/src/utils/cache/persistent.ts b/kicc-ui/src/utils/cache/persistent.ts index 610c3ce6..4b4a8010 100644 --- a/kicc-ui/src/utils/cache/persistent.ts +++ b/kicc-ui/src/utils/cache/persistent.ts @@ -7,7 +7,8 @@ * @create: 2022/4/9 */ -import type { LockInfo, UserInfo } from '/#/store'; +import type { LockInfo } from '/#/store'; +import type { User } from '/@/api/platform/core/entity/user'; import type { ProjectConfig } from '/#/config'; import type { RouteLocationNormalized } from 'vue-router'; import { createLocalStorage, createSessionStorage } from '/@/utils/cache'; @@ -30,7 +31,7 @@ interface BasicStore { [REFRESH_TOKEN_KEY]: string | number | null | undefined; [ROLE_IDS_KEY]: string[]; [PERMISSIONS_KEY]: string[]; - [USER_INFO_KEY]: UserInfo; + [USER_INFO_KEY]: User; [LOCK_INFO_KEY]: LockInfo; [PROJ_CFG_KEY]: ProjectConfig; [MULTIPLE_TABS_KEY]: RouteLocationNormalized[]; diff --git a/kicc-ui/src/utils/cipher.ts b/kicc-ui/src/utils/cipher.ts index ae3ba95a..90eaec3d 100644 --- a/kicc-ui/src/utils/cipher.ts +++ b/kicc-ui/src/utils/cipher.ts @@ -5,7 +5,7 @@ * @create: 2022/4/8 */ import { encrypt, decrypt } from 'crypto-js/aes'; -import { LoginParams } from '/@/api/controller/sys/model/userModel'; +import { LoginParams } from '/@/api/platform/core/entity/user'; import * as CryptoJS from "crypto-js"; import { encryptionLoginModel } from "/#/utils"; diff --git a/kicc-ui/src/utils/http/axios/Axios.ts b/kicc-ui/src/utils/http/axios/Axios.ts index 997ffb7c..894673f0 100644 --- a/kicc-ui/src/utils/http/axios/Axios.ts +++ b/kicc-ui/src/utils/http/axios/Axios.ts @@ -6,7 +6,7 @@ */ import type { AxiosRequestConfig, AxiosInstance, AxiosResponse } from 'axios'; -import type { RequestOptions, Data, UploadFileParams } from '../../../../types/axios'; +import type { RequestOptions, R, UploadFileParams } from '../../../../types/axios'; import type { CreateAxiosOptions } from './axiosTransform'; import axios from 'axios'; import qs from 'qs'; @@ -28,9 +28,7 @@ export class VAxios { this.setupInterceptors(); } - /** - * 创建 axios 实例 - */ + /** 创建 axios 实例 */ private createAxios(config: CreateAxiosOptions): void { this.axiosInstance = axios.create(config); } @@ -44,9 +42,7 @@ export class VAxios { return this.axiosInstance; } - /** - * 值得重新配置 - */ + /** 值得重新配置 */ configAxios(config: CreateAxiosOptions) { if (!this.axiosInstance) { return; @@ -54,9 +50,7 @@ export class VAxios { this.createAxios(config); } - /** - * 设置headers请求头 - */ + /** 设置headers请求头 */ setHeader(headers: any): void { if (!this.axiosInstance) { return; @@ -64,9 +58,7 @@ export class VAxios { Object.assign(this.axiosInstance.defaults.headers, headers); } - /** - * 拦截器配置 - */ + /** 拦截器配置 */ private setupInterceptors() { const transform = this.getTransform(); if (!transform) { @@ -120,9 +112,7 @@ export class VAxios { this.axiosInstance.interceptors.response.use(undefined, responseInterceptorsCatch); } - /** - * 上传文件 - */ + /** 上传文件 */ uploadFile(config: AxiosRequestConfig, params: UploadFileParams) { const formData = new window.FormData(); @@ -210,8 +200,8 @@ export class VAxios { return new Promise((resolve, reject) => { this.axiosInstance - .request>(conf) - .then((res: AxiosResponse) => { + .request>(conf) + .then((res: AxiosResponse) => { if (transformRequestHook && isFunction(transformRequestHook)) { try { const ret = transformRequestHook(res, opt); diff --git a/kicc-ui/src/utils/http/axios/axiosCancel.ts b/kicc-ui/src/utils/http/axios/axiosCancel.ts index cd79aff1..5475aef8 100644 --- a/kicc-ui/src/utils/http/axios/axiosCancel.ts +++ b/kicc-ui/src/utils/http/axios/axiosCancel.ts @@ -10,17 +10,14 @@ import type { AxiosRequestConfig, Canceler } from 'axios'; import axios from 'axios'; import { isFunction } from '/@/utils/is'; -// 用于存储每个请求的识别和取消功能 +/** 用于存储每个请求的识别和取消功能 */ let pendingMap = new Map(); export const getPendingUrl = (config: AxiosRequestConfig) => [config.method, config.url].join('&'); export class AxiosCanceler { - /** - * 添加请求 - * @param {Object} config - */ + /** 添加请求 */ addPending(config: AxiosRequestConfig) { this.removePending(config); const url = getPendingUrl(config); @@ -34,9 +31,7 @@ export class AxiosCanceler { }); } - /** - * 清除所有待处理 - */ + /** 清除所有待处理 */ removeAllPending() { pendingMap.forEach((cancel) => { cancel && isFunction(cancel) && cancel(); @@ -44,10 +39,7 @@ export class AxiosCanceler { pendingMap.clear(); } - /** - * 删除请求 - * @param {Object} config - */ + /** 删除请求 */ removePending(config: AxiosRequestConfig) { const url = getPendingUrl(config); @@ -60,9 +52,7 @@ export class AxiosCanceler { } } - /** - * 重置 - */ + /** 重置 */ reset(): void { pendingMap = new Map(); } diff --git a/kicc-ui/src/utils/http/axios/axiosTransform.ts b/kicc-ui/src/utils/http/axios/axiosTransform.ts index 34ae7332..2e2ba894 100644 --- a/kicc-ui/src/utils/http/axios/axiosTransform.ts +++ b/kicc-ui/src/utils/http/axios/axiosTransform.ts @@ -6,7 +6,7 @@ */ import type { AxiosRequestConfig, AxiosResponse } from 'axios'; -import type { RequestOptions, Data } from '/#/axios'; +import type { RequestOptions, R } from '/#/axios'; export interface CreateAxiosOptions extends AxiosRequestConfig { authenticationScheme?: string; @@ -16,38 +16,25 @@ export interface CreateAxiosOptions extends AxiosRequestConfig { } export abstract class AxiosTransform { - /** - * 请求前的流程配置 - */ + + /** 请求前的流程配置 */ beforeRequestHook?: (config: CreateAxiosOptions, options: RequestOptions) => CreateAxiosOptions; - /** - * 请求成功处理 - */ - transformRequestHook?: (res: AxiosResponse, options: RequestOptions) => any; + /** 请求成功处理 */ + transformRequestHook?: (res: AxiosResponse, options: RequestOptions) => any; - /** - * 请求失败处理 - */ + /** 请求失败处理 */ requestCatchHook?: (e: Error, options: RequestOptions) => Promise; - /** - * 请求之前的拦截器 - */ + /** 请求之前的拦截器 */ requestInterceptors?: (config: CreateAxiosOptions, options: CreateAxiosOptions) => CreateAxiosOptions; - /** - * 请求之后的拦截器 - */ + /** 请求之后的拦截器 */ responseInterceptors?: (res: AxiosResponse) => AxiosResponse; - /** - * 请求之前的拦截器错误处理 - */ + /** 请求之前的拦截器错误处理 */ requestInterceptorsCatch?: (error: Error) => void; - /** - * 请求之后的拦截器错误处理 - */ + /** 请求之后的拦截器错误处理 */ responseInterceptorsCatch?: (error: Error) => void; } diff --git a/kicc-ui/src/utils/http/axios/helper.ts b/kicc-ui/src/utils/http/axios/helper.ts index 2b444874..e443447e 100644 --- a/kicc-ui/src/utils/http/axios/helper.ts +++ b/kicc-ui/src/utils/http/axios/helper.ts @@ -25,9 +25,7 @@ export function joinTimestamp(join: boolean, restful = false): string | object { return { _t: now }; } -/** - * 格式请求参数时间 - */ +/** 格式请求参数时间 */ export function formatRequestDate(params: Recordable) { if (Object.prototype.toString.call(params) !== '[object Object]') { return; diff --git a/kicc-ui/src/utils/http/axios/index.ts b/kicc-ui/src/utils/http/axios/index.ts index 7fd4150f..a7586cbd 100644 --- a/kicc-ui/src/utils/http/axios/index.ts +++ b/kicc-ui/src/utils/http/axios/index.ts @@ -6,7 +6,7 @@ */ import type { AxiosResponse } from 'axios'; -import type { RequestOptions, Data } from '/#/axios'; +import type { RequestOptions, R } from '/#/axios'; import type { AxiosTransform, CreateAxiosOptions } from './axiosTransform'; import { VAxios } from './Axios'; import { checkStatus } from './checkStatus'; @@ -24,14 +24,10 @@ const globSetting = useGlobSetting(); const urlPrefix = globSetting.urlPrefix; const { createMessage, createErrorModal } = useMessage(); -/** - * 数据处理，方便区分多种处理方式 - */ +/** 数据处理，方便区分多种处理方式 */ const transform: AxiosTransform = { - /** - * 处理请求数据。如果数据不是预期格式，可直接抛出错误 - */ - transformRequestHook: (res: AxiosResponse, options: RequestOptions) => { + /** 处理请求数据。如果数据不是预期格式，可直接抛出错误 */ + transformRequestHook: (res: AxiosResponse, options: RequestOptions) => { const { isReturnNativeResponse, isReturnResultResponse } = options; // 是否返回原生响应头 比如：需要获取响应头时使用该属性 @@ -58,9 +54,7 @@ const transform: AxiosTransform = { }, - /** - * 请求之前处理config - */ + /** 请求之前处理config */ beforeRequestHook: (config, options) => { const { apiUrl, joinPrefix, joinParamsToUrl, formatDate, joinTime = true } = options; @@ -109,9 +103,7 @@ const transform: AxiosTransform = { return config; }, - /** - * 请求拦截器处理 - */ + /** 请求拦截器处理 */ requestInterceptors: (config, options) => { // 请求之前处理config const token = getAccessToken(); @@ -130,16 +122,12 @@ const transform: AxiosTransform = { return config; }, - /** - * 响应拦截器处理 - */ + /** 响应拦截器处理 */ responseInterceptors: (res: AxiosResponse) => { return res; }, - /** - * 响应错误处理 - */ + /** 响应错误处理 */ responseInterceptorsCatch: (error: any) => { const { response, code, message, config } = error || {}; const errorMessageMode = config?.requestOptions?.errorMessageMode || 'none'; diff --git a/kicc-ui/src/views/sys/lock/LockPage.vue b/kicc-ui/src/views/sys/lock/LockPage.vue index 878d770f..18fe3ed8 100644 --- a/kicc-ui/src/views/sys/lock/LockPage.vue +++ b/kicc-ui/src/views/sys/lock/LockPage.vue @@ -28,9 +28,9 @@
- +

- {{ userinfo.nickName }} + {{ userInfo.nickName }}

(() => { + const userInfo = computed(() => { return userStore.getUserInfo || {}; }); diff --git a/kicc-ui/src/views/sys/login/LoginForm.vue b/kicc-ui/src/views/sys/login/LoginForm.vue index 3289328c..121c960f 100644 --- a/kicc-ui/src/views/sys/login/LoginForm.vue +++ b/kicc-ui/src/views/sys/login/LoginForm.vue @@ -99,7 +99,7 @@ import { useUserStore } from '/@/store/modules/user'; import { LoginStateEnum, useLoginState, useFormRules, useFormValid } from './useLogin'; import { useDesign } from '/@/hooks/web/useDesign'; - import { getCaptcha } from '/@/api/controller/sys/user'; + import { getCaptcha } from '/@/api/platform/core/controller/user'; import captchaDefImg from '/@/assets/images/captcha.jpg'; const ACol = Col; diff --git a/kicc-ui/src/views/system/client/ClientDrawer.vue b/kicc-ui/src/views/system/client/ClientDrawer.vue index af044555..eccedb30 100644 --- a/kicc-ui/src/views/system/client/ClientDrawer.vue +++ b/kicc-ui/src/views/system/client/ClientDrawer.vue @@ -17,7 +17,7 @@ import { BasicDrawer, useDrawerInner } from '/@/components/Drawer'; import { TreeItem } from '/@/components/Tree'; //import { getMenuList } from '/@/api/system/role'; - import { set } from '/@/api/controller/system/client'; + import { set } from '/@/api/platform/system/controller/client'; const emit = defineEmits(['success', 'register']); const isUpdate = ref(true); diff --git a/kicc-ui/src/views/system/client/index.vue b/kicc-ui/src/views/system/client/index.vue index 7ae6811e..67550f35 100644 --- a/kicc-ui/src/views/system/client/index.vue +++ b/kicc-ui/src/views/system/client/index.vue @@ -33,7 +33,7 @@ // 插入数据内容 import { columns, searchFormSchema } from './client.data'; // 通过API接口获取日志 - import { page, del } from '/@/api/controller/system/client'; + import { page, del } from '/@/api/platform/system/controller/client'; import { useDrawer } from '/@/components/Drawer'; import ClientDrawer from './ClientDrawer.vue'; import { useMessage } from '/@/hooks/web/useMessage'; diff --git a/kicc-ui/src/views/system/config/ConfigModal.vue b/kicc-ui/src/views/system/config/ConfigModal.vue index 453f72c0..53d54fc3 100644 --- a/kicc-ui/src/views/system/config/ConfigModal.vue +++ b/kicc-ui/src/views/system/config/ConfigModal.vue @@ -12,7 +12,7 @@ import { defineComponent, ref, unref } from 'vue'; import {BasicModal, ModalProps, useModalInner} from '/@/components/Modal'; import { BasicForm, useForm } from '/@/components/Form/index'; import { formSchema } from './config.data'; -import { set } from '/@/api/controller/system/config'; +import { set } from '/@/api/platform/system/controller/config'; export default defineComponent({ name: 'ConfigModal', diff --git a/kicc-ui/src/views/system/config/index.vue b/kicc-ui/src/views/system/config/index.vue index ce411734..fffb523d 100644 --- a/kicc-ui/src/views/system/config/index.vue +++ b/kicc-ui/src/views/system/config/index.vue @@ -47,7 +47,7 @@ * author entfrm开发团队-王翔 */ import { BasicTable, useTable, TableAction } from '/@/components/Table'; - import { list, remove } from '/@/api/controller/system/config'; + import { list, remove } from '/@/api/platform/system/controller/config'; import ConfigModal from './ConfigModal.vue'; import { columns, searchFormSchema } from './config.data'; import { useMessage } from '/@/hooks/web/useMessage'; diff --git a/kicc-ui/src/views/system/dept/DeptModal.vue b/kicc-ui/src/views/system/dept/DeptModal.vue index 69104ae1..8b5c5a66 100644 --- a/kicc-ui/src/views/system/dept/DeptModal.vue +++ b/kicc-ui/src/views/system/dept/DeptModal.vue @@ -18,7 +18,7 @@ import { BasicForm, useForm } from '/@/components/Form/index'; import { formSchema } from './dept.data'; import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal'; - import { listDept, addDept, editDept, getDept } from '/@/api/controller/system/dept'; + import { listDept, addDept, editDept, getDept } from '/@/api/platform/system/controller/dept'; import { listToTree } from "/@/utils/helper/treeHelper"; /** 通用变量统一声明区域 */ diff --git a/kicc-ui/src/views/system/dept/index.vue b/kicc-ui/src/views/system/dept/index.vue index 69f99cbd..61db381f 100644 --- a/kicc-ui/src/views/system/dept/index.vue +++ b/kicc-ui/src/views/system/dept/index.vue @@ -54,7 +54,7 @@ import { useModal } from '/@/components/Modal'; import DeptModal from './DeptModal.vue'; import { columns, searchFormSchema } from './dept.data'; - import { delDept, listDept } from '/@/api/controller/system/dept'; + import { delDept, listDept } from '/@/api/platform/system/controller/dept'; import { useMessage } from '/@/hooks/web/useMessage'; import { listToTree } from "/@/utils/helper/treeHelper"; diff --git a/kicc-ui/src/views/system/dict/DictDataModal.vue b/kicc-ui/src/views/system/dict/DictDataModal.vue index 60e30544..2aa17e16 100644 --- a/kicc-ui/src/views/system/dict/DictDataModal.vue +++ b/kicc-ui/src/views/system/dict/DictDataModal.vue @@ -14,7 +14,7 @@ import {ref, computed, unref} from 'vue'; import {BasicForm, useForm} from '/@/components/Form/index'; import {formSchema} from './dictdata.data'; -import {set} from '/@/api/controller/system/dictdata'; +import {set} from '/@/api/platform/system/controller/dictdata'; import {BasicModal, useModalInner} from "/@/components/Modal"; const emit = defineEmits(['success', 'register']); diff --git a/kicc-ui/src/views/system/dict/DictDataTable.vue b/kicc-ui/src/views/system/dict/DictDataTable.vue index 3dd5b857..abe83d62 100644 --- a/kicc-ui/src/views/system/dict/DictDataTable.vue +++ b/kicc-ui/src/views/system/dict/DictDataTable.vue @@ -34,7 +34,7 @@ // 插入数据内容 import { columns, searchFormSchema } from './dictdata.data'; // 通过API接口获取日志 - import { list, remove } from '/@/api/controller/system/dictdata'; + import { list, remove } from '/@/api/platform/system/controller/dictdata'; import { useModal } from '/@/components/Modal'; import DictDataModal from './DictDataModal.vue'; import { useMessage } from '/@/hooks/web/useMessage'; diff --git a/kicc-ui/src/views/system/dict/DictModal.vue b/kicc-ui/src/views/system/dict/DictModal.vue index 057511a8..fb1bccf1 100644 --- a/kicc-ui/src/views/system/dict/DictModal.vue +++ b/kicc-ui/src/views/system/dict/DictModal.vue @@ -15,7 +15,7 @@ import { BasicForm, useForm } from '/@/components/Form/index'; import { formSchema } from './dict.data'; import { TreeItem } from '/@/components/Tree'; - import { set } from '/@/api/controller/system/dict'; + import { set } from '/@/api/platform/system/controller/dict'; import {BasicModal, useModalInner} from "/@/components/Modal"; const emit = defineEmits(['success', 'register']); diff --git a/kicc-ui/src/views/system/dict/index.vue b/kicc-ui/src/views/system/dict/index.vue index 442bad22..8acc7669 100644 --- a/kicc-ui/src/views/system/dict/index.vue +++ b/kicc-ui/src/views/system/dict/index.vue @@ -35,7 +35,7 @@ // 插入数据内容 import { columns, searchFormSchema} from './dict.data'; // 通过API接口获取日志 - import { list, remove } from '/@/api/controller/system/dict'; + import { list, remove } from '/@/api/platform/system/controller/dict'; import { useModal } from '/@/components/Modal'; import DictModal from './DictModal.vue'; import DictDataTable from './DictDataTable.vue'; diff --git a/kicc-ui/src/views/system/log/index.vue b/kicc-ui/src/views/system/log/index.vue index 1609efa9..394bce19 100644 --- a/kicc-ui/src/views/system/log/index.vue +++ b/kicc-ui/src/views/system/log/index.vue @@ -33,7 +33,7 @@ // 插入数据内容 import { columns, searchFormSchema } from './log.data'; // 通过API接口获取日志 - import { getLogListByPage, logEmpty } from '/@/api/controller/system/log'; + import { getLogListByPage, logEmpty } from '/@/api/platform/system/controller/log'; import { useDrawer } from '/@/components/Drawer'; import LogDrawer from './LogDrawer.vue'; diff --git a/kicc-ui/src/views/system/menu/MenuModal.vue b/kicc-ui/src/views/system/menu/MenuModal.vue index 943f37ba..a9694ac2 100644 --- a/kicc-ui/src/views/system/menu/MenuModal.vue +++ b/kicc-ui/src/views/system/menu/MenuModal.vue @@ -18,7 +18,7 @@ import { BasicForm, useForm } from '/@/components/Form/index'; import { formSchema } from './menu.data'; import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal'; - import { listMenu, addMenu, editMenu, getMenu } from '/@/api/controller/system/menu'; + import { listMenu, addMenu, editMenu, getMenu } from '/@/api/platform/system/controller/menu'; import { listToTree } from '/@/utils/helper/treeHelper'; /** 通用变量统一声明区域 */ diff --git a/kicc-ui/src/views/system/menu/index.vue b/kicc-ui/src/views/system/menu/index.vue index bbc79cb0..fcb814c6 100644 --- a/kicc-ui/src/views/system/menu/index.vue +++ b/kicc-ui/src/views/system/menu/index.vue @@ -51,7 +51,7 @@ * author entfrm开发团队-王翔 */ import { BasicTable, useTable, TableAction } from '/@/components/Table'; - import { listMenu, delMenu } from '/@/api/controller/system/menu'; + import { listMenu, delMenu } from '/@/api/platform/system/controller/menu'; import { useModal } from '/@/components/Modal'; import { listToTree } from '/@/utils/helper/treeHelper'; import { columns, searchFormSchema } from './menu.data'; diff --git a/kicc-ui/src/views/system/role/RoleDrawer.vue b/kicc-ui/src/views/system/role/RoleDrawer.vue index 3ac6cabe..a25930d9 100644 --- a/kicc-ui/src/views/system/role/RoleDrawer.vue +++ b/kicc-ui/src/views/system/role/RoleDrawer.vue @@ -31,8 +31,8 @@ import { formSchema } from './role.data'; import { BasicDrawer, DrawerProps, useDrawerInner } from '/@/components/Drawer'; import { BasicTree, TreeItem } from '/@/components/Tree'; - import { listMenu, getRoleMenuIds } from '/@/api/controller/system/menu'; - import { addRole, editRole, getRole } from '/@/api/controller/system/role'; + import { listMenu, getRoleMenuIds } from '/@/api/platform/system/controller/menu'; + import { addRole, editRole, getRole } from '/@/api/platform/system/controller/role'; import { listToTree } from "/@/utils/helper/treeHelper"; /** 类型规范统一声明定义区域 */ diff --git a/kicc-ui/src/views/system/role/index.vue b/kicc-ui/src/views/system/role/index.vue index 57a095ae..3d8198e9 100644 --- a/kicc-ui/src/views/system/role/index.vue +++ b/kicc-ui/src/views/system/role/index.vue @@ -49,7 +49,7 @@ * author entfrm开发团队-王翔 */ import { BasicTable, useTable, TableAction } from '/@/components/Table'; - import { listRole, delRole } from '/@/api/controller/system/role'; + import { listRole, delRole } from '/@/api/platform/system/controller/role'; import { useDrawer } from '/@/components/Drawer'; import RoleDrawer from './RoleDrawer.vue'; import { columns, searchFormSchema } from './role.data'; diff --git a/kicc-ui/src/views/system/role/role.data.ts b/kicc-ui/src/views/system/role/role.data.ts index 880b2746..c53f509b 100644 --- a/kicc-ui/src/views/system/role/role.data.ts +++ b/kicc-ui/src/views/system/role/role.data.ts @@ -9,7 +9,7 @@ import { BasicColumn } from '/@/components/Table'; import { FormSchema } from '/@/components/Table'; import { h } from 'vue'; import { Switch, Tag } from 'ant-design-vue'; -import { changeStatus } from '/@/api/controller/system/role'; +import { changeStatus } from '/@/api/platform/system/controller/role'; import { useMessage } from '/@/hooks/web/useMessage'; /** 通用变量统一声明区域 */ diff --git a/kicc-ui/src/views/system/user/DeptTree.vue b/kicc-ui/src/views/system/user/DeptTree.vue index bba569ee..403b284f 100644 --- a/kicc-ui/src/views/system/user/DeptTree.vue +++ b/kicc-ui/src/views/system/user/DeptTree.vue @@ -19,7 +19,7 @@ */ import { defineComponent, onMounted, ref } from 'vue'; import { BasicTree, TreeItem } from '/@/components/Tree'; - import { listDept } from '/@/api/controller/system/dept'; + import { listDept } from '/@/api/platform/system/controller/dept'; import { listToTree } from "/@/utils/helper/treeHelper"; export default defineComponent({ diff --git a/kicc-ui/src/views/system/user/ResetPwdModal.vue b/kicc-ui/src/views/system/user/ResetPwdModal.vue index 2b13743a..004677ae 100644 --- a/kicc-ui/src/views/system/user/ResetPwdModal.vue +++ b/kicc-ui/src/views/system/user/ResetPwdModal.vue @@ -25,7 +25,7 @@ import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal'; import { StrengthMeter } from '/@/components/StrengthMeter'; import { Form } from 'ant-design-vue'; - import { resetPwd } from '/@/api/controller/system/user'; + import { resetPwd } from '/@/api/platform/system/controller/user'; import { useMessage } from '/@/hooks/web/useMessage'; /** 类型规范统一声明定义区域 */ diff --git a/kicc-ui/src/views/system/user/UserModal.vue b/kicc-ui/src/views/system/user/UserModal.vue index 4c235c09..fee1aa33 100644 --- a/kicc-ui/src/views/system/user/UserModal.vue +++ b/kicc-ui/src/views/system/user/UserModal.vue @@ -18,8 +18,8 @@ import { BasicModal, useModalInner } from '/@/components/Modal'; import { BasicForm, useForm } from '/@/components/Form/index'; import { userFormSchema } from './user.data'; - import { listDept } from '/@/api/controller/system/dept'; - import { addUser, editUser, getUser } from '/@/api/controller/system/user'; + import { listDept } from '/@/api/platform/system/controller/dept'; + import { addUser, editUser, getUser } from '/@/api/platform/system/controller/user'; import { listToTree } from "/@/utils/helper/treeHelper"; import { ModalProps } from "/@/components/Modal"; import { findListNameById } from '/@/utils'; diff --git a/kicc-ui/src/views/system/user/index.vue b/kicc-ui/src/views/system/user/index.vue index ebecfe5a..352fe059 100644 --- a/kicc-ui/src/views/system/user/index.vue +++ b/kicc-ui/src/views/system/user/index.vue @@ -64,7 +64,7 @@ */ import { defineComponent, reactive, toRaw } from 'vue'; import { BasicTable, useTable, TableAction } from '/@/components/Table'; - import { listUser, delUser } from '/@/api/controller/system/user'; + import { listUser, delUser } from '/@/api/platform/system/controller/user'; import ResetPwdModal from './ResetPwdModal.vue'; import { PageWrapper } from '/@/components/Page'; import DeptTree from './DeptTree.vue'; diff --git a/kicc-ui/src/views/system/user/user.data.ts b/kicc-ui/src/views/system/user/user.data.ts index 4236748f..6cd71570 100644 --- a/kicc-ui/src/views/system/user/user.data.ts +++ b/kicc-ui/src/views/system/user/user.data.ts @@ -9,8 +9,8 @@ import { BasicColumn } from '/@/components/Table'; import { FormSchema } from '/@/components/Table'; import { h } from 'vue'; import { Switch } from 'ant-design-vue'; -import { listRole } from '/@/api/controller/system/role'; -import { changeStatus } from '/@/api/controller/system/user'; +import { listRole } from '/@/api/platform/system/controller/role'; +import { changeStatus } from '/@/api/platform/system/controller/user'; import { useMessage } from "/@/hooks/web/useMessage"; /** 通用变量统一声明区域 */ diff --git a/kicc-ui/types/axios.d.ts b/kicc-ui/types/axios.d.ts index 72e71bb7..1238dd45 100644 --- a/kicc-ui/types/axios.d.ts +++ b/kicc-ui/types/axios.d.ts @@ -16,7 +16,7 @@ export interface RequestOptions { // 例如：当需要获取响应头时使用该属性 isReturnNativeResponse?: boolean; // 是否返回后端原生结果集响应 - isReturnResultResponse ?: boolean; + isReturnResultResponse?: boolean; // 是否加入url joinPrefix?: boolean; // 接口地址，留空使用默认apiUrl @@ -34,10 +34,11 @@ export interface RequestOptions { clientSecret?: string; } -export interface Data { +/** 响应信息主体 */ +export interface R { code: number; msg: string; - time: string; + total: number; data: T; } diff --git a/kicc-ui/types/store.d.ts b/kicc-ui/types/store.d.ts index 780df5b0..add2d36f 100644 --- a/kicc-ui/types/store.d.ts +++ b/kicc-ui/types/store.d.ts @@ -15,36 +15,7 @@ export interface LockInfo { isLock?: boolean; } -export interface UserInfo { - // 用户id - id: string; - // 用户名 - userName: string; - // 真实名字 - nickName: string; - // 头像 - avatar: string; - // 所属部门ID - deptId: string; - // 所属部门名称 - deptName: string; - // 邮箱 - email: string; - // 菜单按钮权限 - permissions: string[]; - // 角色ID权限 - roleIds: string[]; - // 手机号 - phone: string; - // 备注信息 - remarks: string; - // 多租户ID - tenantId: string; - // 指定登录后首页跳转 - homePath?: string; - [key: string]: any; -} - +/** 当窗口收缩时,记住一些状态,在窗口恢复时恢复这些状态 */ export interface BeforeMiniState { menuCollapsed?: boolean; menuSplit?: boolean;