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:
zhangwei
2018-12-05 09:28:11 +08:00
parent 17243e6a5c
commit ebbf999cf7
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -717,6 +717,7 @@ public class ConfigServiceUtil {
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
}
} catch (Exception e) {
e.printStackTrace();
throw e;
}finally {
if (response != null) {
@@ -781,6 +782,7 @@ public class ConfigServiceUtil {
//创建连接
WebTarget wt = ClientUtil.getWebTarger(url);
logger.info("sync_send url:"+url);
logger.info("Last-Completed-Tag:"+completeTag);
//获取响应结果
Builder header = wt.request(MediaType.APPLICATION_JSON)
.header("Content-Type", MediaType.APPLICATION_JSON)

6
src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
View File

@@ -136,12 +136,12 @@ public class ConfigSynchronizationService extends BaseService{
handleCallbackData(className,page,entity,request,response,false);
}
if(!isFinished && lastServiceTag){//如果业务没有配置数据，并且为最后一个业务，需要发送给服务接口一个结束标识
String json = "";
if("1".equals(serviceType)){
String json = "{}";
/*if("1".equals(serviceType)){
json="{}";
}else{
json="[]";
}
}*/
JSONObject result = ConfigServiceUtil.configSync(json,Integer.parseInt(serviceType),entity.getServiceId(),entity.getTableName(),"FINISHED");
}
}

13
src/main/resources/service/service_config.xml
View File

@@ -86,7 +86,7 @@
</service>
<service id="66" functionId="37" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="邮件地址白名单">
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="mail_keyword_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="mail_keyword_cfg" ></serviceCfg>
</service>
<!--<service id="132" functionId="34" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="邮件地址监测">
<serviceCfg cfgType="2" tableName="mail_keyword_cfg" ></serviceCfg>
@@ -98,12 +98,12 @@
</service>-->
<service id="132" functionId="35" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="邮件地址监测">
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="mail_keyword_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="mail_keyword_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
</service>
<service id="20" functionId="35" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="邮件地址封堵">
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="mail_keyword_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="mail_keyword_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
</service>
@@ -178,9 +178,9 @@
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<userRegion regionKey="keyring_id" regionColumn="userRegion1" userRegionPosition="0" ></userRegion>
</service>
<service id="521" functionId="200" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP拦截白名单">
<!-- <service id="521" functionId="200" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP拦截白名单">
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
</service>
</service> -->
<service id="513" functionId="201" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="域名拦截监测">
<serviceCfg cfgType="2" tableName=" http_url_cfg" ></serviceCfg>
<userRegion regionKey="DOMAIN_ID" regionColumn="compileId" userRegionPosition="0"></userRegion>
@@ -188,7 +188,8 @@
<userRegion regionKey="keyring_id" regionColumn="userRegion1" userRegionPosition="0"></userRegion>
<userRegion regionKey="intensity" regionColumn="userRegion5" userRegionPosition="0"></userRegion>
</service>
<service id="521" functionId="201" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="域名拦截白名单">
<service id="521" functionId="200" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP或域名拦截白名单">
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg>
</service>
<service id="515" functionId="201" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="域名拦截限速">