From 414de9f2ebdbb6fd3058ff4fbac946f3f4cd0b26 Mon Sep 17 00:00:00 2001
From: "meilin.huang" <954537473@qq.com>
Date: Tue, 20 Jun 2023 17:08:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E5=BA=93=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mayfly_go_web/src/views/ops/db/SqlExec.vue           | 2 +-
 mayfly_go_web/src/views/ops/db/component/DbTable.vue | 2 +-
 server/internal/sys/api/account.go                   | 4 ++--
 server/mayfly-go.sql                                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mayfly_go_web/src/views/ops/db/SqlExec.vue b/mayfly_go_web/src/views/ops/db/SqlExec.vue
index 4efc3e9f..aca14dab 100644
--- a/mayfly_go_web/src/views/ops/db/SqlExec.vue
+++ b/mayfly_go_web/src/views/ops/db/SqlExec.vue
@@ -495,7 +495,7 @@ const registerSqlCompletionItemProvider = () => {
             const secondToken = tokens.length > 2 && tokens[tokens.length - 2].toLowerCase() || ''
 
             // const dbs = nowTab.params?.dbs?.split(' ') || [];
-            const dbs = db ? [db] : [];
+            const dbs = nowTab.params && nowTab.params.dbs && nowTab.params.dbs.split(' ') || [];
             // console.log("光标前文本：=>" + textBeforePointerMulti)
             // console.log("最后输入的：=>" + lastToken)
 
diff --git a/mayfly_go_web/src/views/ops/db/component/DbTable.vue b/mayfly_go_web/src/views/ops/db/component/DbTable.vue
index 4ea13239..32bf81f7 100644
--- a/mayfly_go_web/src/views/ops/db/component/DbTable.vue
+++ b/mayfly_go_web/src/views/ops/db/component/DbTable.vue
@@ -3,7 +3,7 @@
         <el-table @cell-dblclick="(row: any, column: any, cell: any, event: any) => cellClick(row, column, cell)"
             @sort-change="(sort: any) => onTableSortChange(sort)" @selection-change="onDataSelectionChange"
             :data="datas" size="small" :max-height="tableHeight" v-loading="loading" element-loading-text="查询中..."
-            :empty-text="emptyText" stripe border class="mt5">
+            :empty-text="emptyText" highlight-current-row stripe border class="mt5">
             <el-table-column v-if="datas.length > 0 && table" type="selection" width="35" />
             <el-table-column min-width="100" :width="DbInst.flexColumnWidth(item, datas)" align="center"
                 v-for="item in columnNames" :key="item" :prop="item" :label="item" show-overflow-tooltip
diff --git a/server/internal/sys/api/account.go b/server/internal/sys/api/account.go
index d29ef718..87b502ca 100644
--- a/server/internal/sys/api/account.go
+++ b/server/internal/sys/api/account.go
@@ -63,7 +63,7 @@ func (a *Account) Login(rc *req.Ctx) {
 	nowFailCount := cache.GetInt(failCountKey)
 	loginFailCount := accountLoginSecurity.LoginFailCount
 	loginFailMin := accountLoginSecurity.LoginFailMin
-	biz.IsTrue(nowFailCount < loginFailCount, fmt.Sprintf("登录失败超过%d次, 请%d分钟后再试", loginFailCount, loginFailMin))
+	biz.IsTrue(nowFailCount < loginFailCount, "登录失败超过%d次, 请%d分钟后再试", loginFailCount, loginFailMin)
 
 	if err != nil || !utils.CheckPwdHash(originPwd, account.Password) {
 		nowFailCount++
@@ -92,7 +92,7 @@ func (a *Account) Login(rc *req.Ctx) {
 		otpSecret := account.OtpSecret
 		// 修改状态为已注册
 		otpStatus = OtpStatusReg
-		// 该token用于opt双因素校验
+		// 该token用于otp双因素校验
 		token = utils.RandString(32)
 		// 未注册otp secret或重置了秘钥
 		if otpSecret == "" || otpSecret == "-" {
diff --git a/server/mayfly-go.sql b/server/mayfly-go.sql
index d4b1e719..981159b1 100644
--- a/server/mayfly-go.sql
+++ b/server/mayfly-go.sql
@@ -350,7 +350,7 @@ CREATE TABLE `t_sys_config` (
 -- Records of t_sys_config
 -- ----------------------------
 BEGIN;
-INSERT INTO `t_sys_config` (name, `key`, params, value, remark, create_time, creator_id, creator, update_time, modifier_id, modifier) VALUES(5, '账号登录安全设置', 'AccountLoginSecurity', '[{"name":"登录验证码","model":"useCaptcha","placeholder":"是否启用登录验证码","options":"true,false"},{"name":"双因素校验","model":"useOtp","placeholder":"是否启用双因素(OTP)校验","options":"true,false"},{"name":"otp签发人","model":"otpIssuer","placeholder":"otp签发人"},{"name":"允许失败次数","model":"loginFailCount","placeholder":"登录失败n次后禁止登录"},{"name":"禁止登录时间","model":"loginFailMin","placeholder":"登录失败指定次数后禁止m分钟内再次登录"}]', '{"useCaptcha":"true","useOtp":"false","loginFailCount":"5","loginFailMin":"10","otpIssuer":"mayfly-go"}', '系统账号登录相关安全设置', '2023-06-17 11:02:11', 1, 'admin', '2023-06-17 14:18:07', 1, 'admin');
+INSERT INTO `t_sys_config` (name, `key`, params, value, remark, create_time, creator_id, creator, update_time, modifier_id, modifier) VALUES(5, '账号登录安全设置', 'AccountLoginSecurity', '[{"name":"登录验证码","model":"useCaptcha","placeholder":"是否启用登录验证码","options":"true,false"},{"name":"双因素校验(OTP)","model":"useOtp","placeholder":"是否启用双因素(OTP)校验","options":"true,false"},{"name":"OTP签发人","model":"otpIssuer","placeholder":"otp签发人"},{"name":"允许失败次数","model":"loginFailCount","placeholder":"登录失败n次后禁止登录"},{"name":"禁止登录时间","model":"loginFailMin","placeholder":"登录失败指定次数后禁止m分钟内再次登录"}]', '{"useCaptcha":"true","useOtp":"false","loginFailCount":"5","loginFailMin":"10","otpIssuer":"mayfly-go"}', '系统账号登录相关安全设置', '2023-06-17 11:02:11', 1, 'admin', '2023-06-17 14:18:07', 1, 'admin');
 INSERT INTO `t_sys_config` (name, `key`, params, value, remark, create_time, creator_id, creator, update_time, modifier_id, modifier)VALUES ('是否启用水印', 'UseWartermark', NULL, '1', '1: 启用、0: 不启用', '2022-08-25 23:36:35', 1, 'admin', '2022-08-26 10:02:52', 1, 'admin');
 INSERT INTO `t_sys_config` (name, `key`, params, value, remark, create_time, creator_id, creator, update_time, modifier_id, modifier)VALUES ('数据库查询最大结果集', 'DbQueryMaxCount', '[]', '200', '允许sql查询的最大结果集数。注: 0=不限制', '2023-02-11 14:29:03', 1, 'admin', '2023-02-11 14:40:56', 1, 'admin');
 INSERT INTO `t_sys_config` (name, `key`, params, value, remark, create_time, creator_id, creator, update_time, modifier_id, modifier)VALUES ('数据库是否记录查询SQL', 'DbSaveQuerySQL', '[]', '0', '1: 记录、0:不记录', '2023-02-11 16:07:14', 1, 'admin', '2023-02-11 16:44:17', 1, 'admin');