From 82a0eaed4ac67fc559467248d62dbaa887fbab85 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 13 Mar 2024 16:33:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/templates/demo/form/select.html  | 2 +-
 .../src/main/java/com/ruoyi/common/constant/ShiroConstants.java | 2 +-
 ruoyi-framework/pom.xml                                         | 2 +-
 .../com/ruoyi/framework/shiro/service/SysPasswordService.java   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/demo/form/select.html b/ruoyi-admin/src/main/resources/templates/demo/form/select.html
index 070a53174..2abac45cd 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/form/select.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/form/select.html
@@ -91,7 +91,7 @@
                         </div>
                         
                         <div class="form-group">
-                             <label class="font-noraml">分组多选</label>
+                             <label class="font-noraml">分组单选</label>
                              <select class="form-control noselect2 selectpicker">
                                <optgroup label="--请选择开发语言--">
 								 <option value="Java">Java</option>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/ShiroConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/ShiroConstants.java
index dfa57dbfb..239d36fc7 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/ShiroConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/ShiroConstants.java
@@ -70,7 +70,7 @@ public class ShiroConstants
     /**
      * 登录记录缓存
      */
-    public static final String LOGINRECORDCACHE = "loginRecordCache";
+    public static final String LOGIN_RECORD_CACHE = "loginRecordCache";
 
     /**
      * 系统活跃用户缓存
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index 20cf160db..002b5a9ee 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -41,7 +41,7 @@
             <artifactId>kaptcha</artifactId>
             <exclusions>
                 <exclusion>
-                    <artifactId>javax.servlet-api</artifactId>
+                    <artifactId>servlet-api</artifactId>
                     <groupId>javax.servlet</groupId>
                 </exclusion>
             </exclusions>
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java
index 7eff195fa..338e7293e 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java
@@ -36,7 +36,7 @@ public class SysPasswordService
     @PostConstruct
     public void init()
     {
-        loginRecordCache = cacheManager.getCache(ShiroConstants.LOGINRECORDCACHE);
+        loginRecordCache = cacheManager.getCache(ShiroConstants.LOGIN_RECORD_CACHE);
     }
 
     public void validate(SysUser user, String password)