diff --git a/README.md b/README.md index 0ebeb83a8..7d5def184 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

Halo

-> Halo 是一款现代化的个人独立博客系统,给习惯写博客的同学一个更好的选择。 +> Halo 是一款现代化的个人独立博客系统,给习惯写博客的同学多一个选择。

JDK @@ -19,7 +19,7 @@ 轻快,简洁,功能强大,使用 Java 开发的博客系统。 -> [官网论坛](https://bbs.halo.run) | [QQ 交流群](https://jq.qq.com/?_wv=1027&k=5tnr930) | [Telegram 交流群](https://t.me/HaloBlog) | [Telegram 频道](https://t.me/halo_dev) | [WeHalo 小程序](https://github.com/aquanlerou/WeHalo)。 +> [官方社区](https://bbs.halo.run) | [QQ 交流群](https://jq.qq.com/?_wv=1027&k=5tnr930) | [Telegram 交流群](https://t.me/HaloBlog) | [Telegram 频道](https://t.me/halo_dev) | [WeHalo 小程序](https://github.com/aquanlerou/WeHalo)。 ## 快速开始 @@ -38,7 +38,7 @@ wget https://github.com/halo-dev/halo/releases/download/v1.0.3/halo-1.0.3.jar -O ### 启动 Halo ```bash -nohup java -jar halo-latest.jar >/dev/null 2>&1& +java -jar halo-latest.jar ``` 详细文档请移步: @@ -70,32 +70,32 @@ nohup java -jar halo-latest.jar >/dev/null 2>&1& ## 预览图 -![anatole.png](https://i.loli.net/2019/05/08/5cd2fc3e478dc.png) +![theme-anatole.png](https://i.loli.net/2019/09/11/OQtKEWcCe8xYBph.png) -![casper.png](https://i.loli.net/2019/05/08/5cd2fc3e4e587.png) +![theme-walker.png](https://i.loli.net/2019/09/11/F6CjZKJX1N2x5dU.png) -![material.png](https://i.loli.net/2019/05/08/5cd2fc3e78012.png) +![theme-icarus.png](https://i.loli.net/2019/09/11/4lO2wNCLiqyIJmR.png) -![admin-install.png](https://i.loli.net/2019/05/08/5cd2fcae89cae.png) +![theme-destiny.png](https://i.loli.net/2019/09/11/q4t86cCPUEwlGMn.png) -![admin-login.png](https://i.loli.net/2019/05/08/5cd2fcae6a3fa.png) +![install.png](https://i.loli.net/2019/09/11/Iu1eMzZDg6frw97.png) -![admin-dashboard.png](https://i.loli.net/2019/05/08/5cd2fcaf1b2d2.png) +![admin-login.png](https://i.loli.net/2019/09/11/3CahVJAvXngwiQu.png) -![admin-posts.png](https://i.loli.net/2019/05/08/5cd2fcaf18c37.png) +![admin-dashboard.png](https://i.loli.net/2019/09/11/G5R6bOweYoiZKEv.png) -![admin-write.png](https://i.loli.net/2019/05/08/5cd2fcae9bea2.png) +![admin-posts.png](https://i.loli.net/2019/09/11/uMHSeIkmC4iPzfJ.png) -![admin-write1.png](https://i.loli.net/2019/05/08/5cd2fcaf6a1ac.png) +![admin-post-edit.png](https://i.loli.net/2019/09/11/ucDh2tOZLJGTyHX.png) -![admin-write2.png](https://i.loli.net/2019/05/08/5cd2fcb08ea2d.png) +![admin-post-publish.png](https://i.loli.net/2019/09/11/UwC3ecsRpAMONgq.png) -![admin-attachment.png](https://i.loli.net/2019/05/08/5cd2fcb1c752e.png) +![admin-post-settings.png](https://i.loli.net/2019/09/11/bxmJ7OTirtvV4Gs.png) -![admin-themes.png](https://i.loli.net/2019/05/08/5cd2fcb21fc76.png) +![admin-attachment.png](https://i.loli.net/2019/09/11/B5UlX6vAgZ3bzaJ.png) -![admin-theme-settings.png](https://i.loli.net/2019/05/08/5cd2fcb04f9c3.png) +![admin-profile.png](https://i.loli.net/2019/09/11/mMageUXv5EDpfJQ.png) -![admin-profile.png](https://i.loli.net/2019/05/08/5cd2fccee89f5.png) +![admin-themes.png](https://i.loli.net/2019/09/11/FVA953Ljswd4c8G.png) -![admin-options.png](https://i.loli.net/2019/05/08/5cd2fccedc309.png) +![admin-options.png](https://i.loli.net/2019/09/11/TK6SeMdVj1xcrDw.png) \ No newline at end of file diff --git a/src/main/java/run/halo/app/controller/admin/api/MenuController.java b/src/main/java/run/halo/app/controller/admin/api/MenuController.java index 942846461..d85e9d7c8 100644 --- a/src/main/java/run/halo/app/controller/admin/api/MenuController.java +++ b/src/main/java/run/halo/app/controller/admin/api/MenuController.java @@ -40,7 +40,7 @@ public class MenuController { @GetMapping("tree_view") @ApiOperation("List as category tree") - public List listAsTree(@SortDefault(sort = "name", direction = ASC) Sort sort) { + public List listAsTree(@SortDefault(sort = "priority", direction = ASC) Sort sort) { return menuService.listAsTree(sort); } diff --git a/src/main/java/run/halo/app/service/impl/AdminServiceImpl.java b/src/main/java/run/halo/app/service/impl/AdminServiceImpl.java index 9fe7b6f0f..645380e3f 100644 --- a/src/main/java/run/halo/app/service/impl/AdminServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/AdminServiceImpl.java @@ -217,6 +217,8 @@ public class AdminServiceImpl implements AdminService { // Gets random code. String code = RandomUtil.randomNumbers(6); + log.info("Get reset password code:{}", code); + // Send email to administrator. String content = "您正在进行密码重置操作,如不是本人操作,请尽快做好相应措施。密码重置验证码如下(五分钟有效):\n" + code; mailService.sendMail(param.getEmail(), "找回密码验证码", content);