📀 重构前端框架进行适配后端框架

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<Boolean> removeById(@PathVariable String[] ids) {
 		oauthClientDetailsService.removeClientDetailsByIds(Arrays.asList(ids));

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<RoleMenu>().in(RoleMenu::getRoleId, Arrays.asList(id)));
-        roleService.removeByIds(Arrays.asList(id));
+        roleMenuService.remove(new LambdaQueryWrapper<RoleMenu>().in(RoleMenu::getRoleId, Arrays.asList(ids)));
+        roleService.removeByIds(Arrays.asList(ids));
         return R.ok();
     }
 

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();
     }
 

kicc-ui/src/api/platform/system/controller/client.ts

@@ -1,20 +1,34 @@
-import { ClientParams, ClientListGetResultModel, ClientListItem } from '../entity/client';
+/**
+ * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致
+ * Copyright © 2020-2022 <a href="http://www.entfrm.com/">entfrm</a> 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<ClientListGetResultModel>({ url: Api.Page, params });
+/** 查询客户端列表 */
+export const listClient = (params?: Partial<ClientParams>) => defHttp.get<ClientResult>({ url: Api.list, params }, { isReturnResultResponse: true });
 
-// 保存
-export const set = (params: ClientListItem) =>
-  defHttp.post<ClientListItem>({ url: Api.Set, params });
+/** 新增客户端 */
+export const addClient = (params: Partial<ClientParams>) => defHttp.post({ url: Api.add, data: params });
 
-// 删除
-export const del = (params: { ids: String }) =>
-  defHttp.post<boolean>({ url: Api.Del + `?ids=${params.ids}` });
+/** 修改客户端 */
+export const editClient = (params: Partial<ClientParams>) => defHttp.put({ url: Api.edit, data: params });
+
+/** 查询客户端详细 */
+export const getClient = (id: string) => defHttp.get<Client>({ url: `${Api.get}/${id}` });
+
+/** 删除客户端 */
+export const delClient = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` });
+
+/** 清理客户端缓存 */
+export const cleanCache = () => defHttp.put({ url: Api.cache });

kicc-ui/src/api/platform/system/controller/role.ts

@@ -28,7 +28,7 @@ export const editRole = (params: Partial<Role>) => defHttp.put({ url: Api.edit,
 export const getRole = (id: string) => defHttp.get<Role>({ 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 } });

kicc-ui/src/api/platform/system/controller/user.ts

@@ -32,7 +32,7 @@ export const editUser = (params: Partial<User>) => defHttp.put({ url: Api.edit,
 export const getUser = (id: string) => defHttp.get<ResultVo>({ 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<User>) => defHttp.put({ url: Api.updatePwd, params });

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<ClientListItem>;
+/** 客户端响应对象 */
+export type ClientResult = R<Client[]>;