Merge branch 'master' of http://gitlab.linkfern.com/key/common.git

src/main/java/com/egolm/common/HttpUtil.java

@@ -298,8 +298,11 @@ public class HttpUtil {
 		return StringUtil.join("&", params);
 	}
 
-	public static String post(String requestUrl, Map<String, Object> parameters, Map<String, String> headers,
-			Map<String, File> attachments, String contentType) {
+	public static String post(String requestUrl, Map<String, Object> parameters, Map<String, String> headers, Map<String, File> attachments) {
+		return post(requestUrl, parameters, headers, attachments, "application/octet-stream");
+	}
+	
+	public static String post(String requestUrl, Map<String, Object> parameters, Map<String, String> headers, Map<String, File> attachments, String contentType) {
 		HttpURLConnection connection = null;
 		try {
 			Data data = new Data();
@@ -320,9 +323,8 @@ public class HttpUtil {
 					StringBuffer FileBuffer = new StringBuffer();
 					File file = attachments.get(name);
 					FileBuffer.append("--" + BOUNDARY + "\r\n");
-					FileBuffer.append("Content-Disposition: form-data; name=\"" + name + "\"; filename=\""
-							+ file.getName() + "\"" + "\r\n");
-					FileBuffer.append("Content-Type:" + contentType + "" + "\r\n");
+					FileBuffer.append("Content-Disposition: form-data; name=\"" + name + "\"; filename=\"" + file.getName() + "\"" + "\r\n");
+					FileBuffer.append("Content-Type:" + contentType + "\r\n");
 					FileBuffer.append("\r\n");
 					String FileBufferString = FileBuffer.toString();
 					data.add(FileBufferString.getBytes());

src/main/java/com/egolm/common/MathUtil.java

@@ -42,5 +42,9 @@ public class MathUtil {
 		return (T)k;
 	}
 	
-	
+	public static int random(int min, int max) {
+        Random random = new Random();
+        return random.nextInt(max) % (max - min + 1) + min;
+    }
+
 }

src/main/java/com/egolm/common/StringUtil.java

@@ -17,6 +17,7 @@ import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Random;
 import java.util.Map.Entry;
 import java.util.TreeMap;
 import java.util.UUID;
@@ -53,6 +54,18 @@ import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombi
  */
 public class StringUtil {
 	
+	private static final String str="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+	
+	public static String getRandomString(int length){
+	     Random random = new Random();
+	     StringBuffer sb=new StringBuffer();
+	     for(int i=0;i<length;i++){
+	       int number=random.nextInt(62);
+	       sb.append(str.charAt(number));
+	     }
+	     return sb.toString();
+	 }
+	
 	public static String join(Map<String, Object> map, String sign, String before, String after, String joinKey) {
 		sign = sign == null ? "" : sign;
 		before = before == null ? "" : before;

src/main/java/com/egolm/common/jdbc/JdbcTemplate.java

@@ -543,15 +543,16 @@ public class JdbcTemplate extends org.springframework.jdbc.core.JdbcTemplate {
 		});
 	}
 	
-	public List<Object> exec(final String sql, final Object... args) {
-		showSql(sql, args);
+	public List<Object> exec(final String sql, Object... args) {
+		final Object[] argsArray = this.toArray(args);
+		showSql(sql, argsArray);
 		Map<Integer, OutParameter> out = new HashMap<Integer, OutParameter>();
 		return super.execute(new CallableStatementCreator() {
 			public CallableStatement createCallableStatement(final Connection con) throws SQLException {
 				final CallableStatement cs = con.prepareCall(sql);
-				for(int i = 0; i < args.length; i++) {
+				for(int i = 0; i < argsArray.length; i++) {
 					Integer index = i + 1;
-					Object arg = args[i];
+					Object arg = argsArray[i];
 					if(arg != null && arg instanceof OutParameter) {
 						OutParameter outArg = (OutParameter)arg;
 						outArg.setValue(null);
@@ -697,5 +698,12 @@ public class JdbcTemplate extends org.springframework.jdbc.core.JdbcTemplate {
 		}
 	}
 	
+	private Object[] toArray(Object... args) {
+		while(args != null && args.length == 1 && args[0] != null && args[0] instanceof Object[]) {
+			args = (Object[])args[0];
+		}
+		return args;
+	}
+	
 	
 }

src/main/java/com/egolm/common/jdbc/dialect/Dialect.java

@@ -247,7 +247,7 @@ public interface Dialect {
 			}
 			objs[i] = objArg;
 		}
-		String sql = "delete from " + tableName + StringUtil.join(" and ", " where ", "", args);
+		String sql = "delete from " + tableName + StringUtil.join(" and ", " where ", "", args);	
 		return new Sql(sql, objs);
 	}