base

张宗朋
1 parent b1a49d9d
Showing 1 changed file with 11 additions and 18 deletions
src/main/java/com/cnlive/mz/live/rest/BaseUtil.java
@@ -28,14 +28,11 @@ import sun.misc.BASE64Encoder;
 public class BaseUtil {
 	private static final String ENCODING = "UTF-8";
-<<<<<<< HEAD
+
 	// AccessKey、SecretKey
 	private static final String SECRET_KEY = "iqljE4WxQaSMeSd1QP+PPYSpvtK0uWyH0/r6tgi7";
 	private static final String ACCESS_KEY = "I3TC8a4xboN9kSJnUIQh";
-=======
-	private static final String AK_SECRET = "7SxVU5lFpqCEQIqxLprQat9BWoyZNKlKfSScTuIk";
-	private static final String AK_ID = "I3TC8a4xboPUMe5xlp22";
->>>>>>> 180640a4e451ae2b82ae745eb6b1d1651dc5f17f
+
 	/*
 	 * 计算MD5+BASE64
@@ -92,11 +89,8 @@ public class BaseUtil {
 		Calendar cal = Calendar.getInstance();
 		cal.setTime(date);
 		long timestamp = cal.getTimeInMillis();
-<<<<<<< HEAD
 		System.out.println("------timestamp-----"+timestamp);
 		//return String.valueOf(timestamp).substring(0, 10);
-		return "1483200000";
-=======
 		  Calendar calendar = Calendar.getInstance();    
           calendar.add(Calendar.DATE,+1);  
           SimpleDateFormat sdf = new SimpleDateFormat("MMddHHmmss");  
@@ -109,7 +103,7 @@ public class BaseUtil {
 	    // String ss = sd.format(date);
 	     return String.valueOf(timestamp);
 	   //return motoday;
->>>>>>> 180640a4e451ae2b82ae745eb6b1d1651dc5f17f
+
 	}
 	/**
 	 * 签名算法:signature 字符串格式，由三部分组成：GET+”\n”+Expire+”\n”+Resource
@@ -120,7 +114,7 @@ public class BaseUtil {
 	public static String signature(String streamName) throws UnsupportedEncodingException {
 		String method = "GET";
-<<<<<<< HEAD
+
 		String expire = BaseUtil.getTimestamp();
 		String app = "live";
 		String methodadd = "add";
@@ -137,7 +131,7 @@ public class BaseUtil {
 		String signature = HMACSha1(stringToSign, SECRET_KEY);
 		System.out.println( "---signature---"+signature );
 		signature = java.net.URLEncoder.encode(signature, "utf-8");
-=======
+
 		String Expire = String.valueOf(BaseUtil.getTimestamp()).substring(0, 10);
 		  System.out.println(Expire+"---expire----");
 		String Resource = "app=live&method=add&nonce=cnlive&public=0&vdoid=12345&stream="+streamName;
@@ -147,12 +141,11 @@ public class BaseUtil {
 		String signature = HMACSha1(stringToSign, AK_SECRET);
 		System.out.println(signature+"------");
 		signature =java.net.URLEncoder.encode(signature,"utf-8");
->>>>>>> 180640a4e451ae2b82ae745eb6b1d1651dc5f17f
+
 		return signature;
 	}
 	public static String signature(String methodNname,String streamName) throws UnsupportedEncodingException {
-<<<<<<< HEAD
 		String method = "GET";
 		String expire = BaseUtil.getTimestamp();
 		String app = "live";
@@ -174,9 +167,9 @@ public class BaseUtil {
 	}
 	public static String getUUid() {
-=======
+
 	public static String UUid() {
->>>>>>> 180640a4e451ae2b82ae745eb6b1d1651dc5f17f
+
 		String uuid = UUID.randomUUID().toString();
 		uuid = uuid.replaceAll("-", "");
 		return uuid;
@@ -347,7 +340,7 @@ public class BaseUtil {
 		String hhhh = MD5Base64(hh);
 		System.out.println(hh);
 		System.out.println("..............");
-<<<<<<< HEAD
+
 		// String str = signature();
 		// System.out.println(str);//L2muBoImPzyvwyzfBtGXEu+wRNE=
@@ -357,7 +350,7 @@ public class BaseUtil {
 		// long d = getTimestamp();
 		// System.out.println(d);
-=======
+
 		//String str = signature();
 		//System.out.println(str);//L2muBoImPzyvwyzfBtGXEu+wRNE=
 		/*// 发送GET请求
@@ -367,6 +360,6 @@ public class BaseUtil {
 		 System.out.println("response body:" +sendGet(url1, ak_id1, ak_secret1));*/
 		//long d =  getTimestamp();
 		//System.out.println(d);
->>>>>>> 180640a4e451ae2b82ae745eb6b1d1651dc5f17f
+
 	}
 }