admin/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2025-12-08 01:48:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

!15 fix_bug: getProcessor's type is error

Browse Source 
Merge pull request !15 from tzk007/fix_getProcessorTypeError
This commit is contained in:
MaxKeyTop 2022-10-24 09:42:07 +00:00 committed by Gitee
commit 6cd58c50a0
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
maxkey-core/src/main/java/org/maxkey/web/InitializeContext.java
View File

@ -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
);