perf:调整消息日志相关代码
This commit is contained in:
@@ -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<List<CoreLogMessage>> messagePage(String result, @Valid PageDTO dto) {
|
||||
@GetMapping("/api/page")
|
||||
public ApiResp<List<CoreLogApi>> messagePage(String result, @Valid PageDTO dto) {
|
||||
|
||||
QueryWrapper<CoreLogMessage> queryWrapper = new QueryWrapper<>();
|
||||
QueryWrapper<CoreLogApi> 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<CoreLogMessage> page = dto.pageObj();
|
||||
coreLogService.getLogMessageMapper().selectPage(page, queryWrapper);
|
||||
Page<CoreLogApi> page = dto.pageObj();
|
||||
coreLogService.getLogApiMapper().selectPage(page, queryWrapper);
|
||||
return ApiResp.respOK(page.getRecords(), page.getTotal());
|
||||
}
|
||||
|
||||
|
||||
@@ -4,4 +4,4 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.tiesheng.web.pojos.dao.CoreLogApi;
|
||||
|
||||
public interface CoreLogApiMapper extends BaseMapper<CoreLogApi> {
|
||||
}
|
||||
}
|
||||
@@ -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<CoreLogOperationMapper, CoreLo
|
||||
@Autowired
|
||||
CoreLogLoginMapper coreLogLoginMapper;
|
||||
@Autowired
|
||||
CoreLogMessageMapper coreLogMessageMapper;
|
||||
CoreLogApiMapper coreLogApiMapper;
|
||||
@Autowired
|
||||
Ip2regionConfig ip2regionConfig;
|
||||
@Autowired
|
||||
@@ -57,8 +58,8 @@ public class CoreLogService extends TsServiceBase<CoreLogOperationMapper, CoreLo
|
||||
return coreLogLoginMapper;
|
||||
}
|
||||
|
||||
public CoreLogMessageMapper getLogMessageMapper() {
|
||||
return coreLogMessageMapper;
|
||||
public CoreLogApiMapper getLogApiMapper() {
|
||||
return coreLogApiMapper;
|
||||
}
|
||||
|
||||
public CoreLogProcessMapper getCoreLogProcessMapper() {
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
//package com.tiesheng.web.service;
|
||||
//
|
||||
//import cn.hutool.json.JSONUtil;
|
||||
//import cn.hutool.log.LogFactory;
|
||||
//import com.tiesheng.util.service.http.OkHttpUtil;
|
||||
//import okhttp3.Interceptor;
|
||||
//import okhttp3.Request;
|
||||
//import okhttp3.Response;
|
||||
//import org.springframework.stereotype.Component;
|
||||
//
|
||||
//import javax.validation.constraints.NotNull;
|
||||
//
|
||||
//@Component
|
||||
//public class LogApiOkHttpInterceptor 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;
|
||||
// }
|
||||
//}
|
||||
Reference in New Issue
Block a user