刘基城 / cnlive_live_web · Commits

Commit 5688c57ea0768487808b6fd0f75bf15f5ca58c62

Authored by 刘基城
2 parents 4f658cc3 ac47d98a

Merge branch 'v532' of 

http://bj.gitlab.cnlive.com/liujicheng/cnlive_live_web.git into v532

Conflicts:
	src/main/webapp/pages/live/video_management.jsp
	src/main/webapp/pages/live/video_view.jsp
	target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.properties
Inline Side-by-side
Showing 6 changed files with 30 additions and 28 deletions
.settings/org.eclipse.wst.common.component
  View file @5688c57
@@ -11,6 +11,9 @@ @@ -11,6 +11,9 @@
11 <dependent-module archiveName="smart-framework-4.0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-framework/smart-framework"> 11 <dependent-module archiveName="smart-framework-4.0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-framework/smart-framework">
12 <dependency-type>uses</dependency-type> 12 <dependency-type>uses</dependency-type>
13 </dependent-module> 13 </dependent-module>
  14 + <dependent-module archiveName="smart-plugin-job-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-plugin-job/smart-plugin-job">
  15 + <dependency-type>uses</dependency-type>
  16 + </dependent-module>
14 <dependent-module archiveName="smart-plugin-dbcp-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-plugin-dbcp/smart-plugin-dbcp"> 17 <dependent-module archiveName="smart-plugin-dbcp-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-plugin-dbcp/smart-plugin-dbcp">
15 <dependency-type>uses</dependency-type> 18 <dependency-type>uses</dependency-type>
16 </dependent-module> 19 </dependent-module>
src/main/java/com/cnlive/mz/live/action/HttpPostArgumentTest2.java
  View file @5688c57
