From b472c6a2a76cfa16acfe1bcded26323f036bfd23 Mon Sep 17 00:00:00 2001 From: caiyuchao Date: Wed, 16 Apr 2025 15:31:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=82=AE=E4=BB=B6=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/wfc/system/controller/SysEmailController.java | 3 --- wfc-modules/wfc-system/src/main/resources/application.yml | 3 ++- .../main/java/org/wfc/user/controller/UEmailController.java | 3 --- wfc-modules/wfc-user/src/main/resources/application.yml | 3 ++- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysEmailController.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysEmailController.java index bf1d237..d840012 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysEmailController.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysEmailController.java @@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.thymeleaf.TemplateEngine; import org.thymeleaf.context.Context; -import org.thymeleaf.templateresolver.ClassLoaderTemplateResolver; import org.wfc.common.core.constant.Constants; import org.wfc.common.core.constant.GlobalConstants; import org.wfc.common.core.domain.R; @@ -56,8 +55,6 @@ public class SysEmailController extends BaseController { Context context = new Context(); context.setVariable("verificationCode", code); context.setVariable("expirationTime", Constants.MAIL_CAPTCHA_EXPIRATION); - ClassLoaderTemplateResolver resolver = new ClassLoaderTemplateResolver(); - templateEngine.setTemplateResolver(resolver); String htmlStr = templateEngine.process("mail", context); MailUtils.sendHtml(email, "Your WANFI verification code", htmlStr); } catch (Exception e) { diff --git a/wfc-modules/wfc-system/src/main/resources/application.yml b/wfc-modules/wfc-system/src/main/resources/application.yml index 550ff86..32783f6 100644 --- a/wfc-modules/wfc-system/src/main/resources/application.yml +++ b/wfc-modules/wfc-system/src/main/resources/application.yml @@ -5,8 +5,9 @@ spring: port: 6379 password: thymeleaf: - prefix: /opt/wfc/templates + prefix: file:/opt/wfc/templates/ suffix: .html + cache: false datasource: druid: stat-view-servlet: diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UEmailController.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UEmailController.java index b710ca6..94903c2 100644 --- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UEmailController.java +++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UEmailController.java @@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.thymeleaf.TemplateEngine; import org.thymeleaf.context.Context; -import org.thymeleaf.templateresolver.ClassLoaderTemplateResolver; import org.wfc.common.core.constant.Constants; import org.wfc.common.core.constant.GlobalConstants; import org.wfc.common.core.domain.R; @@ -56,8 +55,6 @@ public class UEmailController extends BaseController { Context context = new Context(); context.setVariable("verificationCode", code); context.setVariable("expirationTime", Constants.MAIL_CAPTCHA_EXPIRATION); - ClassLoaderTemplateResolver resolver = new ClassLoaderTemplateResolver(); - templateEngine.setTemplateResolver(resolver); String htmlStr = templateEngine.process("mail", context); MailUtils.sendHtml(email, "Your WANFI verification code", htmlStr); } catch (Exception e) { diff --git a/wfc-modules/wfc-user/src/main/resources/application.yml b/wfc-modules/wfc-user/src/main/resources/application.yml index 8b80434..a50285e 100644 --- a/wfc-modules/wfc-user/src/main/resources/application.yml +++ b/wfc-modules/wfc-user/src/main/resources/application.yml @@ -5,8 +5,9 @@ spring: port: 6379 password: thymeleaf: - prefix: /opt/wfc/templates + prefix: file:/opt/wfc/templates/ suffix: .html + cache: false datasource: druid: stat-view-servlet: