..

张宗朋
2 parents a80e77eb b8a5bf8a
Showing 6 changed files with 57 additions and 48 deletions
.settings/org.eclipse.wst.common.component
src/main/java/com/cnlive/mz/live/action/LiveAction.java
src/main/webapp/pages/common/left.jsp
src/test/java/com/cnlive/test/Test.java
target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.properties
@@ -8,15 +8,6 @@
         <dependent-module archiveName="cnlive_live_model-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/cnlive_live_model/cnlive_live_model">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="cnlive_ks3-1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/cnlive_ks3/cnlive_ks3">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="smart-framework-4.0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-framework/smart-framework">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="smart-plugin-job-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-plugin-job/smart-plugin-job">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <dependent-module archiveName="smart-plugin-dbcp-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-plugin-dbcp/smart-plugin-dbcp">
             <dependency-type>uses</dependency-type>
         </dependent-module>
@@ -123,32 +123,32 @@ public class LiveAction {
 		String video_uuid = params.getString("uuid");
 		if (live_url.isEmpty()) {
 			return null;
-		}else{
-		int index = live_url.lastIndexOf("/");
-		String streamName = live_url.substring(index+1);
-		System.out.println("streamName==="+streamName);
-		String accesskey = BaseUtil.getAccessKey();
-		accesskey = java.net.URLEncoder.encode(accesskey,"utf-8");
-		String add = "add";
-		String addsignature = BaseUtil.signature(add,streamName);
-		String del = "del";
-		String delsignature = BaseUtil.signature(del,streamName);
-		String expire = BaseUtil.getTimestamp();
-		System.out.println(expire+"---expire---");
-		//断流。
-		try {
-			addBlackList(addsignature,accesskey,expire,streamName);
-			delBlackList(delsignature,accesskey,expire,streamName);
-		} catch (UnsupportedEncodingException e) {
-			e.printStackTrace();
+		} else {
+			int index = live_url.lastIndexOf("live");
+			String streamName = live_url.substring(index + 6);
+			System.out.println("streamName===" + streamName);
+			String accesskey = BaseUtil.getAccessKey();
+			accesskey = java.net.URLEncoder.encode(accesskey, "utf-8");
+			String add = "add";
+			String signature = BaseUtil.signature(add, streamName);
+			String del = "del";
+			String delsignature = BaseUtil.signature(del, streamName);
+			String expire = BaseUtil.getTimestamp();
+			System.out.println(expire + "---expire---");
+			// 断流。
+			try {
+				addBlackList(signature, accesskey, expire, streamName);
+				delBlackList(delsignature, accesskey, expire, streamName);
+			} catch (UnsupportedEncodingException e) {
+				e.printStackTrace();
+			}
+			// 直播通知
+			// tLiveService.notify(video_uuid, "-1");
+			boolean flag = tCheckService.closeLive(id);
+			return new Result(flag);
 		}
-		// 直播通知
-	    tLiveService.notify(video_uuid, -2);
-		boolean flag = tCheckService.closeLive(id);
-		return new Result(flag);
-	}
-		
 	}
+
 	// 通过审核
 	@Request.Get("/check/pass/{id}")
 	public Result pass(int id) {
@@ -207,7 +207,7 @@ public class LiveAction {
 		int user_id = CastUtil.castInt(DataContext.getRequest().getSession().getAttribute(LiveUtils.SESSION_KEY_ID));
 		Pager<TLive> tLive = tLiveService.getAllTLivePager(page_number, Constants.PAGE_SIZE);
 		return new View("live/all_live_management.jsp").data("tLive", tLive);
-	} 
+	}
 	@Request.Post("/live/search/{page_number}")
 	public View search(int page_number, Params params) {
@@ -220,4 +220,10 @@ public class LiveAction {
 		System.out.println(tLive);
 		return new View("live/all_live_management.jsp").data("tLive", tLive);
 	}
+
+	@Request.Get("/live/searchg/{page_number}")
+	public Result searchq(int page_number) {
+
+		return new Result(true);
+	}
 }
 \ No newline at end of file
@@ -18,7 +18,7 @@
 			</div>
 		</div>
 		<ul class="sidebar-menu">
-			 <c:if test="${sessionScope.roleId=='0'}"> 
+			<c:if test="${sessionScope.roleId=='0'}">
 			<li class="header">导航栏</li>
 				<li>
 					<a href="${BASE}/switch"><i class="fa fa-circle-o text-blue"></i>全局切换</a>
@@ -57,7 +57,7 @@
 					<a href="${BASE}/channel/list/1"><i class="fa fa-circle-o text-green"></i>频道管理</a>
 			    </li>
 			</c:if>
-				<c:if test="true">
+				<c:if test="${sessionScope.roleId=='2'}">
 				    <li class="header">UGC直播审查</li>
 				    <li>
 						<a href="${BASE}/user/list/1"><i class="fa fa-circle-o text-yellow"></i>主播管理</a>
@@ -13,13 +13,18 @@ import com.cnlive.mz.commons.net.HttpReq;
 public class Test {
 	public static void main(String[] args) {
-		String mediaId="123";
-		String title="hha";
-		String sid="234";
-		//String url = "https://mobile.cnlive.com/CnliveMobile/hd/applyChatRoomId.action?mediaId="+mediaId+"&title="+title+"&sid=?"+sid;
-		String url = "https://mobile.cnlive.com/CnliveMobile/hd/applyChatRoomId.action";
-	    //String chat_room_id = HttpReq.getRequestWidthResult(url);
-	    System.out.println(sendGet(url));
+//		String mediaId="123";
+//		String title="hha";
+//		String sid="234";
+//		//String url = "https://mobile.cnlive.com/CnliveMobile/hd/applyChatRoomId.action?mediaId="+mediaId+"&title="+title+"&sid=?"+sid;
+//		String url = "https://mobile.cnlive.com/CnliveMobile/hd/applyChatRoomId.action";
+//	    //String chat_room_id = HttpReq.getRequestWidthResult(url);
+//	    System.out.println(sendGet(url));
+		String live = "rtmp://cnlive01.rtmplive.ks-cdn.com/live/498122_a9fdb367c6054edc9d2035dc237d28aa";
+		int index = live.lastIndexOf("/");
+		System.out.println(index);
+		String live_url = live.substring(index+1);
+		System.out.println(live_url);
 	}
 	public static String toGMTString(Date date) {
 Manifest-Version: 1.0
-Build-Jdk: 1.7.0_79
-Built-By: adm
+Build-Jdk: 1.7.0_13
+Built-By: Administrator
 Created-By: Maven Integration for Eclipse
 #Generated by Maven Integration for Eclipse
-#Tue Jun 21 09:00:02 CST 2016
+#Tue Jun 21 13:17:57 CST 2016
+version=0.0.1-SNAPSHOT
+groupId=com.cnlive.mz.live.web
+m2e.projectName=cnlive_live_web
+m2e.projectLocation=D\:\\1_CNLIVE_JAVA_CODE\\cnlive_live_web
+artifactId=cnlive_live_web
+#Generated by Maven Integration for Eclipse
+#Mon Jun 20 09:31:18 CST 2016
+#Mon Jun 20 10:10:00 CST 2016
+#Fri Jun 17 09:20:43 CST 2016
 version=0.0.1-SNAPSHOT
 groupId=com.cnlive.mz.live.web
 m2e.projectName=cnlive_live_web
 m2e.projectLocation=C\:\\Users\\Administrator\\git\\cnlive_live_web
 artifactId=cnlive_live_web
-
-