bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-nx' into dev-nx

This commit is contained in:
csyue 2024-05-28 11:41:35 +08:00
parent 86419027c1 1c4fe61c2a
commit 72751401cf
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/model/LoginUser.java
View File

@ -4,6 +4,9 @@ import java.io.Serializable;
import java.util.Set; import java.util.Set;
import com.bonus.sgzb.system.api.domain.SysUser; import com.bonus.sgzb.system.api.domain.SysUser;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/** /**
* 用户信息 * 用户信息

6
sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
View File

@ -64,12 +64,18 @@ public class TokenController {
String uuid = form.getUuid(); String uuid = form.getUuid();
String captcha = redisService.getCacheObject(CacheConstants.CAPTCHA_CODE_KEY + uuid).toString(); String captcha = redisService.getCacheObject(CacheConstants.CAPTCHA_CODE_KEY + uuid).toString();
if (StringUtils.isBlank(captcha)) { if (StringUtils.isBlank(captcha)) {
// 删除验证码缓存
redisService.deleteObject(CacheConstants.CAPTCHA_CODE_KEY + uuid);
return R.fail("验证码超时，请重新刷新"); return R.fail("验证码超时，请重新刷新");
} }
if (form.getCode() != null && form.getCode().equals(captcha)) { if (form.getCode() != null && form.getCode().equals(captcha)) {
// 删除验证码缓存
redisService.deleteObject(CacheConstants.CAPTCHA_CODE_KEY + uuid);
// 获取登录token // 获取登录token
return R.ok(tokenService.createToken(userInfo)); return R.ok(tokenService.createToken(userInfo));
} else { } else {
// 删除验证码缓存
redisService.deleteObject(CacheConstants.CAPTCHA_CODE_KEY + uuid);
return R.fail("验证码错误"); return R.fail("验证码错误");
} }
} }

16
sgzb-ui/src/views/newLogin.vue
View File

@ -505,13 +505,15 @@ export default {
this.$store this.$store
.dispatch('Login', this.loginForm) .dispatch('Login', this.loginForm)
.then(() => { .then(() => {
if (localStorage.getItem('isCode') == 1) { // if (localStorage.getItem('isCode') == 1) {
this.$router // this.$router
.push({ path: '/resetPassword' }) // .push({ path: '/resetPassword' })
.catch(() => {}) // .catch(() => {})
} else { // } else {
this.$router.push({ path: '/' }).catch(() => {}) // this.$router.push({ path: '/' }).catch(() => {})
} // }
this.$router.push({ path: '/' }).catch(() => {})
}) })
.catch(() => { .catch(() => {
this.loading = false this.loading = false

2
sgzb-ui/vue.config.js
View File

@ -45,7 +45,7 @@ module.exports = {
// target: `http://10.40.92.8:28080`, //超 // target: `http://10.40.92.8:28080`, //超
// target: `http://10.40.92.81:8080`, //韩/ // target: `http://10.40.92.81:8080`, //韩/
// target: `http://10.40.92.74:8080`,//旭/ // target: `http://10.40.92.74:8080`,//旭/
target: `http://10.40.92.141:28080`, //帅 target: `http://10.40.92.136:28080`, //帅
// target: `http://10.40.92.253:28080`, //福 // target: `http://10.40.92.253:28080`, //福
//******** 注意事项 ********* */ //******** 注意事项 ********* */