diff --git a/build.gradle b/build.gradle index 6b9b4cc4..54856fbf 100644 --- a/build.gradle +++ b/build.gradle @@ -157,7 +157,7 @@ subprojects { compile group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.13' compile group: 'org.apache.velocity', name: 'velocity', version: '1.7' compile group: 'velocity', name: 'velocity-dep', version: '1.4' - compile group: 'org.freemarker', name: 'freemarker', version: '2.3.30' + compile group: 'org.freemarker', name: 'freemarker', version: '2.3.31' compile group: 'org.apache.xmlbeans', name: 'xmlbeans', version: '3.0.1' compile group: 'org.apache.commons', name: 'commons-compress', version: '1.20' compile group: 'org.apache.poi', name: 'poi', version: "${poiVersion}" @@ -360,7 +360,7 @@ subprojects { compile group: 'com.tencentcloudapi', name: 'tencentcloud-sdk-java', version: '3.1.33' //tomcat embed Core Tomcat implementation - compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.0.41' + compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.0.43' //JULI logging implementation for embedded Tomcat compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-logging-juli', version: '8.5.2' } diff --git a/gradle.properties b/gradle.properties index fc41f4df..4a93940a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,12 +1,14 @@ +#maxkey properties group =maxkey.top version =2.6.0 vendor =https://www.maxkey.top author =maxkeyTop + #Version For use jar log4jVersion =2.14.0 -springVersion =5.3.3 -springBootVersion =2.4.2 -springSecurityVersion =5.4.2 +springVersion =5.3.4 +springBootVersion =2.4.3 +springSecurityVersion =5.4.5 springDataVersion =2.4.1 springSessionVersion =2.4.1 hibernateVersion =6.2.0.Final diff --git a/maxkey-common/src/main/java/org/maxkey/util/PathUtils.java b/maxkey-common/src/main/java/org/maxkey/util/PathUtils.java index d2136af5..3861cf6a 100644 --- a/maxkey-common/src/main/java/org/maxkey/util/PathUtils.java +++ b/maxkey-common/src/main/java/org/maxkey/util/PathUtils.java @@ -36,7 +36,7 @@ public class PathUtils { public static synchronized PathUtils getInstance() { if (instance == null) { instance = new PathUtils(); - PathUtils._logger.debug("getInstance()" + " new PathUtils instance"); + PathUtils._logger.trace("getInstance()" + " new PathUtils instance"); } return instance; } @@ -50,13 +50,13 @@ public class PathUtils { PathUtils.class.getResource(PATH_FILE_NAME).getFile(), "UTF-8" ); - _logger.debug("PathUtils() PathUtils " + classPath); + _logger.trace("PathUtils() PathUtils " + classPath); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } String fileProtocol = PathUtils.class.getResource(PATH_FILE_NAME).getProtocol(); - _logger.info("Properties Protocol:" + _logger.trace("Properties Protocol:" + PathUtils.class.getResource("PathUtils.properties").getProtocol()); if (fileProtocol.equalsIgnoreCase("file") && classPath.indexOf("file:") == 0) { @@ -70,7 +70,7 @@ public class PathUtils { classPath = classPath.substring(5, classPath.length()); } - _logger.info("PathUtils Class Path : " + classPath); + _logger.trace("PathUtils Class Path : " + classPath); classPath = classPath.substring(0, classPath.indexOf("/org/maxkey/util/" + PATH_FILE_NAME)); if (classPath.indexOf(WEB_INFO) == -1) { @@ -82,8 +82,8 @@ public class PathUtils { System.setProperty("APP_PATH", appPath); System.setProperty("CLASSES_PATH", classPath); - _logger.info("PathUtils App Path : " + appPath); - _logger.info("PathUtils Class Path : " + classPath); + _logger.trace("PathUtils App Path : " + appPath); + _logger.debug("PathUtils Class Path : " + classPath); } public String getAppPath() {