From 57f5d632fd98a2a7f039ca270642f154a6df0715 Mon Sep 17 00:00:00 2001 From: ZhaokaiTian <751824405@qq.com> Date: Mon, 24 Oct 2022 16:41:21 +0800 Subject: [PATCH] fix_bug:https://gitee.com/dromara/MaxKey/issues/I5X10K --- .../org/maxkey/web/InitializeContext.java | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/maxkey-core/src/main/java/org/maxkey/web/InitializeContext.java b/maxkey-core/src/main/java/org/maxkey/web/InitializeContext.java index 5b01c53bc..6e17a22fd 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/InitializeContext.java +++ b/maxkey-core/src/main/java/org/maxkey/web/InitializeContext.java @@ -17,19 +17,9 @@ package org.maxkey.web; -import java.sql.Connection; -import java.sql.DatabaseMetaData; -import java.sql.SQLException; -import java.util.Iterator; -import java.util.Map; -import java.util.SortedSet; -import java.util.TreeSet; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; - import org.apache.commons.lang.SystemUtils; import org.apache.commons.lang3.ArchUtils; +import org.apache.commons.lang3.arch.Processor; import org.apache.mybatis.jpa.util.JpaWebContext; import org.joda.time.DateTime; import org.maxkey.configuration.ApplicationConfig; @@ -45,6 +35,18 @@ import org.springframework.core.env.PropertySource; import org.springframework.core.env.StandardEnvironment; import org.springframework.web.context.support.WebApplicationContextUtils; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.SQLException; +import java.util.Iterator; +import java.util.Map; +import java.util.Objects; +import java.util.SortedSet; +import java.util.TreeSet; + /** * InitApplicationContext . * @author Crystal.Sea @@ -199,10 +201,14 @@ public class InitializeContext extends HttpServlet { _logger.trace(key + " = {}" , map.get(key)); } _logger.debug("APP_HOME" + " = {}" , PathUtils.getInstance().getAppPath()); + Processor.Type type = ArchUtils.getProcessor().getType(); + if (Objects.isNull(type)){ + type = Processor.Type.UNKNOWN; + } _logger.debug("OS : {}({} {}), version {}", SystemUtils.OS_NAME, SystemUtils.OS_ARCH, - ArchUtils.getProcessor().getType(), + type, SystemUtils.OS_VERSION );