wangli/axzo-log-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add log sink elk api

Browse Source
This commit is contained in:
pepsi 2022-10-31 20:26:57 +08:00
parent 3c8fed2553
commit a4cfb70e98
4 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
axzo-log-server/src/main/java/cn/axzo/log/platform/server/controller/api/LogSinkELKController.java
View File

@ -24,7 +24,7 @@ import javax.validation.Valid;
* @date: 2022/10/29
*/
@Api(tags = "日志转存 ELK 接口")
@ApiSupport(author = "田立勇")
@ApiSupport(author = "彭健")
@RestController
@RequestMapping("/api/v1")
public class LogSinkELKController {
@ -36,8 +36,8 @@ public class LogSinkELKController {
@RequestMapping(value = "/log/sink/elk", method = RequestMethod.POST)
@ApiOperation(value = "日志中转接入 ELK")
public CommonResponse<?> operateLogDetail(@RequestBody @Valid LogSinkELKReqDTO req,
BindingResult bindingResult) {
public CommonResponse<?> logSinkElk(@RequestBody @Valid LogSinkELKReqDTO req,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
logger.warn("illegal param for log sink elk.");
return CommonResponse.fail(bindingResult.getAllErrors().get(0).getDefaultMessage());

14
axzo-log-server/src/main/java/cn/axzo/log/platform/server/dto/LogSinkELKReqDTO.java
View File

@ -1,13 +1,11 @@
package cn.axzo.log.platform.server.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.Map;
/***
@ -36,14 +34,12 @@ public class LogSinkELKReqDTO {
@ApiModelProperty(value = "操作后数据", position = 5)
private String operateAfter;
@ApiModelProperty(value = "发生时间", required = true, position = 6, example = "2022-10-20 12:12:12")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "发生时间(时间戳)", required = true, position = 6, example = "1667211066490")
@NotNull(message = "操作时间不能为空")
private Date operateTime;
private Long operateTime;
@ApiModelProperty(value = "结束时间", position = 7, example = "2022-10-20 12:12:12")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date operateEndTime;
@ApiModelProperty(value = "结束时间(时间戳)", position = 7, example = "1667211066490")
private Long operateEndTime;
@ApiModelProperty(value = "工作台Id", position = 8)
private Long workspaceId;
@ -67,5 +63,5 @@ public class LogSinkELKReqDTO {
private String logExt;
@ApiModelProperty(value = "签名", position = 14)
private String sign;
private transient String sign;
}

4
axzo-log-server/src/main/java/cn/axzo/log/platform/server/service/impl/LogSinkELKServiceImpl.java
View File

@ -34,7 +34,7 @@ public class LogSinkELKServiceImpl implements LogSinkELKService {
@Autowired
private KafkaProducer<String, String> kafkaProducer;
@Value("${log-plat.kafka.topicccc:axzo.pro.log-plat.sink_elk}")
@Value("${log-plat.kafka.topic:axzo.dev.log-plat.sink_elk}")
private String topic;
@Value("${log-plat.kafka.send.async:false}")
@ -65,7 +65,7 @@ public class LogSinkELKServiceImpl implements LogSinkELKService {
try {
LinkedHashMap<String, String> paramsMap = new LinkedHashMap<>();
paramsMap.put("serviceName", req.getServiceName());
paramsMap.put("operateTime", Long.toString(req.getOperateTime().getTime()));
paramsMap.put("operateTime", Long.toString(req.getOperateTime()));
paramsMap.put("secretKey", SECRET_KEY);
String sign = SignUtil.signParamsMd5(paramsMap);
if (!req.getSign().equals(sign)) {

6
axzo-log-server/src/test/java/cn/axzo/log/platform/server/service/AESServiceTest.java
View File

@ -32,15 +32,15 @@ public class AESServiceTest {
public static void main(String[] args) {
// testMD5();
LinkedHashMap<String, String> allParams = new LinkedHashMap<>();
allParams.put("serviceName", "panel_netlog");
allParams.put("operateTime", "1667138755891");
allParams.put("serviceName", "panel_facelog");
allParams.put("operateTime", "1667211066490");
allParams.put("secretKey", "aEsva0zDHECg47P8SuPzmw==");
System.out.println(SignUtil.signParamsMd5(allParams));
}
public static void testSign() {
LinkedHashMap<String, Object> allParams = new LinkedHashMap<>();
allParams.put("serviceName", "panel_netlog");
allParams.put("serviceName", "panel_facelog");
allParams.put("operateTime", "1667138755891");
allParams.put("secretKey", "aEsva0zDHECg47P8SuPzmw==");