diff --git a/src/main/java/neatlogic/framework/common/config/Config.java b/src/main/java/neatlogic/framework/common/config/Config.java index b24bb146d2091e92e8afb7d43d3c7501c9a9383e..649334ecaf7d7d84714c5cd1d18abce8e39af741 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 9826cd67fb26cc309ec3c57ca29725056caf51ec..a3eaf3b4cd09c170aa8b3620df335f2a74b362e3 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 8739552efc84fd7c9f9b44d56cbe3c413f1d3c41..2551dfaa09d39f1deb67af03c4d3475d0a46af32 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 78e8d47a91da5c9d278067958d5825c06dd589dd..2cb3e8248fcc917be8ac299a6e8ba72d43007124 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 0867ebfcc6351cc78de24d6e4fe91809811de24c..6c684b07dc56f44a12cc922b0fc3288ded9e6f60 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 3f5fc3749da8e7efc638f4d8089c91b0bdbc9f6a..7e88428984a398475f64da261af7ca989465a5bd 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 400f3119d64dbd0709aee6dba482c3ea0d23ad3f..5a943972e5d66b538a2c1e8e8e4e8f9867ccfb66 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 40a5a730549e8b0a325c0f9cb3c18288ec78bf72..c845e1c861608df2e9bf2e4e745c7abeecafe11c 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 3d7274de37cf51bdba92a51ea7a43f7594d57b83..2cecf037f5df25f67921f1f6664bbc20a3bbdf4f 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 0136f6da42fd15f0e4ce20d021db30f399e49ad6..4370734284e5400ec79a8c61c06b28fe284a467a 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());