Skip to content

Commit dd79ecc

Browse files
committed
refactor: 删除原 SysLog 相关配置、bean、client 等
1 parent 2dd1246 commit dd79ecc

5 files changed

Lines changed: 10 additions & 107 deletions

File tree

framework/framework_api/src/main/java/com/github/cadecode/uniboot/framework/api/bean/dto/SysLogDto.java

Lines changed: 0 additions & 59 deletions
This file was deleted.

framework/framework_api/src/main/java/com/github/cadecode/uniboot/framework/api/feignclient/SysLogClient.java

Lines changed: 0 additions & 24 deletions
This file was deleted.

framework/framework_base/src/main/java/com/github/cadecode/uniboot/framework/base/plugin/controller/PlgLogController.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44
import com.github.cadecode.uniboot.common.core.web.response.PageResult;
55
import com.github.cadecode.uniboot.common.plugin.mybatis.converter.BoolToIntTypeHandler;
66
import com.github.cadecode.uniboot.framework.base.annotation.ApiFormat;
7-
import com.github.cadecode.uniboot.framework.base.annotation.ApiInner;
87
import com.github.cadecode.uniboot.framework.base.plugin.bean.po.PlgLog;
98
import com.github.cadecode.uniboot.framework.base.plugin.bean.vo.PlgLogVo;
109
import com.github.cadecode.uniboot.framework.base.plugin.bean.vo.PlgLogVo.PlgLogPageResVo;
11-
import com.github.cadecode.uniboot.framework.base.plugin.bean.vo.PlgLogVo.PlgLogSaveReqVo;
1210
import com.github.cadecode.uniboot.framework.base.plugin.convert.PlgLogConvert;
1311
import com.github.cadecode.uniboot.framework.base.plugin.service.PlgLogService;
1412
import com.github.pagehelper.PageHelper;
@@ -66,12 +64,4 @@ public PageResult<PlgLogPageResVo> page(@RequestBody @Valid PlgLogVo.PlgLogPageR
6664
public boolean delete(@RequestBody @NotEmpty List<Long> idList) {
6765
return logService.removeBatchByIds(idList);
6866
}
69-
70-
@ApiInner(onlyClient = true)
71-
@ApiOperation("添加")
72-
@PostMapping("save")
73-
public boolean save(@RequestBody @NotEmpty List<PlgLogSaveReqVo> requestList) {
74-
List<PlgLog> poList = PlgLogConvert.INSTANCE.voToPo(requestList);
75-
return logService.saveBatch(poList);
76-
}
7767
}

framework/framework_base/src/main/java/com/github/cadecode/uniboot/framework/base/plugin/handler/LogSaveHandler.java

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
import com.github.cadecode.uniboot.common.plugin.log.annotation.ApiLogger;
1111
import com.github.cadecode.uniboot.common.plugin.log.handler.AbstractApiLogHandler;
1212
import com.github.cadecode.uniboot.common.plugin.log.model.BaseLogInfo;
13-
import com.github.cadecode.uniboot.framework.api.bean.dto.SysLogDto.SysLogSaveReqDto;
1413
import com.github.cadecode.uniboot.framework.api.consts.HttpConst;
15-
import com.github.cadecode.uniboot.framework.api.feignclient.SysLogClient;
14+
import com.github.cadecode.uniboot.framework.base.plugin.bean.po.PlgLog;
15+
import com.github.cadecode.uniboot.framework.base.plugin.service.PlgLogService;
1616
import com.github.cadecode.uniboot.framework.base.util.SecurityUtil;
1717
import io.swagger.annotations.ApiOperation;
1818
import lombok.RequiredArgsConstructor;
@@ -22,8 +22,6 @@
2222
import org.springframework.scheduling.annotation.Async;
2323
import org.springframework.stereotype.Component;
2424

25-
import java.util.Collections;
26-
2725
/**
2826
* Log 处理器实现-save
2927
*
@@ -35,12 +33,12 @@
3533
@Component
3634
public class LogSaveHandler extends AbstractApiLogHandler {
3735

38-
private final SysLogClient sysLogClient;
36+
private final PlgLogService logService;
3937

4038
/**
41-
* 构造 LogInfo
39+
* 构造 Log 信息对象
4240
*/
43-
public SysLogSaveReqDto generateLog(ProceedingJoinPoint point, BaseLogInfo baseLogInfo) {
41+
public PlgLog generateLog(ProceedingJoinPoint point, BaseLogInfo baseLogInfo) {
4442
ApiLogger apiLogger = baseLogInfo.getApiLogger();
4543
// 解析 user-agent
4644
String userAgentStr = ServletUtil.getHeader(baseLogInfo.getRequest(), HttpConst.HEAD_USER_AGENT, CharsetUtil.CHARSET_UTF_8);
@@ -63,7 +61,7 @@ public SysLogSaveReqDto generateLog(ProceedingJoinPoint point, BaseLogInfo baseL
6361
description = apiOperation.value();
6462
}
6563
}
66-
return SysLogSaveReqDto.builder()
64+
return PlgLog.builder()
6765
.logType(apiLogger.type())
6866
.classMethod(point.getSignature().getDeclaringTypeName() + '.' + point.getSignature().getName())
6967
.exceptional(baseLogInfo.getExceptional())
@@ -92,15 +90,15 @@ public void save(ApiLogger apiLogger, Object o) {
9290
if (!apiLogger.enableSave()) {
9391
return;
9492
}
95-
SysLogSaveReqDto dto = (SysLogSaveReqDto) o;
93+
PlgLog po = (PlgLog) o;
9694
if (!apiLogger.saveParams()) {
97-
dto.setRequestParams(null);
95+
po.setRequestParams(null);
9896
}
9997
if (!apiLogger.saveResult()) {
100-
dto.setResult(null);
98+
po.setResult(null);
10199
}
102100
try {
103-
sysLogClient.save(Collections.singletonList(dto));
101+
logService.save(po);
104102
} catch (Exception e) {
105103
log.error("API log [{}]: save fail", apiLogger.type(), e);
106104
}

framework/framework_svc/src/main/java/com/github/cadecode/uniboot/framework/svc/config/FrameSecurityConfig.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,5 @@ public void configure(WebSecurity web) {
110110
ignoring.antMatchers("/auth/login");
111111
// 放行接口权限表查询接口
112112
ignoring.antMatchers("/system/api/list_roles_vo");
113-
// 放行系统日志写入接口
114-
ignoring.antMatchers("/system/log/save");
115113
}
116114
}

0 commit comments

Comments
 (0)