@@ -117,7 +117,7 @@ public class HttpPostArgumentTest2 { @@ -117,7 +117,7 @@ public class HttpPostArgumentTest2 {
117 public static void main(String[] args) { 117 public static void main(String[] args) {
118 // new HttpPostArgumentTest2().delete(); 118 // new HttpPostArgumentTest2().delete();
119 //HttpPostArgumentTest2.all(); 119 //HttpPostArgumentTest2.all();
120 - HttpPostArgumentTest2.supload(); 120 + HttpPostArgumentTest2.redirect();
121 // HttpReq.postRequestWidthResult("http://120.132.76.51:9696/cnlive_encoding_job/task", 121 // HttpReq.postRequestWidthResult("http://120.132.76.51:9696/cnlive_encoding_job/task",
122 // "json", "jsonjsonjsonjson");r 122 // "json", "jsonjsonjsonjson");r
123 } 123 }
src/main/webapp/WEB-INF/web.xml
  View file @5688c57
@@ -3,5 +3,13 @@ @@ -3,5 +3,13 @@
3 xmlns="http://java.sun.com/xml/ns/javaee" 3 xmlns="http://java.sun.com/xml/ns/javaee"
4 xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" 4 xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
5 version="3.0"> 5 version="3.0">
6 - 6 + <servlet>
  7 + <servlet-name>init_job</servlet-name>
  8 + <servlet-class>com.cnlive.mz.live.action.Init</servlet-class>
  9 + <init-param>
  10 + <param-name>shutdown-on-unload</param-name>
  11 + <param-value>true</param-value>
  12 + </init-param>
  13 + <load-on-startup>2</load-on-startup>
  14 + </servlet>
7 </web-app> 15 </web-app>
8 \ No newline at end of file 16 \ No newline at end of file
src/main/webapp/pages/live/video_management.jsp
  View file @5688c57
@@ -32,32 +32,13 @@ @@ -32,32 +32,13 @@
32 <div class="row"> 32 <div class="row">
33 <div class="col-xs-12"> 33 <div class="col-xs-12">
34 <div class="box box-warning"> 34 <div class="box box-warning">
35 - <div class="box-header with-border">  
36 - <h3 class="box-title"></h3>  
37 - <div class="box-tools">  
38 - <div class="input-group">  
39 - <form action="../search/1" method="post">  
40 - <div class="input-group">  
41 - <input type="text" name="search_text" id="search_text"  
42 - class="form-control input-sm" style="width: 150px;"  
43 - placeholder="Search" />  
44 - <button id="t_activity_search_btn" type="submit"  
45 - class="btn btn-sm btn-default">  
46 - <i class="fa fa-search"></i>搜索  
47 - </button>  
48 - </div>  
49 - </form>  
50 - </div>  
51 - </div>  
52 - </div>  
53 - <!-- /.box-header --> 35 + <div class="box-header with-border"></div>
54 <div class="box-body"> 36 <div class="box-body">
55 <table class="table table-bordered"> 37 <table class="table table-bordered">
56 <tr> 38 <tr>
57 <th>名称</th> 39 <th>名称</th>
58 <th>状态</th> 40 <th>状态</th>
59 - <th>详情</th>  
60 - <th>播放</th> 41 + <th>修改</th>
61 <th>删除</th> 42 <th>删除</th>
62 </tr> 43 </tr>
63 <c:forEach var="item" items="${videos.recordList}" 44 <c:forEach var="item" items="${videos.recordList}"
@@ -65,7 +46,17 @@ @@ -65,7 +46,17 @@
65 <tr> 46 <tr>
66 <td><a href="${BASE}/video/view/${item.id}">${item.title}</a> 47 <td><a href="${BASE}/video/view/${item.id}">${item.title}</a>
67 </td> 48 </td>
68 - <td></td> 49 + <td><c:if test="${item.state==0}">
  50 + <span class="badge bg-green">未开始</span>
  51 + </c:if> <c:if test="${item.state==1}">
  52 + <span class="badge bg-red">直播中</span>
  53 + </c:if> <c:if test="${item.state==2}">
  54 + <span class="badge">直播结束</span>
  55 + </c:if> <c:if test="${item.state==3}">
  56 + <span class="badge">回放同步中</span>
  57 + </c:if> <c:if test="${item.state==4}">
  58 + <span class="badge">同步完成</span>
  59 + </c:if></td>
69 <td> 60 <td>
70 <button class="btn btn-default btn-sm" 61 <button class="btn btn-default btn-sm"
71 onclick="t_live_edit(${item.id});"> 62 onclick="t_live_edit(${item.id});">
src/main/webapp/pages/live/video_view.jsp
  View file @5688c57
@@ -62,13 +62,13 @@ @@ -62,13 +62,13 @@
62 </div> 62 </div>
63 </div> 63 </div>
64 </div> 64 </div>
  65 + <%@ include file="/pages/common/bottom.jsp"%>
65 </div> 66 </div>
  67 + <%@ include file="/pages/common/js.jsp"%>
  68 + <script src="${BASE}/static/assets/cnlive/js/player_6.js"></script>
66 </div> 69 </div>
67 </section> 70 </section>
68 </div> 71 </div>
69 - <%@ include file="/pages/common/bottom.jsp"%>  
70 </div> 72 </div>
71 - <%@ include file="/pages/common/js.jsp"%>  
72 - <script src="${BASE}/static/assets/cnlive/js/player_6.js"></script>  
73 </body> 73 </body>
74 </html> 74 </html>
target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.properties
  View file @5688c57
1 #Generated by Maven Integration for Eclipse 1 #Generated by Maven Integration for Eclipse
2 -#Wed Jun 08 15:30:24 CST 2016 2 +#Sun Jun 12 09:49:28 CST 2016
3 version=0.0.1-SNAPSHOT 3 version=0.0.1-SNAPSHOT
4 groupId=com.cnlive.mz.live.web 4 groupId=com.cnlive.mz.live.web
5 m2e.projectName=cnlive_live_web 5 m2e.projectName=cnlive_live_web