mirror of https://github.com/halo-dev/halo
fix some page problem
ruibaby
parent
c159353b68
commit
3ff6dcecb4
532
pom.xml
532
pom.xml
|
|
@ -1,126 +1,126 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>cc.ryanc</groupId>
|
||||
<artifactId>halo</artifactId>
|
||||
<version>latest</version>
|
||||
<name>halo</name>
|
||||
<!-- 虽然Halo使用了宽松的GPL协议，但开发不易，希望您可以保留一下版权声明。笔芯~ -->
|
||||
<description>
|
||||
halo，一个基于SpringBoot的博客系统，最求轻快，易用，以内容为中心。
|
||||
</description>
|
||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>cc.ryanc</groupId>
|
||||
<artifactId>halo</artifactId>
|
||||
<version>latest</version>
|
||||
<name>halo</name>
|
||||
<!-- 虽然Halo使用了宽松的GPL协议，但开发不易，希望您可以保留一下版权声明。笔芯~ -->
|
||||
<description>
|
||||
Halo，一个基于 SpringBoot 的博客系统，最求轻快，易用，以内容为中心。
|
||||
</description>
|
||||
|
||||
<organization>
|
||||
<name>halo-dev</name>
|
||||
<url>https://github.com/halo-dev</url>
|
||||
</organization>
|
||||
<organization>
|
||||
<name>halo-dev</name>
|
||||
<url>https://github.com/halo-dev</url>
|
||||
</organization>
|
||||
|
||||
<developers>
|
||||
<developer>
|
||||
<id>ruibaby</id>
|
||||
<name>Ryan Wang</name>
|
||||
<email>i@ryanc.cc</email>
|
||||
<url>https://ryanc.cc</url>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>JohnNiang</id>
|
||||
<name>John Niang</name>
|
||||
<url>https://johnniang.me</url>
|
||||
</developer>
|
||||
</developers>
|
||||
<developers>
|
||||
<developer>
|
||||
<id>ruibaby</id>
|
||||
<name>Ryan Wang</name>
|
||||
<email>i@ryanc.cc</email>
|
||||
<url>https://ryanc.cc</url>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>JohnNiang</id>
|
||||
<name>John Niang</name>
|
||||
<url>https://johnniang.me</url>
|
||||
</developer>
|
||||
</developers>
|
||||
|
||||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-parent</artifactId>
|
||||
<version>2.1.2.RELEASE</version>
|
||||
<relativePath/>
|
||||
</parent>
|
||||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-parent</artifactId>
|
||||
<version>2.1.3.RELEASE</version>
|
||||
<relativePath/>
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
<java.version>1.8</java.version>
|
||||
<oh-my-email.version>0.0.4</oh-my-email.version>
|
||||
<lombok.version>1.18.4</lombok.version>
|
||||
<hutool.version>4.5.0</hutool.version>
|
||||
<upyun-java-sdk.version>4.0.1</upyun-java-sdk.version>
|
||||
<qiniu-java-sdk.version>7.2.18</qiniu-java-sdk.version>
|
||||
<thumbnailator.version>0.4.8</thumbnailator.version>
|
||||
<commonmark.version>0.12.1</commonmark.version>
|
||||
</properties>
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
<java.version>1.8</java.version>
|
||||
<oh-my-email.version>0.0.4</oh-my-email.version>
|
||||
<lombok.version>1.18.4</lombok.version>
|
||||
<hutool.version>4.5.0</hutool.version>
|
||||
<upyun-java-sdk.version>4.0.1</upyun-java-sdk.version>
|
||||
<qiniu-java-sdk.version>7.2.18</qiniu-java-sdk.version>
|
||||
<thumbnailator.version>0.4.8</thumbnailator.version>
|
||||
<commonmark.version>0.12.1</commonmark.version>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependencies>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-web</artifactId>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-tomcat</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-web</artifactId>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-tomcat</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- undertow -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-undertow</artifactId>
|
||||
</dependency>
|
||||
<!-- undertow -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-undertow</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- JPA -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-data-jpa</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-data-jpa</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Dev tools -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-devtools</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<!-- Dev tools -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-devtools</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
|
||||
<!-- mysql-->
|
||||
<dependency>
|
||||
<groupId>mysql</groupId>
|
||||
<artifactId>mysql-connector-java</artifactId>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
<!-- MySQL Driver-->
|
||||
<dependency>
|
||||
<groupId>mysql</groupId>
|
||||
<artifactId>mysql-connector-java</artifactId>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- H2Database -->
|
||||
<dependency>
|
||||
<groupId>com.h2database</groupId>
|
||||
<artifactId>h2</artifactId>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
<!-- H2Database Driver -->
|
||||
<dependency>
|
||||
<groupId>com.h2database</groupId>
|
||||
<artifactId>h2</artifactId>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-cache</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-cache</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- freemarker依赖 -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-freemarker</artifactId>
|
||||
</dependency>
|
||||
<!-- Freemarker -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-freemarker</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- 邮件 -->
|
||||
<dependency>
|
||||
<groupId>io.github.biezhi</groupId>
|
||||
<artifactId>oh-my-email</artifactId>
|
||||
<version>${oh-my-email.version}</version>
|
||||
</dependency>
|
||||
<!-- Oh My Email -->
|
||||
<dependency>
|
||||
<groupId>io.github.biezhi</groupId>
|
||||
<artifactId>oh-my-email</artifactId>
|
||||
<version>${oh-my-email.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Lombok -->
|
||||
<!-- Lombok -->
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
|
|
@ -128,97 +128,97 @@
|
|||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- EhCache -->
|
||||
<dependency>
|
||||
<groupId>net.sf.ehcache</groupId>
|
||||
<artifactId>ehcache</artifactId>
|
||||
</dependency>
|
||||
<!-- EhCache -->
|
||||
<dependency>
|
||||
<groupId>net.sf.ehcache</groupId>
|
||||
<artifactId>ehcache</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- hutool工具包 -->
|
||||
<dependency>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-core</artifactId>
|
||||
<version>${hutool.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-http</artifactId>
|
||||
<version>${hutool.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-crypto</artifactId>
|
||||
<version>${hutool.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-extra</artifactId>
|
||||
<version>${hutool.version}</version>
|
||||
</dependency>
|
||||
<!-- Hutool tool pack -->
|
||||
<dependency>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-core</artifactId>
|
||||
<version>${hutool.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-http</artifactId>
|
||||
<version>${hutool.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-crypto</artifactId>
|
||||
<version>${hutool.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-extra</artifactId>
|
||||
<version>${hutool.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- 又拍云SDK -->
|
||||
<dependency>
|
||||
<groupId>com.upyun</groupId>
|
||||
<artifactId>java-sdk</artifactId>
|
||||
<version>${upyun-java-sdk.version}</version>
|
||||
</dependency>
|
||||
<!-- Upyun SDK -->
|
||||
<dependency>
|
||||
<groupId>com.upyun</groupId>
|
||||
<artifactId>java-sdk</artifactId>
|
||||
<version>${upyun-java-sdk.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- 七牛云SDK -->
|
||||
<dependency>
|
||||
<groupId>com.qiniu</groupId>
|
||||
<artifactId>qiniu-java-sdk</artifactId>
|
||||
<version>${qiniu-java-sdk.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<artifactId>okhttp</artifactId>
|
||||
<groupId>com.squareup.okhttp3</groupId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<!-- Qiniu SDK -->
|
||||
<dependency>
|
||||
<groupId>com.qiniu</groupId>
|
||||
<artifactId>qiniu-java-sdk</artifactId>
|
||||
<version>${qiniu-java-sdk.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<artifactId>okhttp</artifactId>
|
||||
<groupId>com.squareup.okhttp3</groupId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<!-- 图片操作 -->
|
||||
<dependency>
|
||||
<groupId>net.coobird</groupId>
|
||||
<artifactId>thumbnailator</artifactId>
|
||||
<version>${thumbnailator.version}</version>
|
||||
</dependency>
|
||||
<!-- Thumbnailator -->
|
||||
<dependency>
|
||||
<groupId>net.coobird</groupId>
|
||||
<artifactId>thumbnailator</artifactId>
|
||||
<version>${thumbnailator.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Markdown渲染 -->
|
||||
<dependency>
|
||||
<groupId>com.atlassian.commonmark</groupId>
|
||||
<artifactId>commonmark</artifactId>
|
||||
<version>${commonmark.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.atlassian.commonmark</groupId>
|
||||
<artifactId>commonmark-ext-gfm-tables</artifactId>
|
||||
<version>${commonmark.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.atlassian.commonmark</groupId>
|
||||
<artifactId>commonmark-ext-yaml-front-matter</artifactId>
|
||||
<version>${commonmark.version}</version>
|
||||
</dependency>
|
||||
<!-- Markdown render kit -->
|
||||
<dependency>
|
||||
<groupId>com.atlassian.commonmark</groupId>
|
||||
<artifactId>commonmark</artifactId>
|
||||
<version>${commonmark.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.atlassian.commonmark</groupId>
|
||||
<artifactId>commonmark-ext-gfm-tables</artifactId>
|
||||
<version>${commonmark.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.atlassian.commonmark</groupId>
|
||||
<artifactId>commonmark-ext-yaml-front-matter</artifactId>
|
||||
<version>${commonmark.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Swagger -->
|
||||
<dependency>
|
||||
<groupId>io.springfox</groupId>
|
||||
<artifactId>springfox-swagger2</artifactId>
|
||||
<version>2.9.2</version>
|
||||
</dependency>
|
||||
<!-- Swagger -->
|
||||
<dependency>
|
||||
<groupId>io.springfox</groupId>
|
||||
<artifactId>springfox-swagger2</artifactId>
|
||||
<version>2.9.2</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>io.springfox</groupId>
|
||||
<artifactId>springfox-swagger-ui</artifactId>
|
||||
<version>2.9.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.springfox</groupId>
|
||||
<artifactId>springfox-swagger-ui</artifactId>
|
||||
<version>2.9.2</version>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
</dependencies>
|
||||
|
||||
<profiles>
|
||||
<!-- 生产环境打包配置 -->
|
||||
<profile>
|
||||
<id>prod</id>
|
||||
<profiles>
|
||||
<!-- 生产环境打包配置 -->
|
||||
<profile>
|
||||
<id>prod</id>
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>aliyun</id>
|
||||
|
|
@ -231,74 +231,74 @@
|
|||
<url>http://maven.aliyun.com/nexus/content/groups/public</url>
|
||||
</pluginRepository>
|
||||
</pluginRepositories>
|
||||
<build>
|
||||
<finalName>halo</finalName>
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>src/main/java</directory>
|
||||
<filtering>false</filtering>
|
||||
<excludes>
|
||||
<exclude>**/*.java</exclude>
|
||||
</excludes>
|
||||
</resource>
|
||||
</resources>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<configuration>
|
||||
<skip>true</skip>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<build>
|
||||
<finalName>halo</finalName>
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>src/main/java</directory>
|
||||
<filtering>false</filtering>
|
||||
<excludes>
|
||||
<exclude>**/*.java</exclude>
|
||||
</excludes>
|
||||
</resource>
|
||||
</resources>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<configuration>
|
||||
<skip>true</skip>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<configuration>
|
||||
<source>1.8</source>
|
||||
<target>1.8</target>
|
||||
<encoding>UTF-8</encoding>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<configuration>
|
||||
<source>1.8</source>
|
||||
<target>1.8</target>
|
||||
<encoding>UTF-8</encoding>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
<configuration>
|
||||
<appendAssemblyId>false</appendAssemblyId>
|
||||
<descriptors>
|
||||
<descriptor>assembly.xml</descriptor>
|
||||
</descriptors>
|
||||
<outputDirectory>${project.build.directory}/dist/</outputDirectory>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>make-assembly</id>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>single</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>3.1.0</version>
|
||||
<configuration>
|
||||
<archive>
|
||||
<manifest>
|
||||
<mainClass>cc.ryanc.halo.Application</mainClass>
|
||||
<classpathPrefix>lib/</classpathPrefix>
|
||||
<addClasspath>true</addClasspath>
|
||||
</manifest>
|
||||
<manifestEntries>
|
||||
<Class-Path>resources/</Class-Path>
|
||||
</manifestEntries>
|
||||
</archive>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
<plugin>
|
||||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
<configuration>
|
||||
<appendAssemblyId>false</appendAssemblyId>
|
||||
<descriptors>
|
||||
<descriptor>assembly.xml</descriptor>
|
||||
</descriptors>
|
||||
<outputDirectory>${project.build.directory}/dist/</outputDirectory>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>make-assembly</id>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>single</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>3.1.0</version>
|
||||
<configuration>
|
||||
<archive>
|
||||
<manifest>
|
||||
<mainClass>cc.ryanc.halo.Application</mainClass>
|
||||
<classpathPrefix>lib/</classpathPrefix>
|
||||
<addClasspath>true</addClasspath>
|
||||
</manifest>
|
||||
<manifestEntries>
|
||||
<Class-Path>resources/</Class-Path>
|
||||
</manifestEntries>
|
||||
</archive>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
|
||||
<!--CI环境-->
|
||||
<profile>
|
||||
|
|
@ -372,11 +372,11 @@
|
|||
</build>
|
||||
</profile>
|
||||
|
||||
<!-- 开发环境 -->
|
||||
<profile>
|
||||
<id>dev</id>
|
||||
<build>
|
||||
<plugins>
|
||||
<!-- 开发环境 -->
|
||||
<profile>
|
||||
<id>dev</id>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
|
|
@ -384,13 +384,13 @@
|
|||
<fork>true</fork>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>3.0.0</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>3.0.0</version>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -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 = 篇文章。
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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 = 篇文章。
|
||||
|
|
|
|||
|
|
@ -199,3 +199,11 @@
|
|||
.subbutton a.current {
|
||||
color: #000;
|
||||
}
|
||||
|
||||
/**
|
||||
TODO 默认皮肤
|
||||
*/
|
||||
|
||||
.skin-default{
|
||||
|
||||
}
|
||||
|
|
@ -356,14 +356,14 @@
|
|||
<h4 class="modal-title" id="blog-data"><@spring.message code='admin.index.blog-data.title' /></h4>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<p>「${options.blog_title!}」<@spring.message code='admin.index.blog-data.days-count-before' /><span id="blogStartDay">${hadDays!}</span><@spring.message code='admin.index.blog-data.days-count-after' /></p>
|
||||
<p><@spring.message code='admin.index.blog-data.during' /></p>
|
||||
<p><@spring.message code='admin.index.blog-data.posts-count-before' /> ${postsCount!0} <@spring.message code='admin.index.blog-data.posts-count-after' /></p>
|
||||
<p><@spring.message code='admin.index.blog-data.tags-count-before' /> <@commonTag method="tags">${tags?size}</@commonTag> <@spring.message code='admin.index.blog-data.tags-count-after' /></p>
|
||||
<p><@spring.message code='admin.index.blog-data.comments-count-before' /> ${commentsCount!} <@spring.message code='admin.index.blog-data.comments-count-after' /></p>
|
||||
<p><@spring.message code='admin.index.blog-data.links-count-before' /> <@commonTag method="links">${links?size}</@commonTag> <@spring.message code='admin.index.blog-data.links-count-after' /></p>
|
||||
<p><@spring.message code='admin.index.blog-data.views-count-before' /> ${postViewsSum!0} <@spring.message code='admin.index.blog-data.views-count-after' /></p>
|
||||
<p><@spring.message code='admin.index.blog-data.motto' /></p>
|
||||
<#--<p>「${options.blog_title!}」<@spring.message code='admin.index.blog-data.days-count-before' /><span id="blogStartDay">${hadDays!}</span><@spring.message code='admin.index.blog-data.days-count-after' /></p>-->
|
||||
<#--<p><@spring.message code='admin.index.blog-data.during' /></p>-->
|
||||
<#--<p><@spring.message code='admin.index.blog-data.posts-count-before' /> ${postsCount!0} <@spring.message code='admin.index.blog-data.posts-count-after' /></p>-->
|
||||
<#--<p><@spring.message code='admin.index.blog-data.tags-count-before' /> <@commonTag method="tags">${tags?size}</@commonTag> <@spring.message code='admin.index.blog-data.tags-count-after' /></p>-->
|
||||
<#--<p><@spring.message code='admin.index.blog-data.comments-count-before' /> ${commentsCount!} <@spring.message code='admin.index.blog-data.comments-count-after' /></p>-->
|
||||
<#--<p><@spring.message code='admin.index.blog-data.links-count-before' /> <@commonTag method="links">${links?size}</@commonTag> <@spring.message code='admin.index.blog-data.links-count-after' /></p>-->
|
||||
<#--<p><@spring.message code='admin.index.blog-data.views-count-before' /> ${postViewsSum!0} <@spring.message code='admin.index.blog-data.views-count-after' /></p>-->
|
||||
开发中...
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-primary" data-dismiss="modal"><@spring.message code='common.btn.define' /></button>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,8 @@
|
|||
<ol class="breadcrumb">
|
||||
<li>
|
||||
<a data-pjax="true" href="/admin">
|
||||
<i class="fa fa-dashboard"></i> <@spring.message code='admin.index.bread.index' /></a>
|
||||
<i class="fa fa-dashboard"></i> <@spring.message code='admin.index.bread.index' />
|
||||
</a>
|
||||
</li>
|
||||
<li><a data-pjax="true" href="javascript:void(0)"><@spring.message code='admin.setting.bread.setting' /></a></li>
|
||||
<li class="active"><@spring.message code='admin.setting.title' /></li>
|
||||
|
|
|
|||
|
|
@ -4,13 +4,6 @@
|
|||
<div class="content-wrapper">
|
||||
<link rel="stylesheet" href="/static/halo-admin/plugins/easymde/easymde.min.css">
|
||||
<link rel="stylesheet" href="/static/halo-admin/plugins/datetimepicker/css/bootstrap-datetimepicker.min.css">
|
||||
<style type="text/css">
|
||||
#postTitle{font-weight: 400;}
|
||||
.CodeMirror .cm-spell-error:not(.cm-url):not(.cm-comment):not(.cm-tag):not(.cm-word) {background: none;}
|
||||
.CodeMirror-fullscreen,.editor-toolbar.fullscreen{z-index: 1030;}
|
||||
.CodeMirror, .CodeMirror-scroll {min-height: 480px;}
|
||||
.editor-preview-active img,.editor-preview-active-side img{width: 100%;}
|
||||
</style>
|
||||
<section class="content-header" id="animated-header">
|
||||
<h1 style="display: inline-block;">
|
||||
<@spring.message code='admin.pages.edit.title' />
|
||||
|
|
|
|||
|
|
@ -9,8 +9,9 @@
|
|||
</h1>
|
||||
<ol class="breadcrumb">
|
||||
<li>
|
||||
<a data-pjax="true" href="/admin">
|
||||
<i class="fa fa-dashboard"></i> <@spring.message code='admin.index.bread.index' /></a>
|
||||
<a data-pjax="true" href="/admin/">
|
||||
<i class="fa fa-dashboard"></i> <@spring.message code='admin.index.bread.index' />
|
||||
</a>
|
||||
</li>
|
||||
<li><a data-pjax="true" href="javascript:void(0)"><@spring.message code='admin.user.profile.bread.user' /></a></li>
|
||||
<li class="active"><@spring.message code='admin.user.profile.title' /></li>
|
||||
|
|
|
|||
|
|
@ -13,7 +13,8 @@
|
|||
<ol class="breadcrumb">
|
||||
<li>
|
||||
<a data-pjax="true" href="javascript:void(0)">
|
||||
<i class="fa fa-dashboard"></i> <@spring.message code='admin.index.bread.index' /></a>
|
||||
<i class="fa fa-dashboard"></i> <@spring.message code='admin.index.bread.index' />
|
||||
</a>
|
||||
</li>
|
||||
<li><a data-pjax="true" href="javascript:void(0)"><@spring.message code='admin.posts.title' /></a></li>
|
||||
<li class="active"><@spring.message code='admin.tags.title' /></li>
|
||||
|
|
|
|||
|
|
@ -6,8 +6,9 @@
|
|||
<h1 style="display: inline-block;"><@spring.message code='admin.tools.title' /></h1>
|
||||
<ol class="breadcrumb">
|
||||
<li>
|
||||
<a data-pjax="true" href="/admin">
|
||||
<i class="fa fa-dashboard"></i> <@spring.message code='admin.index.bread.index' /></a>
|
||||
<a data-pjax="true" href="/admin/">
|
||||
<i class="fa fa-dashboard"></i> <@spring.message code='admin.index.bread.index' />
|
||||
</a>
|
||||
</li>
|
||||
<li><a data-pjax="true" href="javascript:void(0)"><@spring.message code='admin.setting.bread.setting' /></a></li>
|
||||
<li class="active"><@spring.message code='admin.tools.title' /></li>
|
||||
|
|
|
|||
Loading…
Reference in New Issue