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

本地修改push至服务

Browse Source
This commit is contained in:
duandongmei
2018-06-08 14:30:20 +08:00
parent 1f30f610d9
commit 13e9c1adcd
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java
View File

@@ -156,7 +156,7 @@ public class FileTransferCfgController extends BaseController{
@RequiresPermissions(value={"fileTransfer:fileDigest:config"}) @RequiresPermissions(value={"fileTransfer:fileDigest:config"})
public String saveFileDigestCfg(Model model,HttpServletRequest request,HttpServletResponse response,String ids, public String saveFileDigestCfg(Model model,HttpServletRequest request,HttpServletResponse response,String ids,
FileDigestCfg entity,MultipartFile file,@ModelAttribute("areaCfgIds")String areaCfgIds) { FileDigestCfg entity,MultipartFile file,@ModelAttribute("areaCfgIds")String areaCfgIds) {
try { try {
Date fileTime=null; Date fileTime=null;
Date date=new Date(); Date date=new Date();
if(!StringUtil.isEmpty(entity.getCfgId())){ if(!StringUtil.isEmpty(entity.getCfgId())){

2
src/main/java/com/nis/web/dao/configuration/AreaIpCfgDao.xml
View File

@@ -233,7 +233,7 @@
delete from area_ip_cfg where compile_id=#{compileId} and function_id=#{functionId} delete from area_ip_cfg where compile_id=#{compileId} and function_id=#{functionId}
</delete> </delete>
<update id="updateAreaIpCfgValid" parameterType="com.nis.domain.configuration.BaseCfg"> <update id="updateAreaIpCfgValid" parameterType="com.nis.domain.configuration.BaseCfg">
update area_ip_cfg update area_ip_cfg
<set> <set>
<if test="isValid != null" > <if test="isValid != null" >
is_valid = #{isValid,jdbcType=INTEGER}, is_valid = #{isValid,jdbcType=INTEGER},

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

@@ -373,7 +373,7 @@ public class AvContentCfgService extends BaseService{
strRegionList=accountMap.get("dstList"); strRegionList=accountMap.get("dstList");
} }
if(!StringUtil.isEmpty(areaIpCfgList)){ if(!StringUtil.isEmpty(areaIpCfgList)){
//TODO DELETE后期删除 //TODO DELETE后期删除
for (AreaIpCfg areaIpCfga : areaIpCfgList) { for (AreaIpCfg areaIpCfga : areaIpCfgList) {
areaIpCfga.setCfgType("NTC_IP_RANGE"); areaIpCfga.setCfgType("NTC_IP_RANGE");
} }

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

@@ -319,7 +319,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
} }
public void saveOrUpdateFileDigestCfg(FileDigestCfg entity,ToMaatResult result,String areaCfgIds){ public void saveOrUpdateFileDigestCfg(FileDigestCfg entity,ToMaatResult result,String areaCfgIds){
//设置区域运营商信息 //设置区域运营商信息
setAreaEffectiveIds(entity); setAreaEffectiveIds(entity);
entity.setIsValid(0); entity.setIsValid(0);

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

@@ -831,7 +831,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
strRegionList=map.get("dstList"); strRegionList=map.get("dstList");
} }
} }
//保存区域IP信息 //保存区域IP信息
if(entity.getAreaCfg()!=null && entity.getAreaCfg().size()>0){ if(entity.getAreaCfg()!=null && entity.getAreaCfg().size()>0){
AreaIpCfg cfg = new AreaIpCfg(); AreaIpCfg cfg = new AreaIpCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"}); BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});

2
src/main/webapp/WEB-INF/include/form/stringInfo.jsp
View File

@@ -4,7 +4,7 @@
<div class="row stringInfo"> <div class="row stringInfo">
<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span> <span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span> <span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group "> <div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="key_word"/></label> <label class="control-label col-md-3"><font color="red">*</font><spring:message code="key_word"/></label>

2
src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
View File

@@ -125,7 +125,7 @@ $(function(){
<label class="control-label col-md-3"><font color="red">*</font> <label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="cfds_level" /></label> <spring:message code="cfds_level" /></label>
<div class="col-md-6"> <div class="col-md-6">
<input class="form-control required digits" type="text" range="[1,10]" <input class="form-control required digits" type="text" range="[1,10]"
name="cfdsLevel" name="cfdsLevel"
value="${_cfg.cfdsLevel}"> value="${_cfg.cfdsLevel}">
</div> </div>