KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【修改】登录市场和方法统一修改

Browse Source
This commit is contained in:
zer0Black
2022-04-17 23:13:28 +08:00
parent b5ac2c4a1b
commit 4dcbaf5b57
9 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/exception/JeroBootExceptionHandler.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.jero.common.exception;
import io.lettuce.core.RedisConnectionException;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authz.AuthorizationException;
import org.apache.shiro.authz.UnauthorizedException;
import com.jero.common.api.vo.Result;
@@ -29,7 +29,7 @@ public class JeroBootExceptionHandler {
* 处理自定义异常
*/
@ExceptionHandler(JeroBootException.class)
public Result<?> handleRRException(JeroBootException e){
public Result<?> handleJeroBootException(JeroBootException e){
log.error(e.getMessage(), e);
return Result.error(e.getMessage());
}
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/util/JwtUtil.java
+3 -2
View File
@@ -28,8 +28,9 @@ import com.jero.common.util.oConvertUtils;
**/
public class JwtUtil {
// Token过期时间30分钟（用户登录过期时间是此时间的两倍，以token在reids缓存时间为准）
public static final long EXPIRE_TIME = 60 * 60 * 1000;
// Token过期时间180分钟（用户登录过期时间是此时间的两倍，以token在reids缓存时间为准）
public static final long EXPIRE_TIME = 180 * 60 * 1000;
// public static final long EXPIRE_TIME = 2000;
/**
* 校验token是否正确
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformApiController.java
+6 -8
View File
@@ -143,8 +143,7 @@ public class OnlCgformApiController {
Result var2 = new Result();
OnlCgformHead var3 = (OnlCgformHead)this.onlCgformHeadService.getById(var1);
if (var3 == null) {
var2.error500("实体不存在");
return var2;
return Result.error("实体不存在");
} else {
OnlComplexModel var4 = this.onlineService.queryOnlineConfig(var3);
var4.setIsDesForm(var3.getIsDesForm());
@@ -167,8 +166,7 @@ public class OnlCgformApiController {
Result var3 = new Result();
OnlCgformHead var4 = (OnlCgformHead)this.onlCgformHeadService.getById(var1);
if (var4 == null) {
var3.error500("实体不存在");
return var3;
return Result.error("实体不存在");
} else {
try {
String var5 = var4.getTableName();
@@ -178,7 +176,7 @@ public class OnlCgformApiController {
var3.setResult(var7);
} catch (Exception var8) {
log.error(var8.getMessage(), var8);
var3.error500("数据库查询失败，" + var8.getMessage());
return Result.error("数据库查询失败，" + var8.getMessage());
}
var3.setOnlTable(var4.getTableName());
@@ -1100,7 +1098,7 @@ public class OnlCgformApiController {
Result var3 = new Result();
OnlCgformHead var4 = (OnlCgformHead)this.onlCgformHeadService.getById(var1);
if (var4 == null) {
var3.error500("实体不存在");
var3.error("实体不存在");
return var3;
} else {
try {
@@ -1127,7 +1125,7 @@ public class OnlCgformApiController {
var3.setResult(var11);
} catch (Exception var12) {
log.error(var12.getMessage(), var12);
var3.error500("数据库查询失败" + var12.getMessage());
var3.error("数据库查询失败" + var12.getMessage());
}
var3.setOnlTable(var4.getTableName());
@@ -1183,7 +1181,7 @@ public class OnlCgformApiController {
Result var2 = new Result();
OnlCgformHead var3 = (OnlCgformHead)this.onlCgformHeadService.getById(var1);
if (var3 == null) {
var2.error500("实体不存在");
var2.error("实体不存在");
return var2;
} else {
HashMap var4 = new HashMap();
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/cas/controller/CasClientController.java
+1 -1
View File
@@ -85,7 +85,7 @@ public class CasClientController {
String token = JwtUtil.sign(sysUser.getUsername(), sysUser.getPassword());
// 设置超时时间
redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME*2 / 1000);
redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 1000);
//获取用户部门信息
JSONObject obj = new JSONObject();
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/ngalain/controller/NgAlainController.java
+1 -2
View File
@@ -63,8 +63,7 @@ public class NgAlainController {
result.setResult(ls);
} catch (Exception e) {
log.error(e.getMessage(),e);
result.error500("操作失败");
return result;
return Result.error("操作失败");
}
List<JSONObject> dictlist=new ArrayList<>();
for (DictModel l : ls) {
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDataLogController.java
+1 -1
View File
@@ -83,7 +83,7 @@ public class SysDataLogController {
queryWrapper.eq("data_id", dataId);
List<SysDataLog> list = service.list(queryWrapper);
if(list==null||list.size()<=0) {
result.error500("未找到版本信息");
return Result.error("未找到版本信息");
}else {
result.setResult(list);
result.setSuccess(true);
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java
+4 -4
View File
@@ -118,7 +118,7 @@ public class LoginServiceImpl implements ILoginService {
retryCount = (int) redisUtil.get(RETRY_LOGIN_PREFIX + username);
}
if (retryCount >= RETRY_LOGIN_MAX_COUNT){
return Result.error("密码错误次数过多，请稍后重试");
return Result.error("密码错误次数过多，请15分钟后重试");
}
//2. 校验用户名或密码是否正确
String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt());
@@ -127,7 +127,7 @@ public class LoginServiceImpl implements ILoginService {
// 重试登录次数加一
retryCount++;
if( retryCount == 1){
redisUtil.set(RETRY_LOGIN_PREFIX + username,retryCount,60 * 30);
redisUtil.set(RETRY_LOGIN_PREFIX + username,retryCount,60 * 15);
}else {
redisUtil.set(RETRY_LOGIN_PREFIX + username,retryCount,redisUtil.getExpire(RETRY_LOGIN_PREFIX + username));
}
@@ -409,7 +409,7 @@ public class LoginServiceImpl implements ILoginService {
String token = JwtUtil.sign(username, syspassword);
// 设置超时时间
redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME*2 / 1000);
redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 1000);
//token 信息
obj.put("token", token);
@@ -496,7 +496,7 @@ public class LoginServiceImpl implements ILoginService {
String token = JwtUtil.sign(username, syspassword);
// 设置token缓存有效时间
redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME * 2 / 1000);
redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 1000);
obj.put("token", token);
obj.put("userInfo", sysUser);