pull/32/head
3y 1 year ago
parent 36840c2e88
commit 75dfbb615c

@ -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
```
将可执行权限应用于二进制文件:

@ -27,7 +27,7 @@ public class LinTongSendResult {
String message;
@JSONField(name = "data")
List<DataDTO> dataDTOS;
List<DataDTO> dtoList;
@Data
@AllArgsConstructor

@ -105,13 +105,13 @@ public class LinTongSmsScript implements SmsScript {
}
private List<SmsRecord> assembleSmsRecord(SmsParam smsParam, LinTongSendResult response, LinTongSmsAccount account) {
if (response == null || ArrayUtil.isEmpty(response.getDataDTOS())) {
if (response == null || ArrayUtil.isEmpty(response.getDtoList())) {
return null;
}
List<SmsRecord> 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())

@ -118,10 +118,6 @@
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-miniapp</artifactId>
</dependency>
<dependency>
<groupId>com.qiniu</groupId>
<artifactId>qiniu-java-sdk</artifactId>
</dependency>
</dependencies>
</project>

@ -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;
}
}

@ -16,10 +16,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
</dependency>
<dependency>
<groupId>com.java3y.austin</groupId>
<artifactId>austin-handler</artifactId>

@ -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<Object> 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);
}
}

@ -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);
}
}

@ -37,7 +37,7 @@
<maxFileSize>1000MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文件保留天数-->
<maxHistory>15</maxHistory>
<maxHistory>7</maxHistory>
</rollingPolicy>
<!-- 此日志文件只记录info级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
@ -63,7 +63,7 @@
<maxFileSize>1000MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文件保留天数-->
<maxHistory>15</maxHistory>
<maxHistory>7</maxHistory>
</rollingPolicy>
<!-- 此日志文件只记录ERROR级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">

@ -162,11 +162,11 @@
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.flink/flink-connector-rabbitmq -->
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-rabbitmq</artifactId>
<version>1.15.1</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.apache.flink</groupId>-->
<!-- <artifactId>flink-connector-rabbitmq</artifactId>-->
<!-- <version>1.15.1</version>-->
<!-- </dependency>-->
<!--微信服务号第三方SDK-->
<dependency>
@ -216,13 +216,6 @@
<artifactId>rocketmq-spring-boot-starter</artifactId>
<version>2.2.2</version>
</dependency>
<!--七牛云 SDK OSS-->
<dependency>
<groupId>com.qiniu</groupId>
<artifactId>qiniu-java-sdk</artifactId>
<version>[7.7.0, 7.10.99]</version>
</dependency>
</dependencies>
</dependencyManagement>

Loading…
Cancel
Save