From 09fe1c7188225bcd768ec5c02ca28312ce3e5fa9 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Fri, 14 Dec 2018 00:33:22 +0600
Subject: 修改proxy帮助文档，配置操作日志，增加音视频样例剪切工具下载
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/home.jsp               |  12 ++++++++++--
 .../webapp/WEB-INF/views/sys/cfgOperationLogList.jsp |   5 +++++
 src/main/webapp/online-help/proxy/cache_policy.html  |   3 +++
 .../webapp/online-help/proxy/control_policy.html     |   3 +++
 .../webapp/online-help/proxy/intercept_policy.html   |   5 +++--
 .../online-help/proxy/proxy_policy_object.html       |   5 ++++-
 src/main/webapp/static/PotPlayerSetup64.exe          | Bin 0 -> 27925608 bytes
 7 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 src/main/webapp/static/PotPlayerSetup64.exe

(limited to 'src')

diff --git a/src/main/webapp/WEB-INF/views/home.jsp b/src/main/webapp/WEB-INF/views/home.jsp
index 6e44d0a..43bea69 100644
--- a/src/main/webapp/WEB-INF/views/home.jsp
+++ b/src/main/webapp/WEB-INF/views/home.jsp
@@ -353,15 +353,23 @@ background:#3d3d3d;
 							</ul>
 						</li>
 					</c:if>
+					<li class="dropdown  dropdown-user nav">
+                         <a href="${pageContext.request.contextPath}/static/PotPlayerSetup64.exe" id="helpHref"  target="_self" >
+                         	<i class="fa fa-cloud-download"></i>
+                         	<span class="username username-hide-on-mobile" id="help">  
+                         		<spring:message code="cut sample tool" />
+                         	</span>
+                         </a>
+                     </li>
 					<!-- 在线帮助 -->
-					<%-- <li class="dropdown  dropdown-user nav">
+					<li class="dropdown  dropdown-user nav">
                          <a href="${ctx}/sys/help" id="helpHref"  target="mainFrame" >
                          	<i class="icon-question  font-sharp"></i>
                          	<span class="username username-hide-on-mobile" id="help">  
                          		<spring:message code="help" />
                          	</span>
                          </a>
-                     </li> --%>
+                     </li>
                      <!-- 系统语言 -->
 				     <li class="dropdown  dropdown-user" id="language">
 				     	
diff --git a/src/main/webapp/WEB-INF/views/sys/cfgOperationLogList.jsp b/src/main/webapp/WEB-INF/views/sys/cfgOperationLogList.jsp
index 40d4828..536ebac 100644
--- a/src/main/webapp/WEB-INF/views/sys/cfgOperationLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/cfgOperationLogList.jsp
@@ -96,6 +96,7 @@
 										<th><spring:message code="log_submission" /></th>
 										<th><spring:message code="log_ip" /></th>
 										<th><spring:message code="log_user" /></th>
+										<th><spring:message code="config content" /></th>
 										<th><spring:message code="operate_time" /></th>
 									</tr>
 								</thead>
@@ -143,6 +144,10 @@
 											</td>
 											<td>${log.remoteAddr}</td>
 											<td>${log.createBy}</td>
+											<td>
+											<a href="javascript:;" data-original-title="${log.params}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+										 ${fns:abbr(log.params,100)}</a></td>
 											<td><fmt:formatDate value="${log.createDate}"
 													type="both" /></td>
 										</tr>
