From 40e1f4d6abdd0e4fb5a50c3a4e9ccff06ab26793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A6=BE=E5=87=A0=E6=B5=B7?= Date: Sat, 15 Aug 2020 16:00:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A9=BA=E5=80=BC=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/PartnerSiteServiceImpl.java | 2 +- .../serviceimpl/WebUpdateInfoServiceImpl.java | 22 +++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/PartnerSiteServiceImpl.java b/src/main/java/cn/celess/blog/service/serviceimpl/PartnerSiteServiceImpl.java index 398cba5..0e790fe 100644 --- a/src/main/java/cn/celess/blog/service/serviceimpl/PartnerSiteServiceImpl.java +++ b/src/main/java/cn/celess/blog/service/serviceimpl/PartnerSiteServiceImpl.java @@ -12,11 +12,11 @@ import cn.celess.blog.service.PartnerSiteService; import cn.celess.blog.util.HttpUtil; import cn.celess.blog.util.RedisUtil; import cn.celess.blog.util.RegexUtil; +import com.alibaba.druid.util.StringUtils; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.SneakyThrows; -import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.mail.SimpleMailMessage; diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/WebUpdateInfoServiceImpl.java b/src/main/java/cn/celess/blog/service/serviceimpl/WebUpdateInfoServiceImpl.java index 49888ed..ce51248 100644 --- a/src/main/java/cn/celess/blog/service/serviceimpl/WebUpdateInfoServiceImpl.java +++ b/src/main/java/cn/celess/blog/service/serviceimpl/WebUpdateInfoServiceImpl.java @@ -10,6 +10,7 @@ import cn.celess.blog.service.WebUpdateInfoService; import cn.celess.blog.util.DateFormatUtil; import cn.celess.blog.util.HttpUtil; import cn.celess.blog.util.ModalTrans; +import com.alibaba.druid.util.StringUtils; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.pagehelper.PageHelper; @@ -88,15 +89,18 @@ public class WebUpdateInfoServiceImpl implements WebUpdateInfoService { map.put("lastUpdateInfo", webUpdateInfoMapper.getLastestOne().getUpdateInfo()); try { ObjectMapper mapper = new ObjectMapper(); - JsonNode root = mapper.readTree(HttpUtil.get("https://api.github.com/repos/xiaohai2271/blog-frontEnd/commits?page=1&per_page=1")); - Iterator elements = root.elements(); - JsonNode next = elements.next(); - JsonNode commit = next.get("commit"); - map.put("lastCommit", commit.get("message")); - map.put("committerAuthor", commit.get("committer").get("name")); - Instant parse = Instant.parse(commit.get("committer").get("date").asText()); - map.put("committerDate", DateFormatUtil.get(Date.from(parse))); - map.put("commitUrl", "https://github.com/xiaohai2271/blog-frontEnd/tree/" + next.get("sha").asText()); + String respStr = HttpUtil.get("https://api.github.com/repos/xiaohai2271/blog-frontEnd/commits?page=1&per_page=1"); + if (!StringUtils.isEmpty(respStr)) { + JsonNode root = mapper.readTree(respStr); + Iterator elements = root.elements(); + JsonNode next = elements.next(); + JsonNode commit = next.get("commit"); + map.put("lastCommit", commit.get("message")); + map.put("committerAuthor", commit.get("committer").get("name")); + Instant parse = Instant.parse(commit.get("committer").get("date").asText()); + map.put("committerDate", DateFormatUtil.get(Date.from(parse))); + map.put("commitUrl", "https://github.com/xiaohai2271/blog-frontEnd/tree/" + next.get("sha").asText()); + } } catch (IOException e) { log.info("网络请求失败{}", e.getMessage()); }