From 151a33cad4cab0e5e649f854951d296bd889068c Mon Sep 17 00:00:00 2001 From: ZhouXY108 Date: Wed, 1 Feb 2023 09:46:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E3=80=82=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plusone-start/src/main/resources/application-public.yaml | 5 ----- plusone-start/src/main/resources/application.yaml | 5 +++++ .../system/application/service/AccountContextService.java | 4 ++-- .../system/application/service/AdminLoginService.java | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/plusone-start/src/main/resources/application-public.yaml b/plusone-start/src/main/resources/application-public.yaml index a6a5b1e..d9a2af1 100644 --- a/plusone-start/src/main/resources/application-public.yaml +++ b/plusone-start/src/main/resources/application-public.yaml @@ -62,8 +62,3 @@ plusone: # 异常拦截机制是否拦截所有异常 exception: handle-all-exception: false - -# 日志配置 -logging: - level: - root: debug diff --git a/plusone-start/src/main/resources/application.yaml b/plusone-start/src/main/resources/application.yaml index 4a48e74..378b5ed 100644 --- a/plusone-start/src/main/resources/application.yaml +++ b/plusone-start/src/main/resources/application.yaml @@ -9,3 +9,8 @@ plusone: code: Plusone template: code: 【Plusone】验证码：%s，10分钟内有效，请勿泄露。 +# 日志配置 +logging: + level: + root: info + '[xyz.zhouxy.plusone]': debug diff --git a/plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/service/AccountContextService.java b/plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/service/AccountContextService.java index b40d60c..ab98386 100644 --- a/plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/service/AccountContextService.java +++ b/plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/service/AccountContextService.java @@ -34,7 +34,7 @@ import xyz.zhouxy.plusone.validator.InvalidInputException; @Service public class AccountContextService { - private final static StpLogic adminAuthLogic = AuthLogic.adminAuthLogic; + private static final StpLogic adminAuthLogic = AuthLogic.adminAuthLogic; @Resource private AccountQueries accountQueries; @@ -95,7 +95,7 @@ public class AccountContextService { case MOBILE_PHONE -> accountRepository.findByMobilePhone(MobilePhone.of(principal)); default -> throw InvalidInputException.unsupportedPrincipalTypeException("输入邮箱地址或手机号"); }; - Assert.notNull(account, () -> AccountLoginException.accountNotExistException()); + Assert.notNull(account, AccountLoginException::accountNotExistException); mailAndSmsVerifyService.checkOtp(principal, command.getOtp()); } diff --git a/plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/service/AdminLoginService.java b/plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/service/AdminLoginService.java index 5f12908..7606615 100644 --- a/plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/service/AdminLoginService.java +++ b/plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/service/AdminLoginService.java @@ -49,9 +49,9 @@ public class AdminLoginService { case EMAIL -> accountRepository.findByEmail(Email.of(principal)); case MOBILE_PHONE -> accountRepository.findByMobilePhone(MobilePhone.of(principal)); }; - Assert.notNull(account, () -> AccountLoginException.accountNotExistException()); + Assert.notNull(account, AccountLoginException::accountNotExistException); var isPasswordCorrect = account.checkPassword(command.getPassword()); - Assert.isTrue(isPasswordCorrect, () -> AccountLoginException.passwordErrorException()); + Assert.isTrue(isPasswordCorrect, AccountLoginException::passwordErrorException); adminAuthLogic.login(account.getId().orElseThrow(), command.isRememberMe()); var accountDetails = accountQueries.queryAccountDetails(account.getId().orElseThrow()); @@ -66,7 +66,7 @@ public class AdminLoginService { case MOBILE_PHONE -> accountRepository.findByMobilePhone(MobilePhone.of(principal)); default -> throw InvalidInputException.unsupportedPrincipalTypeException("输入邮箱地址或手机号"); }; - Assert.notNull(account, () -> AccountLoginException.accountNotExistException()); + Assert.notNull(account, AccountLoginException::accountNotExistException); mailAndSmsVerifyService.checkOtp(principal, command.getOtp());