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

Merge branch 'test' into 'planz'

Browse Source 
Test

See merge request infra/xlog!39
This commit is contained in:
彭健 2022-10-18 02:36:44 +00:00
commit 8b24e8dcf9
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
axzo-log-api/src/main/java/cn/axzo/log/platform/client/feign/LogPlatApi.java
View File

@ -18,7 +18,7 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
* @description: TODO
* @date: 2022/9/16
*/
@FeignClient(name = "log-plat", url = "http://log-plat:8080", fallbackFactory = LogPlatApiFallback.class)
@FeignClient(name = "log-plat", url = "http://axzo-log-plat:8080", fallbackFactory = LogPlatApiFallback.class)
public interface LogPlatApi {
@PostMapping(value = "/api/v1/operateLog/create", consumes = APPLICATION_JSON_VALUE)

11
axzo-log-server/src/main/java/cn/axzo/log/platform/server/controller/api/OperateLogController.java
View File

@ -4,7 +4,6 @@ import cn.axzo.log.platform.server.dto.*;
import cn.axzo.log.platform.server.service.OperateLogService;
import cn.azxo.framework.common.model.CommonPageResponse;
import cn.azxo.framework.common.model.CommonResponse;
import cn.hutool.core.date.DateUtil;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -60,11 +59,11 @@ public class OperateLogController {
if (bindingResult.hasErrors()) {
return CommonResponse.fail(bindingResult.getAllErrors().get(0).getDefaultMessage());
}
//时间跨度校验。
if (DateUtil.betweenDay(req.getStartTime(), req.getEndTime(), true) > 7) {
//todo 时间跨度校验。 后续如果切换ES 需要再确定
/* if (DateUtil.betweenDay(req.getStartTime(), req.getEndTime(), true) > 7) {
logger.error("start and end date interval greater than 7.");
return CommonResponse.fail("the time span is greater than 7");
}
}*/
try {
CommonPageResponse<OperateLogQueryRespDTO> resp = operateLogService.queryBasicInfoForPage(req);
return CommonResponse.success(resp);
@ -83,11 +82,11 @@ public class OperateLogController {
if (bindingResult.hasErrors()) {
return CommonResponse.fail(bindingResult.getAllErrors().get(0).getDefaultMessage());
}
//时间跨度校验。
/* //todo 先去除 时间跨度校验。
if (DateUtil.betweenDay(req.getStartTime(), req.getEndTime(), true) > 7) {
logger.error("start and end date interval greater than 7.");
return CommonResponse.fail("the time span is greater than 7");
}
}*/
try {
CommonPageResponse<OperateLogQueryDetailRespDTO> resp = operateLogService.queryForPage(req);
return CommonResponse.success(resp);