From cdbe723d6413fc2560c0d79c4d0a910022edd71e Mon Sep 17 00:00:00 2001
From: lyd <1419499670@qq.com>
Date: Fri, 18 Nov 2022 17:57:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/modules/security/rest/AuthorizationController.java  | 3 +++
 acs/nladmin-ui/src/views/login.vue                             | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java b/acs/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java
index 7b1ced23f..d4325e284 100644
--- a/acs/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java
+++ b/acs/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java
@@ -92,6 +92,9 @@ public class AuthorizationController {
             throw new BadRequestException("账号或密码错误");
         }
 
+        // 判断是否被锁
+        if (!userDto.getEnabled()) throw new BadRequestException("账号未激活");
+
         // 获取权限列表 - 登录查找权限
         List<String> permissionList = roleService.getPermissionList(userDto);
 
diff --git a/acs/nladmin-ui/src/views/login.vue b/acs/nladmin-ui/src/views/login.vue
index ba0c1eacd..caa6d0699 100644
--- a/acs/nladmin-ui/src/views/login.vue
+++ b/acs/nladmin-ui/src/views/login.vue
@@ -9,7 +9,7 @@
         </el-input>
       </el-form-item>
       <el-form-item prop="password">
-        <el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="密码" @keyup.enter.native="handleLogin">
+        <el-input v-model="loginForm.password" type="password" auto-complete="new-password" placeholder="密码" @keyup.enter.native="handleLogin">
           <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>