From 75dfbb615c4e8325a13000a9c210a5ac34249fa6 Mon Sep 17 00:00:00 2001 From: 3y Date: Thu, 16 Mar 2023 21:41:41 +0800 Subject: [PATCH] clean code --- INSTALL.md | 4 + .../handler/domain/sms/LinTongSendResult.java | 2 +- .../handler/script/impl/LinTongSmsScript.java | 4 +- austin-support/pom.xml | 4 - .../java3y/austin/support/utils/OssUtils.java | 73 ------------------- austin-web/pom.xml | 4 - .../austin/web/aspect/AustinAspect.java | 10 +-- .../austin/web/controller/SendController.java | 17 ++++- austin-web/src/main/resources/logback.xml | 4 +- pom.xml | 17 ++--- 10 files changed, 34 insertions(+), 105 deletions(-) delete mode 100644 austin-support/src/main/java/com/java3y/austin/support/utils/OssUtils.java diff --git a/INSTALL.md b/INSTALL.md index a2e3f52..92857bc 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -97,6 +97,10 @@ docker version ``` sudo curl -L "https://github.com/docker/compose/releases/download/1.24.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose + +#慢的话可以用这个 +sudo curl -L https://get.daocloud.io/docker/compose/releases/download/1.25.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose + ``` 将可执行权限应用于二进制文件： diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/domain/sms/LinTongSendResult.java b/austin-handler/src/main/java/com/java3y/austin/handler/domain/sms/LinTongSendResult.java index 602f969..973be6d 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/domain/sms/LinTongSendResult.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/domain/sms/LinTongSendResult.java @@ -27,7 +27,7 @@ public class LinTongSendResult { String message; @JSONField(name = "data") - List dataDTOS; + List dtoList; @Data @AllArgsConstructor diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/LinTongSmsScript.java b/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/LinTongSmsScript.java index afc70f8..806ec5e 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/LinTongSmsScript.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/LinTongSmsScript.java @@ -105,13 +105,13 @@ public class LinTongSmsScript implements SmsScript { } private List assembleSmsRecord(SmsParam smsParam, LinTongSendResult response, LinTongSmsAccount account) { - if (response == null || ArrayUtil.isEmpty(response.getDataDTOS())) { + if (response == null || ArrayUtil.isEmpty(response.getDtoList())) { return null; } List smsRecordList = new ArrayList<>(); - for (LinTongSendResult.DataDTO datum : response.getDataDTOS()) { + for (LinTongSendResult.DataDTO datum : response.getDtoList()) { SmsRecord smsRecord = SmsRecord.builder() .sendDate(Integer.valueOf(DateUtil.format(new Date(), DatePattern.PURE_DATE_PATTERN))) .messageTemplateId(smsParam.getMessageTemplateId()) diff --git a/austin-support/pom.xml b/austin-support/pom.xml index 4fb5e34..c091f98 100644 --- a/austin-support/pom.xml +++ b/austin-support/pom.xml @@ -118,10 +118,6 @@ com.github.binarywang weixin-java-miniapp - - com.qiniu - qiniu-java-sdk - \ No newline at end of file diff --git a/austin-support/src/main/java/com/java3y/austin/support/utils/OssUtils.java b/austin-support/src/main/java/com/java3y/austin/support/utils/OssUtils.java deleted file mode 100644 index c37b50a..0000000 --- a/austin-support/src/main/java/com/java3y/austin/support/utils/OssUtils.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.java3y.austin.support.utils; - -import cn.hutool.core.util.IdUtil; -import com.alibaba.fastjson.JSON; -import com.qiniu.common.QiniuException; -import com.qiniu.http.Response; -import com.qiniu.storage.Configuration; -import com.qiniu.storage.Region; -import com.qiniu.storage.UploadManager; -import com.qiniu.storage.model.DefaultPutRet; -import com.qiniu.util.Auth; - -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; - -/** - * @author 3y - * @description 对象存储（七牛云） - */ -public class OssUtils { - - public static void main(String[] args) throws UnsupportedEncodingException { - //upload(); - String s = getFileUrl("FmnBLE4QtkwlErXIAh9pYS029GZk"); - System.out.println(s); - } - - private static void upload() { - //构造一个带指定 Region 对象的配置类 - Configuration cfg = new Configuration(Region.autoRegion()); - // 指定分片上传版本 - cfg.resumableUploadAPIVersion = Configuration.ResumableUploadAPIVersion.V2; -//...其他参数参考类注释 - - UploadManager uploadManager = new UploadManager(cfg); -//...生成上传凭证，然后准备上传 - String accessKey = "123"; - String secretKey = "123"; - String bucket = "austin3y"; -//如果是Windows情况下，格式是 D:\\qiniu\\test.png - String localFilePath = "C:\\Users\\zhongfucheng\\Desktop\\1201.jpg"; -//默认不指定key的情况下，以文件内容的hash值作为文件名 - String key = IdUtil.fastSimpleUUID(); - - Auth auth = Auth.create(accessKey, secretKey); - String upToken = auth.uploadToken(bucket); - - try { - Response response = uploadManager.put(localFilePath, key, upToken); - DefaultPutRet putRet = JSON.parseObject(response.bodyString(), DefaultPutRet.class); - //解析上传成功的结果 - System.out.println(putRet.key); - System.out.println(putRet.hash); - } catch (QiniuException ex) { - Response r = ex.response; - System.err.println(r.toString()); - try { - System.err.println(r.bodyString()); - } catch (QiniuException ex2) { - //ignore - } - } - } - - public static String getFileUrl(String fileName) throws UnsupportedEncodingException { - - String domainOfBucket = "http://devtools.qiniu.com/austin3y"; - String encodedFileName = URLEncoder.encode(fileName, "utf-8").replace("+", "%20"); - String finalUrl = String.format("%s/%s", domainOfBucket, encodedFileName); - System.out.println(finalUrl); - return finalUrl; - } -} diff --git a/austin-web/pom.xml b/austin-web/pom.xml index 80453cd..2022d97 100644 --- a/austin-web/pom.xml +++ b/austin-web/pom.xml @@ -16,10 +16,6 @@ org.springframework.boot spring-boot-starter-web - - org.springframework.boot - spring-boot-starter-test - com.java3y.austin austin-handler diff --git a/austin-web/src/main/java/com/java3y/austin/web/aspect/AustinAspect.java b/austin-web/src/main/java/com/java3y/austin/web/aspect/AustinAspect.java index 1ab086c..9543372 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/aspect/AustinAspect.java +++ b/austin-web/src/main/java/com/java3y/austin/web/aspect/AustinAspect.java @@ -39,7 +39,7 @@ public class AustinAspect { /** * 同一个请求的KEY */ - private final String requestIdKey = "request_unique_id"; + private final String REQUEST_ID_KEY = "request_unique_id"; /** * 只切AustinAspect注解 @@ -79,7 +79,7 @@ public class AustinAspect { RequestLogDTO logVo = new RequestLogDTO(); //设置请求唯一ID logVo.setId(IdUtil.fastUUID()); - request.setAttribute(requestIdKey, logVo.getId()); + request.setAttribute(REQUEST_ID_KEY, logVo.getId()); logVo.setUri(request.getRequestURI()); logVo.setMethod(request.getMethod()); List args = Lists.newArrayList(); @@ -97,7 +97,7 @@ public class AustinAspect { logVo.setReferer(request.getHeader("referer")); logVo.setRemoteAddr(request.getRemoteAddr()); logVo.setUserAgent(request.getHeader("user-agent")); - log.info("austin-aspect-log,request:{}", JSON.toJSONString(logVo)); + log.info(JSON.toJSONString(logVo)); } /** @@ -107,7 +107,7 @@ public class AustinAspect { */ public void printExceptionLog(Throwable ex) { JSONObject logVo = new JSONObject(); - logVo.put("id", request.getAttribute(requestIdKey)); - log.error("austin-aspect-log,exception:{}", JSON.toJSONString(logVo), ex); + logVo.put("id", request.getAttribute(REQUEST_ID_KEY)); + log.error(JSON.toJSONString(logVo), ex); } } diff --git a/austin-web/src/main/java/com/java3y/austin/web/controller/SendController.java b/austin-web/src/main/java/com/java3y/austin/web/controller/SendController.java index 16da1af..b8f42c5 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/controller/SendController.java +++ b/austin-web/src/main/java/com/java3y/austin/web/controller/SendController.java @@ -1,6 +1,7 @@ package com.java3y.austin.web.controller; +import com.java3y.austin.service.api.domain.BatchSendRequest; import com.java3y.austin.service.api.domain.SendRequest; import com.java3y.austin.service.api.domain.SendResponse; import com.java3y.austin.service.api.service.SendService; @@ -26,9 +27,9 @@ public class SendController { /** - * 发送消息接口 - * 入参完整示例：curl -XPOST "127.0.0.1:8080/send" -H 'Content-Type: application/json' -d '{"code":"send","messageParam":{"receiver":"13788888888","variables":{"title":"yyyyyy","contentValue":"6666164180"}},"messageTemplateId":1}' + * 单个文案下发相同的人 * + * @param sendRequest * @return */ @ApiOperation(value = "下发接口", notes = "多渠道多类型下发消息，目前支持邮件和短信，类型支持：验证码、通知类、营销类。") @@ -36,4 +37,16 @@ public class SendController { public SendResponse send(@RequestBody SendRequest sendRequest) { return sendService.send(sendRequest); } + + /** + * 不同文案下发到不同的人 + * + * @param batchSendRequest + * @return + */ + @ApiOperation(value = "batch下发接口", notes = "多渠道多类型下发消息，目前支持邮件和短信，类型支持：验证码、通知类、营销类。") + @PostMapping("/batchSend") + public SendResponse batchSend(@RequestBody BatchSendRequest batchSendRequest) { + return sendService.batchSend(batchSendRequest); + } } diff --git a/austin-web/src/main/resources/logback.xml b/austin-web/src/main/resources/logback.xml index 838e611..68c13ad 100644 --- a/austin-web/src/main/resources/logback.xml +++ b/austin-web/src/main/resources/logback.xml @@ -37,7 +37,7 @@ 1000MB - 15 + 7 @@ -63,7 +63,7 @@ 1000MB - 15 + 7 diff --git a/pom.xml b/pom.xml index 17ba787..387a092 100644 --- a/pom.xml +++ b/pom.xml @@ -162,11 +162,11 @@ - - org.apache.flink - flink-connector-rabbitmq - 1.15.1 - + + + + + @@ -216,13 +216,6 @@ rocketmq-spring-boot-starter 2.2.2 - - - - com.qiniu - qiniu-java-sdk - [7.7.0, 7.10.99] -