From 205f3ae1c8427b86c68fb53aee139b665d12a4b4 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 17 Jan 2025 11:07:37 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=9C=A8=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6config.properties=E4=B8=AD=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=B8=AAaudit.home=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E4=BD=9C=E4=B8=BA=E5=AE=A1=E8=AE=A1=E6=97=A5=E5=BF=97=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E5=89=8D=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1336091188101120]在配置文件config.properties中增加一个audit.home参数作为审计日志路径前缀 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1336091188101120 --- .../neatlogic/framework/common/config/Config.java | 12 ++++++++++++ .../core/DefaultDependencyHandlerBase.java | 6 +++--- .../file/core/appender/AppenderManager.java | 2 +- .../framework/filter/JsonWebTokenValidFilter.java | 2 +- .../framework/filter/core/LoginAuthHandlerBase.java | 2 +- .../framework/restful/audit/ApiAuditThread.java | 4 ++-- .../auditconfig/handler/ApiAuditCleaner.java | 2 +- .../audit/IntegrationAuditAppendPostProcessor.java | 2 +- .../apiaudit/ApiAuditAppendPostProcessor.java | 2 +- .../module/framework/service/FileServiceImpl.java | 4 ++-- 10 files changed, 25 insertions(+), 13 deletions(-) diff --git a/src/main/java/neatlogic/framework/common/config/Config.java b/src/main/java/neatlogic/framework/common/config/Config.java index b24bb146d..649334eca 100644 --- a/src/main/java/neatlogic/framework/common/config/Config.java +++ b/src/main/java/neatlogic/framework/common/config/Config.java @@ -64,6 +64,7 @@ public class Config { private static Integer DATASOURCE_IDLE_TIMEOUT;//此属性控制允许连接在池中处于空闲状态的最长时间 private static Long DATASOURCE_KEEPALIVE_TIME;//此属性控制允许连接在池中心跳时间，不能比DATASOURCE_MAX_LIFETIME大 private static String DATA_HOME;// 存储文件路径 + private static String AUDIT_HOME;// 审计日志存储文件路径 private static int SERVER_HEARTBEAT_RATE;// 心跳频率 private static int SERVER_HEARTBEAT_THRESHOLD;// 心跳失败上限次数 private static int MQ_SUBSCRIBE_RECONNECT_PERIOD;//MQ连接重试间隔 @@ -303,6 +304,16 @@ public class Config { return DATA_HOME; } + public static String AUDIT_HOME() { + if (AUDIT_HOME == null) { + AUDIT_HOME = DATA_HOME(); + } + if (!AUDIT_HOME.endsWith(File.separator)) { + AUDIT_HOME += File.separator; + } + return AUDIT_HOME; + } + public static int SERVER_HEARTBEAT_RATE() { return SERVER_HEARTBEAT_RATE; } @@ -573,6 +584,7 @@ public class Config { System.out.println("⚡" + I18nUtils.getStaticMessage("common.startloadconfig", "config.properties")); } DATA_HOME = prop.getProperty("data.home", "/app/data"); + AUDIT_HOME = prop.getProperty("audit.home"); SERVER_HEARTBEAT_RATE = Integer.parseInt(prop.getProperty("heartbeat.rate", "1")); SERVER_HEARTBEAT_THRESHOLD = Integer.parseInt(prop.getProperty("heartbeat.threshold", "3")); MQ_SUBSCRIBE_RECONNECT_PERIOD = Integer.parseInt(prop.getProperty("mq.subscribe.reconnect.period", "5")); diff --git a/src/main/java/neatlogic/framework/dependency/core/DefaultDependencyHandlerBase.java b/src/main/java/neatlogic/framework/dependency/core/DefaultDependencyHandlerBase.java index 9826cd67f..a3eaf3b4c 100644 --- a/src/main/java/neatlogic/framework/dependency/core/DefaultDependencyHandlerBase.java +++ b/src/main/java/neatlogic/framework/dependency/core/DefaultDependencyHandlerBase.java @@ -130,11 +130,11 @@ public abstract class DefaultDependencyHandlerBase implements IDependencyHandler /** * 查询引用次数 * - * @param to 被引用者（上游）值（如：服务时间窗口uuid） + * @param from 被引用者（上游）值（如：服务时间窗口uuid） */ @Override - public int getDependencyCount(Object to) { - return dependencyMapper.getDependencyCountByFrom(to, getHandler()); + public int getDependencyCount(Object from) { + return dependencyMapper.getDependencyCountByFrom(from, getHandler()); } public List> getBatchDependencyCount(Object fromList) { diff --git a/src/main/java/neatlogic/framework/file/core/appender/AppenderManager.java b/src/main/java/neatlogic/framework/file/core/appender/AppenderManager.java index 8739552ef..2551dfaa0 100644 --- a/src/main/java/neatlogic/framework/file/core/appender/AppenderManager.java +++ b/src/main/java/neatlogic/framework/file/core/appender/AppenderManager.java @@ -86,7 +86,7 @@ public class AppenderManager { } public Appender build() { - String path = Config.DATA_HOME() + TenantContext.get().getTenantUuid() + File.separator + auditType + File.separator + fileName; + String path = Config.AUDIT_HOME() + TenantContext.get().getTenantUuid() + File.separator + auditType + File.separator + fileName; RollingFileAppender rollingFileAppender = new RollingFileAppender<>(); rollingFileAppender.setFile(path); FixedWindowRollingPolicy fixedWindowRollingPolicy = new FixedWindowRollingPolicy(); diff --git a/src/main/java/neatlogic/framework/filter/JsonWebTokenValidFilter.java b/src/main/java/neatlogic/framework/filter/JsonWebTokenValidFilter.java index 78e8d47a9..2cb3e8248 100644 --- a/src/main/java/neatlogic/framework/filter/JsonWebTokenValidFilter.java +++ b/src/main/java/neatlogic/framework/filter/JsonWebTokenValidFilter.java @@ -118,7 +118,7 @@ public class JsonWebTokenValidFilter extends OncePerRequestFilter { } else { authType = Config.LOGIN_AUTH_TYPE(); } - logger.info("AuthType: " + authType); + logger.debug("AuthType: " + authType); if (StringUtils.isNotBlank(authType)) { loginAuth = LoginAuthFactory.getLoginAuth(authType); if (loginAuth != null) { diff --git a/src/main/java/neatlogic/framework/filter/core/LoginAuthHandlerBase.java b/src/main/java/neatlogic/framework/filter/core/LoginAuthHandlerBase.java index 0867ebfcc..6c684b07d 100644 --- a/src/main/java/neatlogic/framework/filter/core/LoginAuthHandlerBase.java +++ b/src/main/java/neatlogic/framework/filter/core/LoginAuthHandlerBase.java @@ -106,7 +106,7 @@ public abstract class LoginAuthHandlerBase implements ILoginAuthHandler { //如果userVo没有uuid则这个user不合法，直接置null if (userVo != null && StringUtils.isBlank(userVo.getUuid())) { if (!Objects.equals(getType(), "default")) { - logger.error("{} return userVo invalid!! userVo must include uuid", getType()); + logger.debug("{} return userVo invalid!! userVo must include uuid", getType()); } userVo = null; } diff --git a/src/main/java/neatlogic/framework/restful/audit/ApiAuditThread.java b/src/main/java/neatlogic/framework/restful/audit/ApiAuditThread.java index 3f5fc3749..7e8842898 100644 --- a/src/main/java/neatlogic/framework/restful/audit/ApiAuditThread.java +++ b/src/main/java/neatlogic/framework/restful/audit/ApiAuditThread.java @@ -47,12 +47,12 @@ public class ApiAuditThread extends NeatLogicThread { private String getLogPath(String tenant, String logPath) { String logFilePath = ""; if (StringUtils.isBlank(logPath)) { - logFilePath = Config.DATA_HOME() + File.separator + "apiaudit" + File.separator + tenant + File.separator; + logFilePath = Config.AUDIT_HOME() + File.separator + "apiaudit" + File.separator + tenant + File.separator; } else { if (logPath.startsWith(File.separator)) { logFilePath = logPath + File.separator + tenant + File.separator; } else { - logFilePath = Config.DATA_HOME() + File.separator + logPath + File.separator + tenant + File.separator; + logFilePath = Config.AUDIT_HOME() + File.separator + logPath + File.separator + tenant + File.separator; } } return logFilePath; diff --git a/src/main/java/neatlogic/module/framework/auditconfig/handler/ApiAuditCleaner.java b/src/main/java/neatlogic/module/framework/auditconfig/handler/ApiAuditCleaner.java index 400f3119d..5a943972e 100644 --- a/src/main/java/neatlogic/module/framework/auditconfig/handler/ApiAuditCleaner.java +++ b/src/main/java/neatlogic/module/framework/auditconfig/handler/ApiAuditCleaner.java @@ -54,7 +54,7 @@ public class ApiAuditCleaner extends AuditCleanerBase { @Override protected void myClean(int dayBefore) { - String directoryPath = Config.DATA_HOME() + TenantContext.get().getTenantUuid() + File.separator + AuditType.API_AUDIT.getType(); + String directoryPath = Config.AUDIT_HOME() + TenantContext.get().getTenantUuid() + File.separator + AuditType.API_AUDIT.getType(); File dir = new File(directoryPath); if (dir.exists()) { File[] listFiles = dir.listFiles(); diff --git a/src/main/java/neatlogic/module/framework/integration/audit/IntegrationAuditAppendPostProcessor.java b/src/main/java/neatlogic/module/framework/integration/audit/IntegrationAuditAppendPostProcessor.java index 40a5a7305..c845e1c86 100644 --- a/src/main/java/neatlogic/module/framework/integration/audit/IntegrationAuditAppendPostProcessor.java +++ b/src/main/java/neatlogic/module/framework/integration/audit/IntegrationAuditAppendPostProcessor.java @@ -40,7 +40,7 @@ public class IntegrationAuditAppendPostProcessor implements Consumer, IC public void accept(IEvent event) { JSONObject data = event.getData(); String path = data.getString("path"); - String dataHome = Config.DATA_HOME() + TenantContext.get().getTenantUuid(); + String dataHome = Config.AUDIT_HOME() + TenantContext.get().getTenantUuid(); File file = new File(dataHome); dataHome = file.getPath(); if (path.startsWith(dataHome)) { diff --git a/src/main/java/neatlogic/module/framework/restful/apiaudit/ApiAuditAppendPostProcessor.java b/src/main/java/neatlogic/module/framework/restful/apiaudit/ApiAuditAppendPostProcessor.java index 3d7274de3..2cecf037f 100644 --- a/src/main/java/neatlogic/module/framework/restful/apiaudit/ApiAuditAppendPostProcessor.java +++ b/src/main/java/neatlogic/module/framework/restful/apiaudit/ApiAuditAppendPostProcessor.java @@ -52,7 +52,7 @@ public class ApiAuditAppendPostProcessor implements Consumer, ICrossover apiAuditVo.setTimeCost(endTime - startTime); String path = data.getString("path"); - String dataHome = Config.DATA_HOME() + TenantContext.get().getTenantUuid(); + String dataHome = Config.AUDIT_HOME() + TenantContext.get().getTenantUuid(); File file = new File(dataHome); dataHome = file.getPath(); if (path.startsWith(dataHome)) { diff --git a/src/main/java/neatlogic/module/framework/service/FileServiceImpl.java b/src/main/java/neatlogic/module/framework/service/FileServiceImpl.java index 0136f6da4..437073428 100644 --- a/src/main/java/neatlogic/module/framework/service/FileServiceImpl.java +++ b/src/main/java/neatlogic/module/framework/service/FileServiceImpl.java @@ -162,7 +162,7 @@ public class FileServiceImpl implements IFileCrossoverService { @Override public JSONObject readLocalFile(String path, int startIndex, int offset) { - String dataHome = Config.DATA_HOME() + TenantContext.get().getTenantUuid(); + String dataHome = Config.AUDIT_HOME()+ TenantContext.get().getTenantUuid(); String prefix = "${home}"; if (path.startsWith(prefix)) { path = path.substring(prefix.length()); @@ -246,7 +246,7 @@ public class FileServiceImpl implements IFileCrossoverService { @Override public void downloadLocalFile(String path, int startIndex, int offset, HttpServletResponse response) { - String dataHome = Config.DATA_HOME() + TenantContext.get().getTenantUuid(); + String dataHome = Config.AUDIT_HOME() + TenantContext.get().getTenantUuid(); String prefix = "${home}"; if (path.startsWith(prefix)) { path = path.substring(prefix.length()); -- Gitee