xd
/
JNBusiness
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'123'

This commit is contained in:
xd 2024-06-03 08:39:48 +08:00
parent ea00a18ad2
commit ed01e80503
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SsoLoginController.java
View File

@ -13,8 +13,8 @@ package com.ruoyi.web.controller.system;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.model.NoPswLoginBody; 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.framework.web.service.SsoLoginService;
import com.ruoyi.web.utils.SHA1;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
View File

@ -7,8 +7,8 @@ import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.constant.CacheConstants; import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.sign.SHA1;
import com.ruoyi.system.service.*; import com.ruoyi.system.service.*;
import com.ruoyi.web.utils.SHA1;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;

2
ruoyi-admin/src/main/java/com/ruoyi/web/utils/SHA1.java → ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/SHA1.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.utils; package com.ruoyi.common.utils.sign;
import java.security.MessageDigest; import java.security.MessageDigest;

4
ruoyi-ui/src/layout/components/Navbar.vue
View File

@ -27,9 +27,9 @@
<el-dialog :title="switchAccountTitle" :visible.sync="switchAccountOpen" width="500px" append-to-body> <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-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-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">