498 解决解决 Set access token expire time to 0 报错问题和邮件发送用户编号为空问题

YunaiV
1 parent 933bb188
Showing 2 changed files with 3 additions and 5 deletions
yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/config/YudaoCaptchaConfiguration.java
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java
@@ -29,7 +29,7 @@ public class YudaoCaptchaConfiguration {
         // 缓存类型 redis/local/....
         CaptchaCacheService ret = CaptchaServiceFactory.getCache(config.getCacheType().name());
         if (ret instanceof RedisCaptchaServiceImpl) {
-            ((RedisCaptchaServiceImpl)ret).setStringRedisTemplate(stringRedisTemplate);
+            ((RedisCaptchaServiceImpl) ret).setStringRedisTemplate(stringRedisTemplate);
         }
         return ret;
     }
@@ -2,8 +2,6 @@ package cn.iocoder.yudao.module.system.controller.admin.mail;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.security.core.LoginUser;
-import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.system.controller.admin.mail.vo.template.*;
 import cn.iocoder.yudao.module.system.convert.mail.MailTemplateConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailTemplateDO;
@@ -20,6 +18,7 @@ import javax.validation.Valid;
 import java.util.List;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 @Tag(name = "管理后台 - 邮件模版")
 @RestController
@@ -83,8 +82,7 @@ public class MailTemplateController {
     @Operation(summary = "发送短信")
     @PreAuthorize("@ss.hasPermission('system:mail-template:send-mail')")
     public CommonResult<Long> sendMail(@Valid @RequestBody MailTemplateSendReqVO sendReqVO) {
-        LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
-        return success(mailSendService.sendSingleMailToAdmin(sendReqVO.getMail(), loginUser != null ? loginUser.getId() : null,
+        return success(mailSendService.sendSingleMailToAdmin(sendReqVO.getMail(), getLoginUserId(),
                 sendReqVO.getTemplateCode(), sendReqVO.getTemplateParams()));
     }