Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
IEQEFCR
halo
提交
0b4823d0
H
halo
项目概览
IEQEFCR
/
halo
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
H
halo
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0b4823d0
编写于
5月 07, 2019
作者:
J
johnniang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refactor load mail configuration
上级
ff1836e9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
7 addition
and
9 deletion
+7
-9
src/main/java/run/halo/app/model/properties/EmailProperties.java
...n/java/run/halo/app/model/properties/EmailProperties.java
+1
-1
src/main/java/run/halo/app/service/impl/MailServiceImpl.java
src/main/java/run/halo/app/service/impl/MailServiceImpl.java
+6
-8
未找到文件。
src/main/java/run/halo/app/model/properties/EmailProperties.java
浏览文件 @
0b4823d0
...
...
@@ -10,7 +10,7 @@ public enum EmailProperties implements PropertyEnum {
HOST
(
"email_host"
,
String
.
class
,
""
),
PROTOCOL
(
"email_protocol"
,
String
.
class
,
"
SSL
"
),
PROTOCOL
(
"email_protocol"
,
String
.
class
,
"
smtp
"
),
SSL_PORT
(
"email_ssl_port"
,
Integer
.
class
,
"465"
),
...
...
src/main/java/run/halo/app/service/impl/MailServiceImpl.java
浏览文件 @
0b4823d0
package
run.halo.app.service.impl
;
import
cn.hutool.core.text.StrBuilder
;
import
cn.hutool.core.util.StrUtil
;
import
freemarker.template.Template
;
import
io.github.biezhi.ome.OhMyEmail
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.context.ApplicationListener
;
import
org.springframework.stereotype.Service
;
import
org.springframework.ui.freemarker.FreeMarkerTemplateUtils
;
import
org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer
;
import
run.halo.app.event.options.OptionUpdatedEvent
;
import
run.halo.app.exception.EmailException
;
import
run.halo.app.model.properties.EmailProperties
;
import
run.halo.app.service.MailService
;
...
...
@@ -27,14 +24,12 @@ import java.util.Properties;
*/
@Slf4j
@Service
public
class
MailServiceImpl
implements
MailService
{
public
class
MailServiceImpl
implements
MailService
{
private
final
FreeMarkerConfigurer
freeMarker
;
private
final
OptionService
optionService
;
private
boolean
loaded
=
false
;
public
MailServiceImpl
(
FreeMarkerConfigurer
freeMarker
,
OptionService
optionService
)
{
this
.
freeMarker
=
freeMarker
;
...
...
@@ -114,6 +109,7 @@ public class MailServiceImpl implements MailService {
String
fromUsername
=
optionService
.
getByPropertyOfNonNull
(
EmailProperties
.
FROM_NAME
).
toString
();
File
file
=
new
File
(
attachFilename
);
try
{
Template
template
=
freeMarker
.
getConfiguration
().
getTemplate
(
templateName
);
OhMyEmail
.
subject
(
subject
)
...
...
@@ -135,10 +131,12 @@ public class MailServiceImpl implements MailService {
private
void
loadConfig
()
{
// Get default properties
Properties
defaultProperties
=
OhMyEmail
.
defaultConfig
(
log
.
isDebugEnabled
());
// Set smtp host
defaultProperties
.
setProperty
(
"mail.smtp.host"
,
optionService
.
getByPropertyOfNonNull
(
EmailProperties
.
HOST
).
toString
());
defaultProperties
.
setProperty
(
"mail.smtp.ssl.enable"
,
StrUtil
.
isEmpty
(
optionService
.
getByPropertyOfNonNull
(
EmailProperties
.
PROTOCOL
).
toString
())
?
"false"
:
"true"
);
defaultProperties
.
setProperty
(
"mail.smtp.port"
,
StrUtil
.
isEmpty
(
optionService
.
getByPropertyOfNonNull
(
EmailProperties
.
SSL_PORT
).
toString
())
?
"25"
:
"465"
);
defaultProperties
.
setProperty
(
"mail.transport.protocol"
,
optionService
.
getByPropertyOrDefault
(
EmailProperties
.
PROTOCOL
,
String
.
class
,
EmailProperties
.
PROTOCOL
.
defaultValue
()));
defaultProperties
.
setProperty
(
"mail.smtp.port"
,
optionService
.
getByPropertyOrDefault
(
EmailProperties
.
SSL_PORT
,
String
.
class
,
EmailProperties
.
SSL_PORT
.
defaultValue
()));
// Config email
OhMyEmail
.
config
(
defaultProperties
,
optionService
.
getByPropertyOfNonNull
(
EmailProperties
.
USERNAME
).
toString
(),
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录