gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_no_common_group' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop_no_common_group

Browse Source
This commit is contained in:
shangguanyanfei
2019-06-03 10:06:35 +08:00
parent b7e2a89f09 e9a91921d4
commit 9441ed77a1
3 changed files with 41 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/resources/sql/20190521/intercept_policy.sql
View File

@@ -1,22 +1,22 @@
update function_service_dict set action=2,action_code='forward' where service_id=512 and is_valid=1;
#fail method字典
INSERT INTO `sys_data_dictionary_name`(module_name`, `mark`, `remark`, `revision`, `create_time`, `modify_time`, `status`) VALUES ('fail_method', 'FAIL_METHOD', '用于代理拦截策略', NULL, '2019-05-09 11:01:16', '2019-05-09 11:01:21', 1);
INSERT INTO `sys_data_dictionary_name`(`module_name`, `mark`, `remark`, `revision`, `create_time`, `modify_time`, `status`) VALUES ('fail_method', 'FAIL_METHOD', '用于代理拦截策略', NULL, '2019-05-09 11:01:16', '2019-05-09 11:01:21', 1);
#INSERT INTO `sys_data_dictionary_item`(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES (4096, 'pass-through', 'Pass-Through', '默认', 1, 1, 1, 154);
INSERT INTO `sys_data_dictionary_item`(`item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) select 'pass-through', 'Pass-Through', '默认', 1, 1, 1, id from sys_data_dictionary_name where mark='FAIL_METHOD';
#INSERT INTO `sys_data_dictionary_item`(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES (4097, 'fail-close', 'Fail-Close', NULL, 2, 1, 1, 154);
INSERT INTO `sys_data_dictionary_item`(`item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) select ''fail-close'', ''Fail-Close'', NULL, 2, 1, 1, id from sys_data_dictionary_name where mark=''FAIL_METHOD'';
INSERT INTO `sys_data_dictionary_item`(`item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) select 'fail-close', 'Fail-Close', NULL, 2, 1, 1, id from sys_data_dictionary_name where mark='FAIL_METHOD';
#INSERT INTO `sys_data_dictionary_item`(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES (4098, 'ignore', 'Ignore', NULL, 3, 1, 1, 154);
INSERT INTO `sys_data_dictionary_item`(`item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) select ''ignore'', ''Ignore'', NULL, 3, 1, 1, id from sys_data_dictionary_name where mark=''FAIL_METHOD'';
INSERT INTO `sys_data_dictionary_item`(`item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) select 'ignore', 'Ignore', NULL, 3, 1, 1, id from sys_data_dictionary_name where mark='FAIL_METHOD';
#SSL version字典
INSERT INTO `sys_data_dictionary_name`(`module_name`, `mark`, `remark`, `revision`, `create_time`, `modify_time`, `status`) VALUES ('SSL_VERSION', 'SSL_VERSION', '用于代理拦截策略，SSL版本', NULL, '2019-05-09 11:50:43', '2019-05-09 11:50:46', 1);
#INSERT INTO `sys_data_dictionary_item`(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES (4099, 'ssl3', 'SSLv3', 'min default', 1, 1, 1, 155);
INSERT INTO `sys_data_dictionary_item`(`item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) select''ssl3'', ''SSLv3'', ''min default'', 1, 1, 1, id from sys_data_dictionary_name where mark=''SSL_VERSION'';
INSERT INTO `sys_data_dictionary_item`(`item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) select 'ssl3', 'SSLv3', 'min default', 1, 1, 1, id from sys_data_dictionary_name where mark='SSL_VERSION';
#INSERT INTO `sys_data_dictionary_item`(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES (4100, 'tls10', 'TLSv1.0', NULL, 2, 1, 1, 155);
INSERT INTO `sys_data_dictionary_item`(`item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) select''tls10'', ''TLSv1.0'', NULL, 2, 1, 1, id from sys_data_dictionary_name where mark=''SSL_VERSION'';
INSERT INTO `sys_data_dictionary_item`(`item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) select 'tls10', 'TLSv1.0', NULL, 2, 1, 1, id from sys_data_dictionary_name where mark='SSL_VERSION';
#INSERT INTO `sys_data_dictionary_item`(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES (4101, 'tls11', 'TLSv1.1', NULL, 3, 1, 1, 155);
INSERT INTO `sys_data_dictionary_item`(`item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) select''tls11'', ''TLSv1.1'', NULL, 3, 1, 1, id from sys_data_dictionary_name where mark=''SSL_VERSION'';
INSERT INTO `sys_data_dictionary_item`(`item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) select 'tls11', 'TLSv1.1', NULL, 3, 1, 1, id from sys_data_dictionary_name where mark='SSL_VERSION';
#INSERT INTO `sys_data_dictionary_item`(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES (4102, 'tls12', 'TLSv1.2', NULL, 4, 1, 1, 155);
INSERT INTO `sys_data_dictionary_item` (`item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) select''tls12'', ''TLSv1.2'', NULL, 4, 1, 1, id from sys_data_dictionary_name where mark=''SSL_VERSION'';
INSERT INTO `sys_data_dictionary_item` (`item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) select'tls12', 'TLSv1.2', NULL, 4, 1, 1, id from sys_data_dictionary_name where mark='SSL_VERSION';
#INSERT INTO `sys_data_dictionary_item`(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES (4103, 'tls13', 'TLSv1.3', 'max default', 5, 1, 1, 155);
INSERT INTO `sys_data_dictionary_item`(`item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) select 'tls13', 'TLSv1.3', 'max default', 5, 1, 1, id from sys_data_dictionary_name where mark='SSL_VERSION';

21
src/main/webapp/WEB-INF/include/left_menu.jsp
View File

@@ -17,7 +17,12 @@
<a class="nav-link nav-toggle"
<c:if test="${secondMenu.href != null && secondMenu.href != ''}" var="secondHref">
href="javascript:;" onclick="page_turn('${secondMenu.id }','${secondMenu.functionId }','1','','${ctx}${secondMenu.href }',this)" target="mainFrame" >
<c:if test="${fn:startsWith(secondMenu.href,'http')}" var="secondFlag">
href="javascript:;" onclick="page_turn('${secondMenu.id }','${secondMenu.functionId }','1','','${secondMenu.href }',this)" target="mainFrame${cookie.Language.value }" >
</c:if>
<c:if test="${!secondFlag}">
href="javascript:;" onclick="page_turn('${secondMenu.id }','${secondMenu.functionId }','1','','${ctx}${secondMenu.href }',this)" target="mainFrame${cookie.Language.value }" >
</c:if>
</c:if>
<c:if test="${!secondHref }">
href="javascript:;" class="nav-link nav-toggle">
@@ -42,7 +47,12 @@
<a class="nav-link nav-toggle"
<c:if test="${thirdMenu.href != null && thirdMenu.href != ''}" var="thirdHref">
href="javascript:;" onclick="page_turn('${thirdMenu.id }','${thirdMenu.functionId }','2','','${ctx}${thirdMenu.href }',this)" target="mainFrame" >
<c:if test="${fn:startsWith(thirdMenu.href,'http')}" var="thirdFlag">
href="javascript:;" onclick="page_turn('${thirdMenu.id }','${thirdMenu.functionId }','2','','${thirdMenu.href }',this)" target="mainFrame${cookie.Language.value }" >
</c:if>
<c:if test="${!thirdFlag}">
href="javascript:;" onclick="page_turn('${thirdMenu.id }','${thirdMenu.functionId }','2','','${ctx}${thirdMenu.href }',this)" target="mainFrame${cookie.Language.value }" >
</c:if>
</c:if>
<c:if test="${!thirdHref }">
@@ -62,7 +72,12 @@
<c:if test="${fourthMenu.isShow==1}">
<li class="nav-item" id="menu_${fourthMenu.id }" menu-id="${fourthMenu.id }" menu-name="<spring:message code="${fourthMenu.code}"></spring:message>" >
<a href="javascript:;"
onclick="page_turn('${fourthMenu.id }','${fourthMenu.functionId }','3','','${ctx}${fourthMenu.href }',this)" target="mainFrame"
<c:if test="${fn:startsWith(fourthMenu.href,'http')}" var="fourFlag">
onclick="page_turn('${fourthMenu.id }','${fourthMenu.functionId }','3','','${fourthMenu.href }',this)" target="mainFrame${cookie.Language.value }"
</c:if>
<c:if test="${!fourFlag}">
onclick="page_turn('${fourthMenu.id }','${fourthMenu.functionId }','3','','${ctx}${fourthMenu.href }',this)" target="mainFrame${cookie.Language.value }"
</c:if>
class="nav-link ">
<%-- ${fourthMenu.name } --%> <spring:message code="${fourthMenu.code}"></spring:message>
<!-- <span class="badge badge-danger">1</span> -->

56
src/main/webapp/WEB-INF/views/home.jsp
View File

@@ -19,7 +19,11 @@
sessionStorage.setItem("log_time_start","${log_time_start}");
sessionStorage.setItem("log_time_range","${log_time_range}");
//window.frames['mainFrame'].location="${ctx}/dynamicpage/dynamicIndex";
window.frames['mainFrame'].location="${ctx}/dashboard/logChart";
if(lang==""){
window.frames['mainFrameen'].location="${ctx}/dashboard/logChart";
}else{
window.frames['mainFrame${cookie.Language.value }'].location="${ctx}/dashboard/logChart";
}
//国际化切换
var lang = "${cookie.Language.value }".toLowerCase();
var $obj;
@@ -38,7 +42,7 @@
source: function(query,process) {
var sourceArray = new Array();
$(".accordion:visible a[target='mainFrame']").each(function(){
$(".accordion:visible a[target='mainFrame${cookie.Language.value }']").each(function(){
sourceArray.push($(this).parents("li").attr("menu-name")+"_"+$(this).parents("li").attr("menu-id"));
})
@@ -107,7 +111,6 @@ function page_turn(id, functionId,level, name, url,obj){
var $header = $(".page-breadcrumb");//添加头部信息
$(".page-breadcrumb").empty();
var lang = "${cookie.Language.value }".toLowerCase();
var parent_li = $object.parents("li");
var parent_parent_li = $object.parents("li").parents("li");
@@ -151,44 +154,18 @@ function page_turn(id, functionId,level, name, url,obj){
//}
//调入页面
//进行区分是否为外部URL
if (postComment(url)) {
url="http"+url.split("http")[url.split("http").length-1]+"?test_cookie="+lang;
if(url.indexOf("?")>0){
url = url+"&functionId="+functionId;
}else{
if(url.indexOf("?")>0){
url = url+"&functionId="+functionId;
}else{
url = url+"?functionId="+functionId;
}
url = url+"?functionId="+functionId;
}
window.frames['mainFrame'].location=url;
window.frames['mainFrame${cookie.Language.value }'].location=url;
$("#mainFrame").load(function(){
App.stopPageLoading();
});
}
/**
* 前台页面验证url网址输入是否正确
*/
function postComment(str) {
//验证url网址
//判断URL地址的正则表达式为:http(s)?://([\w-]+\.)+[\w-]+(/[\w- ./?%&=]*)?
//下面的代码中应用了转义字符"\"输出一个字符"/"
var Expression=/http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w- .\/?%&=]*)?/;
var objExp=new RegExp(Expression);
if(objExp.test(str) != true){
return false;
} else {
return true;
}
}
function searchMenu() {
@@ -243,8 +220,7 @@ function changeFrameHeight() {
//update for dynamicHomePage S
var paddingHeight = 11;
//update for dynamicHomePage E
iframe.contents().find(".page-content").addClass("page-content-body");
//iframe.contents().find(".page-content").addClass("page-content-body");
iframe.prop("height",clientHeight-headerHeight-barHeight-footerHeight-paddingHeight);
menuHeight();
}
@@ -461,7 +437,7 @@ background:#3d3d3d;
</li>
<!-- 在线帮助 -->
<li class="dropdown dropdown-user nav">
<a href="${ctx}/sys/help" id="helpHref" target="mainFrame" >
<a href="${ctx}/sys/help" id="helpHref" target="mainFrame${cookie.Language.value }" >
<i class="icon-question font-sharp"></i>
<span class="username username-hide-on-mobile" id="help">
<spring:message code="help" />
@@ -495,8 +471,8 @@ background:#3d3d3d;
</a>
<ul class="dropdown-menu dropdown-menu-default">
<li><a href="${ctx}/sys/user/info" target="mainFrame"><i class="icon-user"></i>&nbsp; <spring:message code="userInfo"></spring:message></a></li>
<li><a href="${ctx}/sys/user/modifyPwd" target="mainFrame"><i class="icon-lock"></i>&nbsp; <spring:message code="updatePwd"></spring:message></a></li>
<li><a href="${ctx}/sys/user/info" target="mainFrame${cookie.Language.value }"><i class="icon-user"></i>&nbsp; <spring:message code="userInfo"></spring:message></a></li>
<li><a href="${ctx}/sys/user/modifyPwd" target="mainFrame${cookie.Language.value }"><i class="icon-lock"></i>&nbsp; <spring:message code="updatePwd"></spring:message></a></li>
<li><a href="${pageContext.request.contextPath }/logout" >
<i class="icon-key"></i>&nbsp; <spring:message code="exit"></spring:message></a></li>
</ul></li>
@@ -566,12 +542,12 @@ background:#3d3d3d;
<div class="page-bar">
<ul class="page-breadcrumb">
<!-- <li><a href="${ctx}/dynamicpage/dynamicIndex" target="mainFrame"><spring:message code="home"></spring:message></a> <i class="fa fa-circle"></i></li> -->
<li><a href="${ctx}/dashboard/logChart" target="mainFrame"><spring:message code="home"></spring:message></a> <i class="fa fa-circle"></i></li>
<li><a href="${ctx}/dashboard/logChart" target="mainFrame${cookie.Language.value }"><spring:message code="home"></spring:message></a> <i class="fa fa-circle"></i></li>
</ul>
</div>
<iframe id="mainFrame" name="mainFrame" width="100%" onload="changeFrameHeight()" frameborder="0" srcolling="no" style="background-color:#181818;">
<iframe id="mainFrame" name="mainFrame${cookie.Language.value }" width="100%" onload="changeFrameHeight()" frameborder="0" srcolling="no" style="background-color:#181818;">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>