diff --git a/login-app/src/main/java/ink/wgink/login/app/service/appsign/impl/AppSignServiceImpl.java b/login-app/src/main/java/ink/wgink/login/app/service/appsign/impl/AppSignServiceImpl.java index 15c2deca..12f2246e 100644 --- a/login-app/src/main/java/ink/wgink/login/app/service/appsign/impl/AppSignServiceImpl.java +++ b/login-app/src/main/java/ink/wgink/login/app/service/appsign/impl/AppSignServiceImpl.java @@ -11,7 +11,6 @@ import ink.wgink.login.app.pojo.vos.appsign.AppLoginVO; import ink.wgink.login.app.service.appdeviceuser.IAppDeviceUserService; import ink.wgink.login.app.service.appsign.IAppSignService; import ink.wgink.login.app.service.appversion.IAppVersionService; -import ink.wgink.login.base.exceptions.UserAuthenticationException; import ink.wgink.login.base.service.BaseAppSignService; import ink.wgink.pojo.bos.LoginAppUser; import ink.wgink.service.user.enums.UserStateEnum; @@ -96,7 +95,7 @@ public class AppSignServiceImpl extends BaseAppSignService implements IAppSignSe throw new SearchException("用户已锁定"); } if (DateUtil.isDateExpired(userPO.getUserExpiredDate())) { - throw new UserAuthenticationException("账号已经过期"); + throw new SearchException("账号已经过期"); } LOG.debug("校验设备"); if (!StringUtils.isBlank(appLoginVO.getDeviceNo()) && !appDeviceUserService.canSign(userPO.getUserId(), appLoginVO.getDeviceNo())) { diff --git a/login-base/src/main/java/ink/wgink/login/base/controller/route/IndexRouteController.java b/login-base/src/main/java/ink/wgink/login/base/controller/route/IndexRouteController.java index 1ecf420f..e5191540 100644 --- a/login-base/src/main/java/ink/wgink/login/base/controller/route/IndexRouteController.java +++ b/login-base/src/main/java/ink/wgink/login/base/controller/route/IndexRouteController.java @@ -134,7 +134,7 @@ public class IndexRouteController { String defaultHome = "default-home"; // 含有系统首页分隔符,并且有内容 if (menuIdAndDefaultHomeArray.length > 1) { - String systemHomeUrl = rootMenuId.split(SYSTEM_HOME_SPLIT)[1]; + String systemHomeUrl = menuIdAndDefaultHomeArray[1]; if (!StringUtils.isBlank(systemHomeUrl)) { defaultHome = systemHomeUrl; } diff --git a/service-user/src/main/java/ink/wgink/service/user/controller/app/api/UserAppController.java b/service-user/src/main/java/ink/wgink/service/user/controller/app/api/UserAppController.java index d562b1b7..fea21bb1 100644 --- a/service-user/src/main/java/ink/wgink/service/user/controller/app/api/UserAppController.java +++ b/service-user/src/main/java/ink/wgink/service/user/controller/app/api/UserAppController.java @@ -13,9 +13,9 @@ import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.vos.IdsVO; +import ink.wgink.pojo.vos.UpdatePasswordVO; import ink.wgink.pojo.vos.UpdatePhonePasswordVO; import ink.wgink.service.user.pojo.dtos.AppUserDTO; -import ink.wgink.pojo.vos.UpdatePasswordVO; import ink.wgink.service.user.pojo.vos.UpdateUserVO; import ink.wgink.service.user.service.IUserService; import ink.wgink.util.ReflectUtil; @@ -192,4 +192,15 @@ public class UserAppController extends DefaultBaseController { return userService.listByUserIds(idsVO.getIds()); } + @ApiOperation(value = "是否过期", notes = "是否过期接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("is-expired") + public SuccessResult isExpired(@RequestHeader("token") String token) { + userService.isExpiredByToken(token); + return new SuccessResult(); + } + } diff --git a/service-user/src/main/java/ink/wgink/service/user/service/IUserService.java b/service-user/src/main/java/ink/wgink/service/user/service/IUserService.java index 0e9dd431..a0e65f3f 100644 --- a/service-user/src/main/java/ink/wgink/service/user/service/IUserService.java +++ b/service-user/src/main/java/ink/wgink/service/user/service/IUserService.java @@ -326,4 +326,10 @@ public interface IUserService extends IUserBaseService, IUserCheckService { */ void downLoadAvatar(String userId, HttpServletRequest request, HttpServletResponse response); + /** + * 是否过期 + * + * @param token + */ + void isExpiredByToken(String token); } diff --git a/service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java b/service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java index 5ccdde97..eddeb490 100644 --- a/service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java +++ b/service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java @@ -638,6 +638,18 @@ public class UserServiceImpl extends DefaultBaseService implements IUserService fileService.downLoadFile(request, response, params); } + @Override + public void isExpiredByToken(String token) { + AppTokenUser appTokenUser = getAppTokenUser(token); + UserPO userPO = getPO(appTokenUser.getId()); + if (userPO == null) { + throw new SearchException("用户不存在"); + } + if (DateUtil.isDateExpired(userPO.getUserExpiredDate())) { + throw new SearchException("账号已经过期"); + } + } + @Override public int countDateRange(String startDate, String endDate) { Map params = getHashMap(4);