Commit 674eb293 authored by Liang Ding's avatar Liang Ding

🎨 #12932

parent d9ac2ce8
...@@ -88,7 +88,6 @@ ...@@ -88,7 +88,6 @@
<license-maven-plugin.version>3.0</license-maven-plugin.version> <license-maven-plugin.version>3.0</license-maven-plugin.version>
<maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version> <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
<maven-war-plugin.version>3.2.2</maven-war-plugin.version>
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version> <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.2</jacoco-maven-plugin.version> <jacoco-maven-plugin.version>0.8.2</jacoco-maven-plugin.version>
<testng.version>6.1.1</testng.version> <testng.version>6.1.1</testng.version>
...@@ -326,9 +325,28 @@ ...@@ -326,9 +325,28 @@
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId>
<artifactId>maven-war-plugin</artifactId> <configuration>
<version>${maven-war-plugin.version}</version> <archive>
<manifest>
<mainClass>org.b3log.solo.Server</mainClass>
</manifest>
</archive>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<finalName>solo</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin> </plugin>
</plugins> </plugins>
......
...@@ -179,8 +179,8 @@ public final class Server extends BaseServer { ...@@ -179,8 +179,8 @@ public final class Server extends BaseServer {
} }
Dispatcher.HANDLERS.add(0, new StopwatchStartHandler()); Dispatcher.HANDLERS.add(0, new StopwatchStartHandler());
Dispatcher.HANDLERS.add(1, new InitCheckHandler()); Dispatcher.HANDLERS.add(1, new SkinHandler());
Dispatcher.HANDLERS.add(2, new SkinHandler()); Dispatcher.HANDLERS.add(2, new InitCheckHandler());
Dispatcher.HANDLERS.add(3, new PermalinkHandler()); Dispatcher.HANDLERS.add(3, new PermalinkHandler());
Dispatcher.HANDLERS.add(4, new StopwatchEndHandler()); Dispatcher.HANDLERS.add(4, new StopwatchEndHandler());
......
...@@ -65,7 +65,7 @@ public final class Skins { ...@@ -65,7 +65,7 @@ public final class Skins {
static { static {
TEMPLATE_CFG = new Configuration(Configuration.VERSION_2_3_28); TEMPLATE_CFG = new Configuration(Configuration.VERSION_2_3_28);
TEMPLATE_CFG.setDefaultEncoding("UTF-8"); TEMPLATE_CFG.setDefaultEncoding("UTF-8");
TEMPLATE_CFG.setClassForTemplateLoading(Skins.class, ""); TEMPLATE_CFG.setClassForTemplateLoading(Skins.class, "/");
TEMPLATE_CFG.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER); TEMPLATE_CFG.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
TEMPLATE_CFG.setLogTemplateExceptions(false); TEMPLATE_CFG.setLogTemplateExceptions(false);
} }
......
...@@ -31,7 +31,7 @@ log4j.logger.org.b3log.latke.util.freemarker.Templates=ERROR ...@@ -31,7 +31,7 @@ log4j.logger.org.b3log.latke.util.freemarker.Templates=ERROR
log4j.logger.org.b3log.latke.repository.jdbc.util=WARN log4j.logger.org.b3log.latke.repository.jdbc.util=WARN
log4j.logger.org.b3log.latke.util.Crypts=ERROR log4j.logger.org.b3log.latke.util.Crypts=ERROR
log4j.logger.org.eclipse.jetty=WARN log4j.logger.io.netty=WARN
log4j.logger.freemarker=WARN log4j.logger.freemarker=WARN
log4j.logger.com.mchange=WARN log4j.logger.com.mchange=WARN
log4j.logger.com.alibaba=WARN log4j.logger.com.alibaba=WARN
......
...@@ -29,7 +29,7 @@ log4j.logger.org.b3log.latke=WARN ...@@ -29,7 +29,7 @@ log4j.logger.org.b3log.latke=WARN
log4j.logger.org.b3log.latke.util.freemarker.Templates=ERROR log4j.logger.org.b3log.latke.util.freemarker.Templates=ERROR
log4j.logger.org.b3log.latke.repository.jdbc.util=WARN log4j.logger.org.b3log.latke.repository.jdbc.util=WARN
log4j.logger.org.eclipse.jetty=WARN log4j.logger.io.netty=WARN
log4j.logger.freemarker=WARN log4j.logger.freemarker=WARN
log4j.logger.com.mchange=WARN log4j.logger.com.mchange=WARN
log4j.logger.com.alibaba=WARN log4j.logger.com.alibaba=WARN
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment