Merge branch 'zzpUGC' into 'master'

baseUtil ok See merge request !10

Merge branch 'zzpUGC' into 'master'
baseUtil ok See merge request !10
张宗朋
2 parents 266be006 5a21e77e
Showing 1 changed file with 38 additions and 40 deletions
src/main/java/com/cnlive/mz/live/rest/BaseUtil.java
@@ -26,8 +26,9 @@ import sun.misc.BASE64Encoder;
 public class BaseUtil {
 	private static final String ENCODING = "UTF-8";
-	private static final String AK_SECRET = "7SxVU5lFpqCEQIqxLprQat9BWoyZNKlKfSScTuIk";
-	private static final String AK_ID = "I3TC8a4xboPUMe5xlp22";
+	// AccessKey、SecretKey
+	private static final String SECRET_KEY = "7SxVU5lFpqCEQIqxLprQat9BWoyZNKlKfSScTuIk";
+	private static final String ACCESS_KEY = "I3TC8a4xboPUMe5xlp22";
 	/*
 	 * 计算MD5+BASE64
@@ -60,9 +61,7 @@ public class BaseUtil {
 			Mac mac = Mac.getInstance("HmacSHA1");
 			mac.init(signingKey);
 			byte[] rawHmac = mac.doFinal(data.getBytes());
-			//result = new String(Base64.encodeBase64(rawHmac, false), ENCODING);
-			//result = (new BASE64Encoder()).encode(rawHmac);
-			result = new String(Base64.encodeBase64(rawHmac),ENCODING);
+			result = new String(Base64.encodeBase64(rawHmac), ENCODING);
 		} catch (Exception e) {
 			throw new Error("Failed to generate HMAC : " + e.getMessage());
 		}
@@ -71,54 +70,51 @@ public class BaseUtil {
 	/**
 	 * 获取当前时间戳
+	 * 
 	 * @return
 	 */
-	public static String getTimestamp(){
+	public static String getTimestamp() {
 		DateFormat df = new SimpleDateFormat("yyyyMMdd");
 		Date date = null;
 		try {
-			date = df.parse("20160607");
+			Calendar calendar = Calendar.getInstance();
+			calendar.add(Calendar.DATE, +1);
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHH");
+			String motoday = sdf.format(calendar.getTime());
+			date = df.parse(motoday);
 		} catch (ParseException e) {
 			e.printStackTrace();
 		}
 		Calendar cal = Calendar.getInstance();
 		cal.setTime(date);
 		long timestamp = cal.getTimeInMillis();
-		  Calendar calendar = Calendar.getInstance();    
-          calendar.add(Calendar.DATE,+1);  
-          SimpleDateFormat sdf = new SimpleDateFormat("MMddHHmmss");  
-          String motoday = sdf.format(calendar.getTime());
-		//Timestamp ts = new Timestamp(System.currentTimeMillis());
-		long currentTime=Calendar.getInstance().getTimeInMillis();
-	    // System.out.println(ts+"---..ts..----");
-	    // Date date = new Date();
-	    // SimpleDateFormat sd = new SimpleDateFormat("MMddHHmmss");
-	    // String ss = sd.format(date);
-	     return String.valueOf(timestamp);
-	   //return motoday;
+		return String.valueOf(timestamp).substring(0, 10);
 	}
+
 	/**
-	 * 签名算法:signature 字符串格式，由三部分组成：GET+”\n”+Expire+”\n”+Resource
+	 * 签名算法:signature 字符串格式，由三部分组成：GET+”\n”+Expire+”\n”+Resource 
 	 * 2016 0602171212
+	 * 
 	 * @return
-	 * @throws UnsupportedEncodingException 
+	 * @throws UnsupportedEncodingException
 	 */
 	public static String signature(String streamName) throws UnsupportedEncodingException {
-		
+
 		String method = "GET";
-		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;
-	    Resource = java.net.URLEncoder.encode(Resource,"utf-8"); 
+		String Expire = BaseUtil.getTimestamp();
+		String nonce = getUUid();
+		System.out.println(Expire + "---expire----");
+		String Resource = "app=live&method=add&nonce=" + nonce + "&public=0&vdoid=12345&stream=" + streamName;
+		Resource = java.net.URLEncoder.encode(Resource, "utf-8");
 		String stringToSign = method + "\n" + Expire + "\n" + Resource;
 		// 2.计算 HMAC-SHA1
-		String signature = HMACSha1(stringToSign, AK_SECRET);
-		System.out.println(signature+"------");
-		signature =java.net.URLEncoder.encode(signature,"utf-8");
+		String signature = HMACSha1(stringToSign, SECRET_KEY);
+		System.out.println(signature + "---signature---");
+		signature = java.net.URLEncoder.encode(signature, "utf-8");
 		return signature;
 	}
-	public static String UUid() {
+	public static String getUUid() {
 		String uuid = UUID.randomUUID().toString();
 		uuid = uuid.replaceAll("-", "");
 		return uuid;
@@ -150,7 +146,6 @@ public class BaseUtil {
 		String result = "";
 		try {
 			URL realUrl = new URL(url);
-
 			/*
 			 * http header 参数
 			 */
@@ -286,14 +281,17 @@ public class BaseUtil {
 		String hhhh = MD5Base64(hh);
 		System.out.println(hh);
 		System.out.println("..............");
-		//String str = signature();
-		//System.out.println(str);//L2muBoImPzyvwyzfBtGXEu+wRNE=
-		/*// 发送GET请求
-		 String ak_id1 = "fWUN8KDtJZJGo0ArQ4qo"; //用户ak
-		 String ak_secret1 = "UIWPYVeaV8kq2vWImDkLBvWs/pwmTJVF9MCNHDsC"; // 用户ak_secret
-		 String url1 = "http://cnlive.uplive.ks-cdn.com?signature=L2muBoImPzyvwyzfBtGXEu+wRNE=&accesskey=fWUN8KDtJZJGo0ArQ4qo&expire=1436976000&method=add&app=live&name=498122_57"; 
-		 System.out.println("response body:" +sendGet(url1, ak_id1, ak_secret1));*/
-		//long d =  getTimestamp();
-		//System.out.println(d);
+		// String str = signature();
+		// System.out.println(str);//L2muBoImPzyvwyzfBtGXEu+wRNE=
+		/*
+		 * // 发送GET请求 String ak_id1 = "fWUN8KDtJZJGo0ArQ4qo"; //用户ak String
+		 * ak_secret1 = "UIWPYVeaV8kq2vWImDkLBvWs/pwmTJVF9MCNHDsC"; //
+		 * 用户ak_secret String url1 =
+		 * "http://cnlive.uplive.ks-cdn.com?signature=L2muBoImPzyvwyzfBtGXEu+wRNE=&accesskey=fWUN8KDtJZJGo0ArQ4qo&expire=1436976000&method=add&app=live&name=498122_57";
+		 * System.out.println("response body:" +sendGet(url1, ak_id1,
+		 * ak_secret1));
+		 */
+		// long d = getTimestamp();
+		// System.out.println(d);
 	}
 }