modify docker configuration

build.gradle

@@ -18,7 +18,7 @@ buildscript {
 }
 
 group 'com.uas.cloud.mall'
-version '0.0.1'
+version '0.0.2'
 
 apply plugin: 'java'
 apply plugin: "com.palantir.docker"
@@ -27,6 +27,11 @@ apply plugin: "org.springframework.boot"
 apply from: "$rootDir/gradle/tasks.gradle"
 apply from: "$rootDir/gradle/dependencies-base.gradle"
 
+jar {
+	baseName = project.name
+	version = ''
+}
+
 allprojects {
 	sourceCompatibility = 1.8
 }

gradle/tasks.gradle

@@ -7,5 +7,5 @@ bootRun {
 docker {
 	name "${dcokerRegistry}/${project.name}:${project.version}"
 	dockerfile "${projectDir}/src/main/docker/Dockerfile"
-	files "${buildDir}/libs/${project.name}-${project.version}.jar"
+	files "${buildDir}/libs/${project.name}.jar"
 }.dependsOn build

src/main/docker/Dockerfile

@@ -1,5 +1,5 @@
 FROM hub.c.163.com/library/java:8-jre-alpine
 VOLUME /tmp
-ADD mall-news-service-0.0.1.jar /app.jar
+ADD mall-news-service.jar /app.jar
 ENV JAVA_OPTS=""
 ENTRYPOINT ["sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar /app.jar --spring.profiles.active=test"]

src/main/java/com/uas/cloud/mall/shop/news/service/impl/NewsServiceImpl.java

@@ -11,9 +11,9 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import javax.persistence.criteria.Predicate;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -30,7 +30,7 @@ public class NewsServiceImpl implements NewsService {
     public News findone(Long id) {
         News news = newsRepository.findOne(id);
         //判断summary字段是否为空
-        if ("".equals(news.getSummary()) || news.getSummary() == null){
+        if (news != null && StringUtils.isEmpty(news.getSummary())) {
             news.setSummary(NewsCloumnCutUtil.getHtmlText(100,news.getContent()));
         }
         return news;

src/main/java/com/uas/cloud/mall/shop/news/utils/NewsCloumnCutUtil.java

@@ -1,6 +1,7 @@
 package com.uas.cloud.mall.shop.news.utils;
 
 import com.uas.cloud.mall.shop.news.model.News;
+import org.apache.commons.collections.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -12,6 +13,9 @@ public class NewsCloumnCutUtil {
 
     public static List<News> cutText(List<News> oldnewsList) {
         List<News> newsList = new ArrayList<>();
+        if (CollectionUtils.isEmpty(oldnewsList)) {
+            return newsList;
+        }
         for (News news : oldnewsList) {
             if ("".equals(news.getSummary()) || news.getSummary() == null) {
                 news.setSummary(getHtmlText(100, news.getContent()));