!15 适配登录重构的修改

Merge pull request !15 from MichelleChung/ts

src/api/login.ts

@@ -13,7 +13,9 @@ export function login(data: LoginData): AxiosPromise<LoginResult> {
     username: data.username.trim(),
     password: data.password,
     code: data.code,
-    uuid: data.uuid
+    uuid: data.uuid,
+    clientId: 'e5cd7e4891bf95d1d19206ce24a7b32e',
+    grantType: 'password'
   };
   return request({
     url: '/auth/login',

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

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;
+
+}

src/api/types.ts

@@ -21,13 +21,15 @@ export interface LoginData {
   rememberMe?: boolean;
   code?: string;
   uuid?: string;
+  clientId: string;
+  grantType: string;
 }
 
 /**
  * 登录响应
  */
 export interface LoginResult {
-  token: string;
+  access_token: string;
 }
 
 /**

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);
+      setToken(data.access_token);
-      token.value = data.token;
+      token.value = data.access_token;
       return Promise.resolve();
     }
     return Promise.reject(err);

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

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>