Merge branch 'dev' of https://gitee.com/dapppp/ruoyi-plus-vben5 into warmflow

apps/web-antd/src/api/monitor/online/index.ts

@@ -36,5 +36,5 @@ export function forceLogout(tokenId: string) {
  * @returns void
  */
 export function forceLogout2(tokenId: string) {
-  return requestClient.postWithMsg<void>(`${Api.root}/${tokenId}`);
+  return requestClient.deleteWithMsg<void>(`${Api.root}/myself/${tokenId}`);
 }

apps/web-antd/src/api/system/menu/index.ts

@@ -1,7 +1,7 @@
-import type { Menu, MenuOption, MenuResp } from './model';
-
 import type { ID, IDS } from '#/api/common';
 
+import type { Menu, MenuOption, MenuResp } from './model';
+
 import { requestClient } from '#/api/request';
 
 enum Api {

apps/web-antd/src/api/system/menu/model.d.ts

@@ -33,6 +33,8 @@ export interface MenuOption {
   weight: number;
   children: MenuOption[];
   key: string; // 实际上不存在 ide报错
+  menuType: string;
+  icon: string;
 }
 
 /**

apps/web-antd/src/api/system/oss/index.ts

@@ -1,7 +1,7 @@
-import type { OssFile } from './model';
-
 import type { ID, IDS, PageQuery, PageResult } from '#/api/common';
 
+import type { OssFile } from './model';
+
 import { ContentTypeEnum } from '#/api/helper';
 import { requestClient } from '#/api/request';