zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly
2022-04-29 02:28:54 +08:00
parent 216c1966b7
commit 98e3b9cfc5
27 changed files with 85 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
hutool-extra/src/main/java/cn/hutool/extra/management/JavaInfo.java
View File

@@ -2,6 +2,7 @@ package cn.hutool.extra.management;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.regex.ReUtil;
import cn.hutool.core.util.SystemUtil;
import java.io.Serializable;
@@ -11,11 +12,11 @@ import java.io.Serializable;
public class JavaInfo implements Serializable {
private static final long serialVersionUID = 1L;
private final String JAVA_VERSION = ManagementUtil.get("java.version", false);
private final String JAVA_VERSION = SystemUtil.get("java.version", false);
private final float JAVA_VERSION_FLOAT = getJavaVersionAsFloat();
private final int JAVA_VERSION_INT = getJavaVersionAsInt();
private final String JAVA_VENDOR = ManagementUtil.get("java.vendor", false);
private final String JAVA_VENDOR_URL = ManagementUtil.get("java.vendor.url", false);
private final String JAVA_VENDOR = SystemUtil.get("java.vendor", false);
private final String JAVA_VENDOR_URL = SystemUtil.get("java.vendor.url", false);
// 1.1--1.3能否识别?
private final boolean IS_JAVA_1_1 = getJavaVersionMatches("1.1");

27
hutool-extra/src/main/java/cn/hutool/extra/management/JavaRuntimeInfo.java
View File

@@ -1,6 +1,7 @@
package cn.hutool.extra.management;
import cn.hutool.core.text.StrUtil;
import cn.hutool.core.util.SystemUtil;
import java.io.Serializable;
@@ -10,18 +11,18 @@ import java.io.Serializable;
public class JavaRuntimeInfo implements Serializable{
private static final long serialVersionUID = 1L;
private final String JAVA_RUNTIME_NAME = ManagementUtil.get("java.runtime.name", false);
private final String JAVA_RUNTIME_VERSION = ManagementUtil.get("java.runtime.version", false);
private final String JAVA_HOME = ManagementUtil.get("java.home", false);
private final String JAVA_EXT_DIRS = ManagementUtil.get("java.ext.dirs", false);
private final String JAVA_ENDORSED_DIRS = ManagementUtil.get("java.endorsed.dirs", false);
private final String JAVA_CLASS_PATH = ManagementUtil.get("java.class.path", false);
private final String JAVA_CLASS_VERSION = ManagementUtil.get("java.class.version", false);
private final String JAVA_LIBRARY_PATH = ManagementUtil.get("java.library.path", false);
private final String JAVA_RUNTIME_NAME = SystemUtil.get("java.runtime.name", false);
private final String JAVA_RUNTIME_VERSION = SystemUtil.get("java.runtime.version", false);
private final String JAVA_HOME = SystemUtil.get("java.home", false);
private final String JAVA_EXT_DIRS = SystemUtil.get("java.ext.dirs", false);
private final String JAVA_ENDORSED_DIRS = SystemUtil.get("java.endorsed.dirs", false);
private final String JAVA_CLASS_PATH = SystemUtil.get("java.class.path", false);
private final String JAVA_CLASS_VERSION = SystemUtil.get("java.class.version", false);
private final String JAVA_LIBRARY_PATH = SystemUtil.get("java.library.path", false);
private final String SUN_BOOT_CLASS_PATH = ManagementUtil.get("sun.boot.class.path", false);
private final String SUN_BOOT_CLASS_PATH = SystemUtil.get("sun.boot.class.path", false);
private final String SUN_ARCH_DATA_MODEL = ManagementUtil.get("sun.arch.data.model", false);
private final String SUN_ARCH_DATA_MODEL = SystemUtil.get("sun.arch.data.model", false);
public final String getSunBoothClassPath() {
return SUN_BOOT_CLASS_PATH;
@@ -138,7 +139,7 @@ public class JavaRuntimeInfo implements Serializable{
* @since Java 1.1
*/
public final String[] getClassPathArray() {
return StrUtil.splitToArray(getClassPath(), ManagementUtil.get("path.separator", false));
return StrUtil.splitToArray(getClassPath(), SystemUtil.get("path.separator", false));
}
/**
@@ -182,7 +183,7 @@ public class JavaRuntimeInfo implements Serializable{
*
*/
public final String[] getLibraryPathArray() {
return StrUtil.splitToArray(getLibraryPath(), ManagementUtil.get("path.separator", false));
return StrUtil.splitToArray(getLibraryPath(), SystemUtil.get("path.separator", false));
}
/**
@@ -197,7 +198,7 @@ public class JavaRuntimeInfo implements Serializable{
*
*/
public final String getProtocolPackages() {
return ManagementUtil.get("java.protocol.handler.pkgs", true);
return SystemUtil.get("java.protocol.handler.pkgs", true);
}
/**

8
hutool-extra/src/main/java/cn/hutool/extra/management/JavaSpecInfo.java
View File

@@ -1,5 +1,7 @@
package cn.hutool.extra.management;
import cn.hutool.core.util.SystemUtil;
import java.io.Serializable;
/**
@@ -8,9 +10,9 @@ import java.io.Serializable;
public class JavaSpecInfo implements Serializable{
private static final long serialVersionUID = 1L;
private final String JAVA_SPECIFICATION_NAME = ManagementUtil.get("java.specification.name", false);
private final String JAVA_SPECIFICATION_VERSION = ManagementUtil.get("java.specification.version", false);
private final String JAVA_SPECIFICATION_VENDOR = ManagementUtil.get("java.specification.vendor", false);
private final String JAVA_SPECIFICATION_NAME = SystemUtil.get("java.specification.name", false);
private final String JAVA_SPECIFICATION_VERSION = SystemUtil.get("java.specification.version", false);
private final String JAVA_SPECIFICATION_VENDOR = SystemUtil.get("java.specification.vendor", false);
/**
* 取得当前Java Spec.的名称（取自系统属性：{@code java.specification.name}）。

10
hutool-extra/src/main/java/cn/hutool/extra/management/JvmInfo.java
View File

@@ -1,5 +1,7 @@
package cn.hutool.extra.management;
import cn.hutool.core.util.SystemUtil;
import java.io.Serializable;
/**
@@ -8,10 +10,10 @@ import java.io.Serializable;
public class JvmInfo implements Serializable{
private static final long serialVersionUID = 1L;
private final String JAVA_VM_NAME = ManagementUtil.get("java.vm.name", false);
private final String JAVA_VM_VERSION = ManagementUtil.get("java.vm.version", false);
private final String JAVA_VM_VENDOR = ManagementUtil.get("java.vm.vendor", false);
private final String JAVA_VM_INFO = ManagementUtil.get("java.vm.info", false);
private final String JAVA_VM_NAME = SystemUtil.get("java.vm.name", false);
private final String JAVA_VM_VERSION = SystemUtil.get("java.vm.version", false);
private final String JAVA_VM_VENDOR = SystemUtil.get("java.vm.vendor", false);
private final String JAVA_VM_INFO = SystemUtil.get("java.vm.info", false);
/**
* 取得当前JVM impl.的名称（取自系统属性：{@code java.vm.name}）。

8
hutool-extra/src/main/java/cn/hutool/extra/management/JvmSpecInfo.java
View File

@@ -1,5 +1,7 @@
package cn.hutool.extra.management;
import cn.hutool.core.util.SystemUtil;
import java.io.Serializable;
/**
@@ -8,9 +10,9 @@ import java.io.Serializable;
public class JvmSpecInfo implements Serializable{
private static final long serialVersionUID = 1L;
private final String JAVA_VM_SPECIFICATION_NAME = ManagementUtil.get("java.vm.specification.name", false);
private final String JAVA_VM_SPECIFICATION_VERSION = ManagementUtil.get("java.vm.specification.version", false);
private final String JAVA_VM_SPECIFICATION_VENDOR = ManagementUtil.get("java.vm.specification.vendor", false);
private final String JAVA_VM_SPECIFICATION_NAME = SystemUtil.get("java.vm.specification.name", false);
private final String JAVA_VM_SPECIFICATION_VERSION = SystemUtil.get("java.vm.specification.version", false);
private final String JAVA_VM_SPECIFICATION_VENDOR = SystemUtil.get("java.vm.specification.vendor", false);
/**
* 取得当前JVM spec.的名称（取自系统属性：{@code java.vm.specification.name}）。

14
hutool-extra/src/main/java/cn/hutool/extra/management/OsInfo.java
View File

@@ -1,5 +1,7 @@
package cn.hutool.extra.management;
import cn.hutool.core.util.SystemUtil;
import java.io.Serializable;
/**
@@ -8,9 +10,9 @@ import java.io.Serializable;
public class OsInfo implements Serializable{
private static final long serialVersionUID = 1L;
private final String OS_VERSION = ManagementUtil.get("os.version", false);
private final String OS_ARCH = ManagementUtil.get("os.arch", false);
private final String OS_NAME = ManagementUtil.get("os.name", false);
private final String OS_VERSION = SystemUtil.get("os.version", false);
private final String OS_ARCH = SystemUtil.get("os.arch", false);
private final String OS_NAME = SystemUtil.get("os.name", false);
private final boolean IS_OS_AIX = getOSMatches("AIX");
private final boolean IS_OS_HP_UX = getOSMatches("HP-UX");
private final boolean IS_OS_IRIX = getOSMatches("Irix");
@@ -34,9 +36,9 @@ public class OsInfo implements Serializable{
private final boolean IS_OS_WINDOWS_10 = getOSMatches("Windows", "10.0");
// 由于改变file.encoding属性并不会改变系统字符编码，为了保持一致，通过LocaleUtil取系统默认编码。
private final String FILE_SEPARATOR = ManagementUtil.get("file.separator", false);
private final String LINE_SEPARATOR = ManagementUtil.get("line.separator", false);
private final String PATH_SEPARATOR = ManagementUtil.get("path.separator", false);
private final String FILE_SEPARATOR = SystemUtil.get(SystemPropsKeys.FILE_SEPARATOR, false);
private final String LINE_SEPARATOR = SystemUtil.get(SystemPropsKeys.LINE_SEPARATOR, false);
private final String PATH_SEPARATOR = SystemUtil.get(SystemPropsKeys.PATH_SEPARATOR, false);
/**
* 取得当前OS的架构（取自系统属性：{@code os.arch}）。

15
hutool-extra/src/main/java/cn/hutool/extra/management/UserInfo.java
View File

@@ -1,6 +1,7 @@
package cn.hutool.extra.management;
import cn.hutool.core.text.StrUtil;
import cn.hutool.core.util.SystemUtil;
import java.io.File;
import java.io.Serializable;
@@ -19,16 +20,16 @@ public class UserInfo implements Serializable{
private final String USER_COUNTRY;
public UserInfo(){
USER_NAME = fixPath(ManagementUtil.get("user.name", false));
USER_HOME = fixPath(ManagementUtil.get("user.home", false));
USER_DIR = fixPath(ManagementUtil.get("user.dir", false));
JAVA_IO_TMPDIR = fixPath(ManagementUtil.get("java.io.tmpdir", false));
USER_LANGUAGE = ManagementUtil.get("user.language", false);
USER_NAME = fixPath(SystemUtil.get("user.name", false));
USER_HOME = fixPath(SystemUtil.get("user.home", false));
USER_DIR = fixPath(SystemUtil.get("user.dir", false));
JAVA_IO_TMPDIR = fixPath(SystemUtil.get("java.io.tmpdir", false));
USER_LANGUAGE = SystemUtil.get("user.language", false);
// JDK1.4 {@code user.country}，JDK1.2 {@code user.region}
String userCountry = ManagementUtil.get("user.country", false);
String userCountry = SystemUtil.get("user.country", false);
if(null == userCountry){
userCountry = ManagementUtil.get("user.country", false);
userCountry = SystemUtil.get("user.country", false);
}
USER_COUNTRY = userCountry;
}