From d7b7c7f843aaeb17231fcad932c8baf0c50d5110 Mon Sep 17 00:00:00 2001 From: BingChunMoLi Date: Sat, 18 Dec 2021 01:11:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(v3.3.4):=20=E4=BF=AE=E5=A4=8DBufferedIm?= =?UTF-8?q?age=E4=B8=8D=E6=94=AF=E6=8C=81=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bingchunmoli/api/tencent/service/impl/QqServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/bingchunmoli/api/tencent/service/impl/QqServiceImpl.java b/src/main/java/com/bingchunmoli/api/tencent/service/impl/QqServiceImpl.java index e755533c..a7e69e4f 100644 --- a/src/main/java/com/bingchunmoli/api/tencent/service/impl/QqServiceImpl.java +++ b/src/main/java/com/bingchunmoli/api/tencent/service/impl/QqServiceImpl.java @@ -26,7 +26,6 @@ public class QqServiceImpl implements IQqService { @Override - @Cacheable("getQqImage") public BufferedImage getQqImage(String qq, Integer size) { try { return ImageIO.read(new URL("https://q1.qlogo.cn/g?b=qq&nk=" + qq + "&s=" + size)); @@ -51,7 +50,6 @@ public BufferedImage getQqImage(String qq, Integer size) { } @Override - @Cacheable("getQzImage") public BufferedImage getQzImage(String qq, Integer size) { try { return ImageIO.read(new URL("https://qlogo1.store.qq.com/qzone/" + qq + "/" + qq + "/" + size)); From ff369e1a0c1cae86bfd87863bae3b4f87281a62a Mon Sep 17 00:00:00 2001 From: BingChunMoLi Date: Sat, 18 Dec 2021 01:12:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?docs(v3.3.4):=20=E4=BC=98=E5=8C=96=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E9=94=99=E8=AF=AF=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/advice/ExceptionControllerAdvice.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bingchunmoli/api/controller/advice/ExceptionControllerAdvice.java b/src/main/java/com/bingchunmoli/api/controller/advice/ExceptionControllerAdvice.java index 438a5633..2dc907d0 100644 --- a/src/main/java/com/bingchunmoli/api/controller/advice/ExceptionControllerAdvice.java +++ b/src/main/java/com/bingchunmoli/api/controller/advice/ExceptionControllerAdvice.java @@ -31,7 +31,8 @@ public ResultVO httpRequestMethodNotSupportedException(HttpRequestMethod @ExceptionHandler public ResultVO defaultException(Exception e) { - log.error(e.getMessage()); + log.error("defaultException: {}, msg: {}", e, e.getMessage()); + e.printStackTrace(); return new ResultVO<>(CodeEnum.FAILURE.getCode(), CodeEnum.FAILURE.getMsg(), "默认未分类异常"); } From fc65e3c02d7872160439e9cb19666e839995db22 Mon Sep 17 00:00:00 2001 From: BingChunMoLi Date: Sat, 18 Dec 2021 01:13:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?refactor(v3.3.4):=20=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=8A=9B=E5=87=BA=E9=94=99=E8=AF=AF=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../{QQController.java => QqController.java} | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) rename src/main/java/com/bingchunmoli/api/tencent/controller/{QQController.java => QqController.java} (96%) diff --git a/pom.xml b/pom.xml index 28af5238..25c23055 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ com.bingchunmoli moliapi - 3.3.3 + 3.3.4 MoLiApi MoLiApi diff --git a/src/main/java/com/bingchunmoli/api/tencent/controller/QQController.java b/src/main/java/com/bingchunmoli/api/tencent/controller/QqController.java similarity index 96% rename from src/main/java/com/bingchunmoli/api/tencent/controller/QQController.java rename to src/main/java/com/bingchunmoli/api/tencent/controller/QqController.java index e38a41ad..b982b367 100644 --- a/src/main/java/com/bingchunmoli/api/tencent/controller/QQController.java +++ b/src/main/java/com/bingchunmoli/api/tencent/controller/QqController.java @@ -1,6 +1,7 @@ package com.bingchunmoli.api.tencent.controller; +import com.bingchunmoli.api.exception.ApiParamException; import com.bingchunmoli.api.tencent.bean.enums.QQSizeEnum; import com.bingchunmoli.api.tencent.bean.enums.QZSizeEnum; import com.bingchunmoli.api.tencent.service.IQqService; @@ -22,17 +23,16 @@ @Slf4j @RestController @RequestMapping("tencent") -public class QQController { +public class QqController { @Resource private IQqService qqService; @ApiOperation("返回QQ头像") @GetMapping(value = "qq", produces = MediaType.IMAGE_JPEG_VALUE) - @CrossOrigin public BufferedImage getQqImage(String qq, @RequestParam(required = false, defaultValue = "140") Integer size) { if (size <= 0) { log.debug("非法参数值 负数"); - return null; + throw new ApiParamException("非法参数值 负数"); } if (isQqImageSize(size)) { return qqService.getQqImage(qq, size); @@ -44,7 +44,6 @@ public BufferedImage getQqImage(String qq, @RequestParam(required = false, defau @ApiOperation("返回QQ空间头像") @GetMapping(value = "qz", produces = MediaType.IMAGE_JPEG_VALUE) - @CrossOrigin public BufferedImage getQzImage(String qq, @RequestParam(required = false, defaultValue = "100") Integer size) { if (size <= 0) { return null; @@ -58,7 +57,6 @@ public BufferedImage getQzImage(String qq, @RequestParam(required = false, defau @ApiOperation("返回JSON的QQ头像地址,加密") @GetMapping("qq/json") - @CrossOrigin public String getQqImageForJson(String qq, @RequestParam(required = false, defaultValue = "100") Integer size) { if (size <= 0) { return "没有这样的尺寸"; @@ -72,7 +70,6 @@ public String getQqImageForJson(String qq, @RequestParam(required = false, defau @ApiOperation("返回JSON的QQ空间头像地址") @GetMapping("qz/json") - @CrossOrigin public String getQzImageForJson(String qq) { return qqService.getQzImageForJson(qq); } @@ -80,7 +77,6 @@ public String getQzImageForJson(String qq) { @ApiOperation("返回加密的QQ头像地址") @GetMapping("qq/json/encrypt") @PostMapping("qq/json/encrypt") - @CrossOrigin public String getQqImageForJsonEncrypt(String qq, @RequestParam(required = false, defaultValue = "100") Integer size) { if (size <= 0) { return "没有这样的尺寸"; @@ -95,7 +91,6 @@ public String getQqImageForJsonEncrypt(String qq, @RequestParam(required = false @ApiOperation("返回加密的QQ头像") @GetMapping(value = "qq/encrypt", produces = MediaType.IMAGE_JPEG_VALUE) @PostMapping(value = "qq/encrypt", produces = MediaType.IMAGE_JPEG_VALUE) - @CrossOrigin public BufferedImage getQqImageForEncrypt(String qq, @RequestParam(required = false, defaultValue = "100") Integer size) { if (size <= 0) { return null;