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 @@ - + - +