From ee71c1d68be6f151f08b5f67271a62ddbf6c9979 Mon Sep 17 00:00:00 2001
From: 2812875475 <2812875475@qq.com>
Date: Fri, 12 Apr 2024 15:41:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E5=BC=BA?=
 =?UTF-8?q?=E9=80=80=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/monitor/online.js          |  8 ++++++++
 src/utils/auth.js                  |  3 +++
 src/utils/request.js               |  2 +-
 src/views/monitor/online/index.vue |  6 ++++--
 src/views/system/user/index.vue    | 20 +++++++++++++++++++-
 5 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/src/api/monitor/online.js b/src/api/monitor/online.js
index d53df58..41e312e 100644
--- a/src/api/monitor/online.js
+++ b/src/api/monitor/online.js
@@ -16,3 +16,11 @@ export function forceLogout(tokenId) {
     method: 'delete'
   })
 }
+
+export function findTokenId(query) {
+  return request({
+    url: '/system/online/findTokenId',
+    method: 'post',
+    data: query
+  })
+}
diff --git a/src/utils/auth.js b/src/utils/auth.js
index a673d22..db28a7e 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -1,9 +1,12 @@
 import Cookies from 'js-cookie'
+import request from "@/utils/request";
 
 const TokenKey = 'Admin-Token'
 
 const ExpiresInKey = 'Admin-Expires-In'
 
+
+
 export function getToken() {
   return Cookies.get(TokenKey)
 }
diff --git a/src/utils/request.js b/src/utils/request.js
index 47d1bcb..1946061 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -73,7 +73,7 @@ service.interceptors.request.use(config => {
 
 // 响应拦截器
 service.interceptors.response.use(res => {
-  debugger
+
     // 未设置状态码则默认成功状态
     const code = res.data.code || 200;
     // 获取错误信息
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index 7adeb9b..2578f68 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -77,7 +77,8 @@ export default {
       // 查询参数
       queryParams: {
         ipaddr: undefined,
-        userName: undefined
+        userName: undefined,
+        name:undefined,
       }
     };
   },
@@ -113,7 +114,8 @@ export default {
         this.$modal.msgSuccess("强退成功");
       }).catch(() => {
       });
-    }
+
+    },
   }
 };
 </script>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index a5014a8..8414e76 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -374,6 +374,7 @@ import {
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {findTokenId, forceLogout} from "@/api/monitor/online";
 
 export default {
   name: "User",
@@ -478,6 +479,12 @@ export default {
             trigger: "blur"
           }
         ]
+      },
+      /*强退*/
+      tokenParams: {
+        ipaddr: undefined,
+        userName: undefined,
+        name:undefined,
       }
     };
   },
@@ -551,7 +558,7 @@ export default {
         status: "0",
         remark: undefined,
         postIds: [],
-        roleIds: []
+        roleIds: [],
       };
       this.resetForm("form");
     },
@@ -615,6 +622,15 @@ export default {
     },
     /** 重置密码按钮操作 */
     handleResetPwd(row) {
+      let tokenId="";
+      this.tokenParams.name=row.userName
+      findTokenId(this.tokenParams).then(
+        res=>{
+          console.log(res.data)
+          tokenId=res.data
+        }
+      )
+
       this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -622,8 +638,10 @@ export default {
         inputPattern: /^.{5,20}$/,
         inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
       }).then(({value}) => {
+
         resetUserPwd(row.userId, value).then(response => {
           this.$modal.msgSuccess("修改成功，新密码是：" + value);
+          forceLogout(tokenId)
         });
       }).catch(() => {
       });