刘基城 / cnlive_live_web · Commits

Commit 41b3c98962617cee09c7d7d392abf92f6467592b

Authored by 张宗朋
2 parents ddfaec28 08199d34

Merge branch 'zzpUGC' into 'master' 

checkaction



See merge request !11
Inline Side-by-side
Showing 1 changed file with 3 additions and 4 deletions
src/main/java/com/cnlive/mz/live/action/CheckAction.java
  View file @41b3c98
@@ -52,9 +52,9 @@ public class CheckAction { @@ -52,9 +52,9 @@ public class CheckAction {
52 String streamName = userId+"_"+id; 52 String streamName = userId+"_"+id;
53 //String streamName = "498122_57"; 53 //String streamName = "498122_57";
54 String accesskey = "I3TC8a4xboPUMe5xlp22"; 54 String accesskey = "I3TC8a4xboPUMe5xlp22";
55 - accesskey = java.net.URLEncoder.encode(accesskey,"utf-8"); 55 + //accesskey = java.net.URLEncoder.encode(accesskey,"utf-8");
56 String signature = BaseUtil.signature(streamName); 56 String signature = BaseUtil.signature(streamName);
57 - String expire = String.valueOf(BaseUtil.getTimestamp()).substring(0, 10); 57 + String expire = BaseUtil.getTimestamp();
58 System.out.println(expire+"---expire---"); 58 System.out.println(expire+"---expire---");
59 //添加到黑名单。。 59 //添加到黑名单。。
60 try { 60 try {
@@ -79,8 +79,7 @@ public class CheckAction { @@ -79,8 +79,7 @@ public class CheckAction {
79 System.out.println(url); 79 System.out.println(url);
80 String jsonArrStr = HttpReq.getRequestWidthResult(url); 80 String jsonArrStr = HttpReq.getRequestWidthResult(url);
81 int status = HttpReq.getRequest(url); 81 int status = HttpReq.getRequest(url);
82 - System.out.println("............"+status);  
83 - System.out.println("............"+jsonArrStr); 82 + System.out.println(status+"......and......"+jsonArrStr);
84 /*Map map = JsonUtil.getMapFromJsonObjStr(jsonArrStr); 83 /*Map map = JsonUtil.getMapFromJsonObjStr(jsonArrStr);
85 String chatRoomid = (String) map.get("Content-Length");*/ 84 String chatRoomid = (String) map.get("Content-Length");*/
86 return jsonArrStr; 85 return jsonArrStr;