From ad90c83cf7c5a2c644990fdb0eec47f6dd36e683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE=E6=96=87=E8=B1=AA?= <980287353@qq.com> Date: Mon, 5 Aug 2024 14:46:54 +0800 Subject: [PATCH] =?UTF-8?q?perf=EF=BC=9A=E8=B0=83=E6=95=B4=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E6=97=A5=E5=BF=97=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/controller/TestController.java | 13 +-- .../config/aliyun/AliyunSmsSender.java | 24 ++--- .../message/pojos/MessageReqResp.java | 87 ------------------- .../message/service/TsMessageSender.java | 4 +- .../message/service/TsMessageService.java | 10 +-- .../java/com/tiesheng/util/pojos/ApiResp.java | 13 +++ .../util/service/http/HttpLogInterceptor.java | 37 -------- .../web/controller/LogController.java | 19 ++-- .../tiesheng/web/mapper/CoreLogApiMapper.java | 2 +- .../tiesheng/web/service/CoreLogService.java | 7 +- .../web/service/LogApiOkHttpInterceptor.java | 40 +++++++++ 11 files changed, 85 insertions(+), 171 deletions(-) delete mode 100644 springboot-message/src/main/java/com/tiesheng/message/pojos/MessageReqResp.java delete mode 100644 springboot-util/src/main/java/com/tiesheng/util/service/http/HttpLogInterceptor.java create mode 100644 springboot-web/src/main/java/com/tiesheng/web/service/LogApiOkHttpInterceptor.java diff --git a/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java b/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java index dd2258d..eb9f92f 100644 --- a/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java +++ b/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java @@ -2,7 +2,6 @@ package com.tiesheng.demo.controller; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.TimeInterval; -import cn.hutool.json.JSONUtil; import cn.hutool.log.LogFactory; import cn.hutool.poi.excel.ExcelUtil; import com.alibaba.excel.EasyExcel; @@ -12,8 +11,6 @@ import com.tiesheng.annotation.token.TokenIgnore; import com.tiesheng.database.config.DbBackupConfig; import com.tiesheng.demo.pojos.PoiBean; import com.tiesheng.demo.pojos.TestFile; -import com.tiesheng.message.pojos.MessageReqResp; -import com.tiesheng.message.pojos.UserChannel; import com.tiesheng.platform.config.ding.PlatformDingConfig; import com.tiesheng.platform.config.ding.bean.DingUserInfo; import com.tiesheng.util.config.EncryptConfig; @@ -53,8 +50,6 @@ public class TestController { @Autowired EncryptConfig encryptConfig; @Autowired - CoreMessageService coreMessageService; - @Autowired CoreLogService coreLogService; @Autowired DbBackupConfig dbBackupConfig; @@ -99,12 +94,12 @@ public class TestController { @GetMapping("/send") @TokenIgnore - public ApiResp sendMessage() { + public ApiResp sendMessage() { - MessageReqResp reqResp = coreMessageService.send(new UserChannel("13567116463", "sms"), - JSONUtil.createObj().putOpt("action", "sms-visitor-invite")); +// MessageReqResp reqResp = coreMessageService.send(new UserChannel("13567116463", "sms"), +// JSONUtil.createObj().putOpt("action", "sms-visitor-invite")); - return ApiResp.respOK(reqResp); + return ApiResp.respOK(null); } diff --git a/springboot-message/src/main/java/com/tiesheng/message/config/aliyun/AliyunSmsSender.java b/springboot-message/src/main/java/com/tiesheng/message/config/aliyun/AliyunSmsSender.java index f74b863..1c4221d 100644 --- a/springboot-message/src/main/java/com/tiesheng/message/config/aliyun/AliyunSmsSender.java +++ b/springboot-message/src/main/java/com/tiesheng/message/config/aliyun/AliyunSmsSender.java @@ -7,9 +7,9 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; -import com.tiesheng.message.pojos.MessageReqResp; import com.tiesheng.message.service.TsMessageSender; import com.tiesheng.util.exception.ApiException; +import com.tiesheng.util.pojos.ApiResp; import com.tiesheng.util.service.http.OkHttpUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -119,17 +119,7 @@ public class AliyunSmsSender implements TsMessageSender { * @param tempParam 短信模板 * @return */ - public MessageReqResp sendSms(String phoneNumbers, AliyunTempParam tempParam) { - - MessageReqResp reqResp = new MessageReqResp("阿里云短信"); - reqResp.setTarget(phoneNumbers); - reqResp.setResult(1); - reqResp.setContent(JSONUtil.createObj() - .putOpt("PhoneNumbers", phoneNumbers) - .putOpt("SignName", tempParam.getSignName()) - .putOpt("TemplateCode", tempParam.getTemplateCode()) - .putOpt("TemplateParam", tempParam.getTemplateParam()) - .toString()); + public ApiResp sendSms(String phoneNumbers, AliyunTempParam tempParam) { // 业务API参数 ConcurrentHashMap queryMap = new ConcurrentHashMap<>(); @@ -140,18 +130,16 @@ public class AliyunSmsSender implements TsMessageSender { queryMap.put("TemplateParam", tempParam.getTemplateParam().toString()); } - reqResp.setRespBody(request("SendSms", queryMap)); - JSONObject respObj = JSONUtil.parseObj(reqResp.getRespBody()); + JSONObject respObj = JSONUtil.parseObj(request("SendSms", queryMap)); if (!Objects.equals(respObj.getStr("Code"), "OK")) { - reqResp.setResult(0); - reqResp.setToast(respObj.getStr("Message")); + return ApiResp.resp130(respObj.getStr("Message")); } - return reqResp; + return ApiResp.respOK(""); } @Override - public MessageReqResp send(String user, JSONObject body) { + public ApiResp send(String user, JSONObject body) { boolean mobile = Validator.isMobile(user); if (!mobile) { return null; diff --git a/springboot-message/src/main/java/com/tiesheng/message/pojos/MessageReqResp.java b/springboot-message/src/main/java/com/tiesheng/message/pojos/MessageReqResp.java deleted file mode 100644 index 8b29baa..0000000 --- a/springboot-message/src/main/java/com/tiesheng/message/pojos/MessageReqResp.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.tiesheng.message.pojos; - -public class MessageReqResp { - - private String type; - - /** - * 发送对象 - */ - private String target; - - /** - * 发送内容 - */ - private String content; - - /** - * 返回结果 - */ - private String respBody; - - /** - * 结果，0-否，1-是 - */ - private Integer result; - - /** - * 提示的异常信息 - */ - private String toast; - - public MessageReqResp(String type) { - this.type = type; - } - - /////////////////////////////////////////////////////////////////////////// - // setter\getter - /////////////////////////////////////////////////////////////////////////// - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getTarget() { - return target; - } - - public void setTarget(String target) { - this.target = target; - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - public String getRespBody() { - return respBody; - } - - public void setRespBody(String respBody) { - this.respBody = respBody; - } - - public Integer getResult() { - return result; - } - - public void setResult(Integer result) { - this.result = result; - } - - public String getToast() { - return toast; - } - - public void setToast(String toast) { - this.toast = toast; - } -} diff --git a/springboot-message/src/main/java/com/tiesheng/message/service/TsMessageSender.java b/springboot-message/src/main/java/com/tiesheng/message/service/TsMessageSender.java index c1cd332..20e15fc 100644 --- a/springboot-message/src/main/java/com/tiesheng/message/service/TsMessageSender.java +++ b/springboot-message/src/main/java/com/tiesheng/message/service/TsMessageSender.java @@ -2,7 +2,7 @@ package com.tiesheng.message.service; import cn.hutool.json.JSONObject; -import com.tiesheng.message.pojos.MessageReqResp; +import com.tiesheng.util.pojos.ApiResp; /** * @author hao @@ -20,7 +20,7 @@ public interface TsMessageSender { * @param channel 消息通道，如果为空表示所有通道 * @return 返回的内容，如果为空表示发送成功 */ - MessageReqResp send(String user, JSONObject body); + ApiResp send(String user, JSONObject body); /** diff --git a/springboot-message/src/main/java/com/tiesheng/message/service/TsMessageService.java b/springboot-message/src/main/java/com/tiesheng/message/service/TsMessageService.java index f4f05f2..56db6e6 100644 --- a/springboot-message/src/main/java/com/tiesheng/message/service/TsMessageService.java +++ b/springboot-message/src/main/java/com/tiesheng/message/service/TsMessageService.java @@ -4,8 +4,8 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONObject; -import com.tiesheng.message.pojos.MessageReqResp; import com.tiesheng.message.pojos.UserChannel; +import com.tiesheng.util.pojos.ApiResp; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -61,18 +61,18 @@ public class TsMessageService { * @param userChannel * @param body */ - public MessageReqResp send(UserChannel userChannel, JSONObject body) { + public ApiResp send(UserChannel userChannel, JSONObject body) { if (StrUtil.isEmpty(userChannel.getUser()) || StrUtil.isEmpty(userChannel.getChannel())) { - return null; + return ApiResp.resp130("消息对象或消息通道不存在"); } TsMessageSender messageSender = CollUtil.findOne(messageSenderList, sender -> Objects.equals(sender.getChannel(), userChannel.getChannel()) && sender.support()); if (messageSender != null) { - messageSender.send(userChannel.getUser(), body); + return messageSender.send(userChannel.getUser(), body); } - return null; + return ApiResp.resp130("消息未成功发送"); } } diff --git a/springboot-util/src/main/java/com/tiesheng/util/pojos/ApiResp.java b/springboot-util/src/main/java/com/tiesheng/util/pojos/ApiResp.java index bf42220..0e2c648 100644 --- a/springboot-util/src/main/java/com/tiesheng/util/pojos/ApiResp.java +++ b/springboot-util/src/main/java/com/tiesheng/util/pojos/ApiResp.java @@ -129,6 +129,19 @@ public class ApiResp { } + /** + * 130错误 + * + * @param msg + * @return + */ + public static ApiResp resp130(String msg) { + ApiResp result = new ApiResp<>(); + result.code = 130; + result.message = msg; + return result; + } + /** * 是否成功 * diff --git a/springboot-util/src/main/java/com/tiesheng/util/service/http/HttpLogInterceptor.java b/springboot-util/src/main/java/com/tiesheng/util/service/http/HttpLogInterceptor.java deleted file mode 100644 index 9bde1ec..0000000 --- a/springboot-util/src/main/java/com/tiesheng/util/service/http/HttpLogInterceptor.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.tiesheng.util.service.http; - -import cn.hutool.json.JSONUtil; -import cn.hutool.log.LogFactory; -import okhttp3.Interceptor; -import okhttp3.Request; -import okhttp3.Response; -import org.jetbrains.annotations.NotNull; - -public class HttpLogInterceptor implements Interceptor { - - @NotNull - @Override - public Response intercept(@NotNull Chain chain) { - - Request request = chain.request(); - - Response response; - try { - response = chain.proceed(request); - } catch (Exception e) { - response = new Response.Builder() - .request(request) - .body(OkHttpUtil.ofJsonResponse(JSONUtil.createObj() - .putOpt("code", -1) - .putOpt("message", e.getMessage()) - .putOpt("exception", e) - .toString())) - .code(200).build(); - } - - LogFactory.get().info("url: {}，body: {}", request.url(), response.body().contentType().toString()); - - return response; - } - -} diff --git a/springboot-web/src/main/java/com/tiesheng/web/controller/LogController.java b/springboot-web/src/main/java/com/tiesheng/web/controller/LogController.java index 22ee517..d8bffe7 100644 --- a/springboot-web/src/main/java/com/tiesheng/web/controller/LogController.java +++ b/springboot-web/src/main/java/com/tiesheng/web/controller/LogController.java @@ -3,13 +3,14 @@ package com.tiesheng.web.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.tiesheng.util.pojos.ApiResp; +import com.tiesheng.util.pojos.PageDTO; +import com.tiesheng.web.pojos.dao.CoreLogApi; import com.tiesheng.web.pojos.dao.CoreLogLogin; import com.tiesheng.web.pojos.dao.CoreLogOperation; import com.tiesheng.web.pojos.dao.CoreLogProcess; -import com.tiesheng.util.pojos.PageDTO; import com.tiesheng.web.pojos.vo.ProcessDetailVo; import com.tiesheng.web.service.CoreLogService; -import com.tiesheng.util.pojos.ApiResp; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -69,23 +70,23 @@ public class LogController { /** - * 登录日志列表 + * 调用日志 * * @return */ - @GetMapping("/message/page") - public ApiResp> messagePage(String result, @Valid PageDTO dto) { + @GetMapping("/api/page") + public ApiResp> messagePage(String result, @Valid PageDTO dto) { - QueryWrapper queryWrapper = new QueryWrapper<>(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("is_deleted", 0); if (!StrUtil.isEmpty(result)) { queryWrapper.eq("result", result); } - dto.likeColumns(queryWrapper, "type", "target", "content", "resp_body"); + dto.likeColumns(queryWrapper, "type", "content"); queryWrapper.orderByDesc("create_time"); - Page page = dto.pageObj(); - coreLogService.getLogMessageMapper().selectPage(page, queryWrapper); + Page page = dto.pageObj(); + coreLogService.getLogApiMapper().selectPage(page, queryWrapper); return ApiResp.respOK(page.getRecords(), page.getTotal()); } diff --git a/springboot-web/src/main/java/com/tiesheng/web/mapper/CoreLogApiMapper.java b/springboot-web/src/main/java/com/tiesheng/web/mapper/CoreLogApiMapper.java index 52b09e9..a393abd 100644 --- a/springboot-web/src/main/java/com/tiesheng/web/mapper/CoreLogApiMapper.java +++ b/springboot-web/src/main/java/com/tiesheng/web/mapper/CoreLogApiMapper.java @@ -4,4 +4,4 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.tiesheng.web.pojos.dao.CoreLogApi; public interface CoreLogApiMapper extends BaseMapper { -} +} \ No newline at end of file diff --git a/springboot-web/src/main/java/com/tiesheng/web/service/CoreLogService.java b/springboot-web/src/main/java/com/tiesheng/web/service/CoreLogService.java index 06dbd93..b759e4f 100644 --- a/springboot-web/src/main/java/com/tiesheng/web/service/CoreLogService.java +++ b/springboot-web/src/main/java/com/tiesheng/web/service/CoreLogService.java @@ -13,6 +13,7 @@ import com.tiesheng.util.config.Ip2regionConfig; import com.tiesheng.util.exception.ApiException; import com.tiesheng.util.pojos.TokenBean; import com.tiesheng.util.service.TsServiceBase; +import com.tiesheng.web.mapper.CoreLogApiMapper; import com.tiesheng.web.mapper.CoreLogLoginMapper; import com.tiesheng.web.mapper.CoreLogOperationMapper; import com.tiesheng.web.mapper.CoreLogProcessMapper; @@ -47,7 +48,7 @@ public class CoreLogService extends TsServiceBase