修改Response 的date响应字段

src/main/java/cn/celess/blog/configuration/filter/AuthenticationFilter.java

@@ -1,16 +1,15 @@
 package cn.celess.blog.configuration.filter;
 
 import cn.celess.blog.enmu.ResponseEnum;
+import cn.celess.blog.entity.Response;
 import cn.celess.blog.service.UserService;
 import cn.celess.blog.util.JwtUtil;
 import cn.celess.blog.util.RedisUtil;
-import cn.celess.blog.util.ResponseUtil;
 import net.sf.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -22,6 +21,11 @@ import java.io.IOException;
  * @Description: 鉴权拦截器
  */
 public class AuthenticationFilter implements HandlerInterceptor {
+    private static final Logger logger = LoggerFactory.getLogger(AuthenticationFilter.class);
+    private static final String USER_PREFIX = "/user";
+    private static final String ADMIN_PREFIX = "/admin";
+    private static final String ROLE_ADMIN = "admin";
+    private static final String ROLE_USER = "user";
     @Autowired
     JwtUtil jwtUtil;
     @Autowired
@@ -29,13 +33,6 @@ public class AuthenticationFilter implements HandlerInterceptor {
     @Autowired
     UserService userService;
 
-    private static final Logger logger = LoggerFactory.getLogger(AuthenticationFilter.class);
-
-    private static final String USER_PREFIX = "/user";
-    private static final String ADMIN_PREFIX = "/admin";
-    private static final String ROLE_ADMIN = "admin";
-    private static final String ROLE_USER = "user";
-
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         String path = request.getRequestURI();
@@ -67,7 +64,7 @@ public class AuthenticationFilter implements HandlerInterceptor {
         if (role.equals(ROLE_USER) || role.equals(ROLE_ADMIN)) {
             // 更新token
             String token = jwtUtil.updateTokenDate(jwtStr);
-            response.setHeader("Authorization",token);
+            response.setHeader("Authorization", token);
         }
         if (role.equals(ROLE_ADMIN)) {
             // admin
@@ -84,7 +81,7 @@ public class AuthenticationFilter implements HandlerInterceptor {
         response.setHeader("Content-Type", "application/json;charset=UTF-8");
         try {
             logger.info("鉴权失败，[code:{},msg:{},path:{}]", e.getCode(), e.getMsg(), request.getRequestURI() + "?" + request.getQueryString());
-            response.getWriter().println(JSONObject.fromObject(ResponseUtil.response(e, null)));
+            response.getWriter().println(JSONObject.fromObject(Response.response(e, null)));
         } catch (IOException ex) {
             ex.printStackTrace();
         }

src/main/java/cn/celess/blog/configuration/filter/MultipleSubmitFilter.java

@@ -28,7 +28,7 @@ public class MultipleSubmitFilter implements HandlerInterceptor {
             // 请求参数和路径均相同 且请求时间间隔小于 WAIT_TIME
             response.setContentType("application/json");
             response.setCharacterEncoding("UTF-8");
-            Response result = new Response(ResponseEnum.FAILURE.getCode(), "重复请求", null, System.currentTimeMillis());
+            Response result = new Response(ResponseEnum.FAILURE.getCode(), "重复请求", null);
             response.getWriter().println(result.toString());
             return false;
         }

src/main/java/cn/celess/blog/controller/ArticleController.java

@@ -6,7 +6,6 @@ import cn.celess.blog.entity.model.ArticleModel;
 import cn.celess.blog.entity.request.ArticleReq;
 import cn.celess.blog.service.ArticleService;
 import cn.celess.blog.util.RedisUserUtil;
-import cn.celess.blog.util.ResponseUtil;
 import cn.celess.blog.util.SitemapGenerateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -36,7 +35,7 @@ public class ArticleController {
     public Response create(@RequestBody ArticleReq body) {
         ArticleModel articleModel = articleService.create(body);
         sitemapGenerateUtil.createSitemap();
-        return ResponseUtil.success(articleModel);
+        return Response.success(articleModel);
     }
 
     /**
@@ -49,7 +48,7 @@ public class ArticleController {
     public Response delete(@RequestParam("articleID") long articleId) {
         boolean delete = articleService.delete(articleId);
         sitemapGenerateUtil.createSitemap();
-        return ResponseUtil.success(delete);
+        return Response.success(delete);
     }
 
     /**
@@ -62,7 +61,7 @@ public class ArticleController {
     public Response update(@RequestBody ArticleReq body) {
         ArticleModel update = articleService.update(body);
         sitemapGenerateUtil.createSitemap();
-        return ResponseUtil.success(update);
+        return Response.success(update);
     }
 
     /**
@@ -82,11 +81,11 @@ public class ArticleController {
                                     HttpServletRequest request) {
         ArticleModel article = articleService.retrieveOneById(articleId, is4update);
         if (article.getOpen()) {
-            return ResponseUtil.success(article);
+            return Response.success(article);
         } else if (article.getAuthor().getId().equals(redisUserUtil.get().getId())) {
-            return ResponseUtil.success(article);
+            return Response.success(article);
         }
-        return ResponseUtil.response(ResponseEnum.PERMISSION_ERROR, null);
+        return Response.response(ResponseEnum.PERMISSION_ERROR, null);
     }
 
     /**
@@ -99,7 +98,7 @@ public class ArticleController {
     @GetMapping("/articles")
     public Response articles(@RequestParam(name = "page", defaultValue = "1") int page,
                              @RequestParam(name = "count", defaultValue = "5") int count) {
-        return ResponseUtil.success(articleService.retrievePageForOpen(count, page));
+        return Response.success(articleService.retrievePageForOpen(count, page));
     }
 
     /**
@@ -112,7 +111,7 @@ public class ArticleController {
     @GetMapping("/admin/articles")
     public Response adminArticles(@RequestParam(name = "page", defaultValue = "1") int page,
                                   @RequestParam(name = "count", defaultValue = "10") int count) {
-        return ResponseUtil.success(articleService.adminArticles(count, page));
+        return Response.success(articleService.adminArticles(count, page));
     }
 
     /**
@@ -127,7 +126,7 @@ public class ArticleController {
     public Response findByCategory(@PathVariable("name") String name,
                                    @RequestParam(name = "page", defaultValue = "1") int page,
                                    @RequestParam(name = "count", defaultValue = "10") int count) {
-        return ResponseUtil.success(articleService.findByCategory(name, page, count));
+        return Response.success(articleService.findByCategory(name, page, count));
     }
 
     /**
@@ -142,13 +141,13 @@ public class ArticleController {
     public Response findByTag(@PathVariable("name") String name,
                               @RequestParam(name = "page", defaultValue = "1") int page,
                               @RequestParam(name = "count", defaultValue = "10") int count) {
-        return ResponseUtil.success(articleService.findByTag(name, page, count));
+        return Response.success(articleService.findByTag(name, page, count));
     }
 
 
     @GetMapping("/createSitemap")
     public Response createSitemap() {
         sitemapGenerateUtil.createSitemap();
-        return ResponseUtil.success(null);
+        return Response.success(null);
     }
 }

src/main/java/cn/celess/blog/controller/CategoryController.java

@@ -2,7 +2,6 @@ package cn.celess.blog.controller;
 
 import cn.celess.blog.entity.Response;
 import cn.celess.blog.service.CategoryService;
-import cn.celess.blog.util.ResponseUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -24,7 +23,7 @@ public class CategoryController {
      */
     @PostMapping("/admin/category/create")
     public Response addOne(@RequestParam("name") String name) {
-        return ResponseUtil.success(categoryService.create(name));
+        return Response.success(categoryService.create(name));
     }
 
     /**
@@ -35,7 +34,7 @@ public class CategoryController {
      */
     @DeleteMapping("/admin/category/del")
     public Response deleteOne(@RequestParam("id") long id) {
-        return ResponseUtil.success(categoryService.delete(id));
+        return Response.success(categoryService.delete(id));
     }
 
     /**
@@ -48,7 +47,7 @@ public class CategoryController {
     @PutMapping("/admin/category/update")
     public Response updateOne(@RequestParam("id") Long id,
                               @RequestParam("name") String name) {
-        return ResponseUtil.success(categoryService.update(id, name));
+        return Response.success(categoryService.update(id, name));
     }
 
     /**
@@ -59,6 +58,6 @@ public class CategoryController {
     @GetMapping("/categories")
     public Response getPage(@RequestParam(name = "page", defaultValue = "1") int page,
                             @RequestParam(name = "count", defaultValue = "1000") int count) {
-        return ResponseUtil.success(categoryService.retrievePage(page, count));
+        return Response.success(categoryService.retrievePage(page, count));
     }
 }

src/main/java/cn/celess/blog/controller/CommentController.java

@@ -1,10 +1,8 @@
 package cn.celess.blog.controller;
 
-import cn.celess.blog.entity.Comment;
 import cn.celess.blog.entity.Response;
 import cn.celess.blog.entity.request.CommentReq;
 import cn.celess.blog.service.CommentService;
-import cn.celess.blog.util.ResponseUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -26,17 +24,17 @@ public class CommentController {
      */
     @PostMapping("/user/comment/create")
     public Response addOne(@RequestBody CommentReq reqBody) {
-        return ResponseUtil.success(commentService.create(reqBody));
+        return Response.success(commentService.create(reqBody));
     }
 
     @DeleteMapping("/user/comment/del")
     public Response delete(@RequestParam("id") long id) {
-        return ResponseUtil.success(commentService.delete(id));
+        return Response.success(commentService.delete(id));
     }
 
     @PutMapping("/user/comment/update")
     public Response update(@RequestBody CommentReq reqBody) {
-        return ResponseUtil.success(commentService.update(reqBody));
+        return Response.success(commentService.update(reqBody));
     }
 
     /**
@@ -52,7 +50,7 @@ public class CommentController {
                                       @RequestParam(value = "pid", required = false, defaultValue = "-1") long pid,
                                       @RequestParam(value = "count", required = false, defaultValue = "10") int count,
                                       @RequestParam(value = "page", required = false, defaultValue = "1") int page) {
-        return ResponseUtil.success(commentService.retrievePageByPageAndPid(pagePath, pid, page, count));
+        return Response.success(commentService.retrievePageByPageAndPid(pagePath, pid, page, count));
     }
 
     /**
@@ -63,17 +61,18 @@ public class CommentController {
      * @param page     page
      * @return Response
      */
+    // FIXME:: 左斜线转义的异常
     @GetMapping("/comment/pagePath/{pagePath}")
     public Response retrievePage(@PathVariable("pagePath") String pagePath,
                                  @RequestParam(value = "count", required = false, defaultValue = "10") int count,
                                  @RequestParam(value = "page", required = false, defaultValue = "1") int page) {
-        return ResponseUtil.success(commentService.retrievePage(pagePath, page, count));
+        return Response.success(commentService.retrievePage(pagePath, page, count));
     }
 
     @GetMapping("/user/comment/pagePath/{pagePath}")
     public Response userComment(@PathVariable("pagePath") String pagePath,
                                 @RequestParam(value = "count", required = false, defaultValue = "10") int count,
                                 @RequestParam(value = "page", required = false, defaultValue = "1") int page) {
-        return ResponseUtil.success(commentService.retrievePageByAuthor(pagePath, page, count));
+        return Response.success(commentService.retrievePageByAuthor(pagePath, page, count));
     }
 }

src/main/java/cn/celess/blog/controller/LinksController.java

@@ -9,7 +9,6 @@ import cn.celess.blog.service.MailService;
 import cn.celess.blog.service.PartnerSiteService;
 import cn.celess.blog.util.RedisUtil;
 import cn.celess.blog.util.RegexUtil;
-import cn.celess.blog.util.ResponseUtil;
 import cn.celess.blog.util.DateFormatUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mail.SimpleMailMessage;
@@ -37,17 +36,17 @@ public class LinksController {
 
     @PostMapping("/admin/links/create")
     public Response create(@RequestBody LinkReq reqBody) {
-        return ResponseUtil.success(partnerSiteService.create(reqBody));
+        return Response.success(partnerSiteService.create(reqBody));
     }
 
     @DeleteMapping("/admin/links/del/{id}")
     public Response del(@PathVariable("id") long id) {
-        return ResponseUtil.success(partnerSiteService.del(id));
+        return Response.success(partnerSiteService.del(id));
     }
 
     @PutMapping("/admin/links/update")
     public Response update(@RequestBody LinkReq reqBody) {
-        return ResponseUtil.success(partnerSiteService.update(reqBody));
+        return Response.success(partnerSiteService.update(reqBody));
     }
 
     @GetMapping("/links")
@@ -60,13 +59,13 @@ public class LinksController {
                 sites.add(p);
             }
         }
-        return ResponseUtil.success(sites);
+        return Response.success(sites);
     }
 
     @GetMapping("/admin/links")
     public Response all(@RequestParam("page") int page,
                         @RequestParam("count") int count) {
-        return ResponseUtil.success(partnerSiteService.partnerSitePages(page, count));
+        return Response.success(partnerSiteService.partnerSitePages(page, count));
     }
 
     @PostMapping("/apply")
@@ -74,10 +73,10 @@ public class LinksController {
                           @RequestParam("url") String url) {
         // TODO :: 弃用发送邮件的方式。
         if (name == null || name.replaceAll(" ", "").isEmpty()) {
-            return ResponseUtil.response(ResponseEnum.PARAMETERS_ERROR, null);
+            return Response.response(ResponseEnum.PARAMETERS_ERROR, null);
         }
         if (!RegexUtil.urlMatch(url)) {
-            return ResponseUtil.response(ResponseEnum.PARAMETERS_URL_ERROR, null);
+            return Response.response(ResponseEnum.PARAMETERS_URL_ERROR, null);
         }
         String applyTimeStr = redisUtil.get(request.getRemoteAddr() + "-Apply");
         int applyTime = 0;
@@ -93,6 +92,6 @@ public class LinksController {
         message.setText("name:" + name + "\nurl:" + url + "\n" + DateFormatUtil.getNow());
         Boolean send = mailService.send(message);
         redisUtil.setEx(request.getRemoteAddr() + "-Apply", applyTime + 1 + "", 2, TimeUnit.HOURS);
-        return send ? ResponseUtil.success("") : ResponseUtil.failure("");
+        return send ? Response.success("") : Response.failure("");
     }
 }

src/main/java/cn/celess/blog/controller/Other.java

@@ -8,7 +8,6 @@ import cn.celess.blog.service.CountService;
 import cn.celess.blog.service.QiniuService;
 import cn.celess.blog.util.HttpUtil;
 import cn.celess.blog.util.RedisUtil;
-import cn.celess.blog.util.ResponseUtil;
 import cn.celess.blog.util.VeriCodeUtil;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
@@ -24,9 +23,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.awt.image.BufferedImage;
 import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
@@ -58,7 +54,7 @@ public class Other {
         countMap.put("categoryCount", countService.getCategoriesCount());
         countMap.put("tagCount", countService.getTagsCount());
         countMap.put("visitorCount", countService.getVisitorCount());
-        return ResponseUtil.success(countMap);
+        return Response.success(countMap);
     }
 
 
@@ -79,7 +75,7 @@ public class Other {
         }
         map.put("sessionID", request.getSession().getId());
         map.put("request.getRemoteAddr()", request.getRemoteAddr());
-        return ResponseUtil.success(map);
+        return Response.success(map);
     }
 
     /**
@@ -122,10 +118,10 @@ public class Other {
         if (code.equals(codeStr)) {
             request.getSession().removeAttribute("code");
             request.getSession().setAttribute("verImgCodeStatus", true);
-            return ResponseUtil.success("验证成功");
+            return Response.success("验证成功");
         } else {
             request.getSession().removeAttribute("code");
-            return ResponseUtil.failure("验证失败，请重新获取验证码");
+            return Response.failure("验证失败，请重新获取验证码");
         }
     }
 
@@ -181,10 +177,10 @@ public class Other {
         try {
             imageObj = JSONObject.fromObject(HttpUtil.get("https://cn.bing.com/HPImageArchive.aspx?format=js&idx=0&n=1&mkt=zh-CN"));
         } catch (IOException e) {
-            return ResponseUtil.failure(null);
+            return Response.failure(null);
         }
         JSONArray jsonArray = imageObj.getJSONArray("images");
         String imageName = jsonArray.getJSONObject(0).getString("url");
-        return ResponseUtil.success("https://cn.bing.com" + imageName);
+        return Response.success("https://cn.bing.com" + imageName);
     }
 }

src/main/java/cn/celess/blog/controller/TagController.java

@@ -1,10 +1,8 @@
 package cn.celess.blog.controller;
 
 import cn.celess.blog.entity.Response;
-import cn.celess.blog.entity.Tag;
 import cn.celess.blog.entity.model.TagModel;
 import cn.celess.blog.service.TagService;
-import cn.celess.blog.util.ResponseUtil;
 import net.sf.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -24,24 +22,24 @@ public class TagController {
 
     @PostMapping("/admin/tag/create")
     public Response addOne(@RequestParam("name") String name) {
-        return ResponseUtil.success(tagService.create(name));
+        return Response.success(tagService.create(name));
     }
 
     @DeleteMapping("/admin/tag/del")
     public Response delOne(@RequestParam("id") long id) {
-        return ResponseUtil.success(tagService.delete(id));
+        return Response.success(tagService.delete(id));
     }
 
 
     @PutMapping("/admin/tag/update")
     public Response updateOne(@RequestParam("id") Long id, @RequestParam("name") String name) {
-        return ResponseUtil.success(tagService.update(id, name));
+        return Response.success(tagService.update(id, name));
     }
 
     @GetMapping("/tags")
     public Response getPage(@RequestParam(required = false, defaultValue = "10", value = "count") int count,
                             @RequestParam(required = false, defaultValue = "1", value = "page") int page) {
-        return ResponseUtil.success(tagService.retrievePage(page, count));
+        return Response.success(tagService.retrievePage(page, count));
     }
 
     @GetMapping("/tags/nac")
@@ -54,7 +52,7 @@ public class TagController {
             jsonObject.put("size", t.getArticles().size());
             nameAndCount.add(jsonObject);
         }
-        return ResponseUtil.success(nameAndCount);
+        return Response.success(nameAndCount);
     }
 
 }

src/main/java/cn/celess/blog/controller/UserController.java

@@ -4,7 +4,6 @@ import cn.celess.blog.entity.Response;
 import cn.celess.blog.entity.request.LoginReq;
 import cn.celess.blog.entity.request.UserReq;
 import cn.celess.blog.service.UserService;
-import cn.celess.blog.util.ResponseUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -23,28 +22,28 @@ public class UserController {
 
     @PostMapping("/login")
     public Response login(@RequestBody LoginReq loginReq) {
-        return ResponseUtil.success(userService.login(loginReq));
+        return Response.success(userService.login(loginReq));
     }
 
     @PostMapping("/registration")
     public Response registration(@RequestParam("email") String email,
                                  @RequestParam("password") String password) {
-        return ResponseUtil.success(userService.registration(email, password));
+        return Response.success(userService.registration(email, password));
     }
 
     @GetMapping("/logout")
     public Response logout() {
-        return ResponseUtil.success(userService.logout());
+        return Response.success(userService.logout());
     }
 
     @PutMapping("/user/userInfo/update")
     public Response updateInfo(String desc, String displayName) {
-        return ResponseUtil.success(userService.update(desc, displayName));
+        return Response.success(userService.update(desc, displayName));
     }
 
     @GetMapping("/user/userInfo")
     public Response getUserInfo() {
-        return ResponseUtil.success(userService.getUserInfoBySession());
+        return Response.success(userService.getUserInfoBySession());
     }
 
     /**
@@ -58,7 +57,7 @@ public class UserController {
     @ResponseBody
     public Response upload(@RequestParam("file") MultipartFile file) throws IOException {
         if (file.isEmpty()) {
-            return ResponseUtil.failure("上传失败，请选择文件");
+            return Response.failure("上传失败，请选择文件");
         }
         String fileName = file.getOriginalFilename();
         String mime = fileName.substring(fileName.lastIndexOf("."));
@@ -66,64 +65,64 @@ public class UserController {
                 ".jpeg".equals(mime.toLowerCase()) || ".bmp".equals(mime.toLowerCase())) {
             return (Response) userService.updateUserAavatarImg(file.getInputStream(), mime);
         }
-        return ResponseUtil.failure("请上传图片文件");
+        return Response.failure("请上传图片文件");
     }
 
     @PostMapping("/sendResetPwdEmail")
     public Response sendResetPwdEmail(@RequestParam("email") String email) {
-        return ResponseUtil.success(userService.sendResetPwdEmail(email));
+        return Response.success(userService.sendResetPwdEmail(email));
     }
 
     @PostMapping("/sendVerifyEmail")
     public Response sendVerifyEmail(@RequestParam("email") String email) {
-        return ResponseUtil.success(userService.sendVerifyEmail(email));
+        return Response.success(userService.sendVerifyEmail(email));
     }
 
 
     @PostMapping("/emailVerify")
     public Response emailVerify(@RequestParam("verifyId") String verifyId,
                                 @RequestParam("email") String mail) {
-        return ResponseUtil.success(userService.verifyEmail(verifyId, mail));
+        return Response.success(userService.verifyEmail(verifyId, mail));
     }
 
     @PostMapping("/resetPwd")
     public Response resetPwd(@RequestParam("verifyId") String verifyId,
                              @RequestParam("email") String email,
                              @RequestParam("pwd") String pwd) {
-        return ResponseUtil.success(userService.reSetPwd(verifyId, email, pwd));
+        return Response.success(userService.reSetPwd(verifyId, email, pwd));
     }
 
     @PostMapping("/user/setPwd")
     public Response setPwd(@RequestParam("pwd") String pwd,
                            @RequestParam("newPwd") String newPwd,
                            @RequestParam("confirmPwd") String confirmPwd) {
-        return ResponseUtil.success(userService.setPwd(pwd,newPwd,confirmPwd));
+        return Response.success(userService.setPwd(pwd, newPwd, confirmPwd));
     }
 
 
     @DeleteMapping("/admin/user/delete")
     public Response multipleDelete(@RequestBody Integer[] ids) {
-        return ResponseUtil.success(userService.deleteUser(ids));
+        return Response.success(userService.deleteUser(ids));
     }
 
     @DeleteMapping("/admin/user/delete/{id}")
     public Response delete(@PathVariable("id") Integer id) {
-        return ResponseUtil.success(userService.deleteUser(new Integer[]{id}));
+        return Response.success(userService.deleteUser(new Integer[]{id}));
     }
 
     @PutMapping("/admin/user")
     public Response updateInfoByAdmin(@RequestBody UserReq user) {
-        return ResponseUtil.success(userService.adminUpdate(user));
+        return Response.success(userService.adminUpdate(user));
     }
 
     @GetMapping("/admin/users")
     public Response getAllUser(@RequestParam("page") int pageNum, @RequestParam("count") int count) {
-        return ResponseUtil.success(userService.getUserList(pageNum, count));
+        return Response.success(userService.getUserList(pageNum, count));
     }
 
     @GetMapping("/emailStatus/{email}")
     public Response getEmailStatus(@PathVariable("email") String email) {
-        return ResponseUtil.success(userService.getStatusOfEmail(email));
+        return Response.success(userService.getStatusOfEmail(email));
     }
 
 

src/main/java/cn/celess/blog/controller/VisitorController.java

@@ -3,7 +3,6 @@ package cn.celess.blog.controller;
 import cn.celess.blog.entity.Response;
 import cn.celess.blog.service.CountService;
 import cn.celess.blog.service.VisitorService;
-import cn.celess.blog.util.ResponseUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -22,29 +21,29 @@ public class VisitorController {
 
     @GetMapping("/visitor/count")
     public Response getVisitorCount() {
-        return ResponseUtil.success(countService.getVisitorCount());
+        return Response.success(countService.getVisitorCount());
     }
 
     @GetMapping("/admin/visitor/page")
     public Response page(@RequestParam(value = "count", required = false, defaultValue = "10") int count,
                          @RequestParam(value = "page", required = false, defaultValue = "1") int page,
                          @RequestParam(value = "showLocation", required = false, defaultValue = "false") boolean showLocation) {
-        return ResponseUtil.success(visitorService.visitorPage(page, count, showLocation));
+        return Response.success(visitorService.visitorPage(page, count, showLocation));
     }
 
     @PostMapping("/visit")
     public Response add(HttpServletRequest request) {
-        return ResponseUtil.success(visitorService.addVisitor(request));
+        return Response.success(visitorService.addVisitor(request));
     }
 
     @GetMapping("/dayVisitCount")
     public Response dayVisitCount() {
-        return ResponseUtil.success(countService.getDayVisitCount());
+        return Response.success(countService.getDayVisitCount());
     }
 
     @GetMapping("/ip/{ip}")
     public Response ipLocation(@PathVariable("ip") String ip) {
-        return ResponseUtil.success(visitorService.location(ip));
+        return Response.success(visitorService.location(ip));
     }
 
     /**
@@ -55,6 +54,6 @@ public class VisitorController {
      */
     @GetMapping("/ip")
     public Response getIp(HttpServletRequest request) {
-        return ResponseUtil.success(request.getRemoteAddr());
+        return Response.success(request.getRemoteAddr());
     }
 }

src/main/java/cn/celess/blog/controller/WebUpdateInfoController.java

@@ -2,7 +2,6 @@ package cn.celess.blog.controller;
 
 import cn.celess.blog.entity.Response;
 import cn.celess.blog.service.WebUpdateInfoService;
-import cn.celess.blog.util.ResponseUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -17,31 +16,32 @@ public class WebUpdateInfoController {
 
     @PostMapping("/admin/webUpdate/create")
     public Response create(@RequestParam("info") String info) {
-        return ResponseUtil.success(webUpdateInfoService.create(info));
+        return Response.success(webUpdateInfoService.create(info));
     }
 
     @DeleteMapping("/admin/webUpdate/del/{id}")
     public Response del(@PathVariable("id") long id) {
-        return ResponseUtil.success(webUpdateInfoService.del(id));
+        return Response.success(webUpdateInfoService.del(id));
     }
 
     @PutMapping("/admin/webUpdate/update")
     public Response update(@RequestParam("id") long id, @RequestParam("info") String info) {
-        return ResponseUtil.success(webUpdateInfoService.update(id, info));
+        return Response.success(webUpdateInfoService.update(id, info));
     }
 
     @GetMapping("/webUpdate")
     public Response findAll() {
-        return ResponseUtil.success(webUpdateInfoService.findAll());
+        return Response.success(webUpdateInfoService.findAll());
     }
 
     @GetMapping("/webUpdate/pages")
     public Response page(@RequestParam("page") int page, @RequestParam("count") int count) {
-        return ResponseUtil.success(webUpdateInfoService.pages(count, page));
+        return Response.success(webUpdateInfoService.pages(count, page));
     }
+
     @GetMapping("/lastestUpdate")
     public Response lastestUpdateTime() {
-        return ResponseUtil.success(webUpdateInfoService.getLastestUpdateTime());
+        return Response.success(webUpdateInfoService.getLastestUpdateTime());
     }
 
 

src/main/java/cn/celess/blog/exception/ExceptionHandle.java

@@ -26,12 +26,11 @@ import javax.servlet.http.HttpServletRequest;
 
 @ControllerAdvice
 public class ExceptionHandle {
+    public static final Logger logger = LoggerFactory.getLogger(ExceptionHandle.class);
     @Autowired
     MailService mailService;
     @Autowired
     HttpServletRequest request;
-    public static final Logger logger = LoggerFactory.getLogger(ExceptionHandle.class);
-
     @Value("${spring.profiles.active}")
     private String activeModel;
 
@@ -41,27 +40,27 @@ public class ExceptionHandle {
         //自定义错误
         if (e instanceof MyException) {
             logger.debug("返回了自定义的exception,[code={},msg={}]", ((MyException) e).getCode(), e.getMessage());
-            return new Response(((MyException) e).getCode(), e.getMessage(), null, System.currentTimeMillis());
+            return new Response(((MyException) e).getCode(), e.getMessage(), null);
         }
         //请求路径不支持该方法
         if (e instanceof HttpRequestMethodNotSupportedException) {
-            logger.debug("遇到请求路径与请求方法不匹配的请求，[msg={}，path:{},method:{}]", e.getMessage(),request.getRequestURL(),request.getMethod());
+            logger.debug("遇到请求路径与请求方法不匹配的请求，[msg={}，path:{},method:{}]", e.getMessage(), request.getRequestURL(), request.getMethod());
-            return new Response(ResponseEnum.ERROR.getCode(), e.getMessage(), null, System.currentTimeMillis());
+            return new Response(ResponseEnum.ERROR.getCode(), e.getMessage(), null);
         }
         //数据输入类型不匹配
         if (e instanceof MethodArgumentTypeMismatchException) {
             logger.debug("输入类型不匹配,[msg={}]", e.getMessage());
-            return new Response(ResponseEnum.PARAMETERS_ERROR.getCode(), "数据输入有问题，请修改后再访问", null, System.currentTimeMillis());
+            return new Response(ResponseEnum.PARAMETERS_ERROR.getCode(), "数据输入有问题，请修改后再访问", null);
         }
         //数据验证失败
         if (e instanceof BindException) {
             logger.debug("数据验证失败,[msg={}]", e.getMessage());
-            return new Response(ResponseEnum.PARAMETERS_ERROR.getCode(), "数据输入有问题，请修改", null, System.currentTimeMillis());
+            return new Response(ResponseEnum.PARAMETERS_ERROR.getCode(), "数据输入有问题，请修改", null);
         }
         //数据输入不完整
         if (e instanceof MissingServletRequestParameterException) {
             logger.debug("数据输入不完整,[msg={}]", e.getMessage());
-            return new Response(ResponseEnum.PARAMETERS_ERROR.getCode(), "数据输入不完整,请检查", null, System.currentTimeMillis());
+            return new Response(ResponseEnum.PARAMETERS_ERROR.getCode(), "数据输入不完整,请检查", null);
         }
 
         // 发送错误信息到邮箱
@@ -70,7 +69,7 @@ public class ExceptionHandle {
             sendMessage(e);
         }
         e.printStackTrace();
-        return new Response(ResponseEnum.ERROR.getCode(), "服务器出现错误，已记录", null, System.currentTimeMillis());
+        return new Response(ResponseEnum.ERROR.getCode(), "服务器出现错误，已记录", null);
     }
 
     /**

src/main/java/cn/celess/blog/service/serviceimpl/UserServiceImpl.java

@@ -2,6 +2,7 @@ package cn.celess.blog.service.serviceimpl;
 
 import cn.celess.blog.enmu.ResponseEnum;
 import cn.celess.blog.enmu.RoleEnum;
+import cn.celess.blog.entity.Response;
 import cn.celess.blog.entity.User;
 import cn.celess.blog.entity.model.PageData;
 import cn.celess.blog.entity.model.QiniuResponse;
@@ -185,7 +186,7 @@ public class UserServiceImpl implements UserService {
         user.setAvatarImgUrl(upload.key);
         userMapper.updateAvatarImgUrl(upload.key, user.getId());
         redisUserUtil.set(user);
-        return ResponseUtil.success(user.getAvatarImgUrl());
+        return Response.success(user.getAvatarImgUrl());
     }
 
     @Override

src/main/java/cn/celess/blog/util/ResponseUtil.java

@@ -1,59 +0,0 @@
-package cn.celess.blog.util;
-
-import cn.celess.blog.enmu.ResponseEnum;
-import cn.celess.blog.entity.Response;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * @author : xiaohai
- * @date : 2019/03/28 15:32
- */
-@ResponseBody
-public class ResponseUtil {
-
-    /**
-     * 成功相应
-     *
-     * @param result 结果
-     * @return
-     */
-    public static Response success(Object result) {
-        Response response = new Response();
-        response.setCode(ResponseEnum.SUCCESS.getCode());
-        response.setMsg(ResponseEnum.SUCCESS.getMsg());
-        response.setDate(System.currentTimeMillis());
-        response.setResult(result);
-        return response;
-    }
-
-    /**
-     * 失败的响应
-     *
-     * @param result 结果
-     * @return
-     */
-    public static Response failure(String result) {
-        Response response = new Response();
-        response.setCode(ResponseEnum.FAILURE.getCode());
-        response.setMsg(ResponseEnum.FAILURE.getMsg());
-        response.setDate(System.currentTimeMillis());
-        response.setResult(result);
-        return response;
-    }
-
-    /**
-     * 其他的响应
-     *
-     * @param r      枚举常量
-     * @param result 结果
-     * @return
-     */
-    public static Response response(ResponseEnum r, String result) {
-        Response response = new Response();
-        response.setCode(r.getCode());
-        response.setMsg(r.getMsg());
-        response.setDate(System.currentTimeMillis());
-        response.setResult(result);
-        return response;
-    }
-}