🐛 fixed admin articles list error

cunshan · Jun 12, 2018 · e2c4a1b · e2c4a1b
1 parent 6e42b40
commit e2c4a1b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 34 deletions.
diff --git a/package.sh b/package.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+mvn clean package -Pprod -Dmaven.test.skip=true
diff --git a/pom.xml b/pom.xml
@@ -6,12 +6,12 @@
 
     <groupId>io.github.otale</groupId>
     <artifactId>tale</artifactId>
-    <version>least</version>
+    <version>letast</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <sqlite.version>3.21.0.1</sqlite.version>
-        <blade-mvc.version>2.0.8-R3</blade-mvc.version>
+        <blade-mvc.version>2.0.8-SNAPSHOT</blade-mvc.version>
         <anima.version>0.2.3-SNAPSHOT</anima.version>
         <blade-tpl.verion>0.1.3</blade-tpl.verion>
         <blade-validator>0.0.2</blade-validator>
@@ -205,7 +205,6 @@
                             <addClasspath>true</addClasspath>
                         </manifest>
                         <manifestEntries>
-                            <!-- 在Class-Path下添加配置文件的路径 -->
                             <Class-Path>resources/</Class-Path>
                         </manifestEntries>
                     </archive>

diff --git a/src/main/java/com/tale/bootstrap/ExceptionHandler.java b/src/main/java/com/tale/bootstrap/ExceptionHandler.java
diff --git a/src/main/java/com/tale/service/ContentsService.java b/src/main/java/com/tale/service/ContentsService.java
@@ -133,7 +133,7 @@ public Page<Contents> getArticles(Integer mid, int page, int limit) {
     }
 
     public Page<Contents> findArticles(ArticleParam articleParam) {
-        AnimaQuery<Contents> query = select().from(Contents.class);
+        AnimaQuery<Contents> query = select().from(Contents.class).exclude(Contents::getContent);
 
         if (StringKit.isNotEmpty(articleParam.getStatus())) {
             query.and(Contents::getStatus, articleParam.getStatus());
@@ -160,7 +160,9 @@ private Contents mapContent(Contents contents) {
         } else {
             contents.setUrl("/article/" + contents.getCid());
         }
-        contents.setContent(contents.getContent().replaceAll("\\\\\"", "\\\""));
+        if (StringKit.isNotEmpty(contents.getContent())) {
+            contents.setContent(contents.getContent().replaceAll("\\\\\"", "\\\""));
+        }
         return contents;
     }
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/usr/bin/env bash

		mvn clean package -Pprod -Dmaven.test.skip=true