From 4f1107f5a70f5a5d4651d8dcad711d686d7312d9 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Wed, 4 May 2022 02:07:57 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=80=20=E9=87=8D=E6=9E=84=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E6=A1=86=E6=9E=B6=E8=BF=9B=E8=A1=8C=E9=80=82=E9=85=8D?= =?UTF-8?q?=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 --- .../OauthClientDetailsController.java | 2 +- .../system/controller/RoleController.java | 10 ++--- .../system/controller/UserController.java | 8 ++-- .../api/platform/system/controller/client.ts | 40 +++++++++++++------ .../api/platform/system/controller/role.ts | 2 +- .../api/platform/system/controller/user.ts | 2 +- .../src/api/platform/system/entity/client.ts | 28 ++++++------- 7 files changed, 51 insertions(+), 41 deletions(-) diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/OauthClientDetailsController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/OauthClientDetailsController.java index 48b72180..d7589ee3 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/OauthClientDetailsController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/OauthClientDetailsController.java @@ -68,7 +68,7 @@ public class OauthClientDetailsController { } @SysLog("删除终端") - @DeleteMapping("/{ids}") + @DeleteMapping("/remove/{ids:[\\w,]+}") @PreAuthorize("@pms.hasPermission('client_del')") public R removeById(@PathVariable String[] ids) { oauthClientDetailsService.removeClientDetailsByIds(Arrays.asList(ids)); diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RoleController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RoleController.java index 9d5beceb..30b6203c 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RoleController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RoleController.java @@ -86,15 +86,15 @@ public class RoleController { } @SysLog("角色删除") - @DeleteMapping("/remove/{id:[\\w,]+}") + @DeleteMapping("/remove/{ids:[\\w,]+}") @PreAuthorize("@pms.hasPermission('role_del')") - public R remove(@PathVariable String[] id) { + public R remove(@PathVariable String[] ids) { // todo: 防止管理员角色删除,暂时处理手段 - if(ArrayUtil.contains(id, "1510536230140129280")){ + if(ArrayUtil.contains(ids, "1510536230140129280")){ return R.error("不允许删除管理员角色"); } - roleMenuService.remove(new LambdaQueryWrapper().in(RoleMenu::getRoleId, Arrays.asList(id))); - roleService.removeByIds(Arrays.asList(id)); + roleMenuService.remove(new LambdaQueryWrapper().in(RoleMenu::getRoleId, Arrays.asList(ids))); + roleService.removeByIds(Arrays.asList(ids)); return R.ok(); } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java index 1eb002f4..8b9b923a 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java @@ -123,14 +123,14 @@ public class UserController { } @SysLog("用户删除") - @DeleteMapping("/remove/{id:[\\w,]+}") + @DeleteMapping("/remove/{ids:[\\w,]+}") @PreAuthorize("@pms.hasPermission('user_del')") - public R remove(@PathVariable String[] id) { + public R remove(@PathVariable String[] ids) { // todo: 防止管理员用户删除,暂时处理手段 - if (ArrayUtil.contains(id, "1510539584287346688")) { + if (ArrayUtil.contains(ids, "1510539584287346688")) { return R.error("不允许删除超级管理员"); } - userService.removeByIds(Arrays.asList(id)); + userService.removeByIds(Arrays.asList(ids)); return R.ok(); } diff --git a/kicc-ui/src/api/platform/system/controller/client.ts b/kicc-ui/src/api/platform/system/controller/client.ts index 22d5693f..d33d1d7c 100644 --- a/kicc-ui/src/api/platform/system/controller/client.ts +++ b/kicc-ui/src/api/platform/system/controller/client.ts @@ -1,20 +1,34 @@ -import { ClientParams, ClientListGetResultModel, ClientListItem } from '../entity/client'; +/** + * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致 + * Copyright © 2020-2022 entfrm All rights reserved. + * author entfrm开发团队-王翔 + */ +import type { Client, ClientParams, ClientResult } from '/@/api/platform/system/entity/client'; import { defHttp } from '/@/utils/http/axios'; enum Api { - Page = '/mate-system/client/page', - Set = '/mate-system/client/set', - Del = '/mate-system/client/del', + list = '/system_proxy/system/client/list', + add = '/system_proxy/system/client/save', + get = '/system_proxy/system/client', + edit = '/system_proxy/system/client/update', + del = '/system_proxy/system/client/remove', + cache = '/system_proxy/system/client/cache' } -// 分页查询 -export const page = (params: ClientParams) => - defHttp.get({ url: Api.Page, params }); +/** 查询客户端列表 */ +export const listClient = (params?: Partial) => defHttp.get({ url: Api.list, params }, { isReturnResultResponse: true }); -// 保存 -export const set = (params: ClientListItem) => - defHttp.post({ url: Api.Set, params }); +/** 新增客户端 */ +export const addClient = (params: Partial) => defHttp.post({ url: Api.add, data: params }); -// 删除 -export const del = (params: { ids: String }) => - defHttp.post({ url: Api.Del + `?ids=${params.ids}` }); +/** 修改客户端 */ +export const editClient = (params: Partial) => defHttp.put({ url: Api.edit, data: params }); + +/** 查询客户端详细 */ +export const getClient = (id: string) => defHttp.get({ url: `${Api.get}/${id}` }); + +/** 删除客户端 */ +export const delClient = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` }); + +/** 清理客户端缓存 */ +export const cleanCache = () => defHttp.put({ url: Api.cache }); diff --git a/kicc-ui/src/api/platform/system/controller/role.ts b/kicc-ui/src/api/platform/system/controller/role.ts index e7ec8832..95dca9f8 100644 --- a/kicc-ui/src/api/platform/system/controller/role.ts +++ b/kicc-ui/src/api/platform/system/controller/role.ts @@ -28,7 +28,7 @@ export const editRole = (params: Partial) => defHttp.put({ url: Api.edit, export const getRole = (id: string) => defHttp.get({ url: `${Api.get}/${id}` }); /** 删除角色 */ -export const delRole = (id: string) => defHttp.delete({ url: `${Api.del}/${id}` }); +export const delRole = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` }); /** 修改角色状态 */ export const changeStatus = (id: string, status: string) => defHttp.put({ url: Api.changeStatus, data: { id: id, status: status } }); diff --git a/kicc-ui/src/api/platform/system/controller/user.ts b/kicc-ui/src/api/platform/system/controller/user.ts index 9ee952b1..3778c33c 100644 --- a/kicc-ui/src/api/platform/system/controller/user.ts +++ b/kicc-ui/src/api/platform/system/controller/user.ts @@ -32,7 +32,7 @@ export const editUser = (params: Partial) => defHttp.put({ url: Api.edit, export const getUser = (id: string) => defHttp.get({ url: `${Api.get}/${id}` }); /** 删除用户 */ -export const delUser = (id: string) => defHttp.delete({ url: `${Api.del}/${id}` }); +export const delUser = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` }); /** 更新密码 */ export const updatePwd = (params: Partial) => defHttp.put({ url: Api.updatePwd, params }); diff --git a/kicc-ui/src/api/platform/system/entity/client.ts b/kicc-ui/src/api/platform/system/entity/client.ts index f3668daf..4f1a3fef 100644 --- a/kicc-ui/src/api/platform/system/entity/client.ts +++ b/kicc-ui/src/api/platform/system/entity/client.ts @@ -1,21 +1,18 @@ /** * @program: kicc-ui - * @description: 文件上传实体类 + * @description: 客户端实体类 * 类型定义 * @author: entfrm开发团队-王翔 * @create: 2022/4/8 */ -import { Page, R } from '/@/api/model'; +import { R } from '/#/axios'; +import { CommonEntity, Page } from '/@/api/common/data/entity'; -// 定义查询参数 -export type ClientParams = Page & { - id?: string; - clientId?: string; -}; +/** 客户端查询参数 */ +export type ClientParams = Page & Client; -// 定义客户端对象 -export interface ClientListItem { - id: string; +/** 客户端对象 */ +export interface Client extends CommonEntity { clientId: string; clientSecret: string; resourceIds: string; @@ -23,13 +20,12 @@ export interface ClientListItem { authorizedGrantTypes: string; webServerRedirectUri: string; authorities: string; - accessTokenValidity: string; - refreshTokenValidity: string; + accessTokenValidity: number; + refreshTokenValidity: number; additionalInformation: string; autoapprove: string; - status: string; - createTime: string; + [key: string]: any; } -// 根据客户端对象生成响应模型 -export type ClientListGetResultModel = R; +/** 客户端响应对象 */ +export type ClientResult = R;