From 442ac82538a78620191711771fa1a2f96e973db3 Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Tue, 19 Sep 2023 11:20:38 +0800
Subject: [PATCH 01/12] =?UTF-8?q?feat=20SQL=E6=9F=A5=E8=AF=A2=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataResultSql.api.ts}                     | 12 ++--
 .../DataResultSqlEdit.vue}                    |  2 +-
 .../DataResultSqlList.vue}                    |  5 +-
 .../modules/develop/query/SqlQuery.api.ts     | 23 +++++++
 .../modules/develop/query/SqlQueryInfo.vue    | 62 +++++++++++++++++++
 5 files changed, 95 insertions(+), 9 deletions(-)
 rename src/views/modules/develop/{query/QuerySql.api.ts => dataresult/DataResultSql.api.ts} (85%)
 rename src/views/modules/develop/{query/QuerySqlEdit.vue => dataresult/DataResultSqlEdit.vue} (98%)
 rename src/views/modules/develop/{query/QuerySqlList.vue => dataresult/DataResultSqlList.vue} (97%)
 create mode 100644 src/views/modules/develop/query/SqlQuery.api.ts
 create mode 100644 src/views/modules/develop/query/SqlQueryInfo.vue

diff --git a/src/views/modules/develop/query/QuerySql.api.ts b/src/views/modules/develop/dataresult/DataResultSql.api.ts
similarity index 85%
rename from src/views/modules/develop/query/QuerySql.api.ts
rename to src/views/modules/develop/dataresult/DataResultSql.api.ts
index 4d60613..4fcb13a 100644
--- a/src/views/modules/develop/query/QuerySql.api.ts
+++ b/src/views/modules/develop/dataresult/DataResultSql.api.ts
@@ -7,7 +7,7 @@ import { BaseEntity } from '/#/web'
  */
 export function page(params) {
   return defHttp.get<Result<PageResult<QuerySql>>>({
-    url: '/query/sql/page',
+    url: '/data/result/page',
     params,
   })
 }
