From dc6ae8a184328eace2fc7e5238ad5be981be1177 Mon Sep 17 00:00:00 2001
From: 20300 <643145201@qq.com>
Date: Fri, 12 Apr 2024 15:38:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81,=E5=BC=BA=E9=80=80=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/user.js             |  5 +++--
 src/utils/request.js               |  1 -
 src/views/login.vue                |  2 +-
 src/views/monitor/online/index.vue |  2 ++
 src/views/system/user/index.vue    | 28 +++++++++++++++++++++++++++-
 5 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/api/system/user.js b/src/api/system/user.js
index 89d3972..28fb28b 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -45,10 +45,11 @@ export function delUser(userId) {
 }
 
 // 用户密码重置
-export function resetUserPwd(userId, password) {
+export function resetUserPwd(userId, password, tokenId) {
   const data = {
     userId,
-    password
+    password,
+    tokenId
   }
   return request({
     url: '/system/user/resetPwd',
diff --git a/src/utils/request.js b/src/utils/request.js
index 47d1bcb..406490d 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -73,7 +73,6 @@ service.interceptors.request.use(config => {
 
 // 响应拦截器
 service.interceptors.response.use(res => {
-  debugger
     // 未设置状态码则默认成功状态
     const code = res.data.code || 200;
     // 获取错误信息
diff --git a/src/views/login.vue b/src/views/login.vue
index 2944f5e..36f9e9f 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -72,7 +72,7 @@ export default {
     return {
       codeUrl: "",
       loginForm: {
-        username: "admin",
+        username: "ry@163.com",
         password: "admin123",
         rememberMe: false,
         code: "",
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index 7adeb9b..6e3eecc 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -106,7 +106,9 @@ export default {
     },
     /** 强退按钮操作 */
     handleForceLogout(row) {
+      console.log(row)
       this.$modal.confirm('是否确认强退名称为"' + row.userName + '"的用户？').then(function () {
+        console.log(row.tokenId)
         return forceLogout(row.tokenId);
       }).then(() => {
         this.getList();
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index a5014a8..e31a592 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 {list} from "@/api/monitor/online";
 
 export default {
   name: "User",
@@ -381,6 +382,12 @@ export default {
   components: {Treeselect},
   data() {
     return {
+      loginLogQueryParams: {
+        ipaddr: undefined,
+        userName: undefined
+      },
+      loginLogList: [],
+      loginLogTotal: 0,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -495,6 +502,14 @@ export default {
     });
   },
   methods: {
+    getLoginLogList() {
+      this.loading = true;
+      list(this.loginLogQueryParams).then(response => {
+        this.loginLogList = response.data.rows;
+        this.loginLogTotal = response.data.total;
+        this.loading = false;
+      });
+    },
     /** 查询用户列表 */
     getList() {
       this.loading = true;
@@ -615,6 +630,9 @@ export default {
     },
     /** 重置密码按钮操作 */
     handleResetPwd(row) {
+      this.getLoginLogList()
+      console.log("list",this.loginLogList)
+      console.log("row",row)
       this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -622,7 +640,15 @@ export default {
         inputPattern: /^.{5,20}$/,
         inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
       }).then(({value}) => {
-        resetUserPwd(row.userId, value).then(response => {
+        let tokenId = null
+        this.loginLogList.forEach(loginLog => {
+          if (loginLog.userName === row.userName){
+            tokenId = loginLog.tokenId
+          }
+        })
+        console.log("kkk ")
+        console.log("tokenId",tokenId)
+        resetUserPwd(row.userId, value, tokenId).then(response => {
           this.$modal.msgSuccess("修改成功，新密码是：" + value);
         });
       }).catch(() => {