diff --git a/src/main/java/com/nis/util/JsonDateDeserializer.java b/src/main/java/com/nis/util/JsonDateDeserializer.java
new file mode 100644
index 0000000..fb9bbf6
--- /dev/null
+++ b/src/main/java/com/nis/util/JsonDateDeserializer.java
@@ -0,0 +1,42 @@
+/**
+ * 
+ */
+package com.nis.util;
+
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+
+/**
+ * @ClassName:JsonDateDeserializer
+ * @Description:TODO(这里用一句话描述这个类的作用)
+ * @author (zdx)
+ * @date 2018年6月12日 上午11:06:03
+ * @version V1.0
+ */
+public class JsonDateDeserializer extends JsonDeserializer<Date> {
+
+	private static final SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+	/* (non-Javadoc)
+	 * @see com.fasterxml.jackson.databind.JsonDeserializer#deserialize(com.fasterxml.jackson.core.JsonParser, com.fasterxml.jackson.databind.DeserializationContext)
+	 */
+	@Override
+	public Date deserialize(JsonParser p, DeserializationContext ctxt)
+			throws IOException, JsonProcessingException {
+		// TODO Auto-generated method stub
+		Date date = null;
+		try {
+			date = sdf.parse(p.getText());
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
+		return date;
+	}
+
+}
diff --git a/src/test/java/com/nis/test/RestTest.java b/src/test/java/com/nis/test/RestTest.java
index 4dbc209..a47d153 100644
--- a/src/test/java/com/nis/test/RestTest.java
+++ b/src/test/java/com/nis/test/RestTest.java
@@ -11,6 +11,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import net.sf.json.JSONObject;
 
@@ -28,6 +30,7 @@ import org.apache.http.util.EntityUtils;
 import org.junit.Test;
 
 import com.nis.restful.RestConstants;
+import com.nis.util.FileUtils;
 import com.nis.util.JsonMapper;
 
 /**
@@ -43,14 +46,14 @@ public class RestTest {
 	public void testFileUpload() {
 		CloseableHttpResponse response = null;
 		try {
-			File file = new File("F:/git.rar");
+			File file = new File("C:/Users/dell/Desktop/Cal.java");
 
 //			String md5 = DigestUtils.md5Hex(file);
 			MultipartEntityBuilder builder = MultipartEntityBuilder.create();
 			builder.addBinaryBody("file", file);
 
 			HttpPost request = new HttpPost(
-					"http://10.0.6.120:8080/galaxy/service/cfg/v1/fileUploadSources");
+					"http://10.0.6.201:8090/galaxy/service/cfg/v1/fileDigestSources");
 			//galaxy/service/cfg/v1/fileUploadSources
 			request.getParams().setParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, 600000);
 			request.getParams().setParameter(CoreConnectionPNames.SO_TIMEOUT, 600000);
@@ -61,7 +64,7 @@ public class RestTest {
 			jsonObject.put("fileName", "1.png");
 			//jsonObject.put("checksum", "d99f9aa4f3748fa48aa6e350c628c67f");
 
-			jsonObject.put("checksum", "faa364a36cddcbbfd65c0224f35fcfd0");
+			jsonObject.put("checksum", "fa7f24ab0f449f5d805bdcf51d476074");
 			request.setHeader("File-Desc", jsonObject.toString());
 			HttpEntity entity = builder.build();
 			request.setEntity(entity);
@@ -69,7 +72,6 @@ public class RestTest {
 			
 			response = httpClient.execute(request);
 			System.out.println(EntityUtils.toString(response.getEntity()));
-			System.out.println("aa");	
 		} catch (ClientProtocolException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -229,5 +231,10 @@ public class RestTest {
 			return sqlDate;
 
 		}
-
+		@Test
+		public void test11() {
+			Pattern pattern = Pattern.compile("[0|6|17]");
+			Matcher matcher = pattern.matcher("0");
+			System.out.println(matcher.matches());
+		}
 }
diff --git a/src/test/java/com/nis/test/TestCal.java b/src/test/java/com/nis/test/TestCal.java
new file mode 100644
index 0000000..275b470
--- /dev/null
+++ b/src/test/java/com/nis/test/TestCal.java
@@ -0,0 +1,116 @@
+/**
+ * 
+ */
+package com.nis.test;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.TimeZone;
+
+/**
+ * @ClassName:TestCal
+ * @Description:TODO(这里用一句话描述这个类的作用)
+ * @author (zdx)
+ * @date 2018年6月12日 上午9:52:57
+ * @version V1.0
+ */
+public class TestCal {
+
+	/**
+	 * @Description:
+	 * @author (zdx)
+	 * @date 2018年6月12日 上午9:52:57
+	 * @param args
+	 */
+	public static void main(String[] args) {
+		// TODO Auto-generated method stub
+
+		try {
+			SimpleDateFormat df1 = new SimpleDateFormat(
+					"yyyy-MM-dd HH:mm:ss");
+			System.out.println("defaultTimeZone:------------------------------:"+df1.getTimeZone());
+		//	Date t = new Date();
+			Date t = df1.parse("2018-05-23 13:48:11");
+			Long time = t.getTime();
+			System.out.println(df1.format(t));
+			System.out.println(time);
+			Long time2 = (time/1000)*1000;
+			System.out.println(time2+"      "+df1.format(time2));
+			
+			System.out.println(df1.getTimeZone().getID()+"----------------"+df1.format(t));
+
+			
+			df1.setTimeZone(TimeZone.getTimeZone("UTC"));
+			System.out.println("setTimeZone:--------------:"+df1.getTimeZone());
+			System.out.println(df1.format(t));
+			
+			
+			System.out.println("-------------------------------------------------------------------");
+			
+			SimpleDateFormat df2 = new SimpleDateFormat(
+					"yyyy-MM-dd'T'HH:mm:ss.SSS");
+			Date t2 = new Date();
+			Calendar calendar = Calendar.getInstance();
+			calendar.setTimeInMillis(time);
+			System.out.println(df2.getTimeZone().getID()+"----------------"+df2.format(calendar.getTime()));
+
+
+			df2.setTimeZone(TimeZone.getTimeZone("UTC"));
+			System.out.println(df2.getTimeZone().getID()+"----------------"+df2.format(calendar.getTime()));
+			
+			df2.setTimeZone(TimeZone.getTimeZone("UTC-8"));			
+			System.out.println(df2.getTimeZone().getID()+"----------------"+df2.format(calendar.getTime()));
+			
+			df2.setTimeZone(TimeZone.getTimeZone("UTC+8"));			
+			System.out.println(df2.getTimeZone().getID()+"----------------"+df2.format(calendar.getTime())); 
+			
+			df2.setTimeZone(TimeZone.getTimeZone("GMT+8"));			
+			System.out.println(df2.getTimeZone().getID()+"----------------"+df2.format(calendar.getTime()));
+			
+			df2.setTimeZone(TimeZone.getTimeZone("GMT"));
+			System.out.println(df2.getTimeZone().getID()+"----------------"+df2.format(calendar.getTime()));
+			
+			
+			System.out.println("-----------------------------------------");
+			
+			df2.setTimeZone(TimeZone.getTimeZone("UTC"));
+			Date date = df2.parse("2018-05-23T13:48:11.077");
+			
+			System.out.println("2018-05-23 13:48:11"+"def:"+time+"      "+date.getTime()+"        差："+(time-date.getTime())/(60*60*1000));
+			
+			System.out.println("=====--------------------------------------------------");
+			
+			Calendar calendar2 = Calendar.getInstance();
+			calendar2.setTimeZone(TimeZone.getTimeZone("GMT"));
+			calendar2.setTimeInMillis(1527229532956l);
+			df1.setTimeZone(TimeZone.getTimeZone("GMT"));
+			System.out.println(calendar2.getTime()+df1.getTimeZone().toString()+"----"+df1.format(calendar2.getTime()));
+			
+			Calendar calendar3 = Calendar.getInstance();
+			calendar3.setTimeZone(TimeZone.getTimeZone("GMT+8"));
+			df1.setTimeZone(TimeZone.getTimeZone("GMT+8"));
+			calendar3.setTimeInMillis(1527229532956l);
+			System.out.println(calendar3.getTime()+df1.getTimeZone().toString()+"----"+df1.format(calendar3.getTime()));
+			
+			
+			Date date2 = new Date();
+			System.out.println("Date:"+date2);
+			df1.setTimeZone(TimeZone.getTimeZone("UTC+0800"));			
+			System.out.println("UTC+0800"+df1.getTimeZone().toString()+"   "+df1.format(date2));
+			
+			df1.setTimeZone(TimeZone.getTimeZone("GMT"));			
+			System.out.println("GMT"+df1.getTimeZone().toString()+"   "+df1.format(date2));
+			 
+			df1.setTimeZone(TimeZone.getTimeZone("GMT+8"));			
+			System.out.println("GMT+8"+df1.getTimeZone().toString()+"   "+df1.format(date2));
+			
+			
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+	}
+
+}