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

多域的日志增加可查看配置详情，隐藏日志中的查看详情，提供可以复制日志过长title功能

Browse Source
This commit is contained in:
zhanghongqing
2018-11-28 19:23:38 +08:00
parent 7ab1a38131
commit 1fbc899269
75 changed files with 869 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,8 +71,8 @@ public class BasicProtocolController extends BaseController {
* @return
*/
@RequestMapping(value = {"ajaxIpList"})
public String ajaxSslSubList(Model model,Long cfgId,Integer index) {
AppPolicyCfg cfg = appCfgService.getAppPolicyCfg(cfgId);
public String ajaxSslSubList(Model model,Long cfgId,Integer index,Integer compileId) {
AppPolicyCfg cfg = appCfgService.getAppPolicyCfg(cfgId,compileId);
List<String[]> tabList = new ArrayList();
if(cfg.getIpPortList()!=null){
String cfgType = null;
@@ -108,7 +108,7 @@ public class BasicProtocolController extends BaseController {
@RequiresPermissions(value={"basicprotocol:config"})
public String policyCfgForm(Model model,String ids,AppPolicyCfg entity) {
if(StringUtils.isNotBlank(ids)){
entity = appCfgService.getAppPolicyCfg(Long.parseLong(ids));
entity = appCfgService.getAppPolicyCfg(Long.parseLong(ids),entity.getCompileId());
initUpdateFormCondition(model,entity);
}else{
initFormCondition(model,entity);
@@ -166,7 +166,7 @@ public class BasicProtocolController extends BaseController {
AppPolicyCfg entity = new AppPolicyCfg();
String[] idArray = ids.split(",");
for(String id :idArray){
entity = appCfgService.getAppPolicyCfg(Long.parseLong(id));
entity = appCfgService.getAppPolicyCfg(Long.parseLong(id),entity.getCompileId());
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setAuditorId(UserUtils.getUser().getId());