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

修改文件摘要配置，增加文件URL属性信息。

Browse Source 
Signed-off-by: zhangwei <zhangwei@intranet.com>
This commit is contained in:
zhangwei
2018-06-29 16:32:42 +08:00
parent 8ab4fb9eba
commit 6220b1bdc9
8 changed files with 62 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/nis/domain/configuration/FileDigestCfg.java
View File

@@ -29,6 +29,7 @@ public class FileDigestCfg extends BaseCfg<FileDigestCfg> {
private Long rawLen; private Long rawLen;
private String digest; private String digest;
private Integer cfdsLevel; private Integer cfdsLevel;
private String fileUrl;
public static String getTablename() { public static String getTablename() {
return tableName; return tableName;
@@ -54,5 +55,11 @@ public class FileDigestCfg extends BaseCfg<FileDigestCfg> {
public void setCfdsLevel(Integer cfdsLevel) { public void setCfdsLevel(Integer cfdsLevel) {
this.cfdsLevel = cfdsLevel; this.cfdsLevel = cfdsLevel;
} }
public String getFileUrl() {
return fileUrl;
}
public void setFileUrl(String fileUrl) {
this.fileUrl = fileUrl;
}
} }

5
src/main/java/com/nis/util/ConfigServiceUtil.java
View File

@@ -18,8 +18,9 @@ import net.sf.json.JsonConfig;
import org.glassfish.jersey.media.multipart.FormDataMultiPart; import org.glassfish.jersey.media.multipart.FormDataMultiPart;
import org.glassfish.jersey.media.multipart.file.FileDataBodyPart; import org.glassfish.jersey.media.multipart.file.FileDataBodyPart;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.jcraft.jsch.Logger;
import com.nis.domain.log.ReportResultLog; import com.nis.domain.log.ReportResultLog;
import com.nis.domain.maat.ToMaatResult; import com.nis.domain.maat.ToMaatResult;
import com.nis.domain.maat.ToMaatResult.ResponseData; import com.nis.domain.maat.ToMaatResult.ResponseData;
@@ -27,6 +28,7 @@ import com.nis.exceptions.MaatConvertException;
import com.nis.util.httpclient.ClientUtil; import com.nis.util.httpclient.ClientUtil;
public class ConfigServiceUtil { public class ConfigServiceUtil {
private static Logger logger = LoggerFactory.getLogger(ConfigServiceUtil.class);
/*public static class MapTypeAdapter extends TypeAdapter<Object> { /*public static class MapTypeAdapter extends TypeAdapter<Object> {
@Override @Override
public Object read(JsonReader in) throws IOException { public Object read(JsonReader in) throws IOException {
@@ -285,6 +287,7 @@ public class ConfigServiceUtil {
Response response= header.post(Entity.entity(formDataMultiPart, formDataMultiPart.getMediaType())); Response response= header.post(Entity.entity(formDataMultiPart, formDataMultiPart.getMediaType()));
if( response.getStatus() == 200){ if( response.getStatus() == 200){
result= response.readEntity(String.class); result= response.readEntity(String.class);
logger.info("获取文件摘要响应结果"+result);
JSONObject resObject = JSONObject.fromObject(result); JSONObject resObject = JSONObject.fromObject(result);
bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class); bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class);
}else{ }else{

8
src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml
View File

@@ -94,6 +94,7 @@
<result column="raw_len" property="rawLen" jdbcType="BIGINT" /> <result column="raw_len" property="rawLen" jdbcType="BIGINT" />
<result column="digest" property="digest" jdbcType="VARCHAR" /> <result column="digest" property="digest" jdbcType="VARCHAR" />
<result column="cfgds_level" property="cfgdsLevel" jdbcType="INTEGER" /> <result column="cfgds_level" property="cfgdsLevel" jdbcType="INTEGER" />
<result column="file_url" property="fileUrl" jdbcType="VARCHAR" />
<result column="action" property="action" jdbcType="INTEGER" /> <result column="action" property="action" jdbcType="INTEGER" />
<result column="is_valid" property="isValid" jdbcType="INTEGER" /> <result column="is_valid" property="isValid" jdbcType="INTEGER" />
<result column="is_audit" property="isAudit" jdbcType="INTEGER" /> <result column="is_audit" property="isAudit" jdbcType="INTEGER" />
@@ -171,7 +172,7 @@
a.expr_type,a.match_method,a.is_hexbin,a.area_effective_ids,a.function_id,a.cfg_region_code a.expr_type,a.match_method,a.is_hexbin,a.area_effective_ids,a.function_id,a.cfg_region_code
</sql> </sql>
<sql id="DigestCfg_Column" > <sql id="DigestCfg_Column" >
a.CFG_ID,a.CFG_DESC,a.raw_len,a.digest,a.cfds_level,a.ACTION,a.IS_VALID,a.IS_AUDIT, a.CFG_ID,a.CFG_DESC,a.raw_len,a.digest,a.cfds_level,a.file_url,a.ACTION,a.IS_VALID,a.IS_AUDIT,
a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME, a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME,
a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY, a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY,
a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,cfg_type,cfg_region_code a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,cfg_type,cfg_region_code
@@ -584,6 +585,7 @@
RAW_LEN, RAW_LEN,
DIGEST, DIGEST,
CFDS_LEVEL, CFDS_LEVEL,
FILE_URL,
ACTION, ACTION,
IS_VALID, IS_VALID,
IS_AUDIT, IS_AUDIT,
@@ -609,6 +611,7 @@
#{rawLen,jdbcType=BIGINT}, #{rawLen,jdbcType=BIGINT},
#{digest,jdbcType=VARCHAR}, #{digest,jdbcType=VARCHAR},
#{cfdsLevel,jdbcType=INTEGER}, #{cfdsLevel,jdbcType=INTEGER},
#{fileUrl,jdbcType=VARCHAR},
#{action,jdbcType=INTEGER}, #{action,jdbcType=INTEGER},
0, 0,
0, 0,
@@ -812,6 +815,9 @@
</if> </if>
<if test="cfgType != null and cfgType != ''"> <if test="cfgType != null and cfgType != ''">
CFG_TYPE =#{cfgType,jdbcType=VARCHAR}, CFG_TYPE =#{cfgType,jdbcType=VARCHAR},
</if>
<if test="fileUrl != null and fileUrl != ''">
FILE_URL =#{fileUrl,jdbcType=VARCHAR},
</if> </if>
</trim> </trim>
</set> </set>

9
src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml
View File

@@ -94,6 +94,7 @@
<result column="raw_len" property="rawLen" jdbcType="BIGINT" /> <result column="raw_len" property="rawLen" jdbcType="BIGINT" />
<result column="digest" property="digest" jdbcType="VARCHAR" /> <result column="digest" property="digest" jdbcType="VARCHAR" />
<result column="cfgds_level" property="cfgdsLevel" jdbcType="INTEGER" /> <result column="cfgds_level" property="cfgdsLevel" jdbcType="INTEGER" />
<result column="file_url" property="fileUrl" jdbcType="VARCHAR" />
<result column="action" property="action" jdbcType="INTEGER" /> <result column="action" property="action" jdbcType="INTEGER" />
<result column="is_valid" property="isValid" jdbcType="INTEGER" /> <result column="is_valid" property="isValid" jdbcType="INTEGER" />
<result column="is_audit" property="isAudit" jdbcType="INTEGER" /> <result column="is_audit" property="isAudit" jdbcType="INTEGER" />
@@ -136,7 +137,7 @@
a.expr_type,a.match_method,a.is_hexbin,a.area_effective_ids,a.function_id,a.cfg_region_code a.expr_type,a.match_method,a.is_hexbin,a.area_effective_ids,a.function_id,a.cfg_region_code
</sql> </sql>
<sql id="DigestCfg_Column" > <sql id="DigestCfg_Column" >
a.CFG_ID,a.CFG_DESC,a.raw_len,a.digest,a.cfds_level,a.ACTION,a.IS_VALID,a.IS_AUDIT, a.CFG_ID,a.CFG_DESC,a.raw_len,a.digest,a.cfds_level,a.file_url,a.ACTION,a.IS_VALID,a.IS_AUDIT,
a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME, a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME,
a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY, a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY,
a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,cfg_type,cfg_region_code a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,cfg_type,cfg_region_code
@@ -579,7 +580,8 @@
AREA_EFFECTIVE_IDS, AREA_EFFECTIVE_IDS,
function_id, function_id,
cfg_type, cfg_type,
cfg_region_code cfg_region_code,
file_url
)values ( )values (
#{cfgDesc,jdbcType=VARCHAR}, #{cfgDesc,jdbcType=VARCHAR},
#{rawLen,jdbcType=BIGINT}, #{rawLen,jdbcType=BIGINT},
@@ -604,7 +606,8 @@
#{areaEffectiveIds,jdbcType=VARCHAR}, #{areaEffectiveIds,jdbcType=VARCHAR},
#{functionId,jdbcType=INTEGER}, #{functionId,jdbcType=INTEGER},
#{cfgType,jdbcType=VARCHAR}, #{cfgType,jdbcType=VARCHAR},
#{cfgRegionCode,jdbcType=INTEGER} #{cfgRegionCode,jdbcType=INTEGER},
#{fileUrl,jdbcType=VARCHAR}
) )
</insert> </insert>
<!-- 删除mail ip子配置 --> <!-- 删除mail ip子配置 -->

2
src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
View File

@@ -345,6 +345,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
if(result!=null && result.getData()!=null){ if(result!=null && result.getData()!=null){
entity.setRawLen(result.getData().getRawLen()); entity.setRawLen(result.getData().getRawLen());
entity.setDigest(result.getData().getDigest()); entity.setDigest(result.getData().getDigest());
entity.setFileUrl(result.getData().getAccessUrl());
} }
mailCfgDao.saveMailFileDigestCfg(entity); mailCfgDao.saveMailFileDigestCfg(entity);
@@ -364,6 +365,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
if(result!=null && result.getData()!=null){ if(result!=null && result.getData()!=null){
entity.setRawLen(result.getData().getRawLen()); entity.setRawLen(result.getData().getRawLen());
entity.setDigest(result.getData().getDigest()); entity.setDigest(result.getData().getDigest());
entity.setFileUrl(result.getData().getAccessUrl());
} }
fileTransferCfgDao.updateFileDigestCfg(entity); fileTransferCfgDao.updateFileDigestCfg(entity);

2
src/main/java/com/nis/web/service/configuration/MailCfgService.java
View File

@@ -113,6 +113,7 @@ public class MailCfgService extends CrudService<MailCfgDao,CfgIndexInfo> {
if(result!=null && result.getData()!=null){ if(result!=null && result.getData()!=null){
cfg.setRawLen(result.getData().getRawLen()); cfg.setRawLen(result.getData().getRawLen());
cfg.setDigest(result.getData().getDigest()); cfg.setDigest(result.getData().getDigest());
cfg.setFileUrl(result.getData().getAccessUrl());
} }
mailCfgDao.saveMailFileDigestCfg(cfg); mailCfgDao.saveMailFileDigestCfg(cfg);
} }
@@ -166,6 +167,7 @@ public class MailCfgService extends CrudService<MailCfgDao,CfgIndexInfo> {
if(result!=null && result.getData()!=null){ if(result!=null && result.getData()!=null){
cfg.setRawLen(result.getData().getRawLen()); cfg.setRawLen(result.getData().getRawLen());
cfg.setDigest(result.getData().getDigest()); cfg.setDigest(result.getData().getDigest());
cfg.setFileUrl(result.getData().getAccessUrl());
} }
mailCfgDao.saveMailFileDigestCfg(cfg); mailCfgDao.saveMailFileDigestCfg(cfg);
} }

7
src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
View File

@@ -263,6 +263,7 @@
<th><spring:message code="digest"/></th> <th><spring:message code="digest"/></th>
<th><spring:message code="raw_len"/></th> <th><spring:message code="raw_len"/></th>
<th><spring:message code="cfds_level"/></th> <th><spring:message code="cfds_level"/></th>
<th><spring:message code="file_url"/></th>
<th><spring:message code="block_type"/></th> <th><spring:message code="block_type"/></th>
<th><spring:message code="whether_area_block"/></th> <th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>
@@ -295,6 +296,12 @@
</td> </td>
<td>${indexCfg.rawLen }</td> <td>${indexCfg.rawLen }</td>
<td>${indexCfg.cfdsLevel }</td> <td>${indexCfg.cfdsLevel }</td>
<td>
<a href="${indexCfg.fileUrl }" target="_blank" data-original-title="${indexCfg.fileUrl }"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fn:substring(indexCfg.fileUrl,0,20) }
</a>
</td>
<td> <td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict"> <c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.action }"> <c:if test="${dict.itemCode eq indexCfg.action }">

45
src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp
View File

@@ -27,7 +27,7 @@
<c:if test="${region[1] eq cfg.cfgType }"> <c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content" name="subCfg${index}"> <div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-8">
<div class="form-group"> <div class="form-group">
<label><spring:message code='ip_type'/>:</label> <label><spring:message code='ip_type'/>:</label>
<label> <label>
@@ -37,7 +37,7 @@
</label> </label>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-8">
<div class="form-group"> <div class="form-group">
<label><spring:message code='ip_pattern'/>:</label> <label><spring:message code='ip_pattern'/>:</label>
<label> <label>
@@ -47,7 +47,7 @@
</label> </label>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-8">
<div class="form-group"> <div class="form-group">
<label><spring:message code='client_ip'/>:</label> <label><spring:message code='client_ip'/>:</label>
<label> <label>
@@ -57,7 +57,7 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-8">
<div class="form-group"> <div class="form-group">
<label><spring:message code='port_pattern'/>:</label> <label><spring:message code='port_pattern'/>:</label>
<label> <label>
@@ -67,24 +67,24 @@
</label> </label>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-8">
<div class="form-group"> <div class="form-group">
<label><spring:message code='client_port'/>:</label><label>${cfg.srcPort }</label> <label><spring:message code='client_port'/>:</label><label>${cfg.srcPort }</label>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-8">
<div class="form-group"> <div class="form-group">
<label><spring:message code='server_ip'/>:</label><label>${cfg.destIpAddress }</label> <label><spring:message code='server_ip'/>:</label><label>${cfg.destIpAddress }</label>
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-8">
<div class="form-group"> <div class="form-group">
<label><spring:message code='server_port'/>:</label><label>${cfg.destPort }</label> <label><spring:message code='server_port'/>:</label><label>${cfg.destPort }</label>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-8">
<div class="form-group"> <div class="form-group">
<label><spring:message code='direction'/>:</label> <label><spring:message code='direction'/>:</label>
<label> <label>
@@ -94,7 +94,7 @@
</label> </label>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-8">
<div class="form-group"> <div class="form-group">
<label><spring:message code='protocol'/>:</label> <label><spring:message code='protocol'/>:</label>
<label> <label>
@@ -114,12 +114,12 @@
<c:if test="${region[1] eq cfg.cfgType }"> <c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content" name="subCfg${index}"> <div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-8">
<div class="form-group"> <div class="form-group">
<label><spring:message code='district' />:</label><label>${cfg.district }</label> <label><spring:message code='district' />:</label><label>${cfg.district }</label>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-8">
<div class="form-group"> <div class="form-group">
<label><spring:message code='keywords' />:</label> <label><spring:message code='keywords' />:</label>
<label> <label>
@@ -127,7 +127,7 @@
</label> </label>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-8">
<div class="form-group"> <div class="form-group">
<label><spring:message code='expression_type' />:</label> <label><spring:message code='expression_type' />:</label>
<label> <label>
@@ -141,7 +141,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-8">
<div class="form-group"> <div class="form-group">
<label><spring:message code='match_method' />:</label> <label><spring:message code='match_method' />:</label>
<label> <label>
@@ -151,7 +151,7 @@
</label> </label>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-8">
<div class="form-group"> <div class="form-group">
<label><spring:message code='whether_hexbinary' />:</label> <label><spring:message code='whether_hexbinary' />:</label>
<label> <label>
@@ -161,7 +161,7 @@
</label> </label>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-8">
<div class="form-group"> <div class="form-group">
<label></label><label></label> <label></label><label></label>
</div> </div>
@@ -176,12 +176,12 @@
<c:if test="${region[1] eq cfg.cfgType }"> <c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content" name="subCfg${index}"> <div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-8">
<div class="form-group"> <div class="form-group">
<label><spring:message code='raw_len' />:</label><label>${cfg.rawLen }</label> <label><spring:message code='raw_len' />:</label><label>${cfg.rawLen }</label>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-8">
<div class="form-group"> <div class="form-group">
<label><spring:message code='cfds_level' />:</label> <label><spring:message code='cfds_level' />:</label>
<label> <label>
@@ -191,7 +191,7 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-8">
<div class="form-group"> <div class="form-group">
<label><spring:message code='digest' />:</label> <label><spring:message code='digest' />:</label>
<a href="javascript:;" data-original-title="${cfg.digest}" <a href="javascript:;" data-original-title="${cfg.digest}"
@@ -200,6 +200,15 @@
</a> </a>
</div> </div>
</div> </div>
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='file_url' />:</label>
<a href="${cfg.fileUrl }" target="_blank" data-original-title="${cfg.fileUrl }"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fn:substring(cfg.fileUrl,0,100) }
</a>
</div>
</div>
</div> </div>
</div> </div>
</c:if> </c:if>