diff --git a/src/main/java/cn/celess/blog/controller/WebUpdateInfoController.java b/src/main/java/cn/celess/blog/controller/WebUpdateInfoController.java index a69f4b0..eb5f432 100644 --- a/src/main/java/cn/celess/blog/controller/WebUpdateInfoController.java +++ b/src/main/java/cn/celess/blog/controller/WebUpdateInfoController.java @@ -39,7 +39,7 @@ public class WebUpdateInfoController { public Response page(@RequestParam("page") int page, @RequestParam("count") int count) { return ResponseUtil.success(webUpdateInfoService.pages(count, page)); } - @GetMapping("/lastestUpdateTime") + @GetMapping("/lastestUpdate") public Response lastestUpdateTime() { return ResponseUtil.success(webUpdateInfoService.getLastestUpdateTime()); } diff --git a/src/main/java/cn/celess/blog/mapper/WebUpdateInfoMapper.java b/src/main/java/cn/celess/blog/mapper/WebUpdateInfoMapper.java index 612fc9d..d2fa669 100644 --- a/src/main/java/cn/celess/blog/mapper/WebUpdateInfoMapper.java +++ b/src/main/java/cn/celess/blog/mapper/WebUpdateInfoMapper.java @@ -27,5 +27,5 @@ public interface WebUpdateInfoMapper { List findAll(); - Date getLastestOne(); + WebUpdate getLastestOne(); } diff --git a/src/main/java/cn/celess/blog/service/WebUpdateInfoService.java b/src/main/java/cn/celess/blog/service/WebUpdateInfoService.java index cb6f3aa..6a0aa2f 100644 --- a/src/main/java/cn/celess/blog/service/WebUpdateInfoService.java +++ b/src/main/java/cn/celess/blog/service/WebUpdateInfoService.java @@ -2,6 +2,7 @@ package cn.celess.blog.service; import cn.celess.blog.entity.model.WebUpdateModel; import com.github.pagehelper.PageInfo; +import net.sf.json.JSONObject; import org.springframework.stereotype.Service; import java.util.List; @@ -58,5 +59,5 @@ public interface WebUpdateInfoService { * * @return */ - String getLastestUpdateTime(); + JSONObject getLastestUpdateTime(); } 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 1a70f8a..b8aac47 100644 --- a/src/main/java/cn/celess/blog/service/serviceimpl/WebUpdateInfoServiceImpl.java +++ b/src/main/java/cn/celess/blog/service/serviceimpl/WebUpdateInfoServiceImpl.java @@ -7,11 +7,17 @@ import cn.celess.blog.exception.MyException; import cn.celess.blog.mapper.WebUpdateInfoMapper; import cn.celess.blog.service.WebUpdateInfoService; import cn.celess.blog.util.DateFormatUtil; +import cn.celess.blog.util.HttpUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.time.Instant; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -80,8 +86,23 @@ public class WebUpdateInfoServiceImpl implements WebUpdateInfoService { } @Override - public String getLastestUpdateTime() { - return DateFormatUtil.get(webUpdateInfoMapper.getLastestOne()); + public JSONObject getLastestUpdateTime() { + 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))); + } catch (IOException e) { + jsonObject.put("lastCommit", null); + } + return jsonObject; } private List list2List(List webUpdates) { diff --git a/src/main/resources/mapper/WebUpdateInfoMapper.xml b/src/main/resources/mapper/WebUpdateInfoMapper.xml index db9f799..ce12748 100644 --- a/src/main/resources/mapper/WebUpdateInfoMapper.xml +++ b/src/main/resources/mapper/WebUpdateInfoMapper.xml @@ -39,8 +39,8 @@ select * from web_update - + select * from web_update order by update_id desc limit 1