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

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source 
Conflicts:
	src/main/resources/sql/truncate_tables.sql
This commit is contained in:
duandongmei
2018-09-12 20:25:06 +08:00
parent f3cb325c6a 284a796bb0
commit dda68fb83c
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/resources/sql/20180912/update_specific_service_cfg_basic_protocol.sql Normal file
View File

@@ -0,0 +1,20 @@
delete from specific_service_cfg where cfg_type=3;
INSERT INTO `specific_service_cfg` VALUES (65, 0, 'Beyond The Range Of Protocol', '', 1, '2018-8-24 11:04:31', 0, 0, 109, 3, 'basic_1', NULL);
INSERT INTO `specific_service_cfg` VALUES (71, 6, 'GRE', '', 1, '2018-9-10 15:41:12', 0, 0, 115, 3, '107', NULL);
INSERT INTO `specific_service_cfg` VALUES (73, 8, 'HTTPS', '', 1, '2018-9-10 15:41:47', 0, 0, 117, 3, '104', NULL);
INSERT INTO `specific_service_cfg` VALUES (74, 9, 'ICMP', '', 1, '2018-9-10 15:42:03', 0, 0, 118, 3, '107', NULL);
INSERT INTO `specific_service_cfg` VALUES (77, 12, 'IMAPS', '', 1, '2018-9-10 15:43:13', 0, 0, 121, 3, '106', NULL);
INSERT INTO `specific_service_cfg` VALUES (81, 16, 'NTP', '', 1, '2018-9-10 15:45:37', 0, 0, 125, 3, '112', NULL);
INSERT INTO `specific_service_cfg` VALUES (83, 18, 'POP3 SSL', '', 1, '2018-9-10 15:46:22', 0, 0, 127, 3, '106', NULL);
INSERT INTO `specific_service_cfg` VALUES (85, 20, 'QUIC', '', 1, '2018-9-10 15:50:33', 0, 0, 129, 3, '104', NULL);
INSERT INTO `specific_service_cfg` VALUES (87, 22, 'SMB', '', 1, '2018-9-10 15:52:45', 0, 0, 131, 3, '112', NULL);
INSERT INTO `specific_service_cfg` VALUES (89, 24, 'SMTPS', '', 1, '2018-9-10 15:53:29', 0, 0, 133, 3, '106', NULL);
INSERT INTO `specific_service_cfg` VALUES (90, 25, 'SPDY', 'google tcp', 1, '2018-9-10 15:53:58', 0, 0, 134, 3, '104', NULL);
INSERT INTO `specific_service_cfg` VALUES (91, 28, 'SSH', '', 1, '2018-9-10 15:54:34', 0, 0, 135, 3, '109', NULL);
INSERT INTO `specific_service_cfg` VALUES (94, 268435455, 'Unspecified', '', 1, '2018-8-28 18:08:09', 0, 0, 138, 3, '268435455', NULL);
INSERT INTO `specific_service_cfg` VALUES (296, 30, 'SOCKS', '', 1, '2018-9-12 17:28:43', 0, 0, 200, 3, '108', NULL);
INSERT INTO `specific_service_cfg` VALUES (297, 5, 'FTPS', '', 1, '2018-9-12 17:30:30', 0, 0, 201, 3, '105', NULL);
INSERT INTO `specific_service_cfg` VALUES (298, 10, 'IKE', '', 1, '2018-9-12 17:32:19', 0, 0, 202, 3, '102', NULL);
INSERT INTO `specific_service_cfg` VALUES (299, 13, 'IPSEC', '', 1, '2018-9-12 17:33:19', 0, 0, 203, 3, '102', NULL);
INSERT INTO `specific_service_cfg` VALUES (300, 15, 'L2TP', '', 1, '2018-9-12 17:34:58', 0, 0, 204, 3, '103', NULL);
INSERT INTO `specific_service_cfg` VALUES (301, 19, 'PPTP', '', 1, '2018-9-12 17:36:17', 0, 0, 205, 3, '103', NULL);

9
src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp
View File

@@ -18,9 +18,9 @@ $(function(){
if($("#oldAction").val()==1){
$("#level").show();
}else{
$("input[name$='level']").val("");
$("#level").hide();
}
$(".action").on("change",function(){
$("input[name~=action]").on("change",function(){
$("#serviceId").val($(this).attr("serviceId"));
if($(".action:checked").val()==1){
$("#level").show();
@@ -30,6 +30,9 @@ $(function(){
if($("#level").is(":hidden")){
$("input[name$='level']").val("");
}
if($(".action:checked").attr("id")=="actionOff"){
$("#level").hide();
}
});
$("#serviceId").val($(".action:checked").attr("serviceId"));
$("#save").click(function(){
@@ -148,7 +151,7 @@ $(function(){
</c:forEach>
<input id="actionOff" serviceId="${_cfg.serviceId }"
isValid="${_cfg.isValid}"
type="radio" name="action" class="radio-inline action radio-off" value="0" <c:if test="${_cfg.isValid == 0}">checked</c:if>> <spring:message code="off"/>
type="radio" name="action" class="radio-inline action radio-off" value="${_cfg.action }" <c:if test="${_cfg.isValid == 0}">checked</c:if>> <spring:message code="off"/>
</div>
<div for="action"></div>