diff --git a/src/main/java/com/supwisdom/dlpay/system/dao/impl/DictionaryDaoImpl.java b/src/main/java/com/supwisdom/dlpay/system/dao/impl/DictionaryDaoImpl.java
index 87c8077..56b09e4 100644
--- a/src/main/java/com/supwisdom/dlpay/system/dao/impl/DictionaryDaoImpl.java
+++ b/src/main/java/com/supwisdom/dlpay/system/dao/impl/DictionaryDaoImpl.java
@@ -176,7 +176,6 @@
 
     @Transactional
     @Override
-    @Cacheable(cacheNames = "dicationaryString_cache", key = "#p0")
     public List<String> findDictionaryStringByType(int type) {
         String sql = "select a.dictval || '_' || a.dictcaption as str from t_dictionary a where a.dicttype=?1";
         Query query = entityManager.createNativeQuery(sql);
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
index fb62d74..32351bb 100644
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -17,7 +17,7 @@
         <img th:src="@{/static/custom/images/logo.png}"> logo
     </div>
 
-    <div class=" login-body">
+    <div class=" login-body" onkeydown="keyLogin();">
         <div class="layui-card">
             <div class="layui-card-header">
                 <i class="layui-icon layui-icon-engine"></i>&nbsp;&nbsp;用户登录
@@ -59,7 +59,7 @@
                     <a href="javascript:;" class="layui-link pull-right">忘记密码？</a>
                 </div>
                 <div class="layui-form-item">
-                    <button lay-filter="login-submit" class="layui-btn layui-btn-fluid" lay-submit>登 录</button>
+                    <button lay-filter="login-submit" class="layui-btn layui-btn-fluid" lay-submit  id = "login_login">登 录</button>
                 </div>
                 <!--<div class="layui-form-item login-other">-->
                     <!--<label>第三方登录</label>-->
@@ -121,6 +121,12 @@
             this.src = this.src + '?t=' + (new Date).getTime();
         });
     });
+
+    function keyLogin(){
+        //console.log(window.event.keyCode)
+        if (window.event.keyCode==13)  //回车键的键值为13
+            document.getElementById("login_login").click(); //调用登录按钮的登录事件
+    }
 </script>
 </body>
 </html>
\ No newline at end of file