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 f23665a..17b53f6 100644 --- a/src/main/java/cn/celess/blog/service/serviceimpl/WebUpdateInfoServiceImpl.java +++ b/src/main/java/cn/celess/blog/service/serviceimpl/WebUpdateInfoServiceImpl.java @@ -88,19 +88,15 @@ public class WebUpdateInfoServiceImpl implements WebUpdateInfoService { JSONObject jsonObject = new JSONObject(); jsonObject.put("lastUpdateTime", DateFormatUtil.get(webUpdateInfoMapper.getLastestOne().getUpdateTime())); jsonObject.put("lastUpdateInfo", webUpdateInfoMapper.getLastestOne().getUpdateInfo()); - try { - JSONArray array = JSONArray.fromObject(HttpUtil.get("https://api.github.com/repos/xiaohai2271/blog-frontEnd/commits?page=1&per_page=1")); - JSONObject object = array.getJSONObject(0); - JSONObject commit = object.getJSONObject("commit"); - jsonObject.put("lastCommit", commit.getString("message")); - jsonObject.put("committerAuthor", commit.getJSONObject("committer").getString("name")); - SimpleDateFormat sdf = new SimpleDateFormat(); - Instant parse = Instant.parse(commit.getJSONObject("committer").getString("date")); - jsonObject.put("committerDate", DateFormatUtil.get(Date.from(parse))); - jsonObject.put("commitUrl", "https://github.com/xiaohai2271/blog-frontEnd/tree/" + object.getString("sha")); - } catch (IOException e) { - log.info("网络请求失败{}", e.getMessage()); - } + JSONArray array = JSONArray.fromObject(HttpUtil.get("https://api.github.com/repos/xiaohai2271/blog-frontEnd/commits?page=1&per_page=1")); + JSONObject object = array.getJSONObject(0); + JSONObject commit = object.getJSONObject("commit"); + jsonObject.put("lastCommit", commit.getString("message")); + jsonObject.put("committerAuthor", commit.getJSONObject("committer").getString("name")); + SimpleDateFormat sdf = new SimpleDateFormat(); + Instant parse = Instant.parse(commit.getJSONObject("committer").getString("date")); + jsonObject.put("committerDate", DateFormatUtil.get(Date.from(parse))); + jsonObject.put("commitUrl", "https://github.com/xiaohai2271/blog-frontEnd/tree/" + object.getString("sha")); return jsonObject; } diff --git a/src/test/java/cn/celess/blog/BaseTest.java b/src/test/java/cn/celess/blog/BaseTest.java index e7c14fe..3a81895 100644 --- a/src/test/java/cn/celess/blog/BaseTest.java +++ b/src/test/java/cn/celess/blog/BaseTest.java @@ -29,6 +29,7 @@ import org.springframework.web.context.WebApplicationContext; import java.io.IOException; import java.io.UnsupportedEncodingException; +import java.util.Map; import java.util.UUID; import static cn.celess.blog.enmu.ResponseEnum.SUCCESS; @@ -64,6 +65,8 @@ public class BaseTest { }; protected static final TypeReference OBJECT_TYPE = new TypeReference>() { }; + protected static final TypeReference MAP_OBJECT_TYPE = new TypeReference>>() { + }; @Autowired private WebApplicationContext wac; protected MockHttpSession session;