properties 加载方式优化

xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/PropertiesUtil.java

@@ -2,11 +2,12 @@ package com.xxl.job.admin.core.util;
 
 
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.EncodedResource;
+import org.springframework.core.io.support.PropertiesLoaderUtils;
 
 
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
 import java.util.Properties;
 import java.util.Properties;
 
 
 /**
 /**
@@ -17,36 +18,16 @@ public class PropertiesUtil {
 	private static Logger logger = LoggerFactory.getLogger(PropertiesUtil.class);
 	private static Logger logger = LoggerFactory.getLogger(PropertiesUtil.class);
 	private static final String file_name = "xxl-job-admin.properties";
 	private static final String file_name = "xxl-job-admin.properties";
 
 
-	/**
-	 * load properties
-	 * @param propertyFileName
-	 * @return
-	 */
-	public static Properties loadProperties(String propertyFileName) {
-		Properties prop = new Properties();
-		InputStreamReader  in = null;
-		try {
-			URL url = null;
-			ClassLoader loder = Thread.currentThread().getContextClassLoader();
-			url = loder.getResource(propertyFileName); 
-			in = new InputStreamReader(new FileInputStream(url.getPath()), "UTF-8");
-			prop.load(in);
-		} catch (IOException e) {
-			logger.error(e.getMessage(), e);
-		} finally {
-			if (in != null) {
+
+	public static String getString(String key) {
+		Properties prop = null;
 		try {
 		try {
-					in.close();
+			Resource resource = new ClassPathResource(file_name);
+			EncodedResource encodedResource = new EncodedResource(resource,"UTF-8");
+			prop = PropertiesLoaderUtils.loadProperties(encodedResource);
 		} catch (IOException e) {
 		} catch (IOException e) {
 			logger.error(e.getMessage(), e);
 			logger.error(e.getMessage(), e);
 		}
 		}
-			}
-		}
-		return prop;
-	}
-
-	public static String getString(String key) {
-		Properties prop = loadProperties(file_name);
 		if (prop!=null) {
 		if (prop!=null) {
 			return prop.getProperty(key);
 			return prop.getProperty(key);
 		}
 		}