@@ -17,7 +17,7 @@ export function page(params) {
  */
 export function findAll() {
   return defHttp.get<Result<QuerySql[]>>({
-    url: '/query/sql/findAll',
+    url: '/data/result/findAll',
   })
 }
 
@@ -26,7 +26,7 @@ export function findAll() {
  */
 export function get(id) {
   return defHttp.get<Result<QuerySql>>({
-    url: '/query/sql/findById',
+    url: '/data/result/findById',
     params: { id },
   })
 }
@@ -36,7 +36,7 @@ export function get(id) {
  */
 export function add(obj: QuerySql) {
   return defHttp.post({
-    url: '/query/sql/add',
+    url: '/data/result/add',
     data: obj,
   })
 }
@@ -46,7 +46,7 @@ export function add(obj: QuerySql) {
  */
 export function update(obj: QuerySql) {
   return defHttp.post({
-    url: '/query/sql/update',
+    url: '/data/result/update',
     data: obj,
   })
 }
@@ -56,7 +56,7 @@ export function update(obj: QuerySql) {
  */
 export function del(id) {
   return defHttp.delete({
-    url: '/query/sql/delete',
+    url: '/data/result/delete',
     params: { id },
   })
 }
diff --git a/src/views/modules/develop/query/QuerySqlEdit.vue b/src/views/modules/develop/dataresult/DataResultSqlEdit.vue
similarity index 98%
rename from src/views/modules/develop/query/QuerySqlEdit.vue
rename to src/views/modules/develop/dataresult/DataResultSqlEdit.vue
index 485c59c..115ec05 100644
--- a/src/views/modules/develop/query/QuerySqlEdit.vue
+++ b/src/views/modules/develop/dataresult/DataResultSqlEdit.vue
@@ -53,7 +53,7 @@
   import { nextTick, reactive } from 'vue'
   import { $ref } from 'vue/macros'
   import useFormEdit from '/@/hooks/bootx/useFormEdit'
-  import { add, get, update, QuerySql } from './QuerySql.api'
+  import { add, get, update, QuerySql } from './DataResultSql.api'
   import { FormInstance, Rule } from 'ant-design-vue/lib/form'
   import { FormEditType } from '/@/enums/formTypeEnum'
   import { BasicModal } from '/@/components/Modal'
diff --git a/src/views/modules/develop/query/QuerySqlList.vue b/src/views/modules/develop/dataresult/DataResultSqlList.vue
similarity index 97%
rename from src/views/modules/develop/query/QuerySqlList.vue
rename to src/views/modules/develop/dataresult/DataResultSqlList.vue
index 3491264..9621b70 100644
--- a/src/views/modules/develop/query/QuerySqlList.vue
+++ b/src/views/modules/develop/dataresult/DataResultSqlList.vue
@@ -1,3 +1,4 @@
+
 <template>
   <div>
     <div class="m-3 p-3 pt-5 bg-white">
@@ -58,9 +59,9 @@
 <script lang="ts" setup>
   import { onMounted } from 'vue'
   import { $ref } from 'vue/macros'
-  import { del, page } from './QuerySql.api'
+  import { del, page } from './DataResultSql.api'
   import useTablePage from '/@/hooks/bootx/useTablePage'
-  import QuerySqlEdit from './QuerySqlEdit.vue'
+  import QuerySqlEdit from './DataResultSqlEdit.vue'
   import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
   import BQuery from '/@/components/Bootx/Query/BQuery.vue'
   import { FormEditType } from '/@/enums/formTypeEnum'
diff --git a/src/views/modules/develop/query/SqlQuery.api.ts b/src/views/modules/develop/query/SqlQuery.api.ts
new file mode 100644
index 0000000..8747244
--- /dev/null
+++ b/src/views/modules/develop/query/SqlQuery.api.ts
@@ -0,0 +1,23 @@
+import { defHttp } from '/@/utils/http/axios'
+import { Result } from '/#/axios'
+import { BaseEntity } from '/#/web'
+
+/**
+ * 查询全部
+ */
+export function querySql(sql: string) {
+  return defHttp.post<Result<SqlQueryResult>>({
+    url: '/data/result/querySql',
+    data: { sql },
+  })
+}
+
+/**
+ * SQL查询语句
+ */
+export interface SqlQueryResult extends BaseEntity {
+  // 数据源ID
+  fields: string[]
+  // 名称
+  data: object[]
+}
diff --git a/src/views/modules/develop/query/SqlQueryInfo.vue b/src/views/modules/develop/query/SqlQueryInfo.vue
new file mode 100644
index 0000000..bc9af81
--- /dev/null
+++ b/src/views/modules/develop/query/SqlQueryInfo.vue
@@ -0,0 +1,62 @@
+<template>
+  <div>
+    <div class="m-3 p-3 bg-white">
+      <a-textarea v-model:value="sql" show-count allow-clear placeholder="请输入要查询的SQL" :auto-size="{ minRows: 3, maxRows: 10 }" />
+      <a-space style="margin-top: 1.5em">
+        <a-button type="primary" @click="query">查询</a-button>
+        <a-button @click="reset">重置</a-button>
+      </a-space>
+    </div>
+    <div class="m-3 p-3 bg-white">
+      <vxe-toolbar ref="xToolbar" custom />
+      <vxe-table ref="xTable" :data="records" :loading="loading">
+        <vxe-column type="seq" width="60" />
+        <vxe-column v-for="o in fields" :key="o" :field="o" :title="o" />
+      </vxe-table>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { $ref } from 'vue/macros'
+  import { querySql } from '/@/views/modules/develop/query/SqlQuery.api'
+  import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
+  import { onMounted } from 'vue'
+
+  let sql = $ref<string>('')
+  let loading = $ref(false)
+  let records = $ref<object[]>([])
+
+  let fields = $ref<string[]>(['字段1', '字段2', '字段3', '字段4', '字段5', '字段6', '字段7'])
+
+  const xTable = $ref<VxeTableInstance>()
+  const xToolbar = $ref<VxeToolbarInstance>()
+
+  onMounted(() => {
+    vxeBind()
+  })
+
+  function vxeBind() {
+    xTable?.connect(xToolbar as VxeToolbarInstance)
+  }
+
+  function query() {
+    loading = true
+    querySql(sql).then(({ data }) => {
+      fields = data.fields
+      records = data.data
+      loading = false
+    })
+  }
+
+  /**
+   * 重置
+   */
+  function reset() {
+    loading = false
+    records = []
+    fields = ['字段1', '字段2', '字段3', '字段4', '字段5', '字段6', '字段7']
+  }
+</script>
+
+<style lang="less" scoped></style>
-- 
Gitee


From 7e56355beffc5b774e6d3e60a6ed4350ec7d6617 Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Tue, 19 Sep 2023 20:25:14 +0800
Subject: [PATCH 02/12] =?UTF-8?q?feat=20=E6=97=A5=E5=BF=97=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=B8=85=E7=90=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dataUtil.ts                         |  2 +-
 .../modules/monitor/login/LoginLog.api.ts     |  9 +++
 .../modules/monitor/login/LoginLogInfo.vue    |  4 +-
 .../modules/monitor/login/LoginLogList.vue    | 59 ++++++++++++++++---
 .../modules/monitor/operate/OperateLog.api.ts | 10 ++++
 .../monitor/operate/OperateLogList.vue        | 51 ++++++++++++++--
 6 files changed, 120 insertions(+), 15 deletions(-)

diff --git a/src/utils/dataUtil.ts b/src/utils/dataUtil.ts
index ce38e80..3da9ef5 100644
--- a/src/utils/dataUtil.ts
+++ b/src/utils/dataUtil.ts
@@ -41,7 +41,7 @@ export interface Tree {
  * @param fieldValue 要查询的字段值
  * @param fieldName 字段名称
  */
-export function findOneByField(list: any[], fieldValue: object, fieldName: string) {
+export function findOneByField(list: any, fieldValue: object, fieldName: string) {
   const item = unref(list)?.filter((o) => {
     return o[fieldName] === fieldValue
   })
diff --git a/src/views/modules/monitor/login/LoginLog.api.ts b/src/views/modules/monitor/login/LoginLog.api.ts
index c94c9f9..5673c99 100644
--- a/src/views/modules/monitor/login/LoginLog.api.ts
+++ b/src/views/modules/monitor/login/LoginLog.api.ts
@@ -21,6 +21,15 @@ export const get = (id) => {
     params: { id },
   })
 }
+/**
+ * 清除指定天数之前的日志
+ */
+export const deleteByDay = (deleteDay) => {
+  return defHttp.delete<Result>({
+    url: '/log/login/deleteByDay',
+    params: { deleteDay },
+  })
+}
 
 /**
  * 登陆日志
diff --git a/src/views/modules/monitor/login/LoginLogInfo.vue b/src/views/modules/monitor/login/LoginLogInfo.vue
index 49e5165..40eb4ad 100644
--- a/src/views/modules/monitor/login/LoginLogInfo.vue
+++ b/src/views/modules/monitor/login/LoginLogInfo.vue
@@ -18,8 +18,8 @@
   import { findOneByField } from '/@/utils/dataUtil'
 
   const props = defineProps<{
-    clients: Client[]
-    loginTypes: LoginType[]
+    clients?: Client[]
+    loginTypes?: LoginType[]
   }>()
 
   let data = $ref<LoginLog>()
diff --git a/src/views/modules/monitor/login/LoginLogList.vue b/src/views/modules/monitor/login/LoginLogList.vue
index 4f3026f..63627fd 100644
--- a/src/views/modules/monitor/login/LoginLogList.vue
+++ b/src/views/modules/monitor/login/LoginLogList.vue
@@ -4,7 +4,14 @@
       <b-query :query-params="model.queryParam" :fields="fields" @query="queryPage" @reset="resetQueryParams" />
     </div>
     <div class="m-3 p-3 bg-white">
-      <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
+      <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }">
+        <template #buttons>
+          <a-space>
+            <a-select style="width: 180px" v-model:value="deleteDay" :options="deleteDays" allow-clear placeholder="清除多久前的日志" />
+            <a-button v-if="deleteDay" @click="deleteLogs" type="primary">清理</a-button>
+          </a-space>
+        </template>
+      </vxe-toolbar>
       <vxe-table row-id="id" ref="xTable" :data="pagination.records" :loading="loading">
         <vxe-column type="seq" width="60" />
         <vxe-column field="userId" title="用户id" />
@@ -54,7 +61,7 @@
 <script lang="ts" setup>
   import { computed, onMounted, ref } from 'vue'
   import { $ref } from 'vue/macros'
-  import { page } from './LoginLog.api'
+  import { deleteByDay, page } from './LoginLog.api'
   import useTablePage from '/@/hooks/bootx/useTablePage'
   import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
   import BQuery from '/@/components/Bootx/Query/BQuery.vue'
@@ -64,17 +71,30 @@
   import { findAll as findLoginTypes, LoginType } from '/@/views/modules/system/loginType/LoginType.api'
   import { dropdownTranslate, findOneByField } from '/@/utils/dataUtil'
   import LoginLogInfo from './LoginLogInfo.vue'
+  import { LabeledValue } from 'ant-design-vue/lib/select'
+  import { h } from 'vue/dist/vue'
   // 使用hooks
   const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, pages, model, loading } = useTablePage(queryPage)
-  const { notification, createMessage } = useMessage()
+  const { notification, createMessage, createConfirm } = useMessage()
 
   let clients = $ref<Client[]>()
   let loginTypes = $ref<LoginType[]>()
+  const deleteDay = $ref<any>(undefined)
 
   const xTable = $ref<VxeTableInstance>()
   const xToolbar = $ref<VxeToolbarInstance>()
   const loginLogInfo = $ref<any>()
 
+  // 删除条件
+  let deleteDays = $ref<LabeledValue[]>([
+    { value: '3天之前', key: '3' },
+    { value: '7天之前', key: '7' },
+    { value: '30天之前', key: '30' },
+    { value: '60天之前', key: '60' },
+    { value: '90天之前', key: '90' },
+    { value: '180天之前', key: '180' },
+    { value: '350天之前', key: '350' },
+  ])
   // 查询条件
   const fields = computed(() => {
     return [
@@ -112,7 +132,9 @@
     xTable?.connect(xToolbar as VxeToolbarInstance)
   }
 
-  // 分页查询
+  /**
+   * 分页查询
+   */
   function queryPage() {
     loading.value = true
     page({
@@ -123,18 +145,41 @@
       pageQueryResHandel(data)
     })
   }
-  // 查看
+  /**
+   * 查看
+   */
   function show(record) {
     loginLogInfo.show(record.id)
   }
-  // 获取终端信息
+  /**
+   * 获取终端信息
+   */
   function getClient(code) {
     return findOneByField(clients, code, 'code')?.['name']
   }
-  // 获取登录方式信息
+  /**
+   * 获取登录方式信息
+   */
   function getLoginType(code) {
     return findOneByField(loginTypes, code, 'code')?.['name']
   }
+  /**
+   * 清理日志
+   */
+  function deleteLogs() {
+    createConfirm({
+      iconType: 'warning',
+      title: '警告',
+      content: '是否清除指定日期前的日志，该操作不可撤回',
+      onOk: async () => {
+        createMessage.info('清理日志中...')
+        deleteByDay(deleteDay).then(() => {
+          createMessage.success('清理日志成功')
+          queryPage()
+        })
+      },
+    })
+  }
 </script>
 
 <style lang="less" scoped></style>
diff --git a/src/views/modules/monitor/operate/OperateLog.api.ts b/src/views/modules/monitor/operate/OperateLog.api.ts
index 6b65829..9f5a67c 100644
--- a/src/views/modules/monitor/operate/OperateLog.api.ts
+++ b/src/views/modules/monitor/operate/OperateLog.api.ts
@@ -22,6 +22,16 @@ export const get = (id) => {
   })
 }
 
+/**
+ * 清除指定天数之前的日志
+ */
+export const deleteByDay = (deleteDay) => {
+  return defHttp.delete<Result>({
+    url: '/log/operate/deleteByDay',
+    params: { deleteDay },
+  })
+}
+
 /**
  * 操作日志
  */
diff --git a/src/views/modules/monitor/operate/OperateLogList.vue b/src/views/modules/monitor/operate/OperateLogList.vue
index 2aa9b5e..3b00f2e 100644
--- a/src/views/modules/monitor/operate/OperateLogList.vue
+++ b/src/views/modules/monitor/operate/OperateLogList.vue
@@ -4,7 +4,14 @@
       <b-query :query-params="model.queryParam" :fields="fields" @query="queryPage" @reset="resetQueryParams" />
     </div>
     <div class="m-3 p-3 bg-white">
-      <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
+      <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }">
+        <template #buttons>
+          <a-space>
+            <a-select style="width: 180px" v-model:value="deleteDay" :options="deleteDays" allow-clear placeholder="清除多久前的日志" />
+            <a-button v-if="deleteDay" @click="deleteLogs" type="primary">清理</a-button>
+          </a-space>
+        </template>
+      </vxe-toolbar>
       <vxe-table row-id="id" ref="xTable" :data="pagination.records" :loading="loading">
         <vxe-column type="seq" width="60" />
         <vxe-column field="operateId" title="操作人员id" />
@@ -48,7 +55,7 @@
 <script lang="ts" setup>
   import { onMounted, ref } from 'vue'
   import { $ref } from 'vue/macros'
-  import { page } from './OperateLog.api'
+  import { page, deleteByDay } from './OperateLog.api'
   import useTablePage from '/@/hooks/bootx/useTablePage'
   import OperateLogEdit from './OperateLogInfo.vue'
   import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
@@ -57,11 +64,24 @@
   import { useMessage } from '/@/hooks/web/useMessage'
   import { QueryField } from '/@/components/Bootx/Query/Query'
   import { useDict } from '/@/hooks/bootx/useDict'
+  import { LabeledValue } from "ant-design-vue/lib/select";
 
   // 使用hooks
   const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, pages, model, loading } = useTablePage(queryPage)
-  const { notification, createMessage } = useMessage()
+  const { notification, createMessage, createConfirm } = useMessage()
   const { dictConvert } = useDict()
+
+  const deleteDay = $ref<any>(undefined)
+  // 删除条件
+  let deleteDays = $ref<LabeledValue[]>([
+    { value: '3天之前', key: '3' },
+    { value: '7天之前', key: '7' },
+    { value: '30天之前', key: '30' },
+    { value: '60天之前', key: '60' },
+    { value: '90天之前', key: '90' },
+    { value: '180天之前', key: '180' },
+    { value: '350天之前', key: '350' },
+  ])
   // 查询条件
   const fields = [
     { field: 'title', type: 'string', name: '操作模块', placeholder: '请输入操作模块' },
@@ -80,7 +100,9 @@
     xTable?.connect(xToolbar as VxeToolbarInstance)
   }
 
-  // 分页查询
+  /**
+   * 分页查询
+   */
   function queryPage() {
     loading.value = true
     page({
@@ -91,10 +113,29 @@
     })
     return Promise.resolve()
   }
-  // 查看
+  /**
+   * 查看
+   */
   function show(record) {
     operateLogEdit.show(record.id)
   }
+  /**
+   * 清理日志
+   */
+  function deleteLogs() {
+    createConfirm({
+      iconType: 'warning',
+      title: '警告',
+      content: '是否清除指定日期前的日志，该操作不可撤回',
+      onOk: async () => {
+        createMessage.info('清理日志中...')
+        deleteByDay(deleteDay).then(() => {
+          createMessage.success('清理日志成功')
+          queryPage()
+        })
+      },
+    })
+  }
 </script>
 
 <style lang="less" scoped></style>
-- 
Gitee


From 6b1cc3cd8da7c0b3508f2be80eae4a9d4c1680b5 Mon Sep 17 00:00:00 2001
From: nws <3239709711@qq.com>
Date: Tue, 10 Oct 2023 21:39:15 +0800
Subject: [PATCH 03/12] =?UTF-8?q?feat=20=E5=AF=86=E7=A0=81=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../password/PasswordSecurityConfig.api.ts    |  94 +++++++++
 .../password/PasswordSecurityConfigEdit.vue   | 151 ++++++++++++++
 .../password/PasswordSecurityConfigList.vue   | 193 ++++++++++++++++++
 3 files changed, 438 insertions(+)
 create mode 100644 src/views/modules/system/security/password/PasswordSecurityConfig.api.ts
 create mode 100644 src/views/modules/system/security/password/PasswordSecurityConfigEdit.vue
 create mode 100644 src/views/modules/system/security/password/PasswordSecurityConfigList.vue

diff --git a/src/views/modules/system/security/password/PasswordSecurityConfig.api.ts b/src/views/modules/system/security/password/PasswordSecurityConfig.api.ts
new file mode 100644
index 0000000..d983cb3
--- /dev/null
+++ b/src/views/modules/system/security/password/PasswordSecurityConfig.api.ts
@@ -0,0 +1,94 @@
+import { defHttp } from '/@/utils/http/axios'
+import { PageResult, Result } from '/#/axios'
+import { BaseEntity } from '/#/web'
+
+/**
+ * 分页
+ */
+export function page(params) {
+  return defHttp.get<Result<PageResult<PasswordSecurityConfig>>>({
+    url: '/security/password/page',
+    params,
+  })
+}
+
+/**
+ * 查询全部
+ */
+export function findAll() {
+  return defHttp.get<Result<PasswordSecurityConfig[]>>({
+    url: '/security/password/findAll',
+  })
+}
+
+/**
+ * 获取单条
+ */
+export function get(id) {
+  return defHttp.get<Result<PasswordSecurityConfig>>({
+    url: '/security/password/findById',
+    params: { id },
+  })
+}
+
+/**
+ * 添加
+ */
+export function add(obj: PasswordSecurityConfig) {
+  return defHttp.post({
+    url: '/security/password/add',
+    data: obj,
+  })
+}
+
+/**
+ * 更新
+ */
+export function update(obj: PasswordSecurityConfig) {
+  return defHttp.post({
+    url: '/security/password/update',
+    data: obj,
+  })
+}
+
+/**
+ * 删除
+ */
+export function del(id) {
+  return defHttp.delete({
+    url: '/security/password/delete',
+    params: { id },
+  })
+}
+
+/**
+ * 批量删除
+ */
+export function deleteBatch(ids) {
+  return defHttp.delete({
+    url: '/security/password/template/delete',
+    data: ids,
+  })
+}
+
+/**
+ * 密码安全策略
+ */
+export interface PasswordSecurityConfig extends BaseEntity {
+  // 最大密码错误数
+  maxPwdErrorCount?: number
+  // 密码错误锁定时间(分钟)
+  errorLockTime?: number
+  // 强制修改初始密码
+  requireChangePwd?: boolean
+  // 强制修改初始密码
+  defaultPassword?: string
+  // 更新频率
+  updateFrequency?: number
+  // 到期提醒(天数)
+  expireRemind?: number
+  // 与登录名相同
+  sameAsLoginName?: boolean
+  // 不能与近期多少次密码相同
+  recentPassword?: number
+}
diff --git a/src/views/modules/system/security/password/PasswordSecurityConfigEdit.vue b/src/views/modules/system/security/password/PasswordSecurityConfigEdit.vue
new file mode 100644
index 0000000..457b1db
--- /dev/null
+++ b/src/views/modules/system/security/password/PasswordSecurityConfigEdit.vue
@@ -0,0 +1,151 @@
+<template>
+  <basic-modal
+    v-bind="$attrs"
+    :loading="confirmLoading"
+    :title="title"
+    :width="modalWidth"
+    :visible="visible"
+    :mask-closable="showable"
+    @cancel="handleCancel"
+  >
+    <a-form
+      class="small-from-item"
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :validate-trigger="['blur', 'change']"
+      :label-col="labelCol"
+      :wrapper-col="wrapperCol"
+    >
+      <a-form-item label="主键" name="id" :hidden="true">
+        <a-input v-model:value="form.id" :disabled="showable" />
+      </a-form-item>
+      <a-form-item label="最大密码错误数" name="maxPwdErrorCount">
+        <a-input v-model:value="form.maxPwdErrorCount" :disabled="showable" placeholder="请输入最大密码错误数" />
+      </a-form-item>
+      <a-form-item label="密码错误锁定时间(分钟)" name="errorLockTime">
+        <a-input v-model:value="form.errorLockTime" :disabled="showable" placeholder="请输入密码错误锁定时间(分钟)" />
+      </a-form-item>
+      <a-form-item label="强制修改初始密码" name="requireChangePwd">
+        <a-input v-model:value="form.requireChangePwd" :disabled="showable" placeholder="请输入强制修改初始密码" />
+      </a-form-item>
+      <a-form-item label="强制修改初始密码" name="defaultPassword">
+        <a-input v-model:value="form.defaultPassword" :disabled="showable" placeholder="请输入强制修改初始密码" />
+      </a-form-item>
+      <a-form-item label="更新频率" name="updateFrequency">
+        <a-input v-model:value="form.updateFrequency" :disabled="showable" placeholder="请输入更新频率" />
+      </a-form-item>
+      <a-form-item label="到期提醒(天数)" name="expireRemind">
+        <a-input v-model:value="form.expireRemind" :disabled="showable" placeholder="请输入到期提醒(天数)" />
+      </a-form-item>
+      <a-form-item label="与登录名相同" name="sameAsLoginName">
+        <a-input v-model:value="form.sameAsLoginName" :disabled="showable" placeholder="请输入与登录名相同" />
+      </a-form-item>
+      <a-form-item label="不能与近期多少次密码相同" name="recentPassword">
+        <a-input v-model:value="form.recentPassword" :disabled="showable" placeholder="请输入不能与近期多少次密码相同" />
+      </a-form-item>
+    </a-form>
+    <template #footer>
+      <a-space>
+        <a-button key="cancel" @click="handleCancel">取消</a-button>
+        <a-button v-if="!showable" key="forward" :loading="confirmLoading" type="primary" @click="handleOk">保存</a-button>
+      </a-space>
+    </template>
+  </basic-modal>
+</template>
+
+<script lang="ts" setup>
+  import { nextTick, reactive } from 'vue'
+  import { $ref } from 'vue/macros'
+  import useFormEdit from '/@/hooks/bootx/useFormEdit'
+  import { add, get, update, PasswordSecurityConfig } from './PasswordSecurityConfig.api'
+  import { FormInstance, Rule } from 'ant-design-vue/lib/form'
+  import { FormEditType } from '/@/enums/formTypeEnum'
+  import { BasicModal } from '/@/components/Modal'
+  const {
+    initFormEditType,
+    handleCancel,
+    search,
+    labelCol,
+    wrapperCol,
+    modalWidth,
+    title,
+    confirmLoading,
+    visible,
+    editable,
+    showable,
+    formEditType,
+  } = useFormEdit()
+  // 表单
+  const formRef = $ref<FormInstance>()
+  let form = $ref<PasswordSecurityConfig>({
+    id: null,
+    maxPwdErrorCount: null,
+    errorLockTime: null,
+    requireChangePwd: null,
+    defaultPassword: null,
+    updateFrequency: null,
+    expireRemind: null,
+    sameAsLoginName: null,
+    recentPassword: null,
+  })
+  // 校验
+  const rules = reactive({} as Record<string, Rule[]>)
+  // 事件
+  const emits = defineEmits(['ok'])
+
+  /**
+   * 入口
+   */
+  function init(id, editType: FormEditType) {
+    initFormEditType(editType)
+    resetForm()
+    getInfo(id, editType)
+  }
+
+  /**
+   * 获取信息
+   */
+  function getInfo(id, editType: FormEditType) {
+    if ([FormEditType.Edit, FormEditType.Show].includes(editType)) {
+      confirmLoading.value = true
+      get(id).then(({ data }) => {
+        form = data
+        confirmLoading.value = false
+      })
+    } else {
+      confirmLoading.value = false
+    }
+  }
+
+  /**
+   * 保存
+   */
+  function handleOk() {
+    formRef?.validate().then(async () => {
+      confirmLoading.value = true
+      if (formEditType.value === FormEditType.Add) {
+        await add(form)
+      } else if (formEditType.value === FormEditType.Edit) {
+        await update(form)
+      }
+      confirmLoading.value = false
+      handleCancel()
+      emits('ok')
+    })
+  }
+
+  /**
+   * 重置表单
+   */
+  function resetForm() {
+    nextTick(() => {
+      formRef?.resetFields()
+    })
+  }
+  defineExpose({
+    init,
+  })
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/modules/system/security/password/PasswordSecurityConfigList.vue b/src/views/modules/system/security/password/PasswordSecurityConfigList.vue
new file mode 100644
index 0000000..93c8920
--- /dev/null
+++ b/src/views/modules/system/security/password/PasswordSecurityConfigList.vue
@@ -0,0 +1,193 @@
+<template>
+  <div>
+    <div class="m-3 p-3 pt-5 bg-white">
+      <b-query :query-params="model.queryParam" :fields="fields" @query="queryPage" @reset="resetQueryParams" />
+    </div>
+    <div class="m-3 p-3 bg-white">
+      <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }">
+        <template #buttons>
+          <a-space>
+            <a-button type="primary" pre-icon="ant-design:plus-outlined" @click="add">新建</a-button>
+            <a-dropdown v-if="batchOperateFlag">
+              <a-button post-icon="ant-design:down-outlined"> 批量操作 </a-button>
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item>
+                    <a-link @click="removeBatch">批量删除</a-link>
+                  </a-menu-item>
+                </a-menu>
+              </template>
+            </a-dropdown>
+          </a-space>
+        </template>
+      </vxe-toolbar>
+      <vxe-table
+        row-id="id"
+        ref="xTable"
+        :data="pagination.records"
+        :loading="loading"
+        @checkbox-all="selectAllEvent"
+        @checkbox-change="selectChangeEvent"
+      >
+        <vxe-column type="checkbox" width="50" />
+        <vxe-column field="maxPwdErrorCount" title="最大密码错误数" />
+        <vxe-column field="errorLockTime" title="密码错误锁定时间(分钟)" />
+        <vxe-column field="requireChangePwd" title="强制修改初始密码" />
+        <vxe-column field="defaultPassword" title="强制修改初始密码" />
+        <vxe-column field="updateFrequency" title="更新频率" />
+        <vxe-column field="expireRemind" title="到期提醒(天数)" />
+        <vxe-column field="sameAsLoginName" title="与登录名相同" />
+        <vxe-column field="recentPassword" title="不能与近期多少次密码相同" />
+        <vxe-column field="createTime" title="创建时间" />
+        <vxe-column fixed="right" width="150" :showOverflow="false" title="操作">
+          <template #default="{ row }">
+            <span>
+              <a-link @click="show(row)">查看</a-link>
+            </span>
+            <a-divider type="vertical" />
+            <span>
+              <a-link @click="edit(row)">编辑</a-link>
+            </span>
+            <a-divider type="vertical" />
+            <span>
+              <a-link danger @click="remove(row)">删除</a-link>
+            </span>
+          </template>
+        </vxe-column>
+      </vxe-table>
+      <vxe-pager
+        size="medium"
+        :loading="loading"
+        :current-page="pagination.current"
+        :page-size="pagination.size"
+        :total="pagination.total"
+        @page-change="handleTableChange"
+      />
+      <password-security-config-edit ref="passwordSecurityConfigEdit" @ok="queryPage" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { onMounted } from 'vue'
+  import { $ref } from 'vue/macros'
+  import { del, deleteBatch, page } from './PasswordSecurityConfig.api'
+  import useTablePage from '/@/hooks/bootx/useTablePage'
+  import PasswordSecurityConfigEdit from './PasswordSecurityConfigEdit.vue'
+  import { VxeTableInstance, VxeToolbarInstance, VxeTable, VxeColumn, VxePager, VxeToolbar } from 'vxe-table'
+  import BQuery from '/@/components/Bootx/Query/BQuery.vue'
+  import { FormEditType } from '/@/enums/formTypeEnum'
+  import { useMessage } from '/@/hooks/web/useMessage'
+  import { QueryField } from '/@/components/Bootx/Query/Query'
+  import ALink from '/@/components/Link/Link.vue'
+
+  // 使用hooks
+  const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, pages, batchOperateFlag, model, loading } =
+    useTablePage(queryPage)
+  const { notification, createMessage, createConfirm } = useMessage()
+
+  // 查询条件
+  const fields = [] as QueryField[]
+
+  const xTable = $ref<VxeTableInstance>()
+  const xToolbar = $ref<VxeToolbarInstance>()
+  const passwordSecurityConfigEdit = $ref<any>()
+
+  onMounted(() => {
+    vxeBind()
+    queryPage()
+  })
+
+  /**
+   * 初始化绑定
+   */
+  function vxeBind() {
+    xTable?.connect(xToolbar as VxeToolbarInstance)
+  }
+
+  /**
+   * 分页查询
+   */
+  function queryPage() {
+    loading.value = true
+    page({
+      ...model.queryParam,
+      ...pages,
+    }).then(({ data }) => {
+      pageQueryResHandel(data)
+    })
+    return Promise.resolve()
+  }
+
+  /**
+   * 选中全部
+   */
+  function selectAllEvent() {
+    const records = xTable?.getCheckboxRecords()
+    batchOperateFlag.value = !!records?.length
+  }
+  /**
+   * 选中事件
+   */
+  function selectChangeEvent() {
+    const records = xTable?.getCheckboxRecords()
+    batchOperateFlag.value = !!records?.length
+  }
+
+  /**
+   * 新增
+   */
+  function add() {
+    passwordSecurityConfigEdit.init(null, FormEditType.Add)
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    passwordSecurityConfigEdit.init(record.id, FormEditType.Edit)
+  }
+
+  /**
+   * 查看
+   */
+  function show(record) {
+    passwordSecurityConfigEdit.init(record.id, FormEditType.Show)
+  }
+
+  /**
+   * 删除
+   */
+  function remove(record) {
+    createConfirm({
+      iconType: 'warning',
+      title: '警告',
+      content: '是否删除该数据',
+      onOk: () => {
+        del(record.id).then(() => {
+          createMessage.success('删除成功')
+          queryPage()
+        })
+      },
+    })
+  }
+  /**
+   * 批量删除
+   */
+  function removeBatch() {
+    createConfirm({
+      iconType: 'warning',
+      title: '警告',
+      content: '是否删除选中的数据',
+      onOk: () => {
+        const ids = xTable?.getCheckboxRecords().map((o) => o.id)
+        deleteBatch(ids).then(() => {
+          createMessage.success('删除成功')
+          queryPage()
+        })
+      },
+    })
+  }
+</script>
+
+<style lang="less" scoped></style>
-- 
Gitee