diff --git a/src/main/webapp/online-help/proxy/cache_policy.html b/src/main/webapp/online-help/proxy/cache_policy.html
index 2051ca1..20b6fe5 100644
--- a/src/main/webapp/online-help/proxy/cache_policy.html
+++ b/src/main/webapp/online-help/proxy/cache_policy.html
@@ -24,6 +24,9 @@ License: You must have a valid license purchased only from themeforest(the above
 <meta http-equiv="Content-type" content="text/html; charset=utf-8">
 <meta content="" name="description"/>
 <meta content="" name="author"/>
+<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
+<meta http-equiv="Pragma" content="no-cache" />
+<meta http-equiv="Expires" content="0" />
 <!-- BEGIN GLOBAL MANDATORY STYLES -->
 <link href="http://fonts.googleapis.com/css?family=Open+Sans:400,300,600,700&subset=all" rel="stylesheet" type="text/css"/>
 <link href="../../static/global/plugins/font-awesome/css/font-awesome.css" rel="stylesheet" type="text/css" />
diff --git a/src/main/webapp/online-help/proxy/control_policy.html b/src/main/webapp/online-help/proxy/control_policy.html
index 01b0142..10162a9 100644
--- a/src/main/webapp/online-help/proxy/control_policy.html
+++ b/src/main/webapp/online-help/proxy/control_policy.html
@@ -24,6 +24,9 @@ License: You must have a valid license purchased only from themeforest(the above
 <meta http-equiv="Content-type" content="text/html; charset=utf-8">
 <meta content="" name="description"/>
 <meta content="" name="author"/>
+<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
+<meta http-equiv="Pragma" content="no-cache" />
+<meta http-equiv="Expires" content="0" />
 <!-- BEGIN GLOBAL MANDATORY STYLES -->
 <link href="http://fonts.googleapis.com/css?family=Open+Sans:400,300,600,700&subset=all" rel="stylesheet" type="text/css"/>
 <link href="../../static/global/plugins/font-awesome/css/font-awesome.css" rel="stylesheet" type="text/css" />
diff --git a/src/main/webapp/online-help/proxy/intercept_policy.html b/src/main/webapp/online-help/proxy/intercept_policy.html
index 2c1d913..c561be6 100644
--- a/src/main/webapp/online-help/proxy/intercept_policy.html
+++ b/src/main/webapp/online-help/proxy/intercept_policy.html
@@ -19,11 +19,12 @@ License: You must have a valid license purchased only from themeforest(the above
 <head>
 <meta charset="utf-8"/>
 <title>online help</title>
+<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
+<meta http-equiv="Pragma" content="no-cache" />
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta content="width=device-width, initial-scale=1.0" name="viewport"/>
 <meta http-equiv="Content-type" content="text/html; charset=utf-8">
-<meta content="" name="description"/>
-<meta content="" name="author"/>
+
 <!-- BEGIN GLOBAL MANDATORY STYLES -->
 <link href="http://fonts.googleapis.com/css?family=Open+Sans:400,300,600,700&subset=all" rel="stylesheet" type="text/css"/>
 <link href="../../static/global/plugins/font-awesome/css/font-awesome.css" rel="stylesheet" type="text/css" />
diff --git a/src/main/webapp/online-help/proxy/proxy_policy_object.html b/src/main/webapp/online-help/proxy/proxy_policy_object.html
index aa1ae63..d9f73b2 100644
--- a/src/main/webapp/online-help/proxy/proxy_policy_object.html
+++ b/src/main/webapp/online-help/proxy/proxy_policy_object.html
@@ -24,6 +24,9 @@ License: You must have a valid license purchased only from themeforest(the above
 <meta http-equiv="Content-type" content="text/html; charset=utf-8">
 <meta content="" name="description"/>
 <meta content="" name="author"/>
+<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
+<meta http-equiv="Pragma" content="no-cache" />
+<meta http-equiv="Expires" content="0" />
 <!-- BEGIN GLOBAL MANDATORY STYLES -->
 <link href="http://fonts.googleapis.com/css?family=Open+Sans:400,300,600,700&subset=all" rel="stylesheet" type="text/css"/>
 <link href="../../static/global/plugins/font-awesome/css/font-awesome.css" rel="stylesheet" type="text/css" />
@@ -60,7 +63,7 @@ License: You must have a valid license purchased only from themeforest(the above
 						<div class="panel-heading">
 							<h4 class="panel-title">
 							<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion1" href="#accordion1_1">
-							1.功能简介</a>
+							1.Function Introduction</a>
 							</h4>
 						</div>
 						<div id="accordion1_1" class="panel-collapse collapse in">
diff --git a/src/main/webapp/static/PotPlayerSetup64.exe b/src/main/webapp/static/PotPlayerSetup64.exe
new file mode 100644
index 0000000..c604170
Binary files /dev/null and b/src/main/webapp/static/PotPlayerSetup64.exe differ
-- 
cgit v1.2.3