ProductEnvironment

This commit is contained in:
MaxKey 2023-09-23 10:23:36 +08:00
parent 5fea26f427
commit bad2bf2fe8
5 changed files with 76 additions and 69 deletions

View File

@ -17,11 +17,7 @@
package org.dromara.maxkey.web;
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.util.PathUtils;
import org.dromara.mybatis.jpa.spring.MybatisJpaContext;
import org.joda.time.DateTime;
import org.slf4j.Logger;
@ -42,10 +38,6 @@ 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 .
@ -57,12 +49,6 @@ public class InitializeContext extends HttpServlet {
private static final long serialVersionUID = -797399138268601444L;
ApplicationContext applicationContext;
@Override
public String getServletInfo() {
return super.getServletInfo();
}
@Override
public void init(ServletConfig config) throws ServletException {
@ -70,9 +56,6 @@ public class InitializeContext extends HttpServlet {
MybatisJpaContext.init(applicationContext);
// List Environment Variables
listEnvVars();
listProperties();
// List DatabaseMetaData Variables
@ -179,56 +162,6 @@ public class InitializeContext extends HttpServlet {
}
}
/**
* listEnvVars.
*/
public void listEnvVars() {
_logger.debug("-----------------------------------------------------------");
_logger.debug("List Environment Variables ");
Map<String, String> map = System.getenv();
SortedSet<String> keyValueSet = new TreeSet<String>();
for (Iterator<String> itr = map.keySet().iterator(); itr.hasNext();) {
String key = itr.next();
keyValueSet.add(key);
}
// out
for (Iterator<String> it = keyValueSet.iterator(); it.hasNext();) {
String key = (String) it.next();
_logger.trace(key + " = {}" , map.get(key));
}
_logger.debug("APP_HOME" + " = {}" , PathUtils.getInstance().getAppPath());
Processor processor = ArchUtils.getProcessor();
if (Objects.isNull(processor)){
processor = new Processor(Processor.Arch.UNKNOWN, Processor.Type.UNKNOWN);
}
_logger.debug("OS : {}({} {}), version {}",
SystemUtils.OS_NAME,
SystemUtils.OS_ARCH,
processor.getType(),
SystemUtils.OS_VERSION
);
_logger.debug("COMPUTER: {}, USERNAME : {}",
map.get("COMPUTERNAME") ,
map.get("USERNAME")
);
_logger.debug("JAVA :");
_logger.debug("{} java version {}, class {}",
SystemUtils.JAVA_VENDOR,
SystemUtils.JAVA_VERSION,
SystemUtils.JAVA_CLASS_VERSION
);
_logger.debug("{} (build {}, {})",
SystemUtils.JAVA_VM_NAME,
SystemUtils.JAVA_VM_VERSION,
SystemUtils.JAVA_VM_INFO
);
_logger.debug("-----------------------------------------------------------");
}
/**
* showLicense.
*/

View File

@ -0,0 +1,68 @@
package org.dromara.maxkey.web;
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.SortedSet;
import java.util.TreeSet;
import org.apache.commons.lang.SystemUtils;
import org.apache.commons.lang3.ArchUtils;
import org.apache.commons.lang3.arch.Processor;
import org.dromara.maxkey.util.PathUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class ProductEnvironment {
private static final Logger logger = LoggerFactory.getLogger(ProductEnvironment.class);
/**
* List Environment Variables.
*/
public static void listEnvVars() {
logger.info("-----------------------------------------------------------");
logger.info("List Environment Variables ");
Map<String, String> map = System.getenv();
SortedSet<String> keyValueSet = new TreeSet<>();
for (Iterator<String> itr = map.keySet().iterator(); itr.hasNext();) {
String key = itr.next();
keyValueSet.add(key);
}
// out
for (Iterator<String> it = keyValueSet.iterator(); it.hasNext();) {
String key = it.next();
logger.trace("{} = {}" , key , map.get(key));
}
logger.debug("APP_HOME" + " = {}" , PathUtils.getInstance().getAppPath());
Processor processor = ArchUtils.getProcessor();
if (Objects.isNull(processor)){
processor = new Processor(Processor.Arch.UNKNOWN, Processor.Type.UNKNOWN);
}
logger.info("OS : {}({} {}), version {}",
SystemUtils.OS_NAME,
SystemUtils.OS_ARCH,
processor.getType(),
SystemUtils.OS_VERSION
);
logger.info("COMPUTER: {}, USERNAME : {}",
map.get("COMPUTERNAME") ,
map.get("USERNAME")
);
logger.info("JAVA :");
logger.info("{} java version {}, class {}",
SystemUtils.JAVA_VENDOR,
SystemUtils.JAVA_VERSION,
SystemUtils.JAVA_CLASS_VERSION
);
logger.info("{} (build {}, {})",
SystemUtils.JAVA_VM_NAME,
SystemUtils.JAVA_VM_VERSION,
SystemUtils.JAVA_VM_INFO
);
logger.info("-----------------------------------------------------------");
}
}

View File

@ -19,6 +19,7 @@ package org.dromara.maxkey;
import org.apache.ibatis.io.VFS;
import org.dromara.maxkey.web.InitializeContext;
import org.dromara.maxkey.web.ProductEnvironment;
import org.dromara.maxkey.web.WebContext;
import org.dromara.mybatis.jpa.starter.SpringBootVFS;
import org.joda.time.DateTime;
@ -45,6 +46,7 @@ public class MaxKeyApplication extends SpringBootServletInitializer {
*/
public static void main(String[] args) {
logger.info("Start MaxKey Application ...");
ProductEnvironment.listEnvVars();
VFS.addImplClass(SpringBootVFS.class);
ConfigurableApplicationContext applicationContext =

View File

@ -18,6 +18,7 @@
package org.dromara.maxkey;
import org.dromara.maxkey.web.InitializeContext;
import org.dromara.maxkey.web.ProductEnvironment;
import org.dromara.maxkey.web.WebContext;
import org.joda.time.DateTime;
import org.mybatis.spring.annotation.MapperScan;
@ -63,6 +64,7 @@ public class MaxKeyMgtApplication extends SpringBootServletInitializer {
public static void main(String[] args) {
logger.info("Start MaxKeyMgt Application ...");
ProductEnvironment.listEnvVars();
ConfigurableApplicationContext applicationContext =
SpringApplication.run(MaxKeyMgtApplication.class, args);

View File

@ -19,6 +19,7 @@ package org.dromara.maxkey;
import org.dromara.maxkey.web.InitializeContext;
import org.dromara.maxkey.web.ProductEnvironment;
import org.dromara.maxkey.web.WebContext;
import org.joda.time.DateTime;
import org.mybatis.spring.annotation.MapperScan;
@ -59,6 +60,7 @@ public class MaxKeyOpenApiApplication extends SpringBootServletInitializer {
public static void main(String[] args) {
logger.info("Start MaxKey OpenApi Application ...");
ProductEnvironment.listEnvVars();
ConfigurableApplicationContext applicationContext =
SpringApplication.run(MaxKeyOpenApiApplication.class, args);