From ed01e805034523488738601fa8336d745d93dda6 Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Mon, 3 Jun 2024 08:39:48 +0800
Subject: [PATCH] '123'

---
 .../com/ruoyi/web/controller/system/SsoLoginController.java   | 2 +-
 .../com/ruoyi/web/controller/system/SysUserController.java    | 2 +-
 .../src/main/java/com/ruoyi/common/utils/sign}/SHA1.java      | 2 +-
 ruoyi-ui/src/layout/components/Navbar.vue                     | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename {ruoyi-admin/src/main/java/com/ruoyi/web/utils => ruoyi-common/src/main/java/com/ruoyi/common/utils/sign}/SHA1.java (96%)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SsoLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SsoLoginController.java
index f662992..cf3c544 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SsoLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SsoLoginController.java
@@ -13,8 +13,8 @@ package com.ruoyi.web.controller.system;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.NoPswLoginBody;
+import com.ruoyi.common.utils.sign.SHA1;
 import com.ruoyi.framework.web.service.SsoLoginService;
-import com.ruoyi.web.utils.SHA1;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 37adeb3..027dabe 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -7,8 +7,8 @@ import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.sign.SHA1;
 import com.ruoyi.system.service.*;
-import com.ruoyi.web.utils.SHA1;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/SHA1.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/SHA1.java
similarity index 96%
rename from ruoyi-admin/src/main/java/com/ruoyi/web/utils/SHA1.java
rename to ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/SHA1.java
index 3fa50bf..0d9adce 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/SHA1.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/SHA1.java
@@ -1,4 +1,4 @@
-package com.ruoyi.web.utils;
+package com.ruoyi.common.utils.sign;
 
 import java.security.MessageDigest;
 
diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index 760205a..e8e9280 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -27,9 +27,9 @@
 
 
         <el-dialog :title="switchAccountTitle" :visible.sync="switchAccountOpen" width="500px" append-to-body>
-          <el-form ref="form" :model="form":rules="rules" label-width="100px">
+          <el-form ref="form" :model="form":rules="rules" label-width="100px" @submit.native.prevent>
             <el-form-item label="账号" prop="account">
-              <el-input v-model="form.account" placeholder="请输入账号" clearable/>
+              <el-input v-model="form.account" placeholder="请输入账号" @keyup.enter.native="switchAccountConfirm(form.account)" clearable/>
             </el-form-item>
           </el-form>
           <div slot="footer" class="dialog-footer">