merge

2023-07-10 22:56:42 +08:00 · 2023-07-10 22:56:42 +08:00 · d160c3a61c
commit d160c3a61c
parent 538c52a3ad 81195fd9c8
23 changed files with 828 additions and 134 deletions
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "ruoyi-vue-plus",
-  "version": "5.0.0",
+  "version": "5.1.0",
  "description": "RuoYi-Vue-Plus多租户管理系统",
  "author": "LionLi",
  "license": "MIT",
@ -29,6 +29,7 @@
    "fuse.js": "6.6.2",
    "js-cookie": "3.0.1",
    "jsencrypt": "3.3.1",
+    "crypto-js": "^4.1.1",
    "nprogress": "0.2.0",
    "path-browserify": "1.0.1",
    "path-to-regexp": "6.2.0",
@ -44,6 +45,7 @@
  "devDependencies": {
    "@iconify/json": "^2.2.40",
    "@intlify/unplugin-vue-i18n": "0.8.2",
+    "@types/crypto-js": "^4.1.1",
    "@types/file-saver": "2.0.5",
    "@types/js-cookie": "3.0.3",
    "@types/node": "18.14.2",
--- a/src/api/login.ts
+++ b/src/api/login.ts
@ -3,22 +3,24 @@ import { AxiosPromise } from 'axios';
 import { LoginData, LoginResult, VerifyCodeResult, TenantInfo } from './types';
 import { UserInfo } from '@/api/system/user/types';

+// pc端固定客户端授权id
+const clientId = 'e5cd7e4891bf95d1d19206ce24a7b32e';
+
 /**
 * @param data {LoginData}
 * @returns
 */
 export function login(data: LoginData): AxiosPromise<LoginResult> {
  const params = {
-    tenantId: data.tenantId,
-    username: data.username.trim(),
-    password: data.password,
-    code: data.code,
-    uuid: data.uuid
+    ...data,
+    clientId: data.clientId || clientId,
+    grantType: data.grantType || 'password'
  };
  return request({
    url: '/auth/login',
    headers: {
-      isToken: false
+      isToken: false,
+      isEncrypt: true
    },
    method: 'post',
    data: params
@ -60,19 +62,20 @@ export function getCodeImg(): AxiosPromise<VerifyCodeResult> {
    timeout: 20000
  });
 }
+
 /**
 * 第三方登录
- * @param source 第三方登录类型
- * */
-export function socialLogin(source: string, code: any, state: any): AxiosPromise<any> {
-  const data = {
-    code,
-    state
+ */
+export function callback(data: LoginData): AxiosPromise<any> {
+  const LoginData = {
+    ...data,
+    clientId: clientId,
+    grantType: 'social'
  };
  return request({
-    url: '/auth/social-login/' + source,
-    method: 'get',
-    params: data
+    url: '/auth/social/callback',
+    method: 'post',
+    data: LoginData
  });
 }

--- a/src/api/system/client/index.ts
+++ b/src/api/system/client/index.ts
@ -0,0 +1,80 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ClientVO, ClientForm, ClientQuery } from '@/api/system/client/types';
+
+/**
+ * 查询客户端管理列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listClient = (query?: ClientQuery): AxiosPromise<ClientVO[]> => {
+  return request({
+    url: '/system/client/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询客户端管理详细
+ * @param id
+ */
+export const getClient = (id: string | number): AxiosPromise<ClientVO> => {
+  return request({
+    url: '/system/client/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增客户端管理
+ * @param data
+ */
+export const addClient = (data: ClientForm) => {
+  return request({
+    url: '/system/client',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改客户端管理
+ * @param data
+ */
+export const updateClient = (data: ClientForm) => {
+  return request({
+    url: '/system/client',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除客户端管理
+ * @param id
+ */
+export const delClient = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/system/client/' + id,
+    method: 'delete'
+  });
+};
+
+/**
+ * 状态修改
+ * @param id ID
+ * @param status 状态
+ */
+export function changeStatus(id: number | string, status: string) {
+  const data = {
+    id,
+    status
+  };
+  return request({
+    url: '/system/client/changeStatus',
+    method: 'put',
+    data: data
+  });
+}
--- a/src/api/system/client/types.ts
+++ b/src/api/system/client/types.ts
@ -0,0 +1,138 @@
+export interface ClientVO {
+  /**
+   * id
+   */
+  id: string | number;
+
+  /**
+   * 客户端id
+   */
+  clientId: string | number;
+
+  /**
+   * 客户端key
+   */
+  clientKey: string;
+
+  /**
+   * 客户端秘钥
+   */
+  clientSecret: string;
+
+  /**
+   * 授权类型
+   */
+  grantTypeList: string[];
+
+  /**
+   * 设备类型
+   */
+  deviceType: string;
+
+  /**
+   * token活跃超时时间
+   */
+  activeTimeout: number;
+
+  /**
+   * token固定超时
+   */
+  timeout: number;
+
+  /**
+   * 状态（0正常 1停用）
+   */
+  status: string;
+
+}
+
+export interface ClientForm extends BaseEntity {
+  /**
+   * id
+   */
+  id?: string | number;
+
+  /**
+   * 客户端id
+   */
+  clientId?: string | number;
+
+  /**
+   * 客户端key
+   */
+  clientKey?: string;
+
+  /**
+   * 客户端秘钥
+   */
+  clientSecret?: string;
+
+  /**
+   * 授权类型
+   */
+  grantTypeList?: string[];
+
+  /**
+   * 设备类型
+   */
+  deviceType?: string;
+
+  /**
+   * token活跃超时时间
+   */
+  activeTimeout?: number;
+
+  /**
+   * token固定超时
+   */
+  timeout?: number;
+
+  /**
+   * 状态（0正常 1停用）
+   */
+  status?: string;
+
+}
+
+export interface ClientQuery extends PageQuery {
+  /**
+   * 客户端id
+   */
+  clientId?: string | number;
+
+  /**
+   * 客户端key
+   */
+  clientKey?: string;
+
+  /**
+   * 客户端秘钥
+   */
+  clientSecret?: string;
+
+  /**
+   * 授权类型
+   */
+  grantType?: string;
+
+  /**
+   * 设备类型
+   */
+  deviceType?: string;
+
+  /**
+   * token活跃超时时间
+   */
+  activeTimeout?: number;
+
+  /**
+   * token固定超时
+   */
+  timeout?: number;
+
+  /**
+   * 状态（0正常 1停用）
+   */
+  status?: string;
+
+}
--- a/src/api/types.ts
+++ b/src/api/types.ts
@ -15,19 +15,24 @@ export type RegisterForm = {
 * 登录请求
 */
 export interface LoginData {
-  tenantId: string;
-  username: string;
-  password: string;
+  tenantId?: string;
+  username?: string;
+  password?: string;
  rememberMe?: boolean;
+  socialCode?: string,
+  socialState?: string,
+  source?: string,
  code?: string;
  uuid?: string;
+  clientId: string;
+  grantType: string;
 }

 /**
 * 登录响应
 */
 export interface LoginResult {
-  token: string;
+  access_token: string;
 }

 /**
--- a/src/components/RuoYiDoc/index.vue
+++ b/src/components/RuoYiDoc/index.vue
@ -5,7 +5,7 @@
 </template>

 <script setup>
-const url = ref('https://javalionli.gitee.io/plus-doc');
+const url = ref('https://plus-doc.dromara.org/');

 function goto() {
  window.open(url.value)
--- a/src/layout/components/SocialCallback/index.vue
+++ b/src/layout/components/SocialCallback/index.vue
@ -0,0 +1,82 @@
+<template>
+  <div v-loading="loading" class="social-callback"></div>
+</template>
+
+<script setup lang="ts">
+import { login, callback } from '@/api/login';
+import { setToken } from '@/utils/auth';
+import Cookies from 'js-cookie';
+import { getToken } from '@/utils/auth';
+import { LoginData } from '@/api/types';
+
+const route = useRoute();
+const loading = ref(true);
+
+
+/**
+ * 接收Route传递的参数
+ * @param {Object} route.query.
+ */
+const code = route.query.code as string;
+const state = route.query.state as string;
+const source = route.query.source as string;
+const tenantId = Cookies.get("tenantId") ? Cookies.get("tenantId") as string : '000000';
+
+
+const processResponse = async (res: any) => {
+  if (res.code !== 200) {
+    throw new Error(res.msg);
+  }
+  setToken(res.data.access_token);
+  ElMessage.success(res.msg);
+  location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+};
+
+const handleError = (error: any) => {
+  ElMessage.error(error.message);
+  location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+};
+
+const callbackByCode = async (data: LoginData) => {
+  try {
+    const res = await callback(data);
+    await processResponse(res);
+    loading.value = false;
+  } catch (error) {
+    handleError(error);
+  }
+};
+
+const loginByCode = async (data: LoginData) => {
+  try {
+    const res = await login(data);
+    await processResponse(res);
+    loading.value = false;
+  } catch (error) {
+    handleError(error);
+  }
+};
+
+const init = async () => {
+  const data: LoginData = {
+    socialCode: code,
+    socialState: state,
+    tenantId: tenantId,
+    source: source,
+    clientId: 'e5cd7e4891bf95d1d19206ce24a7b32e',
+    grantType: 'social'
+  };
+
+  if (!getToken()) {
+    await loginByCode(data);
+  } else {
+    await callbackByCode(data);
+  }
+};
+
+onMounted(() => {
+  nextTick(() => {
+    init();
+  });
+});
+</script>
--- a/src/layout/components/SocialLogin/index.vue
+++ b/src/layout/components/SocialLogin/index.vue
@ -1,36 +0,0 @@
-<template>
-  <div v-loading="loading" class="social-login"></div>
-</template>
-
-<script setup lang="ts">
-import {socialLogin} from '@/api/login';
-import {setToken} from '@/utils/auth';
-
-const route = useRoute();
-const router = useRouter();
-
-
-/**
- * 接收Route传递的参数
- * @param {Object} route.query.
- */
-const code = route.query.code;
-const state = route.query.state;
-const source = route.query.source as string;
-const loading = ref(true);
-await socialLogin(source, code, state)
-  .then(async (res) => {
-    if (res.code !== 200) {
-      ElMessage.error(res.msg);
-      router.go(-2);
-      return;
-    }
-    loading.value = false;
-    setToken(res.msg);
-    ElMessage.success('登录成功');
-    router.go(-2);
-  })
-  .catch(() => {
-    loading.value = false;
-  });
-</script>
--- a/src/layout/components/TagsView/ScrollPane.vue
+++ b/src/layout/components/TagsView/ScrollPane.vue
@ -95,7 +95,7 @@ defineExpose({
    bottom: 0px;
  }
  :deep(.el-scrollbar__wrap) {
-    height: 39px;
+    height: 49px;
  }
 }
 </style>
--- a/src/permission.ts
+++ b/src/permission.ts
@ -10,7 +10,7 @@ import useSettingsStore from '@/store/modules/settings';
 import usePermissionStore from '@/store/modules/permission';

 NProgress.configure({ showSpinner: false });
-const whiteList = ['/login', '/register', '/social-login'];
+const whiteList = ['/login', '/register', '/social-callback'];

 router.beforeEach(async (to, from, next) => {
  NProgress.start();
--- a/src/plugins/download.ts
+++ b/src/plugins/download.ts
@ -34,21 +34,29 @@ export default {
  },
  async zip(url: string, name: string) {
    url = baseURL + url;
-    const res = await axios({
-      method: 'get',
-      url: url,
-      responseType: 'blob',
-      headers: {
-        Authorization: 'Bearer ' + getToken(),
-        datasource: localStorage.getItem('dataName')
+    downloadLoadingInstance = ElLoading.service({ text: '正在下载数据，请稍候', background: 'rgba(0, 0, 0, 0.7)' });
+    try {
+      const res = await axios({
+        method: 'get',
+        url: url,
+        responseType: 'blob',
+        headers: {
+          Authorization: 'Bearer ' + getToken(),
+          datasource: localStorage.getItem('dataName')
+        }
+      });
+      const isBlob = blobValidate(res.data);
+      if (isBlob) {
+        const blob = new Blob([res.data], { type: 'application/zip' });
+        FileSaver.saveAs(blob, name);
+      } else {
+        this.printErrMsg(res.data);
      }
-    });
-    const isBlob = blobValidate(res.data);
-    if (isBlob) {
-      const blob = new Blob([res.data], { type: 'application/zip' });
-      FileSaver.saveAs(blob, name);
-    } else {
-      this.printErrMsg(res.data);
+      downloadLoadingInstance.close();
+    } catch (r) {
+      console.error(r)
+      ElMessage.error('下载文件出现错误，请联系管理员！')
+      downloadLoadingInstance.close();
    }
  },
  async printErrMsg(data: any) {
--- a/src/router/index.ts
+++ b/src/router/index.ts
@ -38,9 +38,9 @@ export const constantRoutes: RouteOption[] = [
    ]
  },
  {
-    path: '/social-login',
+    path: '/social-callback',
    hidden: true,
-    component: () => import('@/layout/components/SocialLogin/index.vue')
+    component: () => import('@/layout/components/SocialCallback/index.vue')
  },
  {
    path: '/login',
@ -181,4 +181,5 @@ const router = createRouter({
  }
 });

+
 export default router;
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@ -23,8 +23,8 @@ export const useUserStore = defineStore('user', () => {
    const [err, res] = await to(loginApi(userInfo));
    if (res) {
      const data = res.data;
-      setToken(data.token);
-      token.value = data.token;
+      setToken(data.access_token);
+      token.value = data.access_token;
      return Promise.resolve();
    }
    return Promise.reject(err);
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@ -4,6 +4,6 @@ const tokenStorage = useStorage<null | string>(TokenKey, null);

 export const getToken = () => tokenStorage.value;

-export const setToken = (token: string) => (tokenStorage.value = token);
+export const setToken = (access_token: string) => (tokenStorage.value = access_token);

 export const removeToken = () => (tokenStorage.value = null);
--- a/src/utils/crypto.ts
+++ b/src/utils/crypto.ts
@ -0,0 +1,45 @@
+import CryptoJS from 'crypto-js';
+
+/**
+ * 随机生成32位的字符串
+ * @returns {string}
+ */
+const generateRandomString = () => {
+  const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+  let result = '';
+  const charactersLength = characters.length;
+  for (let i = 0; i < 32; i++) {
+    result += characters.charAt(Math.floor(Math.random() * charactersLength));
+  }
+  return result;
+};
+
+/**
+ * 随机生成aes 密钥
+ * @returns {string}
+ */
+export const generateAesKey = () => {
+  return CryptoJS.enc.Utf8.parse(generateRandomString());
+};
+
+/**
+ * 加密base64
+ * @returns {string}
+ */
+export const encryptBase64 = (str: CryptoJS.lib.WordArray) => {
+  return CryptoJS.enc.Base64.stringify(str);
+};
+
+/**
+ * 使用密钥对数据进行加密
+ * @param message
+ * @param aesKey
+ * @returns {string}
+ */
+export const encryptWithAes = (message: string, aesKey: CryptoJS.lib.WordArray) => {
+  const encrypted = CryptoJS.AES.encrypt(message, aesKey, {
+    mode: CryptoJS.mode.ECB,
+    padding: CryptoJS.pad.Pkcs7
+  });
+  return encrypted.toString();
+};
--- a/src/utils/jsencrypt.ts
+++ b/src/utils/jsencrypt.ts
@ -2,7 +2,8 @@ import JSEncrypt from 'jsencrypt';
 // 密钥对生成 http://web.chacuo.net/netrsakeypair

 const publicKey =
-  'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdH\n' + 'nzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ==';
+  'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdH\n' +
+  'nzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ==';

 const privateKey =
  'MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY\n' +
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@ -8,6 +8,8 @@ import { errorCode } from '@/utils/errorCode';
 import { LoadingInstance } from 'element-plus/es/components/loading/src/loading';
 import FileSaver from 'file-saver';
 import { getLanguage } from '@/lang';
+import { encryptBase64, encryptWithAes, generateAesKey } from '@/utils/crypto';
+import { encrypt } from '@/utils/jsencrypt';

 let downloadLoadingInstance: LoadingInstance;
 // 是否显示重新登录
@ -29,6 +31,8 @@ service.interceptors.request.use(
    const isToken = (config.headers || {}).isToken === false;
    // 是否需要防止数据重复提交
    const isRepeatSubmit = (config.headers || {}).repeatSubmit === false;
+    // 是否需要加密
+    const isEncrypt = (config.headers || {}).isEncrypt === 'true';
    if (getToken() && !isToken) {
      config.headers['Authorization'] = 'Bearer ' + getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改
    }
@ -63,6 +67,13 @@ service.interceptors.request.use(
        }
      }
    }
+    // 当开启参数加密
+    if (isEncrypt && (config.method === 'post' || config.method === 'put')) {
+      // 生成一个 AES 密钥
+      const aesKey = generateAesKey();
+      config.headers['encrypt-key'] = encrypt(encryptBase64(aesKey));
+      config.data = typeof config.data === 'object' ? encryptWithAes(JSON.stringify(config.data), aesKey) : encryptWithAes(config.data, aesKey);
+    }
    // FormData数据去请求头Content-Type
    if (config.data instanceof FormData) {
      delete config.headers['Content-Type'];
--- a/src/views/index.vue
+++ b/src/views/index.vue
@ -33,14 +33,14 @@
          * 部署方式 Docker 容器编排 一键部署业务集群<br />
          * 国际化 SpringMessage Spring标准国际化方案<br />
        </p>
-        <p><b>当前版本:</b> <span>v5.0.0</span></p>
+        <p><b>当前版本:</b> <span>v5.1.0</span></p>
        <p>
          <el-tag type="danger">&yen;免费开源</el-tag>
        </p>
        <p>
          <el-button type="primary" icon="Cloudy" plain @click="goTarget('https://gitee.com/dromara/RuoYi-Vue-Plus')">访问码云</el-button>
          <el-button type="primary" icon="Cloudy" plain @click="goTarget('https://github.com/dromara/RuoYi-Vue-Plus')">访问GitHub</el-button>
-          <el-button type="primary" icon="Cloudy" plain @click="goTarget('https://javalionli.gitee.io/plus-doc/#/ruoyi-vue-plus/changlog')"
+          <el-button type="primary" icon="Cloudy" plain @click="goTarget('https://plus-doc.dromara.org/#/ruoyi-vue-plus/changlog')"
            >更新日志</el-button
          >
        </p>
@ -78,14 +78,14 @@
          * 分布式监控 Prometheus、Grafana 全方位性能监控<br />
          * 其余与 Vue 版本一致<br />
        </p>
-        <p><b>当前版本:</b> <span>v2.0.0</span></p>
+        <p><b>当前版本:</b> <span>v2.1.0</span></p>
        <p>
          <el-tag type="danger">&yen;免费开源</el-tag>
        </p>
        <p>
          <el-button type="primary" icon="Cloudy" plain @click="goTarget('https://gitee.com/dromara/RuoYi-Cloud-Plus')">访问码云</el-button>
          <el-button type="primary" icon="Cloudy" plain @click="goTarget('https://github.com/dromara/RuoYi-Cloud-Plus')">访问GitHub</el-button>
-          <el-button type="primary" icon="Cloudy" plain @click="goTarget('https://javalionli.gitee.io/plus-doc/#/ruoyi-cloud-plus/changlog')"
+          <el-button type="primary" icon="Cloudy" plain @click="goTarget('https://plus-doc.dromara.org/#/ruoyi-cloud-plus/changlog')"
            >更新日志</el-button
          >
        </p>
--- a/src/views/login.vue
+++ b/src/views/login.vue
@ -72,7 +72,7 @@ const userStore = useUserStore();
 const router = useRouter();

 const loginForm = ref<LoginData>({
-  tenantId: "000000",
+  tenantId: '000000',
  username: 'admin',
  password: 'admin123',
  rememberMe: false,
@ -176,6 +176,12 @@ const initTenantList = async () => {
    }
  }
 }
+
+//检测租户选择框的变化
+watch(() => loginForm.value.tenantId, (val: string) => {
+  Cookies.set("tenantId", loginForm.value.tenantId, { expires: 30 })
+});
+
 /**
 * 第三方登录
 * @param type
@ -183,8 +189,9 @@ const initTenantList = async () => {
 const doSocialLogin = (type: string) => {
  authBinding(type).then((res: any) => {
    if (res.code === HttpStatus.SUCCESS) {
-      window.location.href = res.msg;
-  } else {
+      // 获取授权地址跳转
+      window.location.href = res.data;
+    } else {
      ElMessage.error(res.msg);
    }
  });
--- a/src/views/monitor/cache/index.vue
+++ b/src/views/monitor/cache/index.vue
@ -133,56 +133,59 @@ const usedmemory = ref();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;

 const getList = async () => {
-    proxy?.$modal.loading("正在加载缓存监控数据，请稍候！");
-    const res = await getCache();
-    proxy?.$modal.closeLoading();
-    cache.value = res.data;
-    const commandstatsIntance = echarts.init(commandstats.value, "macarons");
-    commandstatsIntance.setOption({
-        tooltip: {
-            trigger: "item",
-            formatter: "{a} <br/>{b} : {c} ({d}%)"
+  proxy?.$modal.loading("正在加载缓存监控数据，请稍候！");
+  const res = await getCache();
+  proxy?.$modal.closeLoading();
+  cache.value = res.data;
+  const commandstatsIntance = echarts.init(commandstats.value, "macarons");
+  commandstatsIntance.setOption({
+    tooltip: {
+      trigger: "item",
+      formatter: "{a} <br/>{b} : {c} ({d}%)"
+    },
+    series: [
+      {
+        name: "命令",
+        type: "pie",
+        roseType: "radius",
+        radius: [15, 95],
+        center: ["50%", "38%"],
+        data: res.data.commandStats,
+        animationEasing: "cubicInOut",
+        animationDuration: 1000
+      }
+    ]
+  });
+  const usedmemoryInstance = echarts.init(usedmemory.value, "macarons");
+  usedmemoryInstance.setOption({
+    tooltip: {
+      formatter: "{b} <br/>{a} : " + cache.value.info.used_memory_human
+    },
+    series: [
+      {
+        name: "峰值",
+        type: "gauge",
+        min: 0,
+        max: 1000,
+        detail: {
+          formatter: cache.value.info.used_memory_human
        },
-        series: [
-            {
-                name: "命令",
-                type: "pie",
-                roseType: "radius",
-                radius: [15, 95],
-                center: ["50%", "38%"],
-                data: res.data.commandStats,
-                animationEasing: "cubicInOut",
-                animationDuration: 1000
-            }
+        data: [
+          {
+            value: parseFloat(cache.value.info.used_memory_human),
+            name: "内存消耗"
+          }
        ]
-    });
-
-    const usedmemoryInstance = echarts.init(usedmemory.value, "macarons");
-    usedmemoryInstance.setOption({
-        tooltip: {
-            formatter: "{b} <br/>{a} : " + cache.value.info.used_memory_human
-        },
-        series: [
-            {
-                name: "峰值",
-                type: "gauge",
-                min: 0,
-                max: 1000,
-                detail: {
-                    formatter: cache.value.info.used_memory_human
-                },
-                data: [
-                    {
-                        value: parseFloat(cache.value.info.used_memory_human),
-                        name: "内存消耗"
-                    }
-                ]
-            }
-        ]
-    })
+      }
+    ]
+  })
+  window.addEventListener("resize",()=>{
+    commandstatsIntance.resize()
+    usedmemoryInstance.resize()
+  });
 }

 onMounted(() => {
-    getList();
+  getList();
 })
 </script>
--- a/src/views/system/client/index.vue
+++ b/src/views/system/client/index.vue
@ -0,0 +1,344 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div class="search" v-show="showSearch">
+        <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="100px">
+          <el-form-item label="客户端key" prop="clientKey">
+            <el-input v-model="queryParams.clientKey" placeholder="请输入客户端key" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="客户端秘钥" prop="clientSecret">
+            <el-input v-model="queryParams.clientSecret" placeholder="请输入客户端秘钥" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="状态" prop="status">
+            <el-select v-model="queryParams.status" placeholder="状态" clearable>
+              <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:client:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:client:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:client:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:client:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="clientList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="id" align="center" prop="id" v-if="true" />
+        <el-table-column label="客户端id" align="center" prop="clientId" />
+        <el-table-column label="客户端key" align="center" prop="clientKey" />
+        <el-table-column label="客户端秘钥" align="center" prop="clientSecret" />
+        <el-table-column label="授权类型" align="center">
+          <template #default="scope">
+            <div>
+              <template v-for="type in scope.row.grantTypeList">
+                <dict-tag class="el-check-tag" :options="sys_grant_type" :value="type" />
+              </template>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="设备类型" align="center">
+          <template #default="scope">
+            <dict-tag :options="sys_device_type" :value="scope.row.deviceType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="Token活跃超时时间" align="center" prop="activeTimeout" />
+        <el-table-column label="Token固定超时时间" align="center" prop="timeout" />
+        <el-table-column label="状态" align="center" key="status">
+          <template #default="scope">
+            <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:client:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:client:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+          v-show="total>0"
+          :total="total"
+          v-model:page="queryParams.pageNum"
+          v-model:limit="queryParams.pageSize"
+          @pagination="getList"
+      />
+    </el-card>
+    <!-- 添加或修改客户端管理对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="clientFormRef" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="客户端key" prop="clientKey">
+          <el-input v-model="form.clientKey" :disabled="form.id != null" placeholder="请输入客户端key" />
+        </el-form-item>
+        <el-form-item label="客户端秘钥" prop="clientSecret">
+          <el-input v-model="form.clientSecret" :disabled="form.id != null" placeholder="请输入客户端秘钥" />
+        </el-form-item>
+        <el-form-item label="授权类型" prop="grantTypeList">
+          <el-select v-model="form.grantTypeList" multiple placeholder="请输入授权类型">
+            <el-option
+              v-for="dict in sys_grant_type"
+              :key="dict.value" :label="dict.label" :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="设备类型" prop="deviceType">
+          <el-select v-model="form.deviceType" placeholder="请输入设备类型">
+            <el-option
+              v-for="dict in sys_device_type"
+              :key="dict.value" :label="dict.label" :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="activeTimeout" label-width="auto">
+          <template #label>
+            <span>
+              <el-tooltip content="指定时间无操作则过期（单位：秒），默认30分钟（1800秒）" placement="top">
+                <el-icon><question-filled /></el-icon>
+              </el-tooltip>
+              Token活跃超时时间
+            </span>
+          </template>
+          <el-input v-model="form.activeTimeout" placeholder="请输入Token活跃超时时间" />
+        </el-form-item>
+        <el-form-item prop="timeout" label-width="auto">
+          <template #label>
+            <span>
+              <el-tooltip content="指定时间必定过期（单位：秒），默认七天（604800秒）" placement="top">
+                <el-icon><question-filled /></el-icon>
+              </el-tooltip>
+              Token固定超时时间
+            </span>
+          </template>
+          <el-input v-model="form.timeout" placeholder="请输入Token固定超时时间" />
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-radio-group v-model="form.status">
+            <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">
+              {{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Client" lang="ts">
+import { listClient, getClient, delClient, addClient, updateClient, changeStatus } from '@/api/system/client';
+import { ClientVO, ClientQuery, ClientForm } from '@/api/system/client/types';
+import { ComponentInternalInstance } from 'vue';
+import { ElForm } from 'element-plus';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { sys_normal_disable } = toRefs<any>(proxy?.useDict("sys_normal_disable"));
+const { sys_grant_type } = toRefs<any>(proxy?.useDict("sys_grant_type"));
+const { sys_device_type } = toRefs<any>(proxy?.useDict("sys_device_type"));
+
+const clientList = ref<ClientVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref(ElForm);
+const clientFormRef = ref(ElForm);
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: ClientForm = {
+  id: undefined,
+  clientId: undefined,
+  clientKey: undefined,
+  clientSecret: undefined,
+  grantTypeList: undefined,
+  deviceType: undefined,
+  activeTimeout: undefined,
+  timeout: undefined,
+  status: undefined,
+}
+const data = reactive<PageData<ClientForm, ClientQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    clientId: undefined,
+    clientKey: undefined,
+    clientSecret: undefined,
+    grantType: undefined,
+    deviceType: undefined,
+    activeTimeout: undefined,
+    timeout: undefined,
+    status: undefined,
+  },
+  rules: {
+    id: [
+      { required: true, message: "id不能为空", trigger: "blur" }
+    ],
+    clientId: [
+      { required: true, message: "客户端id不能为空", trigger: "blur" }
+    ],
+    clientKey: [
+      { required: true, message: "客户端key不能为空", trigger: "blur" }
+    ],
+    clientSecret: [
+      { required: true, message: "客户端秘钥不能为空", trigger: "blur" }
+    ],
+    grantTypeList: [
+      { required: true, message: "授权类型不能为空", trigger: "change" }
+    ],
+    deviceType: [
+      { required: true, message: "设备类型不能为空", trigger: "change" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询客户端管理列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listClient(queryParams.value);
+  clientList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  clientFormRef.value.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: ClientVO[]) => {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  dialog.visible = true;
+  dialog.title = "添加客户端管理";
+  nextTick(() => {
+    reset();
+  });
+}
+
+/** 修改按钮操作 */
+const handleUpdate = (row?: ClientVO) => {
+  loading.value = true
+  dialog.visible = true;
+  dialog.title = "修改客户端管理";
+  nextTick(async () => {
+    reset();
+    const _id = row?.id || ids.value[0]
+    const res = await getClient(_id);
+    loading.value = false;
+    Object.assign(form.value, res.data);
+  });
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  clientFormRef.value.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateClient(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addClient(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("修改成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: ClientVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除客户端管理编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await delClient(_ids);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('system/client/export', {
+    ...queryParams.value
+  }, `client_${new Date().getTime()}.xlsx`)
+}
+
+/** 状态修改  */
+const handleStatusChange = async (row: ClientVO) => {
+  let text = row.status === "0" ? "启用" : "停用"
+  try {
+    await proxy?.$modal.confirm('确认要"' + text + '"吗?');
+    await changeStatus(row.id, row.status);
+    proxy?.$modal.msgSuccess(text + "成功");
+  } catch (err) {
+    row.status = row.status === "0" ? "1" : "0";
+  }
+}
+
+onMounted(() => {
+  getList();
+});
+</script>
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@ -181,7 +181,7 @@
          </el-col>
          <el-col :span="12" v-if="form.menuType === 'C'">
            <el-form-item>
-              <el-input v-model="form.query" placeholder="请输入路由参数" maxlength="255" />
+              <el-input v-model="form.queryParam" placeholder="请输入路由参数" maxlength="255" />
              <template #label>
                <span>
                  <el-tooltip content='访问路由的默认传递参数，如：`{"id": 1, "name": "ry"}`' placement="top">
--- a/src/views/system/user/profile/thirdParty.vue
+++ b/src/views/system/user/profile/thirdParty.vue
@ -80,7 +80,7 @@ const unlockAuth = (row: any) => {
 const authUrl = (source: string) => {
  authBinding(source).then((res: any) => {
    if (res.code === 200) {
-      window.location.href = res.msg;
+      window.location.href = res.data;
    } else {
      ElMessage.error(res.msg);
    }