Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
IEQEFCR
halo
提交
b82c39e6
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,发现更多精彩内容 >>
提交
b82c39e6
编写于
5月 07, 2019
作者:
J
johnniang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move test mail to MailController
上级
0b4823d0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
37 addition
and
12 deletion
+37
-12
src/main/java/run/halo/app/controller/admin/api/MailController.java
...ava/run/halo/app/controller/admin/api/MailController.java
+34
-0
src/main/java/run/halo/app/controller/admin/api/OptionController.java
...a/run/halo/app/controller/admin/api/OptionController.java
+3
-12
未找到文件。
src/main/java/run/halo/app/controller/admin/api/MailController.java
0 → 100644
浏览文件 @
b82c39e6
package
run.halo.app.controller.admin.api
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
run.halo.app.model.params.MailParam
;
import
run.halo.app.model.support.BaseResponse
;
import
run.halo.app.service.MailService
;
import
javax.validation.Valid
;
/**
* Mail controller.
*
* @author johnniang
* @date 19-5-7
*/
@RestController
@RequestMapping
(
"/api/admin/mails"
)
public
class
MailController
{
private
final
MailService
mailService
;
public
MailController
(
MailService
mailService
)
{
this
.
mailService
=
mailService
;
}
@PostMapping
(
"test"
)
public
BaseResponse
testMail
(
@Valid
@RequestBody
MailParam
mailParam
)
{
mailService
.
sendMail
(
mailParam
.
getTo
(),
mailParam
.
getSubject
(),
mailParam
.
getContent
());
return
BaseResponse
.
ok
(
"发送成功"
);
}
}
src/main/java/run/halo/app/controller/admin/api/OptionController.java
浏览文件 @
b82c39e6
...
...
@@ -26,12 +26,8 @@ public class OptionController {
private
final
OptionService
optionService
;
private
final
MailService
mailService
;
public
OptionController
(
OptionService
optionService
,
MailService
mailService
)
{
public
OptionController
(
OptionService
optionService
)
{
this
.
optionService
=
optionService
;
this
.
mailService
=
mailService
;
}
@GetMapping
...
...
@@ -46,7 +42,7 @@ public class OptionController {
@GetMapping
(
"map_view"
)
@ApiOperation
(
"Lists all options with map view"
)
public
Map
<
String
,
Object
>
listAllWithMapView
(
@RequestParam
(
value
=
"key"
,
required
=
false
)
List
<
String
>
keys
)
{
public
Map
<
String
,
Object
>
listAllWithMapView
(
@RequestParam
(
value
=
"key
[]
"
,
required
=
false
)
List
<
String
>
keys
)
{
if
(
CollectionUtils
.
isEmpty
(
keys
))
{
return
optionService
.
listOptions
();
}
...
...
@@ -55,7 +51,7 @@ public class OptionController {
}
@GetMapping
(
"map_keys"
)
@ApiOperation
(
"List all of options by keys"
)
@ApiOperation
(
"List all of options by keys
, replaced by `listAllWithMapView`
"
)
@Deprecated
public
Map
<
String
,
Object
>
listByKeysWithMapView
(
@RequestParam
(
value
=
"keys"
)
String
keys
)
{
return
optionService
.
listByKeys
(
keys
);
...
...
@@ -67,9 +63,4 @@ public class OptionController {
optionService
.
save
(
optionMap
);
}
@PostMapping
(
"test_mail"
)
public
BaseResponse
testMail
(
@Valid
@RequestBody
MailParam
mailParam
){
mailService
.
sendMail
(
mailParam
.
getTo
(),
mailParam
.
getSubject
(),
mailParam
.
getContent
());
return
BaseResponse
.
ok
(
"发送成功"
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录