From ecde7701c2d5a07eb22026d7a5e1d95d54a52eca Mon Sep 17 00:00:00 2001
From: nws <3239709711@qq.com>
Date: Wed, 11 Oct 2023 23:23:24 +0800
Subject: [PATCH 04/12] =?UTF-8?q?feat=20=E8=81=94=E8=B0=83=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=B8=85=E9=99=A4=E5=8A=9F=E8=83=BD=E5=92=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96redis=E5=92=8C=E7=B3=BB=E7=BB=9F=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=9B=91=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/monitor/login/LoginLogList.vue  | 15 ++++++++-------
 .../modules/monitor/operate/OperateLogList.vue    | 14 +++++++-------
 .../modules/monitor/redis/RedisInfoMonitor.vue    |  1 +
 .../modules/monitor/system/SystemInfoMonitor.vue  |  3 ++-
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/views/modules/monitor/login/LoginLogList.vue b/src/views/modules/monitor/login/LoginLogList.vue
index 63627fd..c32c030 100644
--- a/src/views/modules/monitor/login/LoginLogList.vue
+++ b/src/views/modules/monitor/login/LoginLogList.vue
@@ -87,13 +87,13 @@
 
   // 删除条件
   let deleteDays = $ref<LabeledValue[]>([
-    { value: '3天之前', key: '3' },
-    { value: '7天之前', key: '7' },
-    { value: '30天之前', key: '30' },
-    { value: '60天之前', key: '60' },
-    { value: '90天之前', key: '90' },
-    { value: '180天之前', key: '180' },
-    { value: '350天之前', key: '350' },
+    { label: '3天之前', value: '3' },
+    { label: '7天之前', value: '7' },
+    { label: '30天之前', value: '30' },
+    { label: '60天之前', value: '60' },
+    { label: '90天之前', value: '90' },
+    { label: '180天之前', value: '180' },
+    { label: '365天之前', value: '365' },
   ])
   // 查询条件
   const fields = computed(() => {
@@ -121,6 +121,7 @@
    */
   function initClientAndLoginType() {
     findClients().then(({ data }) => {
+      console.log(data)
       clients = data
     })
     findLoginTypes().then(({ data }) => {
diff --git a/src/views/modules/monitor/operate/OperateLogList.vue b/src/views/modules/monitor/operate/OperateLogList.vue
index 3b00f2e..ef4ac8e 100644
--- a/src/views/modules/monitor/operate/OperateLogList.vue
+++ b/src/views/modules/monitor/operate/OperateLogList.vue
@@ -74,13 +74,13 @@
   const deleteDay = $ref<any>(undefined)
   // 删除条件
   let deleteDays = $ref<LabeledValue[]>([
-    { value: '3天之前', key: '3' },
-    { value: '7天之前', key: '7' },
-    { value: '30天之前', key: '30' },
-    { value: '60天之前', key: '60' },
-    { value: '90天之前', key: '90' },
-    { value: '180天之前', key: '180' },
-    { value: '350天之前', key: '350' },
+    { label: '3天之前', value: '3' },
+    { label: '7天之前', value: '7' },
+    { label: '30天之前', value: '30' },
+    { label: '60天之前', value: '60' },
+    { label: '90天之前', value: '90' },
+    { label: '180天之前', value: '180' },
+    { label: '365天之前', value: '365' },
   ])
   // 查询条件
   const fields = [
diff --git a/src/views/modules/monitor/redis/RedisInfoMonitor.vue b/src/views/modules/monitor/redis/RedisInfoMonitor.vue
index 378795a..4b2434b 100644
--- a/src/views/modules/monitor/redis/RedisInfoMonitor.vue
+++ b/src/views/modules/monitor/redis/RedisInfoMonitor.vue
@@ -131,6 +131,7 @@
    * 加载页面
    */
   onMounted(() => {
+    getInfo()
     resume()
   })
 
diff --git a/src/views/modules/monitor/system/SystemInfoMonitor.vue b/src/views/modules/monitor/system/SystemInfoMonitor.vue
index 88e64d0..dc6d1af 100644
--- a/src/views/modules/monitor/system/SystemInfoMonitor.vue
+++ b/src/views/modules/monitor/system/SystemInfoMonitor.vue
@@ -63,7 +63,7 @@
             <a-typography-text
               :style="{ width: '200px' }"
               :ellipsis="{ tooltip: hardwareInfo.cpuModel }"
-              :content="hardwareInfo.cpuModel"
+              :content="hardwareInfo.cpuModel || ''"
             />
           </td>
           <td>CPU核数：</td>
@@ -155,6 +155,7 @@
   const { pause, resume } = useIntervalFn(() => getSysInfo(), 1000 * 5, { immediate: true })
 
   onMounted(() => {
+    getSysInfo()
     resume()
   })
 
-- 
Gitee


From f05b2a0ac2439b698c7082dc870668428b9f07c3 Mon Sep 17 00:00:00 2001
From: nws <3239709711@qq.com>
Date: Thu, 12 Oct 2023 23:44:17 +0800
Subject: [PATCH 05/12] =?UTF-8?q?feat=20=E5=AF=BC=E5=87=BASQL=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/develop/query/SqlQuery.api.ts     | 11 ++++++++
 .../modules/develop/query/SqlQueryInfo.vue    | 25 ++++++++++++++++---
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/develop/query/SqlQuery.api.ts b/src/views/modules/develop/query/SqlQuery.api.ts
index 8747244..bb996bc 100644
--- a/src/views/modules/develop/query/SqlQuery.api.ts
+++ b/src/views/modules/develop/query/SqlQuery.api.ts
@@ -12,6 +12,17 @@ export function querySql(sql: string) {
   })
 }
 
+/**
+ *  导出查询结果
+ */
+export function exportQueryResult(sql: string) {
+  return defHttp.post<BlobPart>({
+    url: '/data/result/exportQueryResult',
+    responseType: 'blob',
+    data: { sql },
+  })
+}
+
 /**
  * SQL查询语句
  */
diff --git a/src/views/modules/develop/query/SqlQueryInfo.vue b/src/views/modules/develop/query/SqlQueryInfo.vue
index bc9af81..1fdad99 100644
--- a/src/views/modules/develop/query/SqlQueryInfo.vue
+++ b/src/views/modules/develop/query/SqlQueryInfo.vue
@@ -4,12 +4,13 @@
       <a-textarea v-model:value="sql" show-count allow-clear placeholder="请输入要查询的SQL" :auto-size="{ minRows: 3, maxRows: 10 }" />
       <a-space style="margin-top: 1.5em">
         <a-button type="primary" @click="query">查询</a-button>
-        <a-button @click="reset">重置</a-button>
+        <a-button type="default" @click="exportResult">导出</a-button>
+        <a-button danger @click="reset">重置</a-button>
       </a-space>
     </div>
     <div class="m-3 p-3 bg-white">
-      <vxe-toolbar ref="xToolbar" custom />
-      <vxe-table ref="xTable" :data="records" :loading="loading">
+      <vxe-toolbar ref="xToolbar" custom export />
+      <vxe-table ref="xTable" :data="records" :loading="loading" :export-config="{}">
         <vxe-column type="seq" width="60" />
         <vxe-column v-for="o in fields" :key="o" :field="o" :title="o" />
       </vxe-table>
@@ -19,9 +20,10 @@
 
 <script lang="ts" setup>
   import { $ref } from 'vue/macros'
-  import { querySql } from '/@/views/modules/develop/query/SqlQuery.api'
+  import { exportQueryResult, querySql } from '/@/views/modules/develop/query/SqlQuery.api'
   import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
   import { onMounted } from 'vue'
+  import { downloadByData } from '/@/utils/file/download'
 
   let sql = $ref<string>('')
   let loading = $ref(false)
@@ -40,6 +42,9 @@
     xTable?.connect(xToolbar as VxeToolbarInstance)
   }
 
+  /**
+   * 查询结果
+   */
   function query() {
     loading = true
     querySql(sql).then(({ data }) => {
@@ -49,6 +54,18 @@
     })
   }
 
+  /**
+   * 导出结果
+   */
+  function exportResult() {
+    loading = true
+    exportQueryResult(sql).then((response) => {
+      downloadByData(response, '查询结果.xlsx')
+      loading = false
+    })
+  }
+
+
   /**
    * 重置
    */
-- 
Gitee


From b851a21113fe0feb3b27424a77a3e04535e49f14 Mon Sep 17 00:00:00 2001
From: nws <3239709711@qq.com>
Date: Sat, 14 Oct 2023 00:21:01 +0800
Subject: [PATCH 06/12] =?UTF-8?q?ref=20=E6=94=AF=E6=8C=81=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E5=90=8E=E9=87=8D=E5=AE=9A=E5=90=91,=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E5=92=8C=E8=B7=AF=E7=94=B1=E5=AE=88=E5=8D=AB=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84,=20=E9=87=8D=E6=9E=84=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=93=8D=E4=BD=9C=E8=A1=8C=E4=B8=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/enums/pageEnum.ts                       |   4 +-
 src/hooks/web/usePermission.ts              |  18 +---
 src/logics/websocket/UserGlobalWebSocker.ts |   3 +
 src/router/guard/permissionGuard.ts         |  52 +++-------
 src/store/action/userAction.ts              |  27 +++++
 src/store/modules/user.ts                   | 103 +++++---------------
 src/utils/http/axios/index.ts               |  56 +++++------
 src/views/login/LoginForm.vue               |   2 +-
 src/views/login/QrCodeForm.vue              |   1 -
 src/views/login/useLogin.ts                 |   5 +-
 types/axios.d.ts                            |   6 +-
 11 files changed, 104 insertions(+), 173 deletions(-)
 create mode 100644 src/store/action/userAction.ts

diff --git a/src/enums/pageEnum.ts b/src/enums/pageEnum.ts
index 49b0a64..420b05e 100644
--- a/src/enums/pageEnum.ts
+++ b/src/enums/pageEnum.ts
@@ -1,5 +1,5 @@
 export enum PageEnum {
-  // 登录
+  // 登录页
   BASE_LOGIN = '/login',
   // 个人设置
   ACCOUNT_SETTING = '/account/setting',
@@ -9,6 +9,6 @@ export enum PageEnum {
   BASE_HOME = '/dashboard',
   // 异常页
   ERROR_PAGE = '/exception',
-  // error log page path
+  // 错误日志页面路径
   ERROR_LOG_PAGE = '/error-log/list',
 }
diff --git a/src/hooks/web/usePermission.ts b/src/hooks/web/usePermission.ts
index 06895a0..a862d6a 100644
--- a/src/hooks/web/usePermission.ts
+++ b/src/hooks/web/usePermission.ts
@@ -81,22 +81,6 @@ export function usePermission() {
     return true
   }
 
-  /**
-   * Change roles
-   * @param roles
-   */
-  async function changeRole(roles: RoleEnum | RoleEnum[]): Promise<void> {
-    if (projectSetting.permissionMode !== PermissionModeEnum.ROUTE_MAPPING) {
-      throw new Error('Please switch PermissionModeEnum to ROUTE_MAPPING mode in the configuration to operate!')
-    }
-
-    if (!isArray(roles)) {
-      roles = [roles]
-    }
-    userStore.setRoleList(roles)
-    await resume()
-  }
-
   /**
    * refresh menu data
    */
@@ -104,5 +88,5 @@ export function usePermission() {
     resume()
   }
 
-  return { changeRole, hasPermission, togglePermissionMode, refreshMenu }
+  return { hasPermission, togglePermissionMode, refreshMenu }
 }
diff --git a/src/logics/websocket/UserGlobalWebSocker.ts b/src/logics/websocket/UserGlobalWebSocker.ts
index 4248384..4404123 100644
--- a/src/logics/websocket/UserGlobalWebSocker.ts
+++ b/src/logics/websocket/UserGlobalWebSocker.ts
@@ -13,6 +13,9 @@ const { notification } = useMessage()
 // websocket关闭
 let wsClose: WebSocket['close']
 
+/**
+ * 初始化用户是否加载
+ */
 export async function initWebSocket() {
   const userStore = useUserStoreWithOut()
   const token = userStore.getToken
diff --git a/src/router/guard/permissionGuard.ts b/src/router/guard/permissionGuard.ts
index cd1eb99..24e97a9 100644
--- a/src/router/guard/permissionGuard.ts
+++ b/src/router/guard/permissionGuard.ts
@@ -1,39 +1,34 @@
 import type { Router, RouteRecordRaw } from 'vue-router'
 
 import { usePermissionStoreWithOut } from '/@/store/modules/permission'
-
 import { PageEnum } from '/@/enums/pageEnum'
 import { useUserStoreWithOut } from '/@/store/modules/user'
-
 import { PAGE_NOT_FOUND_ROUTE } from '/@/router/routes/basic'
-
-import { initWebSocket } from "/@/logics/websocket/UserGlobalWebSocker";
+import { userInitAction } from '/@/store/action/userAction'
 
 const LOGIN_PATH = PageEnum.BASE_LOGIN
 
 const whitePathList: PageEnum[] = [LOGIN_PATH]
 
 /**
- * 路由守卫
+ * 路由守卫: 处理下列情况
+ * 1. 载入菜单
+ * 2. 处理登录后用户提示
  * @param router
  */
 export function createPermissionGuard(router: Router) {
   const userStore = useUserStoreWithOut()
   const permissionStore = usePermissionStoreWithOut()
   router.beforeEach(async (to, from, next) => {
-
     const token = userStore.getToken
-
-    // Whitelist can be directly entered
+    // 可以访问输入白名单中的页面
     if (whitePathList.includes(to.path as PageEnum)) {
+      // 如果在登录状态下访问登录页, 自动跳转到后续页面
       if (to.path === LOGIN_PATH && token) {
-        const isSessionTimeout = userStore.getSessionTimeout
         try {
-          await userStore.afterLoginAction()
-          if (!isSessionTimeout) {
-            next((to.query?.redirect as string) || '/')
-            return
-          }
+          // 如果参数未携带重定向路径则自动跳转到首页
+          next((to.query?.redirect as string) || '/')
+          return
         } catch {}
       }
       next()
@@ -47,8 +42,7 @@ export function createPermissionGuard(router: Router) {
         next()
         return
       }
-
-      // redirect login page
+      //重定向登录页面
       const redirectData: { path: string; replace: boolean; query?: Recordable<string> } = {
         path: LOGIN_PATH,
         replace: true,
@@ -63,33 +57,17 @@ export function createPermissionGuard(router: Router) {
       return
     }
 
-    // Jump to the 404 page after processing the login
-    if (from.path === LOGIN_PATH && to.name === PAGE_NOT_FOUND_ROUTE.name && to.fullPath !== PageEnum.BASE_HOME) {
-      next(PageEnum.BASE_HOME)
-      return
-    }
-
-    // get userinfo while last fetch time is empty
-    if (userStore.getLastUpdateTime === 0) {
-      try {
-        await userStore.refreshUserInfoAction()
-      } catch (err) {
-        next()
-        return
-      }
-    }
-
+    // 路由是否初始化完毕, 完毕后直接直接跳转, 不再向下执行初始化操作
     if (permissionStore.getIsDynamicAddedRoute) {
       next()
       return
     }
-    // 初始化 websocket连接.
-    initWebSocket()
+    // 用户初始化等操作.
+    userInitAction()
 
-    // 重载菜单
+    // 重载菜单, 进行路由菜单的组装并进行跳转
     console.log('重载菜单')
     const routes = await permissionStore.buildRoutesAction()
-
     routes.forEach((route) => {
       try {
         router.addRoute(route as unknown as RouteRecordRaw)
@@ -98,8 +76,8 @@ export function createPermissionGuard(router: Router) {
       }
     })
 
+    // 40x 系列路由
     router.addRoute(PAGE_NOT_FOUND_ROUTE as unknown as RouteRecordRaw)
-
     permissionStore.setDynamicAddedRoute(true)
 
     if (to.name === PAGE_NOT_FOUND_ROUTE.name) {
diff --git a/src/store/action/userAction.ts b/src/store/action/userAction.ts
new file mode 100644
index 0000000..43ecc3a
--- /dev/null
+++ b/src/store/action/userAction.ts
@@ -0,0 +1,27 @@
+import { closeWebSocket, initWebSocket } from '/@/logics/websocket/UserGlobalWebSocker'
+import { useUserStoreWithOut } from '/@/store/modules/user'
+
+/**
+ * 用户初始化等操作, 主要用在下列两种场景上
+ * 1. 用户登陆后的操作
+ * 2. 刷新页面时路由重新加载
+ */
+export function userInitAction() {
+  const userStore = useUserStoreWithOut()
+  // 初始化 websocket连接.
+  initWebSocket().then()
+  // 刷新登陆后用户信息
+  userStore.refreshUserInfoAction().then()
+}
+
+/**
+ * 用户后的操作
+ */
+export function userLogoutAction() {
+  const userStore = useUserStoreWithOut()
+  // 关闭websocket
+  closeWebSocket()
+
+  // 重置 Token和用户信息 需要放最后
+  userStore.resetState()
+}
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 879f830..8be57a3 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -1,44 +1,30 @@
 import type { UserInfo } from '/#/store'
 import { defineStore } from 'pinia'
 import { store } from '/@/store'
-import { RoleEnum } from '/@/enums/roleEnum'
+import { clearAuthCache, getAuthCache, setAuthCache } from '/@/utils/auth'
 import { PageEnum } from '/@/enums/pageEnum'
-import { ROLES_KEY, TOKEN_KEY, USER_INFO_KEY } from '/@/enums/cacheEnum'
-import { getAuthCache, setAuthCache } from '/@/utils/auth'
 import { LoginParams } from '/@/api/sys/model/userModel'
 import { doLogout, login } from '/@/api/sys/login'
 import { useMessage } from '/@/hooks/web/useMessage'
 import { router } from '/@/router'
-import { usePermissionStore } from '/@/store/modules/permission'
-import { RouteRecordRaw } from 'vue-router'
-import { PAGE_NOT_FOUND_ROUTE } from '/@/router/routes/basic'
 import { h } from 'vue'
 import { getFilePreviewUrlPrefix } from '/@/api/common/FileUpload'
-// @ts-ignore
 import { getUserInfo } from '/@/api/sys/user'
-import { closeWebSocket, initWebSocket } from '/@/logics/websocket/UserGlobalWebSocker'
+import { userLogoutAction } from '/@/store/action/userAction'
+import { TOKEN_KEY, USER_INFO_KEY } from '/@/enums/cacheEnum'
 
 interface UserState {
   userInfo: Nullable<UserInfo>
   token?: string
-  roleList: RoleEnum[]
-  sessionTimeout?: boolean
-  lastUpdateTime: number
 }
 
 export const useUserStore = defineStore({
   id: 'app-user',
   state: (): UserState => ({
-    // user info
+    // 用户信息
     userInfo: null,
     // token
     token: undefined,
-    // roleList
-    roleList: [],
-    // Whether the login expired
-    sessionTimeout: false,
-    // Last fetch time
-    lastUpdateTime: 0,
   }),
   getters: {
     getUserInfo(): UserInfo {
@@ -47,87 +33,50 @@ export const useUserStore = defineStore({
     getToken(): string {
       return this.token || getAuthCache<string>(TOKEN_KEY)
     },
-    getRoleList(): RoleEnum[] {
-      return this.roleList.length > 0 ? this.roleList : getAuthCache<RoleEnum[]>(ROLES_KEY)
-    },
-    getSessionTimeout(): boolean {
-      return !!this.sessionTimeout
-    },
-    getLastUpdateTime(): number {
-      return this.lastUpdateTime
-    },
   },
   actions: {
-    // token信息
+    /**
+     * 设置token
+     */
     setToken(info: string | undefined) {
-      this.token = info ? info : '' // for null or undefined value
+      this.token = info ? info : ''
       setAuthCache(TOKEN_KEY, info)
     },
-    setRoleList(roleList: RoleEnum[]) {
-      this.roleList = roleList
-      setAuthCache(ROLES_KEY, roleList)
-    },
     /**
      * 保存用户信息, 不要直接使用
      * 使用 UserStoreUtil 中的包装方法来处理
      */
     setUserInfo(info: UserInfo | null) {
       this.userInfo = info
-      this.lastUpdateTime = new Date().getTime()
       setAuthCache(USER_INFO_KEY, info)
     },
-    setSessionTimeout(flag: boolean) {
-      this.sessionTimeout = flag
-    },
+    /**
+     * 重置 Token和用户状态
+     */
     resetState() {
       this.userInfo = null
       this.token = ''
-      this.roleList = []
-      this.sessionTimeout = false
+      clearAuthCache()
     },
     /**
      * 登录方法
      */
     async login(params: LoginParams) {
       try {
+        const to = router.currentRoute.value
         const { data: token } = await login(params)
         // 保存token
         this.setToken(token)
-        await this.afterLoginAction(true)
+        // 跳转路由
+        await router.replace((to.query?.redirect as string) || '/')
         return token
       } catch (error) {
-        return Promise.reject(error)
+        console.error(error)
       }
     },
     /**
-     * 登录后操作
+     * 刷新登陆后用户信息
      */
-    async afterLoginAction(goHome?: boolean) {
-      if (!this.getToken) return null
-      // 刷新登陆后用户信息
-      await this.refreshUserInfoAction()
-      const sessionTimeout = this.sessionTimeout
-      // 超时
-      if (sessionTimeout) {
-        this.setSessionTimeout(false)
-      } else {
-        const permissionStore = usePermissionStore()
-        if (!permissionStore.isDynamicAddedRoute) {
-          // 构建路由
-          const routes = await permissionStore.buildRoutesAction()
-          routes.forEach((route) => {
-            router.addRoute(route as unknown as RouteRecordRaw)
-          })
-          // 404路由
-          router.addRoute(PAGE_NOT_FOUND_ROUTE as unknown as RouteRecordRaw)
-          permissionStore.setDynamicAddedRoute(true)
-        }
-        // 初始化 websocket连接.
-        initWebSocket()
-        goHome && (await router.replace(PageEnum.BASE_HOME))
-      }
-    },
-    // 刷新登陆后用户信息
     async refreshUserInfoAction() {
       if (!this.getToken) return null
       const { data: userInfo } = await getUserInfo()
@@ -137,25 +86,25 @@ export const useUserStore = defineStore({
       this.setUserInfo(userInfo)
     },
     /**
-     * 退出
+     * 退出操作
      */
     async logout(goLogin = false) {
       if (this.getToken) {
         try {
+          // 服务端退出
           await doLogout()
         } catch {
-          console.log('注销Token失败')
+          console.warn('注销Token失败')
         }
       }
-      this.setToken(undefined)
-      this.setSessionTimeout(false)
-      this.setUserInfo(null)
-      closeWebSocket()
-      goLogin && router.push(PageEnum.BASE_LOGIN)
+      // 重置状态
+      userLogoutAction()
+      // 跳转到登录页
+      goLogin && (await router.push(PageEnum.BASE_LOGIN))
     },
 
     /**
-     * @description: Confirm before logging out
+     * 是否进行退出弹窗
      */
     confirmLoginOut() {
       const { createConfirm } = useMessage()
@@ -171,7 +120,7 @@ export const useUserStore = defineStore({
   },
 })
 
-// Need to be used outside the setup
+// setup 之外使用
 export function useUserStoreWithOut() {
   return useUserStore(store)
 }
diff --git a/src/utils/http/axios/index.ts b/src/utils/http/axios/index.ts
index 594b702..111be69 100644
--- a/src/utils/http/axios/index.ts
+++ b/src/utils/http/axios/index.ts
@@ -1,6 +1,3 @@
-// axios配置  可自行根据项目进行更改，只需更改该文件即可，其他文件可以不动
-// The axios configuration can be changed according to the project, just change the file, other files can be left unchanged
-
 import type { AxiosResponse } from 'axios'
 import { clone } from 'lodash-es'
 import type { RequestOptions, Result } from '/#/axios'
@@ -11,7 +8,6 @@ import { useGlobSetting } from '/@/hooks/setting'
 import { useMessage } from '/@/hooks/web/useMessage'
 import { RequestEnum, ResultEnum, ContentTypeEnum } from '/@/enums/httpEnum'
 import { isString } from '/@/utils/is'
-import { getToken } from '/@/utils/auth'
 import { setObjToUrlParams, deepMerge } from '/@/utils'
 import { useErrorLogStoreWithOut } from '/@/store/modules/errorLog'
 import { useI18n } from '/@/hooks/web/useI18n'
@@ -19,16 +15,20 @@ import { joinTimestamp, formatRequestDate } from './helper'
 import { useUserStoreWithOut } from '/@/store/modules/user'
 import { AxiosRetry } from '/@/utils/http/axios/axiosRetry'
 
+/**
+ * axios配置  可自行根据项目进行更改，只需更改该文件即可，其他文件可以不动
+ */
+
 const globSetting = useGlobSetting()
 const urlPrefix = globSetting.urlPrefix
 const { createMessage, createErrorModal } = useMessage()
 
 /**
- * @description: 数据处理，方便区分多种处理方式
+ * 数据处理，方便区分多种处理方式
  */
 const transform: AxiosTransform = {
   /**
-   * @description: 处理响应数据。如果数据不是预期格式，可直接抛出错误
+   * 处理响应数据。如果数据不是预期格式，可直接抛出错误
    */
   transformResponseHook: (res: AxiosResponse<Result>, options: RequestOptions) => {
     // 不进行任何处理，直接返回
@@ -48,8 +48,7 @@ const transform: AxiosTransform = {
       return rawData
     }
 
-    // 接收的通常是json的数据
-    //  这里 code，data，message为 后台统一的字段，需要在 types.ts内修改为项目自己的接口返回格式
+    // 接收的通常是json的数据,这里 code，data，message为 后台统一的字段，需要在 types.ts内修改为项目自己的接口返回格式
     const { code, msg, traceId } = rawData
 
     // 这里逻辑可以根据项目进行修改
@@ -58,8 +57,7 @@ const transform: AxiosTransform = {
       return rawData
     }
 
-    // 在此处根据自己项目的实际情况对不同的code执行不同的操作
-    // 如果不希望中断当前请求，请return数据，否则直接抛出异常即可
+    // 在此处根据自己项目的实际情况对不同的code执行不同的操作, 如果不希望中断当前请求，请return数据，否则直接抛出异常即可
     let timeoutMsg = ''
     const userStore = useUserStoreWithOut()
     switch (code) {
@@ -67,7 +65,7 @@ const transform: AxiosTransform = {
       case ResultEnum.NOT_LOGIN:
         timeoutMsg = '登录超时,请重新登录!'
         userStore.setToken(undefined)
-        userStore.logout(true)
+        userStore.logout(true).then()
         break
       default:
         if (msg) {
@@ -86,7 +84,9 @@ const transform: AxiosTransform = {
     throw new Error(timeoutMsg || '请求出错，请稍候重试')
   },
 
-  // 请求之前处理config
+  /**
+   * 请求之前处理config
+   */
   beforeRequestHook: (config, options) => {
     const { apiUrl, joinPrefix, joinParamsToUrl, formatDate, joinTime = true, urlPrefix } = options
     if (joinPrefix) {
@@ -96,6 +96,7 @@ const transform: AxiosTransform = {
     if (apiUrl && isString(apiUrl)) {
       config.url = `${apiUrl}${config.url}`
     }
+    // 请求参数和请求体藕最
     const params = config.params || {}
     const data = config.data || false
     formatDate && data && !isString(data) && formatRequestDate(data)
@@ -114,10 +115,6 @@ const transform: AxiosTransform = {
         if (Reflect.has(config, 'data') && config.data && (Object.keys(config.data).length > 0 || config.data instanceof FormData)) {
           config.data = data
           config.params = params
-        } else {
-          // 非GET请求如果没有提供data，则将params视为data (去除, 非GET也会进行普通参数请求)
-          // config.data = params
-          // config.params = undefined
         }
         if (joinParamsToUrl) {
           config.url = setObjToUrlParams(config.url as string, Object.assign({}, config.params, config.data))
@@ -132,11 +129,12 @@ const transform: AxiosTransform = {
   },
 
   /**
-   * @description: 请求拦截器处理
+   * 请求拦截器处理
    */
   requestInterceptors: (config, options) => {
     // 请求之前处理config
-    const token = getToken()
+    const userStore = useUserStoreWithOut()
+    const token = userStore.getToken
     if (token && (config as Recordable)?.requestOptions?.withToken !== false) {
       // 添加 token 到请求头
       ;(config as Recordable).headers.AccessToken = token
@@ -145,14 +143,14 @@ const transform: AxiosTransform = {
   },
 
   /**
-   * @description: 响应拦截器处理
+   * 响应拦截器处理
    */
   responseInterceptors: (res: AxiosResponse<any>) => {
     return res
   },
 
   /**
-   * @description: 响应错误处理
+   * 响应错误处理
    */
   responseInterceptorsCatch: (axiosInstance: AxiosResponse, error: any) => {
     const { t } = useI18n()
@@ -166,15 +164,15 @@ const transform: AxiosTransform = {
 
     try {
       if (code === 'ECONNABORTED' && message.indexOf('timeout') !== -1) {
-        errMessage = t('sys.api.apiTimeoutMessage')
+        errMessage = '接口请求超时,请刷新页面重试!'
       }
       if (err?.includes('Network Error')) {
-        errMessage = t('sys.api.networkExceptionMsg')
+        errMessage = '网络异常，请检查您的网络连接是否正常!'
       }
 
       if (errMessage) {
         if (errorMessageMode === 'modal') {
-          createErrorModal({ title: t('sys.api.errorTip'), content: errMessage })
+          createErrorModal({ title: '错误提示', content: errMessage })
         } else if (errorMessageMode === 'message') {
           createMessage.error(errMessage)
         }
@@ -197,6 +195,10 @@ const transform: AxiosTransform = {
   },
 }
 
+/**
+ * 创建请求用 Axios 对象
+ * @param opt
+ */
 function createAxios(opt?: Partial<CreateAxiosOptions>) {
   return new VAxios(
     // 深度合并
@@ -251,11 +253,3 @@ function createAxios(opt?: Partial<CreateAxiosOptions>) {
   )
 }
 export const defHttp = createAxios()
-
-// other api url
-// export const otherHttp = createAxios({
-//   requestOptions: {
-//     apiUrl: 'xxx',
-//     urlPrefix: 'xxx',
-//   },
-// });
diff --git a/src/views/login/LoginForm.vue b/src/views/login/LoginForm.vue
index 64f2b58..703c963 100644
--- a/src/views/login/LoginForm.vue
+++ b/src/views/login/LoginForm.vue
@@ -95,7 +95,7 @@
 
   const form = reactive({
     client: '',
-    account: 'xxm1995',
+    account: 'bootx',
     password: '123456',
     loginType: 'password',
     captchaKey: '',
diff --git a/src/views/login/QrCodeForm.vue b/src/views/login/QrCodeForm.vue
index f9e10f5..46dd0cf 100644
--- a/src/views/login/QrCodeForm.vue
+++ b/src/views/login/QrCodeForm.vue
@@ -31,7 +31,6 @@
 
   const getShow = computed(() => {
     const flag = unref(getLoginState) === LoginStateEnum.QR_CODE
-    console.log(flag)
     // 变相实现Watch的效果
     flag ? getQrCode() : pause()
     return flag
diff --git a/src/views/login/useLogin.ts b/src/views/login/useLogin.ts
index cbcbf56..2d977e0 100644
--- a/src/views/login/useLogin.ts
+++ b/src/views/login/useLogin.ts
@@ -1,7 +1,4 @@
-import type { ValidationRule } from 'ant-design-vue/lib/form/Form'
-import type { RuleObject } from 'ant-design-vue/lib/form/interface'
-import { ref, computed, unref, Ref } from 'vue'
-import { useI18n } from '/@/hooks/web/useI18n'
+import { ref, computed } from 'vue'
 
 export enum LoginStateEnum {
   LOGIN,
diff --git a/types/axios.d.ts b/types/axios.d.ts
index 6b3131f..f24e1b5 100644
--- a/types/axios.d.ts
+++ b/types/axios.d.ts
@@ -10,13 +10,13 @@ export interface RequestOptions {
   // Whether to return native response headers
   // For example: use this attribute when you need to get the response headers
   isReturnNativeResponse?: boolean
-  // Whether to join url
+  // 是否加入网址
   joinPrefix?: boolean
-  // Interface address, use the default apiUrl if you leave it blank
+  // 接口地址，如果将其留空，请使用默认 apiUrl
   apiUrl?: string
   // 请求拼接路径
   urlPrefix?: string
-  // Error message prompt type
+  // 错误消息提示类型
   errorMessageMode?: ErrorMessageMode
   // Whether to add a timestamp
   joinTime?: boolean
-- 
Gitee


From 4f369ae29e0527db2482433d802693ef05a0ccea Mon Sep 17 00:00:00 2001
From: nws <3239709711@qq.com>
Date: Sat, 14 Oct 2023 23:56:28 +0800
Subject: [PATCH 07/12] =?UTF-8?q?feat=20=E6=A3=80=E6=9F=A5=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common/BaseApi.api.ts               | 21 +++++++++
 src/api/common/Pay.ts                       | 32 -------------
 src/logics/websocket/UserGlobalWebSocker.ts | 11 +++--
 src/logics/websocket/WebsocketNotice.ts     |  2 +-
 src/router/guard/permissionGuard.ts         |  4 +-
 src/store/action/userAction.ts              | 20 ++++++--
 src/views/security/remind/UserRemind.api.ts | 21 +++++++++
 src/views/security/remind/UserRemind.ts     | 52 +++++++++++++++++++++
 src/views/sys/about/index.vue               |  2 +-
 src/views/sys/exception/Exception.vue       | 11 ++---
 10 files changed, 125 insertions(+), 51 deletions(-)
 create mode 100644 src/api/common/BaseApi.api.ts
 delete mode 100644 src/api/common/Pay.ts
 create mode 100644 src/views/security/remind/UserRemind.api.ts
 create mode 100644 src/views/security/remind/UserRemind.ts

diff --git a/src/api/common/BaseApi.api.ts b/src/api/common/BaseApi.api.ts
new file mode 100644
index 0000000..a1604a9
--- /dev/null
+++ b/src/api/common/BaseApi.api.ts
@@ -0,0 +1,21 @@
+import { defHttp } from '/@/utils/http/axios'
+
+/**
+ * 回声测试
+ */
+export function echo(msg: string) {
+  return defHttp.get<string>({
+    url: '/echo',
+    params: { msg },
+  })
+}
+
+/**
+ * 回声测试(必须要进行登录)
+ */
+export function authEcho(msg: string) {
+  return defHttp.get<string>({
+    url: '/auth/echo',
+    params: { msg },
+  })
+}
diff --git a/src/api/common/Pay.ts b/src/api/common/Pay.ts
deleted file mode 100644
index 0713c76..0000000
--- a/src/api/common/Pay.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { defHttp } from '/@/utils/http/axios'
-
-/**
- * 取消支付(支付id)
- */
-export function cancelByPaymentId(paymentId) {
-  return defHttp.post({
-    url: '/uni_pay/cancelByPaymentId',
-    params: { paymentId },
-  })
-}
-
-/**
- * 退款
- */
-export function refund(obj) {
-  return defHttp.post({
-    url: '/uni_pay/refund',
-    data: obj,
-  })
-}
-
-/**
- * 刷新指定业务id的支付单状态
- */
-export function syncByBusinessId(businessId) {
-  return defHttp.post({
-    url: '/uni_pay/syncByBusinessId',
-    method: 'POST',
-    params: { businessId },
-  })
-}
diff --git a/src/logics/websocket/UserGlobalWebSocker.ts b/src/logics/websocket/UserGlobalWebSocker.ts
index 4404123..53ca017 100644
--- a/src/logics/websocket/UserGlobalWebSocker.ts
+++ b/src/logics/websocket/UserGlobalWebSocker.ts
@@ -7,6 +7,7 @@ import { EVENT_NOTICE, NOTIFICATION_ERROR, NOTIFICATION_INFO, NOTIFICATION_WARN
 import { publishWsEvent } from '/@/logics/websocket/WebsocketNotice'
 import { useMessage } from '/@/hooks/web/useMessage'
 import { findByParamKey } from '/@/api/common/Parameter'
+import { authEcho } from '/@/api/common/BaseApi.api'
 
 const { notification } = useMessage()
 
@@ -20,13 +21,15 @@ export async function initWebSocket() {
   const userStore = useUserStoreWithOut()
   const token = userStore.getToken
   const { data: wsUrl } = await findByParamKey('WebsocketServerUrl')
-  // TODO 判断token是否有效
-
+  // 判断token是否有效, 无效会自动退出
+  await authEcho('')
+  // 后端服务地址
   const serverUrl = `${wsUrl}/ws/user?AccessToken=${token}`
 
+  // 创建websocket实例
   const { close } = useWebSocket(serverUrl, {
-    autoReconnect: true,
-    heartbeat: true,
+    autoReconnect: true, //自动重新连接
+    heartbeat: true, // 心跳检测
     onMessage: onMessage,
     onConnected: () => {
       console.log('用户全局WebSocket连接成功')
diff --git a/src/logics/websocket/WebsocketNotice.ts b/src/logics/websocket/WebsocketNotice.ts
index d5214f4..9936472 100644
--- a/src/logics/websocket/WebsocketNotice.ts
+++ b/src/logics/websocket/WebsocketNotice.ts
@@ -24,7 +24,7 @@ export function listenerEvent(key: WsListenerEnum, callback: Handler) {
  * 清除指定key所关联的事件监听
  */
 export function clearEventsByKey(key: WsListenerEnum) {
-  // 一个key可能对应多个事件回调, 清除时
+  // 一个key可能对应多个事件回调, 清除该key所关联的所有会话
   const eventHandlerList = emitter.all.get(key.toString()) as EventHandlerList
   eventHandlerList.forEach((value) => emitter.off(key.toString(), value))
 }
diff --git a/src/router/guard/permissionGuard.ts b/src/router/guard/permissionGuard.ts
index 24e97a9..def9954 100644
--- a/src/router/guard/permissionGuard.ts
+++ b/src/router/guard/permissionGuard.ts
@@ -4,7 +4,7 @@ import { usePermissionStoreWithOut } from '/@/store/modules/permission'
 import { PageEnum } from '/@/enums/pageEnum'
 import { useUserStoreWithOut } from '/@/store/modules/user'
 import { PAGE_NOT_FOUND_ROUTE } from '/@/router/routes/basic'
-import { userInitAction } from '/@/store/action/userAction'
+import { userLoginInitAction } from '/@/store/action/userAction'
 
 const LOGIN_PATH = PageEnum.BASE_LOGIN
 
@@ -63,7 +63,7 @@ export function createPermissionGuard(router: Router) {
       return
     }
     // 用户初始化等操作.
-    userInitAction()
+    userLoginInitAction()
 
     // 重载菜单, 进行路由菜单的组装并进行跳转
     console.log('重载菜单')
diff --git a/src/store/action/userAction.ts b/src/store/action/userAction.ts
index 43ecc3a..6456811 100644
--- a/src/store/action/userAction.ts
+++ b/src/store/action/userAction.ts
@@ -1,17 +1,25 @@
 import { closeWebSocket, initWebSocket } from '/@/logics/websocket/UserGlobalWebSocker'
 import { useUserStoreWithOut } from '/@/store/modules/user'
+import { userPassWordCheck } from '/@/views/security/remind/UserRemind'
 
 /**
- * 用户初始化等操作, 主要用在下列两种场景上
+ * 用户登录后初始化等操作, 主要用在下列两种场景上
  * 1. 用户登陆后的操作
  * 2. 刷新页面时路由重新加载
  */
-export function userInitAction() {
+export async function userLoginInitAction() {
   const userStore = useUserStoreWithOut()
-  // 初始化 websocket连接.
-  initWebSocket().then()
+
   // 刷新登陆后用户信息
   userStore.refreshUserInfoAction().then()
+  // 初始化 websocket连接.
+  initWebSocket().then()
+  // 检查密码情况
+  const check = await userPassWordCheck()
+  if (!check) {
+    return
+  }
+  // 检查消息提醒
 }
 
 /**
@@ -25,3 +33,7 @@ export function userLogoutAction() {
   // 重置 Token和用户信息 需要放最后
   userStore.resetState()
 }
+
+/**
+ * 监听后端推送的退出事件
+ */
diff --git a/src/views/security/remind/UserRemind.api.ts b/src/views/security/remind/UserRemind.api.ts
new file mode 100644
index 0000000..6c08328
--- /dev/null
+++ b/src/views/security/remind/UserRemind.api.ts
@@ -0,0 +1,21 @@
+import { defHttp } from '/@/utils/http/axios'
+import { Result } from '/#/axios'
+
+/**
+ * 获取用户安全信息
+ */
+export function checkPasswordSecurity() {
+  return defHttp.get<Result<passwordSecurityCheckResult>>({
+    url: `/security/password/checkPasswordSecurity`,
+  })
+}
+
+/**
+ * 用户密码各种状态的检查
+ */
+export interface passwordSecurityCheckResult {
+  defaultPwd: boolean
+  expirePwd: boolean
+  expireRemind: boolean
+  expireRemindNum?: number
+}
diff --git a/src/views/security/remind/UserRemind.ts b/src/views/security/remind/UserRemind.ts
new file mode 100644
index 0000000..30d251e
--- /dev/null
+++ b/src/views/security/remind/UserRemind.ts
@@ -0,0 +1,52 @@
+import { checkPasswordSecurity } from '/@/views/security/remind/UserRemind.api'
+import { useMessage } from '/@/hooks/web/useMessage'
+import { Modal } from 'ant-design-vue'
+
+/**
+ * 用户密码检查
+ */
+export async function userPassWordCheck(): Promise<boolean> {
+  const { createConfirm, createMessage } = useMessage()
+  const { data } = await checkPasswordSecurity()
+  // 检查是否是默认密码未进行修改
+  if (data.defaultPwd) {
+    Modal.warning({
+      title: '警告',
+      content: '请修改用户的默认密码后进行登录',
+      okText: '去修改',
+      keyboard: false,
+      onOk: () => {
+        createMessage.success('开发中...')
+      },
+    })
+    return false
+  }
+  // 检查密码是否已经过期
+  if (!data.expirePwd) {
+    Modal.warning({
+      title: '警告',
+      content: '密码已经过期，请进行修改',
+      okText: '去修改',
+      keyboard: false,
+      onOk: () => {
+        createMessage.success('开发中...')
+      },
+    })
+    return false
+  }
+  // 密码临过期提醒
+  if (data.expireRemind) {
+    createConfirm({
+      iconType: 'warning',
+      title: '警告',
+      content: `密码还有 ${data.expireRemindNum} 天将过期，请及时进行修改`,
+      okText: '去修改',
+      cancelText: '暂不修改',
+      onOk: () => {
+        createMessage.success('开发中...')
+      },
+    })
+    return false
+  }
+  return true
+}
diff --git a/src/views/sys/about/index.vue b/src/views/sys/about/index.vue
index 8e1821e..26f45a1 100644
--- a/src/views/sys/about/index.vue
+++ b/src/views/sys/about/index.vue
@@ -18,7 +18,7 @@
   import { h } from 'vue'
   import { Tag } from 'ant-design-vue'
   import { PageWrapper } from '/@/components/Page'
-  import { Description, DescItem, useDescription } from '/@/components/Description/index'
+  import { Description, DescItem, useDescription } from '/@/components/Description'
   import { GITHUB_URL, SITE_URL, DOC_URL, GITEE_URL } from '/@/settings/siteSetting'
 
   const { pkg, lastBuildTime } = __APP_INFO__
diff --git a/src/views/sys/exception/Exception.vue b/src/views/sys/exception/Exception.vue
index 595d48e..92ca515 100644
--- a/src/views/sys/exception/Exception.vue
+++ b/src/views/sys/exception/Exception.vue
@@ -63,9 +63,6 @@
         return unref(statusMapRef).get(unref(getStatus)) as MapValue
       })
 
-      const backLoginI18n = '返回登录'
-      const backHomeI18n = '返回首页'
-
       unref(statusMapRef).set(ExceptionEnum.PAGE_NOT_ACCESS, {
         title: '403',
         status: `${ExceptionEnum.PAGE_NOT_ACCESS}`,
@@ -86,12 +83,12 @@
         title: '500',
         status: `${ExceptionEnum.ERROR}`,
         subTitle: t('sys.exception.subTitle500'),
-        btnText: backHomeI18n,
+        btnText: '返回首页',
         handler: () => go(),
       })
 
       unref(statusMapRef).set(ExceptionEnum.PAGE_NOT_DATA, {
-        title: t('sys.exception.noDataTitle'),
+        title: '当前页无数据',
         subTitle: '',
         btnText: t('common.redo'),
         handler: () => redo(),
@@ -99,8 +96,8 @@
       })
 
       unref(statusMapRef).set(ExceptionEnum.NET_WORK_ERROR, {
-        title: t('sys.exception.networkErrorTitle'),
-        subTitle: t('sys.exception.networkErrorSubTitle'),
+        title: '网络错误',
+        subTitle: '抱歉，您的网络连接已断开，请检查您的网络！',
         btnText: t('common.redo'),
         handler: () => redo(),
         icon: netWorkSvg,
-- 
Gitee


From 56cafbd78989cd20e20da5aceb7ce44d4237d1eb Mon Sep 17 00:00:00 2001
From: nws <3239709711@qq.com>
Date: Mon, 16 Oct 2023 23:44:19 +0800
Subject: [PATCH 08/12] =?UTF-8?q?feat=20=E5=AF=86=E7=A0=81=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/http/axios/index.ts                 |   5 +
 src/views/modules/system/menu/MenuEdit.vue    |   1 -
 .../password/PasswordSecurityConfig.api.ts    |  46 +----
 .../password/PasswordSecurityConfig.vue       |  92 +++++++++
 .../password/PasswordSecurityConfigEdit.vue   | 151 --------------
 .../password/PasswordSecurityConfigList.vue   | 193 ------------------
 6 files changed, 100 insertions(+), 388 deletions(-)
 create mode 100644 src/views/modules/system/security/password/PasswordSecurityConfig.vue
 delete mode 100644 src/views/modules/system/security/password/PasswordSecurityConfigEdit.vue
 delete mode 100644 src/views/modules/system/security/password/PasswordSecurityConfigList.vue

diff --git a/src/utils/http/axios/index.ts b/src/utils/http/axios/index.ts
index 111be69..bbaf284 100644
--- a/src/utils/http/axios/index.ts
+++ b/src/utils/http/axios/index.ts
@@ -51,6 +51,11 @@ const transform: AxiosTransform = {
     // 接收的通常是json的数据,这里 code，data，message为 后台统一的字段，需要在 types.ts内修改为项目自己的接口返回格式
     const { code, msg, traceId } = rawData
 
+    // 如果返回值中连code都没有, 说明返回的不是结构体, 不继续向下进行处理
+    if (code === undefined) {
+      return
+    }
+
     // 这里逻辑可以根据项目进行修改
     const hasSuccess = rawData && Reflect.has(rawData, 'code') && code === ResultEnum.SUCCESS
     if (hasSuccess) {
diff --git a/src/views/modules/system/menu/MenuEdit.vue b/src/views/modules/system/menu/MenuEdit.vue
index 2193b76..002d179 100644
--- a/src/views/modules/system/menu/MenuEdit.vue
+++ b/src/views/modules/system/menu/MenuEdit.vue
@@ -14,7 +14,6 @@
         <a-form-item v-show="form.menuType !== 0" label="上级菜单" name="parentId">
           <a-tree-select
             style="width: 100%"
-            :dropdown-style="{ maxHeight: '200px', overflow: 'auto' }"
             :tree-data="treeData"
             v-model:value="form.parentId"
             placeholder="请选择父级菜单"
diff --git a/src/views/modules/system/security/password/PasswordSecurityConfig.api.ts b/src/views/modules/system/security/password/PasswordSecurityConfig.api.ts
index d983cb3..fd5302e 100644
--- a/src/views/modules/system/security/password/PasswordSecurityConfig.api.ts
+++ b/src/views/modules/system/security/password/PasswordSecurityConfig.api.ts
@@ -3,31 +3,11 @@ import { PageResult, Result } from '/#/axios'
 import { BaseEntity } from '/#/web'
 
 /**
- * 分页
+ * 获取配置
  */
-export function page(params) {
-  return defHttp.get<Result<PageResult<PasswordSecurityConfig>>>({
-    url: '/security/password/page',
-    params,
-  })
-}
-
-/**
- * 查询全部
- */
-export function findAll() {
-  return defHttp.get<Result<PasswordSecurityConfig[]>>({
-    url: '/security/password/findAll',
-  })
-}
-
-/**
- * 获取单条
- */
-export function get(id) {
+export function getDefault(){
   return defHttp.get<Result<PasswordSecurityConfig>>({
-    url: '/security/password/findById',
-    params: { id },
+    url: '/security/password/getDefault',
   })
 }
 
@@ -51,26 +31,6 @@ export function update(obj: PasswordSecurityConfig) {
   })
 }
 
-/**
- * 删除
- */
-export function del(id) {
-  return defHttp.delete({
-    url: '/security/password/delete',
-    params: { id },
-  })
-}
-
-/**
- * 批量删除
- */
-export function deleteBatch(ids) {
-  return defHttp.delete({
-    url: '/security/password/template/delete',
-    data: ids,
-  })
-}
-
 /**
  * 密码安全策略
  */
diff --git a/src/views/modules/system/security/password/PasswordSecurityConfig.vue b/src/views/modules/system/security/password/PasswordSecurityConfig.vue
new file mode 100644
index 0000000..c70e89c
--- /dev/null
+++ b/src/views/modules/system/security/password/PasswordSecurityConfig.vue
@@ -0,0 +1,92 @@
+<template>
+  <div>
+    <div class="m-3 p-3 bg-white">
+      <a-spin :spinning="loading">
+        <a-form ref="formRef" :validate-trigger="['blur', 'change']" :label-col="2" :model="form" :rules="rules">
+          <a-row>
+            <a-col :offset="5" :span="6">
+              <a-form-item label="最大密码错误数" class="w-400px" name="name">
+                <a-input-number placeholder="请输入排序，可以是小数" :precision="0" v-model:value="form.maxPwdErrorCount" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
+              <a-form-item label="密码错误锁定时间(分钟)" class="w-400px" name="name">
+                <a-input-number placeholder="请输入排序，可以是小数" :precision="0" v-model:value="form.maxPwdErrorCount" />
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row>
+            <a-col :offset="5" :span="6">
+              <a-form-item label="最大密码错误数" class="w-400px" name="name">
+                <a-input-number placeholder="请输入排序，可以是小数" :precision="0" v-model:value="form.maxPwdErrorCount" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
+              <a-form-item label="密码错误锁定时间(分钟)" class="w-400px" name="name">
+                <a-input-number placeholder="请输入排序，可以是小数" :precision="0" v-model:value="form.maxPwdErrorCount" />
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row>
+            <a-col :push="8">
+              <a-button :disabled="edit" type="primary" @click="addOrUpdate">保存信息</a-button>
+              <a-button style="margin-left: 50px" :disabled="!edit" @click="edit = true">编辑信息</a-button>
+            </a-col>
+          </a-row>
+        </a-form>
+      </a-spin>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { onMounted, reactive } from 'vue'
+  import { getDefault, PasswordSecurityConfig } from './PasswordSecurityConfig.api'
+  import { $ref } from 'vue/macros'
+  import { FormInstance, Rule } from 'ant-design-vue/lib/form'
+  import useFormEdit from '/@/hooks/bootx/useFormEdit'
+  import CollapseContainer from '/@/components/Container/src/collapse/CollapseContainer.vue'
+
+  const { labelCol, wrapperCol } = useFormEdit()
+
+  let form = $ref<PasswordSecurityConfig>({})
+  let loading = $ref(false)
+  const formRef = $ref<FormInstance>()
+  let edit = $ref(false)
+
+  const rules = reactive({} as Record<string, Rule[]>)
+
+  onMounted(() => initData)
+
+  /**
+   * 初始化数据
+   */
+  function initData() {
+    loading = true
+    getDefault().then(({ data }) => {
+      form = data
+      loading = true
+    })
+  }
+
+  /**
+   * 保存或配置
+   */
+  async function addOrUpdate() {
+    await formRef?.validate()
+    createConfirm({
+      iconType: 'warning',
+      title: '警告',
+      content: '是否更新用户基础信息',
+      onOk: async () => {
+        confirmLoading = true
+        await updateBaseInfo(form)
+        createMessage.success('更新用户信息成功')
+        await userStore.refreshUserInfoAction()
+        confirmLoading = false
+      },
+    })
+  }
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/modules/system/security/password/PasswordSecurityConfigEdit.vue b/src/views/modules/system/security/password/PasswordSecurityConfigEdit.vue
deleted file mode 100644
index 457b1db..0000000
--- a/src/views/modules/system/security/password/PasswordSecurityConfigEdit.vue
+++ /dev/null
@@ -1,151 +0,0 @@
-<template>
-  <basic-modal
-    v-bind="$attrs"
-    :loading="confirmLoading"
-    :title="title"
-    :width="modalWidth"
-    :visible="visible"
-    :mask-closable="showable"
-    @cancel="handleCancel"
-  >
-    <a-form
-      class="small-from-item"
-      ref="formRef"
-      :model="form"
-      :rules="rules"
-      :validate-trigger="['blur', 'change']"
-      :label-col="labelCol"
-      :wrapper-col="wrapperCol"
-    >
-      <a-form-item label="主键" name="id" :hidden="true">
-        <a-input v-model:value="form.id" :disabled="showable" />
-      </a-form-item>
-      <a-form-item label="最大密码错误数" name="maxPwdErrorCount">
-        <a-input v-model:value="form.maxPwdErrorCount" :disabled="showable" placeholder="请输入最大密码错误数" />
-      </a-form-item>
-      <a-form-item label="密码错误锁定时间(分钟)" name="errorLockTime">
-        <a-input v-model:value="form.errorLockTime" :disabled="showable" placeholder="请输入密码错误锁定时间(分钟)" />
-      </a-form-item>
-      <a-form-item label="强制修改初始密码" name="requireChangePwd">
-        <a-input v-model:value="form.requireChangePwd" :disabled="showable" placeholder="请输入强制修改初始密码" />
-      </a-form-item>
-      <a-form-item label="强制修改初始密码" name="defaultPassword">
-        <a-input v-model:value="form.defaultPassword" :disabled="showable" placeholder="请输入强制修改初始密码" />
-      </a-form-item>
-      <a-form-item label="更新频率" name="updateFrequency">
-        <a-input v-model:value="form.updateFrequency" :disabled="showable" placeholder="请输入更新频率" />
-      </a-form-item>
-      <a-form-item label="到期提醒(天数)" name="expireRemind">
-        <a-input v-model:value="form.expireRemind" :disabled="showable" placeholder="请输入到期提醒(天数)" />
-      </a-form-item>
-      <a-form-item label="与登录名相同" name="sameAsLoginName">
-        <a-input v-model:value="form.sameAsLoginName" :disabled="showable" placeholder="请输入与登录名相同" />
-      </a-form-item>
-      <a-form-item label="不能与近期多少次密码相同" name="recentPassword">
-        <a-input v-model:value="form.recentPassword" :disabled="showable" placeholder="请输入不能与近期多少次密码相同" />
-      </a-form-item>
-    </a-form>
-    <template #footer>
-      <a-space>
-        <a-button key="cancel" @click="handleCancel">取消</a-button>
-        <a-button v-if="!showable" key="forward" :loading="confirmLoading" type="primary" @click="handleOk">保存</a-button>
-      </a-space>
-    </template>
-  </basic-modal>
-</template>
-
-<script lang="ts" setup>
-  import { nextTick, reactive } from 'vue'
-  import { $ref } from 'vue/macros'
-  import useFormEdit from '/@/hooks/bootx/useFormEdit'
-  import { add, get, update, PasswordSecurityConfig } from './PasswordSecurityConfig.api'
-  import { FormInstance, Rule } from 'ant-design-vue/lib/form'
-  import { FormEditType } from '/@/enums/formTypeEnum'
-  import { BasicModal } from '/@/components/Modal'
-  const {
-    initFormEditType,
-    handleCancel,
-    search,
-    labelCol,
-    wrapperCol,
-    modalWidth,
-    title,
-    confirmLoading,
-    visible,
-    editable,
-    showable,
-    formEditType,
-  } = useFormEdit()
-  // 表单
-  const formRef = $ref<FormInstance>()
-  let form = $ref<PasswordSecurityConfig>({
-    id: null,
-    maxPwdErrorCount: null,
-    errorLockTime: null,
-    requireChangePwd: null,
-    defaultPassword: null,
-    updateFrequency: null,
-    expireRemind: null,
-    sameAsLoginName: null,
-    recentPassword: null,
-  })
-  // 校验
-  const rules = reactive({} as Record<string, Rule[]>)
-  // 事件
-  const emits = defineEmits(['ok'])
-
-  /**
-   * 入口
-   */
-  function init(id, editType: FormEditType) {
-    initFormEditType(editType)
-    resetForm()
-    getInfo(id, editType)
-  }
-
-  /**
-   * 获取信息
-   */
-  function getInfo(id, editType: FormEditType) {
-    if ([FormEditType.Edit, FormEditType.Show].includes(editType)) {
-      confirmLoading.value = true
-      get(id).then(({ data }) => {
-        form = data
-        confirmLoading.value = false
-      })
-    } else {
-      confirmLoading.value = false
-    }
-  }
-
-  /**
-   * 保存
-   */
-  function handleOk() {
-    formRef?.validate().then(async () => {
-      confirmLoading.value = true
-      if (formEditType.value === FormEditType.Add) {
-        await add(form)
-      } else if (formEditType.value === FormEditType.Edit) {
-        await update(form)
-      }
-      confirmLoading.value = false
-      handleCancel()
-      emits('ok')
-    })
-  }
-
-  /**
-   * 重置表单
-   */
-  function resetForm() {
-    nextTick(() => {
-      formRef?.resetFields()
-    })
-  }
-  defineExpose({
-    init,
-  })
-</script>
-
-<style lang="less" scoped></style>
diff --git a/src/views/modules/system/security/password/PasswordSecurityConfigList.vue b/src/views/modules/system/security/password/PasswordSecurityConfigList.vue
deleted file mode 100644
index 93c8920..0000000
--- a/src/views/modules/system/security/password/PasswordSecurityConfigList.vue
+++ /dev/null
@@ -1,193 +0,0 @@
-<template>
-  <div>
-    <div class="m-3 p-3 pt-5 bg-white">
-      <b-query :query-params="model.queryParam" :fields="fields" @query="queryPage" @reset="resetQueryParams" />
-    </div>
-    <div class="m-3 p-3 bg-white">
-      <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }">
-        <template #buttons>
-          <a-space>
-            <a-button type="primary" pre-icon="ant-design:plus-outlined" @click="add">新建</a-button>
-            <a-dropdown v-if="batchOperateFlag">
-              <a-button post-icon="ant-design:down-outlined"> 批量操作 </a-button>
-              <template #overlay>
-                <a-menu>
-                  <a-menu-item>
-                    <a-link @click="removeBatch">批量删除</a-link>
-                  </a-menu-item>
-                </a-menu>
-              </template>
-            </a-dropdown>
-          </a-space>
-        </template>
-      </vxe-toolbar>
-      <vxe-table
-        row-id="id"
-        ref="xTable"
-        :data="pagination.records"
-        :loading="loading"
-        @checkbox-all="selectAllEvent"
-        @checkbox-change="selectChangeEvent"
-      >
-        <vxe-column type="checkbox" width="50" />
-        <vxe-column field="maxPwdErrorCount" title="最大密码错误数" />
-        <vxe-column field="errorLockTime" title="密码错误锁定时间(分钟)" />
-        <vxe-column field="requireChangePwd" title="强制修改初始密码" />
-        <vxe-column field="defaultPassword" title="强制修改初始密码" />
-        <vxe-column field="updateFrequency" title="更新频率" />
-        <vxe-column field="expireRemind" title="到期提醒(天数)" />
-        <vxe-column field="sameAsLoginName" title="与登录名相同" />
-        <vxe-column field="recentPassword" title="不能与近期多少次密码相同" />
-        <vxe-column field="createTime" title="创建时间" />
-        <vxe-column fixed="right" width="150" :showOverflow="false" title="操作">
-          <template #default="{ row }">
-            <span>
-              <a-link @click="show(row)">查看</a-link>
-            </span>
-            <a-divider type="vertical" />
-            <span>
-              <a-link @click="edit(row)">编辑</a-link>
-            </span>
-            <a-divider type="vertical" />
-            <span>
-              <a-link danger @click="remove(row)">删除</a-link>
-            </span>
-          </template>
-        </vxe-column>
-      </vxe-table>
-      <vxe-pager
-        size="medium"
-        :loading="loading"
-        :current-page="pagination.current"
-        :page-size="pagination.size"
-        :total="pagination.total"
-        @page-change="handleTableChange"
-      />
-      <password-security-config-edit ref="passwordSecurityConfigEdit" @ok="queryPage" />
-    </div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-  import { onMounted } from 'vue'
-  import { $ref } from 'vue/macros'
-  import { del, deleteBatch, page } from './PasswordSecurityConfig.api'
-  import useTablePage from '/@/hooks/bootx/useTablePage'
-  import PasswordSecurityConfigEdit from './PasswordSecurityConfigEdit.vue'
-  import { VxeTableInstance, VxeToolbarInstance, VxeTable, VxeColumn, VxePager, VxeToolbar } from 'vxe-table'
-  import BQuery from '/@/components/Bootx/Query/BQuery.vue'
-  import { FormEditType } from '/@/enums/formTypeEnum'
-  import { useMessage } from '/@/hooks/web/useMessage'
-  import { QueryField } from '/@/components/Bootx/Query/Query'
-  import ALink from '/@/components/Link/Link.vue'
-
-  // 使用hooks
-  const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, pages, batchOperateFlag, model, loading } =
-    useTablePage(queryPage)
-  const { notification, createMessage, createConfirm } = useMessage()
-
-  // 查询条件
-  const fields = [] as QueryField[]
-
-  const xTable = $ref<VxeTableInstance>()
-  const xToolbar = $ref<VxeToolbarInstance>()
-  const passwordSecurityConfigEdit = $ref<any>()
-
-  onMounted(() => {
-    vxeBind()
-    queryPage()
-  })
-
-  /**
-   * 初始化绑定
-   */
-  function vxeBind() {
-    xTable?.connect(xToolbar as VxeToolbarInstance)
-  }
-
-  /**
-   * 分页查询
-   */
-  function queryPage() {
-    loading.value = true
-    page({
-      ...model.queryParam,
-      ...pages,
-    }).then(({ data }) => {
-      pageQueryResHandel(data)
-    })
-    return Promise.resolve()
-  }
-
-  /**
-   * 选中全部
-   */
-  function selectAllEvent() {
-    const records = xTable?.getCheckboxRecords()
-    batchOperateFlag.value = !!records?.length
-  }
-  /**
-   * 选中事件
-   */
-  function selectChangeEvent() {
-    const records = xTable?.getCheckboxRecords()
-    batchOperateFlag.value = !!records?.length
-  }
-
-  /**
-   * 新增
-   */
-  function add() {
-    passwordSecurityConfigEdit.init(null, FormEditType.Add)
-  }
-
-  /**
-   * 编辑
-   */
-  function edit(record) {
-    passwordSecurityConfigEdit.init(record.id, FormEditType.Edit)
-  }
-
-  /**
-   * 查看
-   */
-  function show(record) {
-    passwordSecurityConfigEdit.init(record.id, FormEditType.Show)
-  }
-
-  /**
-   * 删除
-   */
-  function remove(record) {
-    createConfirm({
-      iconType: 'warning',
-      title: '警告',
-      content: '是否删除该数据',
-      onOk: () => {
-        del(record.id).then(() => {
-          createMessage.success('删除成功')
-          queryPage()
-        })
-      },
-    })
-  }
-  /**
-   * 批量删除
-   */
-  function removeBatch() {
-    createConfirm({
-      iconType: 'warning',
-      title: '警告',
-      content: '是否删除选中的数据',
-      onOk: () => {
-        const ids = xTable?.getCheckboxRecords().map((o) => o.id)
-        deleteBatch(ids).then(() => {
-          createMessage.success('删除成功')
-          queryPage()
-        })
-      },
-    })
-  }
-</script>
-
-<style lang="less" scoped></style>
-- 
Gitee


From 9c924693a7951bd74a6ea56f93f0aaab7063d8b3 Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Thu, 19 Oct 2023 16:31:49 +0800
Subject: [PATCH 09/12] =?UTF-8?q?feat=20=E5=AF=86=E7=A0=81=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9=E8=B7=B3=E8=BD=AC,=20=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E5=AE=88=E5=8D=AB=E5=A4=84=E7=90=86=E7=A9=BA=E6=8C=87?=
 =?UTF-8?q?=E9=92=88=E9=97=AE=E9=A2=98=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/enums/pageEnum.ts                         |   5 +
 src/hooks/bootx/useDict.ts                    |   1 -
 src/router/helper/routeHelper.ts              |   2 +-
 src/store/modules/permission.ts               |  73 ++++++-------
 src/views/account/setting/index.vue           |   6 +-
 .../password/PasswordSecurityConfig.api.ts    |  14 +--
 .../password/PasswordSecurityConfig.vue       | 102 ++++++++++++------
 src/views/security/remind/UserRemind.ts       |  10 +-
 8 files changed, 128 insertions(+), 85 deletions(-)

diff --git a/src/enums/pageEnum.ts b/src/enums/pageEnum.ts
index 420b05e..ab34f75 100644
--- a/src/enums/pageEnum.ts
+++ b/src/enums/pageEnum.ts
@@ -12,3 +12,8 @@ export enum PageEnum {
   // 错误日志页面路径
   ERROR_LOG_PAGE = '/error-log/list',
 }
+
+export const PageConstant = {
+  // 个人修改密码设置路由
+  ACCOUNT_PASSWORD: { path: PageEnum.ACCOUNT_SETTING, query: { activeKey: 2 } },
+}
diff --git a/src/hooks/bootx/useDict.ts b/src/hooks/bootx/useDict.ts
index 21eda55..5b09ca0 100644
--- a/src/hooks/bootx/useDict.ts
+++ b/src/hooks/bootx/useDict.ts
@@ -10,7 +10,6 @@ const dictStore = useDictStore()
 async function getDict(): Promise<Dict[]> {
   const dictList = dictStore.getDict
   if (dictList.length > 0) {
-    console.log(dictList)
     return dictList
   } else {
     return await dictStore.initDict()
diff --git a/src/router/helper/routeHelper.ts b/src/router/helper/routeHelper.ts
index 1dff7b9..d664e46 100644
--- a/src/router/helper/routeHelper.ts
+++ b/src/router/helper/routeHelper.ts
@@ -84,7 +84,7 @@ function dynamicImport(dynamicViewsModules: Record<string, () => Promise<Recorda
  * 将后端对象变成路由对象
  */
 export function transformObjToRoute<T = AppRouteModule>(routeList: AppRouteRecordRaw[]): T[] {
-  routeList.forEach((route) => {
+  routeList?.forEach((route) => {
     const component = route.component as string
     if (component) {
       if (component.toUpperCase() === 'LAYOUT') {
diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
index b8cdab6..d0630be 100644
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -2,7 +2,7 @@ import type { AppRouteRecordRaw, Menu } from '/@/router/types'
 
 import { defineStore } from 'pinia'
 import { store } from '/@/store'
-import { transformObjToRoute, flatMultiLevelRoutes } from '/@/router/helper/routeHelper'
+import { flatMultiLevelRoutes, transformObjToRoute } from '/@/router/helper/routeHelper'
 import { transformRouteToMenu } from '/@/router/helper/menuHelper'
 
 import { DASHBOARD, ERROR_LOG_ROUTE, PAGE_NOT_FOUND_ROUTE } from '/@/router/routes/basic'
@@ -15,7 +15,7 @@ import { useMessage } from '/@/hooks/web/useMessage'
 import { PageEnum } from '/@/enums/pageEnum'
 import { getAppEnvConfig } from '/@/utils/env'
 import { PermMenu } from '/@/api/sys/model/menuModel'
-import { PROJECT_BASE } from "/@/router/routes/project";
+import { PROJECT_BASE } from '/@/router/routes/project'
 
 interface PermissionState {
   // 权限代码列表
@@ -89,7 +89,7 @@ export const usePermissionStore = defineStore({
       this.lastBuildMenuTime = 0
     },
     /**
-     * 权限码和菜单更新
+     * 权限码和菜单更新, 更新权限码并返回菜单信息
      */
     async changeMenuAndPermCode(): Promise<PermMenu[]> {
       const { VITE_GLOB_APP_CLIENT } = getAppEnvConfig()
@@ -104,28 +104,27 @@ export const usePermissionStore = defineStore({
      * 转换路由为系统中的菜单
      */
     convertMenus(permMenus: PermMenu[]): AppRouteRecordRaw[] {
-      return permMenus?.map((o) => {
-        const menu = {
-          name: o.name,
-          path: o.path,
-          component: o.component,
-          targetOutside: o.targetOutside,
-          iframeUrl: o.iframeUrl,
-          redirect: o.redirect,
-          meta: {
-            orderNo: o.sortNo,
-            title: o.title,
-            icon: o.icon,
-            hideMenu: o.hidden,
-            hideChildrenInMenu: o.hideChildrenInMenu,
-            ignoreKeepAlive: !o.keepAlive,
-          },
-          children: this.convertMenus(o.children),
-        } as AppRouteRecordRaw
-        if (o.component.toUpperCase()) {
-        }
-        return menu
-      })
+      return (
+        permMenus?.map((o) => {
+          return {
+            name: o.name,
+            path: o.path,
+            component: o.component,
+            targetOutside: o.targetOutside,
+            iframeUrl: o.iframeUrl,
+            redirect: o.redirect,
+            meta: {
+              orderNo: o.sortNo,
+              title: o.title,
+              icon: o.icon,
+              hideMenu: o.hidden,
+              hideChildrenInMenu: o.hideChildrenInMenu,
+              ignoreKeepAlive: !o.keepAlive,
+            },
+            children: this.convertMenus(o.children),
+          } as AppRouteRecordRaw
+        }) || []
+      )
     },
 
     /**
@@ -184,7 +183,7 @@ export const usePermissionStore = defineStore({
 
       let routeList: AppRouteRecordRaw[] = []
 
-      // 获取菜单和权限码
+      // 获取后台的菜单和更新权限码
       try {
         const permMenus = await this.changeMenuAndPermCode()
         // 将 后端获取的菜单转换为系统中的菜单格式
@@ -192,17 +191,19 @@ export const usePermissionStore = defineStore({
       } catch (error) {
         console.error(error)
       }
+      // 后端获取的菜单如果为空, 不进行处理
+      if (routeList) {
+        routeList = transformObjToRoute(routeList)
+        //  后台路由到菜单结构
+        const backMenuList = transformRouteToMenu(routeList)
+        this.setBackMenuList(backMenuList)
+        // 删除 meta.ignoreRoute 项
+        routeList = filter(routeList, routeRemoveIgnoreFilter)
+        routeList = routeList.filter(routeRemoveIgnoreFilter)
+
+        routeList = flatMultiLevelRoutes(routeList)
+      }
 
-      // 动态引入组件
-      routeList = transformObjToRoute(routeList)
-      //  后台路由到菜单结构
-      const backMenuList = transformRouteToMenu(routeList)
-      this.setBackMenuList(backMenuList)
-      // 删除 meta.ignoreRoute 项
-      routeList = filter(routeList, routeRemoveIgnoreFilter)
-      routeList = routeList.filter(routeRemoveIgnoreFilter)
-
-      routeList = flatMultiLevelRoutes(routeList)
       routes = [PAGE_NOT_FOUND_ROUTE, ...routeList]
 
       // 添加更多配置的路由菜单
diff --git a/src/views/account/setting/index.vue b/src/views/account/setting/index.vue
index c8041e0..07aa9db 100644
--- a/src/views/account/setting/index.vue
+++ b/src/views/account/setting/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ScrollContainer>
     <div ref="wrapperRef" :class="prefixCls">
-      <a-tabs tab-position="left" :tabBarStyle="tabBarStyle">
+      <a-tabs tab-position="left" :active-key="activeKey" @change="(o) => (activeKey = o)" :tabBarStyle="tabBarStyle">
         <template v-for="item in settingList" :key="item.key">
           <a-tab-pane :tab="item.name">
             <component :is="item.component" />
@@ -15,11 +15,15 @@
 <script lang="ts" setup>
   import { ScrollContainer } from '/@/components/Container'
   import { settingList } from './data'
+  import { $ref } from 'vue/macros'
+  import { useRoute } from 'vue-router'
 
   const prefixCls = 'account-setting'
   const tabBarStyle = {
     width: '220px',
   }
+  const route = useRoute()
+  let activeKey = $ref(route?.query?.activeKey || '1')
 </script>
 <script lang="ts">
   import { defineComponent } from 'vue'
diff --git a/src/views/modules/system/security/password/PasswordSecurityConfig.api.ts b/src/views/modules/system/security/password/PasswordSecurityConfig.api.ts
index fd5302e..6dfe5a7 100644
--- a/src/views/modules/system/security/password/PasswordSecurityConfig.api.ts
+++ b/src/views/modules/system/security/password/PasswordSecurityConfig.api.ts
@@ -14,19 +14,9 @@ export function getDefault(){
 /**
  * 添加
  */
-export function add(obj: PasswordSecurityConfig) {
+export function addOrUpdate(obj: PasswordSecurityConfig) {
   return defHttp.post({
-    url: '/security/password/add',
-    data: obj,
-  })
-}
-
-/**
- * 更新
- */
-export function update(obj: PasswordSecurityConfig) {
-  return defHttp.post({
-    url: '/security/password/update',
+    url: '/security/password/addOrUpdate',
     data: obj,
   })
 }
diff --git a/src/views/modules/system/security/password/PasswordSecurityConfig.vue b/src/views/modules/system/security/password/PasswordSecurityConfig.vue
index c70e89c..e793303 100644
--- a/src/views/modules/system/security/password/PasswordSecurityConfig.vue
+++ b/src/views/modules/system/security/password/PasswordSecurityConfig.vue
@@ -2,35 +2,77 @@
   <div>
     <div class="m-3 p-3 bg-white">
       <a-spin :spinning="loading">
-        <a-form ref="formRef" :validate-trigger="['blur', 'change']" :label-col="2" :model="form" :rules="rules">
+        <a-form ref="formRef" :validate-trigger="['blur', 'change']" :label-col="{ span: 12 }" :model="form" :rules="rules">
           <a-row>
-            <a-col :offset="5" :span="6">
-              <a-form-item label="最大密码错误数" class="w-400px" name="name">
-                <a-input-number placeholder="请输入排序，可以是小数" :precision="0" v-model:value="form.maxPwdErrorCount" />
+            <a-col :offset="2" :span="10">
+              <a-form-item label="最大密码错误数" class="w-400px" name="maxPwdErrorCount">
+                <a-input-number
+                  :disabled="!edit"
+                  placeholder="请输入最大密码错误数"
+                  :precision="0"
+                  :min="1"
+                  v-model:value="form.maxPwdErrorCount"
+                />
               </a-form-item>
             </a-col>
-            <a-col :span="6">
-              <a-form-item label="密码错误锁定时间(分钟)" class="w-400px" name="name">
-                <a-input-number placeholder="请输入排序，可以是小数" :precision="0" v-model:value="form.maxPwdErrorCount" />
+            <a-col :span="10">
+              <a-form-item label="密码错误锁定时间(分钟)" class="w-400px" name="errorLockTime">
+                <a-input-number
+                  :disabled="!edit"
+                  placeholder="请输入密码错误锁定时间(分钟)"
+                  :precision="0"
+                  :min="1"
+                  v-model:value="form.errorLockTime"
+                />
               </a-form-item>
             </a-col>
           </a-row>
           <a-row>
-            <a-col :offset="5" :span="6">
-              <a-form-item label="最大密码错误数" class="w-400px" name="name">
-                <a-input-number placeholder="请输入排序，可以是小数" :precision="0" v-model:value="form.maxPwdErrorCount" />
+            <a-col :offset="2" :span="10">
+              <a-form-item label="密码更新频率(天)" class="w-400px" name="updateFrequency">
+                <a-input-number
+                  placeholder="请输入密码更新频率(天)，可以是小数"
+                  :disabled="!edit"
+                  :precision="0"
+                  :min="1"
+                  v-model:value="form.updateFrequency"
+                />
               </a-form-item>
             </a-col>
-            <a-col :span="6">
-              <a-form-item label="密码错误锁定时间(分钟)" class="w-400px" name="name">
-                <a-input-number placeholder="请输入排序，可以是小数" :precision="0" v-model:value="form.maxPwdErrorCount" />
+            <a-col :span="10">
+              <a-form-item label="到期提醒(天)" class="w-400px" name="expireRemind">
+                <a-input-number
+                  :disabled="!edit"
+                  placeholder="请输入到期提醒(天)"
+                  :precision="0"
+                  :min="1"
+                  v-model:value="form.expireRemind"
+                />
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row>
+            <a-col :offset="2" :span="10">
+              <a-form-item label="允许密码与登录名相同" class="w-400px" name="sameAsLoginName">
+                <a-switch :disabled="!edit" checkedChildren="是" unCheckedChildren="否" v-model:checked="form.sameAsLoginName" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="10">
+              <a-form-item label="不能与近期多少次密码相同" class="w-400px" name="recentPassword">
+                <a-input-number
+                  :disabled="!edit"
+                  placeholder="请输入不能与近期多少次密码相同"
+                  :precision="0"
+                  :min="1"
+                  v-model:value="form.recentPassword"
+                />
               </a-form-item>
             </a-col>
           </a-row>
           <a-row>
             <a-col :push="8">
-              <a-button :disabled="edit" type="primary" @click="addOrUpdate">保存信息</a-button>
-              <a-button style="margin-left: 50px" :disabled="!edit" @click="edit = true">编辑信息</a-button>
+              <a-button :disabled="!edit" type="primary" @click="update">保存信息</a-button>
+              <a-button style="margin-left: 50px" :disabled="edit" @click="edit = true">编辑信息</a-button>
             </a-col>
           </a-row>
         </a-form>
@@ -41,22 +83,23 @@
 
 <script lang="ts" setup>
   import { onMounted, reactive } from 'vue'
-  import { getDefault, PasswordSecurityConfig } from './PasswordSecurityConfig.api'
+  import { addOrUpdate, getDefault, PasswordSecurityConfig } from './PasswordSecurityConfig.api'
   import { $ref } from 'vue/macros'
   import { FormInstance, Rule } from 'ant-design-vue/lib/form'
-  import useFormEdit from '/@/hooks/bootx/useFormEdit'
-  import CollapseContainer from '/@/components/Container/src/collapse/CollapseContainer.vue'
+  import { useMessage } from '/@/hooks/web/useMessage'
 
-  const { labelCol, wrapperCol } = useFormEdit()
+  const { createConfirm, createMessage } = useMessage()
 
-  let form = $ref<PasswordSecurityConfig>({})
+  let form = $ref<PasswordSecurityConfig>({
+    sameAsLoginName: false,
+  })
   let loading = $ref(false)
   const formRef = $ref<FormInstance>()
   let edit = $ref(false)
 
   const rules = reactive({} as Record<string, Rule[]>)
 
-  onMounted(() => initData)
+  onMounted(() => initData())
 
   /**
    * 初始化数据
@@ -65,25 +108,24 @@
     loading = true
     getDefault().then(({ data }) => {
       form = data
-      loading = true
+      loading = false
     })
   }
 
   /**
-   * 保存或配置
+   * 保存或更新配置
    */
-  async function addOrUpdate() {
+  async function update() {
     await formRef?.validate()
+    loading = true
     createConfirm({
       iconType: 'warning',
       title: '警告',
-      content: '是否更新用户基础信息',
+      content: '是否更新密码安全配置信息',
       onOk: async () => {
-        confirmLoading = true
-        await updateBaseInfo(form)
-        createMessage.success('更新用户信息成功')
-        await userStore.refreshUserInfoAction()
-        confirmLoading = false
+        await addOrUpdate(form)
+        createMessage.success('更新密码安全配置成功')
+        initData()
       },
     })
   }
diff --git a/src/views/security/remind/UserRemind.ts b/src/views/security/remind/UserRemind.ts
index 30d251e..7eeb93e 100644
--- a/src/views/security/remind/UserRemind.ts
+++ b/src/views/security/remind/UserRemind.ts
@@ -1,6 +1,8 @@
 import { checkPasswordSecurity } from '/@/views/security/remind/UserRemind.api'
 import { useMessage } from '/@/hooks/web/useMessage'
 import { Modal } from 'ant-design-vue'
+import { router } from '/@/router'
+import { PageConstant, PageEnum } from '/@/enums/pageEnum'
 
 /**
  * 用户密码检查
@@ -16,20 +18,20 @@ export async function userPassWordCheck(): Promise<boolean> {
       okText: '去修改',
       keyboard: false,
       onOk: () => {
-        createMessage.success('开发中...')
+        router.push(PageConstant.ACCOUNT_PASSWORD)
       },
     })
     return false
   }
   // 检查密码是否已经过期
-  if (!data.expirePwd) {
+  if (data.expirePwd) {
     Modal.warning({
       title: '警告',
       content: '密码已经过期，请进行修改',
       okText: '去修改',
       keyboard: false,
       onOk: () => {
-        createMessage.success('开发中...')
+        router.push(PageConstant.ACCOUNT_PASSWORD)
       },
     })
     return false
@@ -43,7 +45,7 @@ export async function userPassWordCheck(): Promise<boolean> {
       okText: '去修改',
       cancelText: '暂不修改',
       onOk: () => {
-        createMessage.success('开发中...')
+        router.push(PageConstant.ACCOUNT_PASSWORD)
       },
     })
     return false
-- 
Gitee


From 5904ce3447d3846d6ce1d39ea291b8766f57417b Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Thu, 19 Oct 2023 20:28:55 +0800
Subject: [PATCH 10/12] =?UTF-8?q?ref=20=E8=B6=85=E6=97=B6=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E9=85=8D=E7=BD=AE=E6=8F=90=E5=8F=96=E5=88=B0env?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=AD,=20=E4=BC=98=E5=8C=96=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                           |  3 +++
 .env.production                            |  3 +++
 src/utils/env.ts                           |  2 ++
 src/utils/http/axios/index.ts              |  5 ++++-
 src/views/account/accountModel.ts          |  4 ++--
 src/views/modules/system/user/User.api.ts  | 12 ++++++------
 src/views/modules/system/user/UserList.vue | 12 ++++++------
 types/config.d.ts                          |  2 ++
 8 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/.env.development b/.env.development
index 02b4fc6..770bf03 100644
--- a/.env.development
+++ b/.env.development
@@ -13,6 +13,9 @@ VITE_DROP_CONSOLE=false
 # 接口地址
 VITE_GLOB_API_URL=/api
 
+# 接口超时时间
+VITE_GLOB_API_TIMEOUT=30000
+
 # 文件上传地址
 VITE_GLOB_UPLOAD_URL=/upload
 
diff --git a/.env.production b/.env.production
index b3378da..f1bdfbc 100644
--- a/.env.production
+++ b/.env.production
@@ -17,6 +17,9 @@ VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE=false
 # 接口地址
 VITE_GLOB_API_URL=/api
 
+# 接口超时时间
+VITE_GLOB_API_TIMEOUT=30000
+
 # 文件上传地址
 VITE_GLOB_UPLOAD_URL=/upload
 
diff --git a/src/utils/env.ts b/src/utils/env.ts
index ca0d943..4149644 100644
--- a/src/utils/env.ts
+++ b/src/utils/env.ts
@@ -27,6 +27,7 @@ export function getAppEnvConfig() {
     VITE_GLOB_API_URL,
     VITE_GLOB_APP_SHORT_NAME,
     VITE_GLOB_API_URL_PREFIX,
+    VITE_GLOB_API_TIMEOUT,
     VITE_GLOB_UPLOAD_URL,
     VITE_GLOB_APP_CLIENT,
   } = ENV
@@ -42,6 +43,7 @@ export function getAppEnvConfig() {
     VITE_GLOB_API_URL,
     VITE_GLOB_APP_SHORT_NAME,
     VITE_GLOB_API_URL_PREFIX,
+    VITE_GLOB_API_TIMEOUT,
     VITE_GLOB_UPLOAD_URL,
     VITE_GLOB_APP_CLIENT,
   }
diff --git a/src/utils/http/axios/index.ts b/src/utils/http/axios/index.ts
index bbaf284..33f5c09 100644
--- a/src/utils/http/axios/index.ts
+++ b/src/utils/http/axios/index.ts
@@ -14,6 +14,7 @@ import { useI18n } from '/@/hooks/web/useI18n'
 import { joinTimestamp, formatRequestDate } from './helper'
 import { useUserStoreWithOut } from '/@/store/modules/user'
 import { AxiosRetry } from '/@/utils/http/axios/axiosRetry'
+import { getAppEnvConfig } from "/@/utils/env";
 
 /**
  * axios配置  可自行根据项目进行更改，只需更改该文件即可，其他文件可以不动
@@ -205,6 +206,8 @@ const transform: AxiosTransform = {
  * @param opt
  */
 function createAxios(opt?: Partial<CreateAxiosOptions>) {
+  const { VITE_GLOB_API_TIMEOUT } = getAppEnvConfig()
+  console.log(VITE_GLOB_API_TIMEOUT)
   return new VAxios(
     // 深度合并
     deepMerge(
@@ -213,7 +216,7 @@ function createAxios(opt?: Partial<CreateAxiosOptions>) {
         // authentication schemes，e.g: Bearer
         // authenticationScheme: 'Bearer',
         authenticationScheme: '',
-        timeout: 10 * 1000,
+        timeout: VITE_GLOB_API_TIMEOUT,
         // 基础接口地址
         // baseURL: globSetting.apiUrl,
 
diff --git a/src/views/account/accountModel.ts b/src/views/account/accountModel.ts
index cb8c617..f36240a 100644
--- a/src/views/account/accountModel.ts
+++ b/src/views/account/accountModel.ts
@@ -13,9 +13,9 @@ export interface UserDetails {
   // 邮箱
   email?: string
   // 是否管理员
-  admin?: boolean
+  administrator?: boolean
   // 终端id列表
-  clientIdList?: string[]
+  clients?: string[]
 }
 
 /**
diff --git a/src/views/modules/system/user/User.api.ts b/src/views/modules/system/user/User.api.ts
index 7329b67..f54721c 100644
--- a/src/views/modules/system/user/User.api.ts
+++ b/src/views/modules/system/user/User.api.ts
@@ -71,21 +71,21 @@ export function restartPasswordBatch(userIds, newPassword) {
 }
 
 /**
- * 锁定用户
+ * 封禁用户
  */
-export function lockUser(userId) {
+export function banUser(userId) {
   return defHttp.post({
-    url: '/user/admin/lock',
+    url: '/user/admin/ban',
     params: { userId },
   })
 }
 
 /**
- * 锁定用户 批量
+ * 封禁用户 批量
  */
-export function lockUserBatch(userIds) {
+export function banUserBatch(userIds) {
   return defHttp.post({
-    url: '/user/admin/lockBatch',
+    url: '/user/admin/banUserBatch',
     data: userIds,
   })
 }
diff --git a/src/views/modules/system/user/UserList.vue b/src/views/modules/system/user/UserList.vue
index 7448c3d..49a5fb0 100644
--- a/src/views/modules/system/user/UserList.vue
+++ b/src/views/modules/system/user/UserList.vue
@@ -84,7 +84,7 @@
                     <a @click="resetPwd(row)">重置密码</a>
                   </a-menu-item>
                   <a-menu-item>
-                    <a v-if="row.status === 1" @click="lockUserConfirm(row.id, true)">锁定账号</a>
+                    <a v-if="row.status === 1" @click="lockUserConfirm(row.id, true)">封禁账号</a>
                     <a v-if="row.status === 3" @click="lockUserConfirm(row.id, false)">解锁账号</a>
                   </a-menu-item>
                 </a-menu>
@@ -124,7 +124,7 @@
   import { QueryField, STRING } from '/@/components/Bootx/Query/Query'
   import { $ref } from 'vue/macros'
   import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
-  import { lockUser, lockUserBatch, page, unlockUser, unlockUserBatch } from './User.api'
+  import { banUser, banUserBatch, page, unlockUser, unlockUserBatch } from './User.api'
   import { useDict } from '/@/hooks/bootx/useDict'
   import { Icon } from '/@/components/Icon'
   import UserAdd from './UserAdd.vue'
@@ -137,7 +137,7 @@
   import UserDeptAssign from './dept/UserDeptAssign.vue'
   import UserDeptAssignBatch from './dept/UserDeptAssignBatch.vue'
   import UserResetPwd from './UserResetPwd.vue'
-  import UserResetPwdBatch from "./UserResetPwdBatch.vue";
+  import UserResetPwdBatch from './UserResetPwdBatch.vue'
 
   // 使用hooks
   const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, pages, model, loading, batchOperateFlag } =
@@ -206,10 +206,10 @@
     createConfirm({
       iconType: 'warning',
       title: '警告',
-      content: type ? '是否锁定选中的用户' : '是否解锁选中的用户',
+      content: type ? '是否封禁选中的用户' : '是否解锁选中的用户',
       onOk: async () => {
         if (type) {
-          await lockUser(userId)
+          await banUser(userId)
         } else {
           await unlockUser(userId)
         }
@@ -229,7 +229,7 @@
       content: type ? '是否锁定选中的用户' : '是否解锁选中的用户',
       onOk: async () => {
         if (type) {
-          await lockUserBatch(userIds)
+          await banUserBatch(userIds)
         } else {
           await unlockUserBatch(userIds)
         }
diff --git a/types/config.d.ts b/types/config.d.ts
index 12b76a8..8a01ffc 100644
--- a/types/config.d.ts
+++ b/types/config.d.ts
@@ -153,6 +153,8 @@ export interface GlobEnvConfig {
   VITE_GLOB_APP_TITLE: string
   // 接口地址
   VITE_GLOB_API_URL: string
+  // 请求超时时间
+  VITE_GLOB_API_TIMEOUT: number
   // 接口前缀
   VITE_GLOB_API_URL_PREFIX?: string
   // Project abbreviation
-- 
Gitee


From 7071d6978f9575422fb7c6748b2ad434cc4de94d Mon Sep 17 00:00:00 2001
From: xxm1995 <xxm1995@outlook.com>
Date: Fri, 20 Oct 2023 17:43:08 +0800
Subject: [PATCH 11/12] =?UTF-8?q?feat=20=E5=A2=9E=E5=8A=A0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AF=86=E7=A0=81=E6=97=B6=E4=B8=8D=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E4=B8=8E=E4=B9=8B=E5=89=8DN=E6=AC=A1=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E7=9A=84=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/account/account.api.ts            | 10 ++++++++++
 src/views/account/security/PasswordEdit.vue | 15 +++++++++++++--
 src/views/modules/system/user/User.api.ts   |  4 ++--
 src/views/modules/system/user/UserEdit.vue  |  6 +++---
 src/views/modules/system/user/UserList.vue  |  4 ++--
 5 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/views/account/account.api.ts b/src/views/account/account.api.ts
index bc2bfa3..5dcd37d 100644
--- a/src/views/account/account.api.ts
+++ b/src/views/account/account.api.ts
@@ -40,6 +40,16 @@ export function updatePassword(password, newPassword) {
   })
 }
 
+/**
+ * 要修改的密码是否重复
+ */
+export function isRecentlyUsed(password) {
+  return defHttp.get<Result<boolean>>({
+    url: '/security/password/isRecentlyUsed',
+    params: { password },
+  })
+}
+
 /**
  * 绑定手机
  */
diff --git a/src/views/account/security/PasswordEdit.vue b/src/views/account/security/PasswordEdit.vue
index 6252d83..f990885 100644
--- a/src/views/account/security/PasswordEdit.vue
+++ b/src/views/account/security/PasswordEdit.vue
@@ -35,7 +35,7 @@
   import { nextTick, reactive } from 'vue'
   import { FormInstance, Rule } from 'ant-design-vue/lib/form'
   import StrengthMeter from '/@/components/StrengthMeter/src/StrengthMeter.vue'
-  import { updatePassword } from '/@/views/account/account.api'
+  import { isRecentlyUsed, updatePassword } from '/@/views/account/account.api'
 
   const { visible, confirmLoading, modalWidth, labelCol, wrapperCol, handleCancel } = useFormEdit()
 
@@ -48,7 +48,10 @@
   })
   const rules = reactive({
     oldPassword: [{ required: true, message: '请输入原密码!' }],
-    newPassword: [{ required: true, message: '请输入新密码!' }],
+    newPassword: [
+      { required: true, message: '请输入新密码!' },
+      { validator: validatePasswordRecently, trigger: 'blur' },
+    ],
     confirmPassword: [{ required: true, message: '请重新输入新密码!' }, { validator: validateConfirmPassword }],
   } as Record<string, Rule[]>)
   const formRef = $ref<FormInstance>()
@@ -60,6 +63,14 @@
     })
   }
 
+  /**
+   * 查看要修改的密码是否重复
+   */
+  async function validatePasswordRecently() {
+    const { data } = await isRecentlyUsed(form.newPassword)
+    return data ? Promise.reject('不可以使用近期使用过的密码! ') : Promise.resolve()
+  }
+
   // 验证新密码
   function validateNewPassword() {
     if (confirmDirty) {
diff --git a/src/views/modules/system/user/User.api.ts b/src/views/modules/system/user/User.api.ts
index f54721c..1dedcde 100644
--- a/src/views/modules/system/user/User.api.ts
+++ b/src/views/modules/system/user/User.api.ts
@@ -59,6 +59,7 @@ export function restartPassword(userId, newPassword) {
     params: { userId, newPassword },
   })
 }
+
 /**
  * 批量重置密码
  */
@@ -127,8 +128,7 @@ export interface UserInfo extends BaseEntity {
   // 邮箱
   email?: string
   // 关联终端
-  clientIds?: string
-  clientIdList?: string[]
+  clientIds?: string[]
   // 注册来源
   source?: string
   // 是否超级管理员
diff --git a/src/views/modules/system/user/UserEdit.vue b/src/views/modules/system/user/UserEdit.vue
index d223182..f319504 100644
--- a/src/views/modules/system/user/UserEdit.vue
+++ b/src/views/modules/system/user/UserEdit.vue
@@ -25,11 +25,11 @@
         <a-form-item label="用户名称" name="name">
           <a-input v-model:value="form.name" placeholder="请输入用户名称" />
         </a-form-item>
-        <a-form-item label="关联应用" name="clientIdList">
+        <a-form-item label="关联终端" name="clientIds">
           <a-select
             allowClear
             mode="multiple"
-            v-model:value="form.clientIdList"
+            v-model:value="form.clientIds"
             :filter-option="search"
             :options="clients"
             placeholder="请选择关联适用的终端"
@@ -83,7 +83,7 @@
     username: '',
     phone: '',
     email: '',
-    clientIdList: [],
+    clientIds: [],
   })
   let rawForm: any = {}
 
diff --git a/src/views/modules/system/user/UserList.vue b/src/views/modules/system/user/UserList.vue
index 49a5fb0..dce84fa 100644
--- a/src/views/modules/system/user/UserList.vue
+++ b/src/views/modules/system/user/UserList.vue
@@ -49,9 +49,9 @@
         <vxe-column field="username" title="账号" />
         <vxe-column field="phone" title="手机号" />
         <vxe-column field="email" title="邮箱" />
-        <vxe-column field="admin" title="是否管理员">
+        <vxe-column field="administrator" title="是否管理员">
           <template #default="{ row }">
-            <a-tag v-if="row.admin" color="green">是</a-tag>
+            <a-tag v-if="row.administrator" color="green">是</a-tag>
             <a-tag v-else color="red">否</a-tag>
           </template>
         </vxe-column>
-- 
Gitee


From 0f8095806eeec1ff5f1af6c120563acff336d35f Mon Sep 17 00:00:00 2001
From: nws <3239709711@qq.com>
Date: Sat, 21 Oct 2023 23:08:11 +0800
Subject: [PATCH 12/12] =?UTF-8?q?config=20=E5=88=87=E6=8D=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=97=B6=E6=98=AF=E5=90=A6=E5=88=A0=E9=99=A4=E6=9C=AA?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E7=9A=84=E6=B6=88=E6=81=AF=E5=B9=B6=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=20=E8=AE=BE=E7=BD=AE=E4=B8=BA=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/setting/components/SettingFooter.vue      |  6 +++---
 src/router/guard/index.ts                             |  7 +++++--
 src/settings/projectSetting.ts                        | 11 +++++------
 src/utils/http/axios/index.ts                         |  1 -
 src/views/security/remind/UserRemind.ts               |  2 +-
 types/config.d.ts                                     |  6 +++---
 6 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/layouts/default/setting/components/SettingFooter.vue b/src/layouts/default/setting/components/SettingFooter.vue
index ff80d4d..ead2af8 100644
--- a/src/layouts/default/setting/components/SettingFooter.vue
+++ b/src/layouts/default/setting/components/SettingFooter.vue
@@ -2,17 +2,17 @@
   <div :class="prefixCls">
     <a-button type="primary" block @click="handleCopy">
       <CopyOutlined class="mr-2" />
-      {{ t('layout.setting.copyBtn') }}
+      拷贝
     </a-button>
 
     <a-button color="warning" block @click="handleResetSetting" class="my-3">
       <RedoOutlined class="mr-2" />
-      {{ t('common.resetText') }}
+      重置
     </a-button>
 
     <a-button color="error" block @click="handleClearAndRedo">
       <RedoOutlined class="mr-2" />
-      {{ t('layout.setting.clearBtn') }}
+      清空缓存并返回登录页
     </a-button>
   </div>
 </template>
diff --git a/src/router/guard/index.ts b/src/router/guard/index.ts
index 4682385..1794ff4 100644
--- a/src/router/guard/index.ts
+++ b/src/router/guard/index.ts
@@ -13,7 +13,7 @@ import nProgress from 'nprogress'
 import projectSetting from '/@/settings/projectSetting'
 import { createParamMenuGuard } from './paramMenuGuard'
 
-// Don't change the order of creation
+// 不要更改创建顺序
 export function setupRouterGuard(router: Router) {
   createPageGuard(router)
   createPageLoadingGuard(router)
@@ -111,15 +111,18 @@ function createScrollGuard(router: Router) {
 }
 
 /**
- * Used to close the message instance when the route is switched
+ * 用于在切换路由时关闭消息实例
  * @param router
  */
 export function createMessageGuard(router: Router) {
   const { closeMessageOnSwitch } = projectSetting
 
+  console.log(projectSetting)
+  console.log(closeMessageOnSwitch)
   router.beforeEach(async () => {
     try {
       if (closeMessageOnSwitch) {
+        console.log(666444)
         Modal.destroyAll()
         notification.destroy()
       }
diff --git a/src/settings/projectSetting.ts b/src/settings/projectSetting.ts
index a2e2236..ca8e897 100644
--- a/src/settings/projectSetting.ts
+++ b/src/settings/projectSetting.ts
@@ -165,17 +165,16 @@ const setting: ProjectConfig = {
   // Use error-handler-plugin
   useErrorHandle: false,
 
-  // Whether to open back to top
+  // 是否打开返回顶部
   useOpenBackTop: true,
 
-  //  Is it possible to embed iframe pages
+  //  是否可以嵌入 iframe 页面
   canEmbedIFramePage: true,
 
-  // Whether to delete unclosed messages and notify when switching the interface
-  closeMessageOnSwitch: true,
+  // 切换接口时是否删除未关闭的消息并通知
+  closeMessageOnSwitch: false,
 
-  // Whether to cancel the http request that has been sent but not responded when switching the interface.
-  // If it is enabled, I want to overwrite a single interface. Can be set in a separate interface
+  // 如果启用，我想覆盖单个接口。可以在单独的界面中设置
   removeAllHttpPending: false,
 }
 
diff --git a/src/utils/http/axios/index.ts b/src/utils/http/axios/index.ts
index 33f5c09..166af4b 100644
--- a/src/utils/http/axios/index.ts
+++ b/src/utils/http/axios/index.ts
@@ -207,7 +207,6 @@ const transform: AxiosTransform = {
  */
 function createAxios(opt?: Partial<CreateAxiosOptions>) {
   const { VITE_GLOB_API_TIMEOUT } = getAppEnvConfig()
-  console.log(VITE_GLOB_API_TIMEOUT)
   return new VAxios(
     // 深度合并
     deepMerge(
diff --git a/src/views/security/remind/UserRemind.ts b/src/views/security/remind/UserRemind.ts
index 7eeb93e..1bc9b3e 100644
--- a/src/views/security/remind/UserRemind.ts
+++ b/src/views/security/remind/UserRemind.ts
@@ -2,7 +2,7 @@ import { checkPasswordSecurity } from '/@/views/security/remind/UserRemind.api'
 import { useMessage } from '/@/hooks/web/useMessage'
 import { Modal } from 'ant-design-vue'
 import { router } from '/@/router'
-import { PageConstant, PageEnum } from '/@/enums/pageEnum'
+import { PageConstant } from '/@/enums/pageEnum'
 
 /**
  * 用户密码检查
diff --git a/types/config.d.ts b/types/config.d.ts
index 8a01ffc..41b60f9 100644
--- a/types/config.d.ts
+++ b/types/config.d.ts
@@ -126,11 +126,11 @@ export interface ProjectConfig {
   showBreadCrumbIcon: boolean
   // Use error-handler-plugin
   useErrorHandle: boolean
-  // Whether to open back to top
+  // 是否打开返回顶部
   useOpenBackTop: boolean
-  // Is it possible to embed iframe pages
+  // 是否可以嵌入 iframe 页面
   canEmbedIFramePage: boolean
-  // Whether to delete unclosed messages and notify when switching the interface
+  // 切换接口时是否删除未关闭的消息并通知
   closeMessageOnSwitch: boolean
   // Whether to cancel the http request that has been sent but not responded when switching the interface.
   removeAllHttpPending: boolean
-- 
Gitee