From 5eeddc6b0e80c3947a72a1112bb57c418f7ce9cc Mon Sep 17 00:00:00 2001 From: MaxKey Date: Thu, 17 Aug 2023 10:29:13 +0800 Subject: [PATCH] dromara. --- .../maxkey/autoconfigure/SessionAutoConfiguration.java | 2 +- .../maxkey/autoconfigure/TokenAutoConfiguration.java | 2 +- .../src/main/java/org/dromara/maxkey/util/PathUtils.java | 2 +- .../org/{ => dromara}/maxkey/util/PathUtils.properties | 0 .../main/java/org/dromara/maxkey/web/InitializeContext.java | 6 +----- 5 files changed, 4 insertions(+), 8 deletions(-) rename maxkey-authentications/maxkey-authentication-core/src/main/java/org/{ => dromara}/maxkey/autoconfigure/SessionAutoConfiguration.java (98%) rename maxkey-authentications/maxkey-authentication-core/src/main/java/org/{ => dromara}/maxkey/autoconfigure/TokenAutoConfiguration.java (98%) rename maxkey-common/src/main/resources/org/{ => dromara}/maxkey/util/PathUtils.properties (100%) diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/SessionAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/autoconfigure/SessionAutoConfiguration.java similarity index 98% rename from maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/SessionAutoConfiguration.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/autoconfigure/SessionAutoConfiguration.java index 68926ad90..02cc91ecb 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/SessionAutoConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/autoconfigure/SessionAutoConfiguration.java @@ -15,7 +15,7 @@ */ -package org.maxkey.autoconfigure; +package org.dromara.maxkey.autoconfigure; import org.dromara.maxkey.authn.session.SessionManager; import org.dromara.maxkey.authn.session.SessionManagerFactory; diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/TokenAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/autoconfigure/TokenAutoConfiguration.java similarity index 98% rename from maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/TokenAutoConfiguration.java rename to maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/autoconfigure/TokenAutoConfiguration.java index 2b20995c0..f4bd2a2cd 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/TokenAutoConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/autoconfigure/TokenAutoConfiguration.java @@ -15,7 +15,7 @@ */ -package org.maxkey.autoconfigure; +package org.dromara.maxkey.autoconfigure; import org.dromara.maxkey.authn.jwt.AuthRefreshTokenService; import org.dromara.maxkey.authn.jwt.AuthTokenService; diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/PathUtils.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/PathUtils.java index 960f71a4c..5a97375be 100644 --- a/maxkey-common/src/main/java/org/dromara/maxkey/util/PathUtils.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/PathUtils.java @@ -72,7 +72,7 @@ public class PathUtils { _logger.trace("PathUtils Class Path : " + classPath); classPath = classPath.substring(0, - classPath.indexOf("/org/maxkey/util/" + PATH_FILE_NAME)); + classPath.indexOf("/org/dromara/maxkey/util/" + PATH_FILE_NAME)); if (classPath.indexOf(WEB_INFO) == -1) { appPath = classPath.substring(0, classPath.lastIndexOf("/")); } else { diff --git a/maxkey-common/src/main/resources/org/maxkey/util/PathUtils.properties b/maxkey-common/src/main/resources/org/dromara/maxkey/util/PathUtils.properties similarity index 100% rename from maxkey-common/src/main/resources/org/maxkey/util/PathUtils.properties rename to maxkey-common/src/main/resources/org/dromara/maxkey/util/PathUtils.properties diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/InitializeContext.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/InitializeContext.java index b797db329..68029d3a7 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/web/InitializeContext.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/InitializeContext.java @@ -21,7 +21,6 @@ import org.apache.commons.lang.SystemUtils; import org.apache.commons.lang3.ArchUtils; import org.apache.commons.lang3.arch.Processor; import org.dromara.maxkey.configuration.ApplicationConfig; -import org.dromara.maxkey.crypto.Md5Sum; import org.dromara.maxkey.util.PathUtils; import org.dromara.mybatis.jpa.spring.MybatisJpaContext; import org.joda.time.DateTime; @@ -66,7 +65,6 @@ public class InitializeContext extends HttpServlet { @Override public void init(ServletConfig config) throws ServletException { - super.init(config); WebContext.applicationContext = applicationContext; @@ -148,9 +146,7 @@ public class InitializeContext extends HttpServlet { _logger.debug("UserName : {}" , databaseMetaData.getUserName()); _logger.debug("-----------------------------------------------------------"); - if(Md5Sum.checkVersion()) { - _logger.trace("The Version dependent on is Reliable ."); - } + } catch (SQLException e) { e.printStackTrace(); _logger.error("DatabaseMetaData Variables Error .",e);