diff --git a/pom.xml b/pom.xml index a0e99ac51..f5f5fdda2 100755 --- a/pom.xml +++ b/pom.xml @@ -1,126 +1,126 @@ - - 4.0.0 - cc.ryanc - halo - latest - halo - - - halo,一个基于SpringBoot的博客系统,最求轻快,易用,以内容为中心。 - + + 4.0.0 + cc.ryanc + halo + latest + halo + + + Halo,一个基于 SpringBoot 的博客系统,最求轻快,易用,以内容为中心。 + - - halo-dev - https://github.com/halo-dev - + + halo-dev + https://github.com/halo-dev + - - - ruibaby - Ryan Wang - i@ryanc.cc - https://ryanc.cc - - - JohnNiang - John Niang - https://johnniang.me - - + + + ruibaby + Ryan Wang + i@ryanc.cc + https://ryanc.cc + + + JohnNiang + John Niang + https://johnniang.me + + - - org.springframework.boot - spring-boot-starter-parent - 2.1.2.RELEASE - - + + org.springframework.boot + spring-boot-starter-parent + 2.1.3.RELEASE + + - - UTF-8 - UTF-8 - 1.8 - 0.0.4 - 1.18.4 - 4.5.0 - 4.0.1 - 7.2.18 - 0.4.8 - 0.12.1 - + + UTF-8 + UTF-8 + 1.8 + 0.0.4 + 1.18.4 + 4.5.0 + 4.0.1 + 7.2.18 + 0.4.8 + 0.12.1 + - + - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-tomcat - - - + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + - - org.springframework.boot - spring-boot-starter-test - test - + + org.springframework.boot + spring-boot-starter-test + test + - - - org.springframework.boot - spring-boot-starter-undertow - + + + org.springframework.boot + spring-boot-starter-undertow + - - org.springframework.boot - spring-boot-starter-data-jpa - + + org.springframework.boot + spring-boot-starter-data-jpa + - - - org.springframework.boot - spring-boot-devtools - true - + + + org.springframework.boot + spring-boot-devtools + true + - - - mysql - mysql-connector-java - runtime - + + + mysql + mysql-connector-java + runtime + - - - com.h2database - h2 - runtime - + + + com.h2database + h2 + runtime + - - org.springframework.boot - spring-boot-starter-cache - + + org.springframework.boot + spring-boot-starter-cache + - - - org.springframework.boot - spring-boot-starter-freemarker - + + + org.springframework.boot + spring-boot-starter-freemarker + - - - io.github.biezhi - oh-my-email - ${oh-my-email.version} - + + + io.github.biezhi + oh-my-email + ${oh-my-email.version} + - + org.projectlombok lombok @@ -128,97 +128,97 @@ provided - - - net.sf.ehcache - ehcache - + + + net.sf.ehcache + ehcache + - - - cn.hutool - hutool-core - ${hutool.version} - - - cn.hutool - hutool-http - ${hutool.version} - - - cn.hutool - hutool-crypto - ${hutool.version} - - - cn.hutool - hutool-extra - ${hutool.version} - + + + cn.hutool + hutool-core + ${hutool.version} + + + cn.hutool + hutool-http + ${hutool.version} + + + cn.hutool + hutool-crypto + ${hutool.version} + + + cn.hutool + hutool-extra + ${hutool.version} + - - - com.upyun - java-sdk - ${upyun-java-sdk.version} - + + + com.upyun + java-sdk + ${upyun-java-sdk.version} + - - - com.qiniu - qiniu-java-sdk - ${qiniu-java-sdk.version} - - - okhttp - com.squareup.okhttp3 - - - + + + com.qiniu + qiniu-java-sdk + ${qiniu-java-sdk.version} + + + okhttp + com.squareup.okhttp3 + + + - - - net.coobird - thumbnailator - ${thumbnailator.version} - + + + net.coobird + thumbnailator + ${thumbnailator.version} + - - - com.atlassian.commonmark - commonmark - ${commonmark.version} - - - com.atlassian.commonmark - commonmark-ext-gfm-tables - ${commonmark.version} - - - com.atlassian.commonmark - commonmark-ext-yaml-front-matter - ${commonmark.version} - + + + com.atlassian.commonmark + commonmark + ${commonmark.version} + + + com.atlassian.commonmark + commonmark-ext-gfm-tables + ${commonmark.version} + + + com.atlassian.commonmark + commonmark-ext-yaml-front-matter + ${commonmark.version} + - - - io.springfox - springfox-swagger2 - 2.9.2 - + + + io.springfox + springfox-swagger2 + 2.9.2 + - - io.springfox - springfox-swagger-ui - 2.9.2 - + + io.springfox + springfox-swagger-ui + 2.9.2 + - + - - - - prod + + + + prod aliyun @@ -231,74 +231,74 @@ http://maven.aliyun.com/nexus/content/groups/public - - halo - - - src/main/java - false - - **/*.java - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - + + halo + + + src/main/java + false + + **/*.java + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + - - maven-compiler-plugin - - 1.8 - 1.8 - UTF-8 - - + + maven-compiler-plugin + + 1.8 + 1.8 + UTF-8 + + - - maven-assembly-plugin - - false - - assembly.xml - - ${project.build.directory}/dist/ - - - - make-assembly - package - - single - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.0 - - - - cc.ryanc.halo.Application - lib/ - true - - - resources/ - - - - - - - + + maven-assembly-plugin + + false + + assembly.xml + + ${project.build.directory}/dist/ + + + + make-assembly + package + + single + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.1.0 + + + + cc.ryanc.halo.Application + lib/ + true + + + resources/ + + + + + + + @@ -372,11 +372,11 @@ - - - dev - - + + + dev + + org.springframework.boot spring-boot-maven-plugin @@ -384,13 +384,13 @@ true - - org.apache.maven.plugins - maven-javadoc-plugin - 3.0.0 - + + org.apache.maven.plugins + maven-javadoc-plugin + 3.0.0 + - - - + + + diff --git a/src/main/resources/i18n/messages.properties b/src/main/resources/i18n/messages.properties index 65cdc57aa..bfeacabc7 100644 --- a/src/main/resources/i18n/messages.properties +++ b/src/main/resources/i18n/messages.properties @@ -77,7 +77,6 @@ admin.index.widgets.text.all-logs = 所有日志 admin.index.blog-data.title = 博客数据 admin.index.blog-data.days-count-before = 已经运行 admin.index.blog-data.days-count-after = 天了。 -admin.index.blog-data.motto = 加油!不要因为走的太远,而忘了当初为什么出发。 admin.index.blog-data.during = 在此期间: admin.index.blog-data.posts-count-before = 累计发表了 admin.index.blog-data.posts-count-after = 篇文章。 diff --git a/src/main/resources/i18n/messages_en_US.properties b/src/main/resources/i18n/messages_en_US.properties index d05a4e65c..6906a871a 100644 --- a/src/main/resources/i18n/messages_en_US.properties +++ b/src/main/resources/i18n/messages_en_US.properties @@ -77,7 +77,6 @@ admin.index.widgets.text.all-logs = All logs admin.index.blog-data.title = Blog data admin.index.blog-data.days-count-before = Has been running for 5 days admin.index.blog-data.days-count-after = days. -admin.index.blog-data.motto = Come on! Don’t forget why you left because you’re too far away. admin.index.blog-data.during = During this period: admin.index.blog-data.posts-count-before = Accumulated admin.index.blog-data.posts-count-after = articles. diff --git a/src/main/resources/i18n/messages_zh_CN.properties b/src/main/resources/i18n/messages_zh_CN.properties index 65cdc57aa..bfeacabc7 100644 --- a/src/main/resources/i18n/messages_zh_CN.properties +++ b/src/main/resources/i18n/messages_zh_CN.properties @@ -77,7 +77,6 @@ admin.index.widgets.text.all-logs = 所有日志 admin.index.blog-data.title = 博客数据 admin.index.blog-data.days-count-before = 已经运行 admin.index.blog-data.days-count-after = 天了。 -admin.index.blog-data.motto = 加油!不要因为走的太远,而忘了当初为什么出发。 admin.index.blog-data.during = 在此期间: admin.index.blog-data.posts-count-before = 累计发表了 admin.index.blog-data.posts-count-after = 篇文章。 diff --git a/src/main/resources/static/halo-admin/css/style.css b/src/main/resources/static/halo-admin/css/style.css index 64bbd184c..f0b377ca2 100644 --- a/src/main/resources/static/halo-admin/css/style.css +++ b/src/main/resources/static/halo-admin/css/style.css @@ -199,3 +199,11 @@ .subbutton a.current { color: #000; } + +/** + TODO 默认皮肤 +*/ + +.skin-default{ + +} \ No newline at end of file diff --git a/src/main/resources/templates/admin/admin_index.ftl b/src/main/resources/templates/admin/admin_index.ftl index 1ea5b5d2a..87b2a0bf0 100755 --- a/src/main/resources/templates/admin/admin_index.ftl +++ b/src/main/resources/templates/admin/admin_index.ftl @@ -356,14 +356,14 @@