diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java index ce7a5331d..149d74078 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java @@ -8,6 +8,7 @@ import cc.ryanc.halo.service.AttachmentService; import cc.ryanc.halo.service.LogsService; import cc.ryanc.halo.utils.HaloUtils; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -81,12 +82,16 @@ public class AttachmentController { @GetMapping(value = "/select") public String selectAttachment(Model model, @RequestParam(value = "page", defaultValue = "0") Integer page, - @RequestParam(value = "id") String id) { + @RequestParam(value = "id",defaultValue = "none") String id, + @RequestParam(value = "type",defaultValue = "normal") String type) { Sort sort = new Sort(Sort.Direction.DESC, "attachId"); Pageable pageable = PageRequest.of(page, 18, sort); Page attachments = attachmentService.findAllAttachments(pageable); model.addAttribute("attachments", attachments); model.addAttribute("id", id); + if(StringUtils.equals(type,"post")){ + return "admin/widget/_attachment-select-post"; + } return "admin/widget/_attachment-select"; } diff --git a/src/main/resources/templates/admin/admin_index.ftl b/src/main/resources/templates/admin/admin_index.ftl index b37467e07..70bfd56da 100755 --- a/src/main/resources/templates/admin/admin_index.ftl +++ b/src/main/resources/templates/admin/admin_index.ftl @@ -177,7 +177,7 @@ - + diff --git a/src/main/resources/templates/admin/admin_page.ftl b/src/main/resources/templates/admin/admin_page.ftl index d9713388c..d322880d9 100755 --- a/src/main/resources/templates/admin/admin_page.ftl +++ b/src/main/resources/templates/admin/admin_page.ftl @@ -100,7 +100,7 @@ <#else> - + diff --git a/src/main/resources/templates/admin/admin_page_md_editor.ftl b/src/main/resources/templates/admin/admin_page_md_editor.ftl index 3559942fc..43100d5b5 100755 --- a/src/main/resources/templates/admin/admin_page_md_editor.ftl +++ b/src/main/resources/templates/admin/admin_page_md_editor.ftl @@ -12,11 +12,19 @@ #post_title{ font-weight: 400; } + #btnOpenAttach{margin-left:4px;padding:3px 6px;position:relative;top:-4px;border:1px solid #ccc;border-radius:2px;background:#fff;text-shadow:none;font-weight:600;font-size:12px;line-height:normal;color:#3c8dbc;cursor:pointer;transition:all .2s ease-in-out} + #btnOpenAttach:hover{background:#3c8dbc;color:#fff} + .form-horizontal .control-label{ + text-align: left; + }
-

+

新建页面

+ + 附件库 +
  1. 首页 @@ -119,6 +127,18 @@ scrollbar: false }); } + function openAttachCopy() { + layer.open({ + type: 2, + title: '所有附件', + shadeClose: true, + shade: 0.5, + maxmin: true, + area: ['90%', '90%'], + content: '/admin/attachments/select?type=post', + scrollbar: false + }); + } var editor; function loadEditor() { editor = editormd("markdown-editor", { diff --git a/src/main/resources/templates/admin/admin_post.ftl b/src/main/resources/templates/admin/admin_post.ftl index 5a14ee3a6..c3e12518e 100755 --- a/src/main/resources/templates/admin/admin_post.ftl +++ b/src/main/resources/templates/admin/admin_post.ftl @@ -61,7 +61,11 @@ <#if posts.content?size gt 0> <#list posts.content as post>
- + <#if post.postTitle?length gt 20> + + <#else > + + - + diff --git a/src/main/resources/templates/admin/admin_post_md_editor.ftl b/src/main/resources/templates/admin/admin_post_md_editor.ftl index 48b75c7a8..1ab4877bb 100755 --- a/src/main/resources/templates/admin/admin_post_md_editor.ftl +++ b/src/main/resources/templates/admin/admin_post_md_editor.ftl @@ -13,11 +13,17 @@ #post_title{ font-weight: 400; } + #btnOpenAttach{margin-left:4px;padding:3px 6px;position:relative;top:-4px;border:1px solid #ccc;border-radius:2px;background:#fff;text-shadow:none;font-weight:600;font-size:12px;line-height:normal;color:#3c8dbc;cursor:pointer;transition:all .2s ease-in-out} + #btnOpenAttach:hover{background:#3c8dbc;color:#fff} + .form-horizontal .control-label{ + text-align: left; + }
-

- 新建文章 -

+

新建文章

+ + 附件库 +
  1. 首页 @@ -194,6 +200,19 @@ scrollbar: false }); } + + function openAttachCopy() { + layer.open({ + type: 2, + title: '所有附件', + shadeClose: true, + shade: 0.5, + maxmin: true, + area: ['90%', '90%'], + content: '/admin/attachments/select?type=post', + scrollbar: false + }); + } var editor; /** diff --git a/src/main/resources/templates/admin/widget/_attachment-select-post.ftl b/src/main/resources/templates/admin/widget/_attachment-select-post.ftl new file mode 100644 index 000000000..9b96e4747 --- /dev/null +++ b/src/main/resources/templates/admin/widget/_attachment-select-post.ftl @@ -0,0 +1,108 @@ + + + + + + + + + + + + +
    +
    +
    + +
    +
    +
    + <#list attachments.content as attachment> +
    + + + +
    + +
    +
    + 第${attachments.number+1}/${attachments.totalPages}页 +
    + +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    + + + + + + + + + + \ No newline at end of file diff --git a/src/test/java/cc/ryanc/halo/service/impl/MailServiceImplTest.java b/src/test/java/cc/ryanc/halo/service/impl/MailServiceImplTest.java index 4dd829462..e67748c75 100644 --- a/src/test/java/cc/ryanc/halo/service/impl/MailServiceImplTest.java +++ b/src/test/java/cc/ryanc/halo/service/impl/MailServiceImplTest.java @@ -22,37 +22,37 @@ import static org.junit.Assert.*; */ public class MailServiceImplTest { - @Before - public void before() throws GeneralSecurityException { - // 配置，一次即可 - OhMyEmail.config(OhMyEmail.SMTP_163(false), "ryan0up@163.com", "wangdashen666"); - } - - @Test - public void testSendText() throws MessagingException { - OhMyEmail.subject("这是一封测试TEXT邮件") - .from("RYAN0UP") - .to("709831589@qq.com") - .text("信件内容") - .send(); - } - - @Test - public void testSendHtml() throws MessagingException { - OhMyEmail.subject("这是一封测试HTML邮件") - .from("王爵的QQ邮箱") - .to("921293209@qq.com") - .html("

    信件内容

    ") - .send(); - } - - @Test - public void testSendAttach() throws MessagingException { - OhMyEmail.subject("这是一封测试附件邮件") - .from("王爵的QQ邮箱") - .to("921293209@qq.com") - .html("

    信件内容

    ") - .attach(new File("/Users/biezhi/Downloads/hello.jpeg"), "测试图片.jpeg") - .send(); - } +// @Before +// public void before() throws GeneralSecurityException { +// // 配置，一次即可 +// OhMyEmail.config(OhMyEmail.SMTP_163(false), "", ""); +// } +// +// @Test +// public void testSendText() throws MessagingException { +// OhMyEmail.subject("这是一封测试TEXT邮件") +// .from("RYAN0UP") +// .to("709831589@qq.com") +// .text("信件内容") +// .send(); +// } +// +// @Test +// public void testSendHtml() throws MessagingException { +// OhMyEmail.subject("") +// .from("") +// .to("") +// .html("") +// .send(); +// } +// +// @Test +// public void testSendAttach() throws MessagingException { +// OhMyEmail.subject("") +// .from("") +// .to("") +// .html("") +// .attach(new File(""), "") +// .send(); +// } } \ No newline at end of file
标题标题 状态 日期
暂无页面暂无页面
${post.postTitle}${post.postTitle?substring(0,20)}...${post.postTitle} <#if post.categories?size gt 0> <#list post.categories as cate> @@ -109,7 +113,7 @@ <#else>
暂无文章暂无文章