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

基础协议，加密隧道行为IP导入提交

Browse Source
This commit is contained in:
wangxin
2018-10-20 11:56:59 +08:00
parent 8ce5a0f9af
commit cce50a3a43
4 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -2483,7 +2483,9 @@ public class BaseController {
String specServiceId=request.getParameter("appId"); String specServiceId=request.getParameter("appId");
String behaviorId=request.getParameter("behaviorId"); String behaviorId=request.getParameter("behaviorId");
SpecificServiceCfg specificServiceCfg=null; SpecificServiceCfg specificServiceCfg=null;
if(serviceDict.getServiceId().intValue()==33||serviceDict.getServiceId().intValue()==145) { if(serviceDict.getServiceId().intValue()==33||serviceDict.getServiceId().intValue()==145||
serviceDict.getServiceId().intValue()==35||serviceDict.getServiceId().intValue()==147||
serviceDict.getServiceId().intValue()==36||serviceDict.getServiceId().intValue()==148) {
if(StringUtils.isNotBlank(specServiceId)) { if(StringUtils.isNotBlank(specServiceId)) {
specificServiceCfg=specificServiceCfgService.getBySpecServiceId(Integer.parseInt(specServiceId)); specificServiceCfg=specificServiceCfgService.getBySpecServiceId(Integer.parseInt(specServiceId));
} }
@@ -2508,7 +2510,9 @@ public class BaseController {
cfg.setServiceId(serviceDict.getServiceId()); cfg.setServiceId(serviceDict.getServiceId());
cfg.setTableName("ip_port_cfg"); cfg.setTableName("ip_port_cfg");
cfg.setCompileId(ipCfgService.getCompileId()); cfg.setCompileId(ipCfgService.getCompileId());
if(serviceDict.getServiceId().intValue()==33||serviceDict.getServiceId().intValue()==145) { if(serviceDict.getServiceId().intValue()==33||serviceDict.getServiceId().intValue()==145||
serviceDict.getServiceId().intValue()==35||serviceDict.getServiceId().intValue()==147||
serviceDict.getServiceId().intValue()==36||serviceDict.getServiceId().intValue()==148) {
if(specificServiceCfg!=null&&appRegion!=null) { if(specificServiceCfg!=null&&appRegion!=null) {
AppPolicyCfg appPolicyCfg=new AppPolicyCfg(); AppPolicyCfg appPolicyCfg=new AppPolicyCfg();
BeanUtils.copyProperties(cfg, appPolicyCfg); BeanUtils.copyProperties(cfg, appPolicyCfg);

7
src/main/resources/sql/20181020/update_app_policy_region_service_.sql Normal file
View File

@@ -0,0 +1,7 @@
UPDATE function_service_dict SET region_code='1,2,3' WHERE function_id=63;
UPDATE function_service_dict SET region_code='1,2,3' WHERE function_id=407;
UPDATE function_service_dict SET region_code='1,2,3' WHERE function_id=408;
UPDATE function_region_dict SET is_import=1 WHERE function_id=63 AND config_service_type='app_policy';
UPDATE function_region_dict SET is_import=1 WHERE function_id=407 AND config_service_type='app_policy';
UPDATE function_region_dict SET is_import=1 WHERE function_id=408 AND config_service_type='app_policy';

7
src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
View File

@@ -101,6 +101,9 @@
onClick="javascript:window.location='${ctx}/basicprotocol/form?functionId=${cfg.functionId}'"> onClick="javascript:window.location='${ctx}/basicprotocol/form?functionId=${cfg.functionId}'">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
<spring:message code="add"></spring:message></button> <spring:message code="add"></spring:message></button>
<button type="button" class="btn btn-primary import" >
<i class="fa fa-plus"></i>
<spring:message code="import"></spring:message></button>
</shiro:hasPermission> </shiro:hasPermission>
</div> </div>
@@ -489,6 +492,8 @@
</div> </div>
</div> </div>
</div> </div>
<c:set var="importPath" value="/basicprotocol/list?functionId=${cfg.functionId}"/>
<!-- 模板导入，start -->
<%@include file="/WEB-INF/include/excel/importModal.jsp" %>
</body> </body>
</html> </html>

7
src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
View File

@@ -98,6 +98,9 @@
onClick="javascript:window.location='${ctx}/encryptedtunnelbehav/form?functionId=${cfg.functionId}'"> onClick="javascript:window.location='${ctx}/encryptedtunnelbehav/form?functionId=${cfg.functionId}'">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
<spring:message code="add"></spring:message></button> <spring:message code="add"></spring:message></button>
<button type="button" class="btn btn-primary import" >
<i class="fa fa-plus"></i>
<spring:message code="import"></spring:message></button>
</shiro:hasPermission> </shiro:hasPermission>
</div> </div>
@@ -486,6 +489,8 @@
</div> </div>
</div> </div>
</div> </div>
<c:set var="importPath" value="/encryptedtunnelbehav/list?functionId=${cfg.functionId}"/>
<!-- 模板导入，start -->
<%@include file="/WEB-INF/include/excel/importModal.jsp" %>
</body> </body>
</html> </html>