jar升级和代码优化
This commit is contained in:
@@ -17,17 +17,15 @@
|
||||
|
||||
package org.dromara.maxkey.util;
|
||||
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.nio.file.Paths;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class PathUtils {
|
||||
private static final Logger _logger = LoggerFactory.getLogger(PathUtils.class);
|
||||
private static PathUtils instance = null;
|
||||
private String classPath;
|
||||
private String appPath;
|
||||
public static String WEB_INFO = "/WEB-INF/";
|
||||
private static final String PATH_FILE_NAME = "PathUtils.properties";
|
||||
static final Logger _logger = LoggerFactory.getLogger(PathUtils.class);
|
||||
static PathUtils instance = null;
|
||||
String appPath;
|
||||
|
||||
/**
|
||||
* getInstance .
|
||||
@@ -45,56 +43,15 @@ public class PathUtils {
|
||||
* PathUtils.
|
||||
*/
|
||||
public PathUtils() {
|
||||
try {
|
||||
classPath = java.net.URLDecoder.decode(
|
||||
PathUtils.class.getResource(PATH_FILE_NAME).getFile(),
|
||||
"UTF-8"
|
||||
);
|
||||
_logger.trace("PathUtils() PathUtils " + classPath);
|
||||
} catch (UnsupportedEncodingException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
String fileProtocol = PathUtils.class.getResource(PATH_FILE_NAME).getProtocol();
|
||||
_logger.trace("Properties Protocol:"
|
||||
+ PathUtils.class.getResource("PathUtils.properties").getProtocol());
|
||||
|
||||
if (fileProtocol.equalsIgnoreCase("file") && classPath.indexOf("file:") == 0) {
|
||||
classPath = classPath.substring(5, classPath.length());
|
||||
} else if (fileProtocol.equalsIgnoreCase("jar") && classPath.indexOf("file:") == 0) {
|
||||
// file:/Server/webapps/app
|
||||
classPath = classPath.substring(5, classPath.length());
|
||||
} else if (fileProtocol.equalsIgnoreCase("wsjar") && classPath.indexOf("file:") == 0) {
|
||||
classPath = classPath.substring(5, classPath.length());
|
||||
} else if (classPath.equalsIgnoreCase("file:")) {
|
||||
classPath = classPath.substring(5, classPath.length());
|
||||
}
|
||||
|
||||
_logger.trace("PathUtils Class Path : " + classPath);
|
||||
classPath = classPath.substring(0,
|
||||
classPath.indexOf("/org/dromara/maxkey/util/" + PATH_FILE_NAME));
|
||||
if (classPath.indexOf(WEB_INFO) == -1) {
|
||||
appPath = classPath.substring(0, classPath.lastIndexOf("/"));
|
||||
} else {
|
||||
appPath = classPath.substring(0, classPath.lastIndexOf(WEB_INFO));
|
||||
}
|
||||
|
||||
appPath =System.getProperty("user.dir");
|
||||
if(StringUtils.isBlank(appPath)) {
|
||||
appPath = Paths.get("").toAbsolutePath().toString();
|
||||
}
|
||||
System.setProperty("APP_PATH", appPath);
|
||||
System.setProperty("CLASSES_PATH", classPath);
|
||||
|
||||
_logger.trace("PathUtils App Path : " + appPath);
|
||||
_logger.trace("PathUtils Class Path : " + classPath);
|
||||
_logger.trace("PathUtils App Path : {} " ,appPath);
|
||||
}
|
||||
|
||||
public String getAppPath() {
|
||||
return appPath + "/";
|
||||
}
|
||||
|
||||
public String getClassPath() {
|
||||
return classPath + "/";
|
||||
}
|
||||
|
||||
public String getWebInf() {
|
||||
return (classPath.lastIndexOf(WEB_INFO) > -1) ? (appPath + WEB_INFO) : "";
|
||||
return appPath;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
org.maxkey.util.PathUtils
|
||||
Reference in New Issue
Block a user