diff --git a/src/cn/edu/hactcm/util/MD5Util.java b/src/cn/edu/hactcm/util/MD5Util.java deleted file mode 100644 index 05c3c28..0000000 --- a/src/cn/edu/hactcm/util/MD5Util.java +++ /dev/null @@ -1,57 +0,0 @@ -package cn.edu.hactcm.util; - -import java.security.MessageDigest; - -public class MD5Util { - - private static String byteArrayToHexString(byte b[]) { - StringBuffer resultSb = new StringBuffer(); - for (int i = 0; i < b.length; i++) - resultSb.append(byteToHexString(b[i])); - - return resultSb.toString(); - } - - private static String byteToHexString(byte b) { - int n = b; - if (n < 0) - n += 256; - int d1 = n / 16; - int d2 = n % 16; - return hexDigits[d1] + hexDigits[d2]; - } - - /** - * 返回大写MD5 - * - * @param origin - * @param charsetname - * @return - */ - private static String MD5Encode(String origin, String charsetname) { - String resultString = null; - try { - resultString = new String(origin); - MessageDigest md = MessageDigest.getInstance("MD5"); - if (charsetname == null || "".equals(charsetname)) - resultString = byteArrayToHexString(md.digest(resultString.getBytes())); - else - resultString = byteArrayToHexString(md.digest(resultString.getBytes(charsetname))); - } catch (Exception exception) { - } - return resultString.toUpperCase(); - } - - public static String MD5EncodeUtf8(String origin) { - - //盐值Salt加密 - //origin = origin + PropertiesUtil.getProperty("password.salt", ""); - return MD5Encode(origin, "utf-8"); - } - - - private static final String hexDigits[] = {"0", "1", "2", "3", "4", "5", - "6", "7", "8", "9", "a", "b", "c", "d", "e", "f"}; - -} - diff --git a/src/cn/edu/hactcm/util/PropertiesUtil.java b/src/cn/edu/hactcm/util/PropertiesUtil.java deleted file mode 100644 index ff3693b..0000000 --- a/src/cn/edu/hactcm/util/PropertiesUtil.java +++ /dev/null @@ -1,46 +0,0 @@ -package cn.edu.hactcm.util; - -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.io.InputStreamReader; -import java.util.Properties; - -public class PropertiesUtil { - - private static Logger logger = LoggerFactory.getLogger(PropertiesUtil.class); - - private static Properties props; - - static { - String fileName = "mmall.properties"; - props = new Properties(); - try { - props.load(new InputStreamReader(PropertiesUtil.class.getClassLoader().getResourceAsStream(fileName),"UTF-8")); - } catch (IOException e) { - logger.error("配置文件读取异常",e); - } - } - - public static String getProperty(String key){ - String value = props.getProperty(key.trim()); - if(StringUtils.isBlank(value)){ - return null; - } - return value.trim(); - } - - public static String getProperty(String key,String defaultValue){ - - String value = props.getProperty(key.trim()); - if(StringUtils.isBlank(value)){ - value = defaultValue; - } - return value.trim(); - } - - - -} -