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

Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

Browse Source
This commit is contained in:
DuanDongmei
2018-11-26 20:12:29 +08:00
parent 3591288008 c9147ef04b
commit 01815bcf76
26 changed files with 2785 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/maat-tools-0.0.1-SNAPSHOT.jar
View File

Binary file not shown.

28
src/main/java/com/nis/domain/callback/InlineIp.java
View File

@@ -11,6 +11,10 @@ package com.nis.domain.callback;
import java.util.Date;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
import com.nis.util.StringUtils;
import com.nis.web.service.SpringContextHolder;
import com.nis.web.service.basics.SysDictInfoService;
/**
* @ClassName: InlineIp.java
@@ -58,7 +62,9 @@ public class InlineIp {
private Integer policyGroup;
@Expose
private String userRegion;//用于存储协议跟流量阀值
@Expose
@SerializedName("effectiveRange")
private String areaEffectiveIds ;
public String getUserRegion() {
return userRegion;
@@ -302,5 +308,23 @@ public class InlineIp {
public void setPolicyGroup(Integer policyGroup) {
this.policyGroup = policyGroup;
}
public String getAreaEffectiveIds() {
return areaEffectiveIds;
}
/**
* areaEffectiveIds
* areaEffectiveIds=7242:5,7212:4,7122:3
* 接口要求格式为：72425,72124,71223
* @param areaEffectiveIds
*/
public void setAreaEffectiveIds(String areaEffectiveIds) {
if(StringUtils.isEmpty(areaEffectiveIds)){
areaEffectiveIds="0";
}else {
// 组织区域、运营商配置下发格式
SysDictInfoService service = SpringContextHolder.getBean(SysDictInfoService.class);
areaEffectiveIds = service.setEffectiveRange(areaEffectiveIds);
}
this.areaEffectiveIds = areaEffectiveIds;
}
}

10
src/main/java/com/nis/domain/configuration/AppPolicyCfg.java
View File

@@ -40,21 +40,23 @@ public class AppPolicyCfg extends BaseCfg<AppPolicyCfg> {
private Integer appCode;//specific_service_cfg表一级节点的spec_service_code
private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code
private Integer specServiceId;
@ExcelField(title="basic_protocol",sort=3)
@ExcelField(title="basic_protocol",sort=5)
private String appName;
@ExcelField(title="behaviour_type",sort=4)
@ExcelField(title="behaviour_type",sort=6)
private String behavName;
private String cfgKeywords;
private String userRegion1;
@ExcelField(title="ratelimit",dictType="APP_RATE_LIMIT",sort=3)
private String userRegion2;
private String userRegion3;
@ExcelField(title="block_by_app_server_ip",dictType="SYS_YES_NO",sort=4)
private String userRegion4;
private String userRegion5;
private String configType;
@ExcelField(title="encrypted_tunnel_behavior",sort=3)
@ExcelField(title="encrypted_tunnel_behavior",sort=5)
private String behaviorName;
@ExcelField(title="social_app",sort=3)
@ExcelField(title="social_app",sort=5)
private String socialName;

12
src/main/java/com/nis/domain/configuration/PxyObjTrustedCaCert.java
View File

@@ -1,5 +1,6 @@
package com.nis.domain.configuration;
import com.nis.util.excel.ExcelField;
/**
* 可信证书
@@ -13,8 +14,19 @@ public class PxyObjTrustedCaCert extends BaseCfg<PxyObjTrustedCaCert> {
*/
private static final long serialVersionUID = -2720862431960415564L;
private String indexTable="pxy_obj_trusted_ca_cert";
@ExcelField(title="issuer",sort=3)
private String issuer; //颁发者
@ExcelField(title="certificate_file",sort=2)
private String certFile;
@ExcelField(title="crl_file",sort=4)
private String crlFile;
public String getCrlFile() {
return crlFile;
}
public void setCrlFile(String crlFile) {
this.crlFile = crlFile;
}
public String getIssuer() {
return issuer;
}

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

@@ -624,6 +624,142 @@ public class ConfigServiceUtil {
}
return result;
}
/**
* 配置全量更新指令下发
* @param params
* @return
* @throws MaatConvertException
*/
public static ToMaatResult configSyncCmd(String params) throws MaatConvertException{
Response response=null;
ToMaatResult bean = null;
try {
String result = null;
String url = DictUtils.getDictLabel("config_sync_url", "sync_cmd");
//创建连接
WebTarget wt = ClientUtil.getWebTarger(url);
logger.info("sync_cmd url:"+url);
//获取响应结果
Builder header = wt.request(MediaType.APPLICATION_JSON)
.header("Content-Type", MediaType.APPLICATION_JSON);
try {
response= header.post(Entity.entity(params, MediaType.APPLICATION_JSON));
if(response != null) {
result=response.readEntity(String.class);
}
} catch (Exception e) {
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
}
if(response != null && response.getStatus() == 200){
logger.info("get result success");
JsonConfig config=new JsonConfig();
JSONObject resObject = JSONObject.fromObject(result,config);
bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class);
}else{
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
}
} catch (Exception e) {
throw e;
}finally {
if (response != null) {
response.close();
}
}
return bean;
}
/**
* 配置全量更新获取当前状态
* @param params
* @return
* @throws MaatConvertException
*/
public static ToMaatResult configSyncStatus() throws MaatConvertException{
Response response=null;
ToMaatResult bean = null;
try {
String result = null;
String url = DictUtils.getDictLabel("config_sync_url", "get_sync_status");
//创建连接
WebTarget wt = ClientUtil.getWebTarger(url);
logger.info("get_sync_status url:"+url);
//获取响应结果
Builder header = wt.request(MediaType.APPLICATION_JSON)
.header("Content-Type", MediaType.APPLICATION_JSON);
try {
response= header.get();
if(response != null) {
result=response.readEntity(String.class);
}
} catch (Exception e) {
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
}
if(response != null && response.getStatus() == 200){
logger.info("get result success");
JsonConfig config=new JsonConfig();
JSONObject resObject = JSONObject.fromObject(result,config);
bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class);
}else{
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
}
} catch (Exception e) {
throw e;
}finally {
if (response != null) {
response.close();
}
}
return bean;
}
/**
* 配置全量更新
* @param params
* @return
* @throws MaatConvertException
*/
public static ToMaatResult configSync(String params,Integer cfgType,Integer serviceId,String tableName,String completeTag) throws MaatConvertException{
Response response=null;
ToMaatResult bean = null;
try {
String result = null;
String url = DictUtils.getDictLabel("config_sync_url", "sync_send");
//创建连接
WebTarget wt = ClientUtil.getWebTarger(url);
logger.info("sync_send url:"+url);
//获取响应结果
Builder header = wt.request(MediaType.APPLICATION_JSON)
.header("Content-Type", MediaType.APPLICATION_JSON)
.header("Config-Type", cfgType)
.header("Service-Id", serviceId)
.header("Config-Table", tableName)
.header("Last-Completed-Tag", completeTag);
try {
response= header.post(Entity.entity(params, MediaType.APPLICATION_JSON));
if(response != null) {
result=response.readEntity(String.class);
}
} catch (Exception e) {
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
}
if(response != null && response.getStatus() == 200){
logger.info("get result success");
JsonConfig config=new JsonConfig();
config.setExcludes(new String[]{"configCompileList"});
JSONObject resObject = JSONObject.fromObject(result,config);
bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class);
}else{
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
}
} catch (Exception e) {
throw e;
}finally {
if (response != null) {
response.close();
}
}
return bean;
}
public static void main(String[] args) {
try {
// getId(1,1);

137
src/main/java/com/nis/util/ServiceConfigTemplateUtil.java Normal file
View File

@@ -0,0 +1,137 @@
package com.nis.util;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.apache.commons.collections.map.CaseInsensitiveMap;
import org.apache.log4j.Logger;
import org.dom4j.Attribute;
import org.dom4j.Element;
import org.dom4j.Node;
import org.dom4j.io.SAXReader;
public class ServiceConfigTemplateUtil {
private Logger logger = Logger.getLogger(getClass());
private Node root;
/**
* 配置文件内容
* @return
*/
public ServiceConfigTemplateUtil(){
SAXReader reader = new SAXReader();
org.dom4j.Document document = null;
String configPath = "/service/service_config.xml";
try {
document = reader.read(ServiceConfigTemplateUtil.class.getResourceAsStream(configPath));
root = document.getRootElement();
} catch (Exception e) {
logger.error(e.getMessage());
e.printStackTrace();
}
}
/**
* 获取业务节点列表
* @return
*/
public List<Node> getServiceNodeList(){
List<Node> nodes = root.selectNodes("service");
return nodes;
}
/**
* 获取业务列表
* @return
*/
public List<Map<String,Object>> getServiceList(){
List<Map<String,Object>> list =new ArrayList();
List<Element> elements = root.selectNodes("service");
for(Element element:elements){
Map<String,Object> map = new HashMap();
for(int i=0;i<element.attributes().size();i++){
String attributeName = element.attribute(i).getName();
map.put(attributeName, element.attributeValue(attributeName));
}
map.put("cfgList", getServiceCfgList(element));
map.put("userRegionList",getUserRegionList(element));
list.add(map);
}
return list;
}
/**
* 获取业务配置列表
* @return
*/
public List<Map<String,Object>> getServiceCfgList(Element serviceNode){
List<Map<String,Object>> list = new ArrayList();
List<Element> elements = serviceNode.selectNodes("serviceCfg");
for(Element element:elements){
Map<String,Object> map = new HashMap();
for(int i=0;i<element.attributes().size();i++){
map.put(element.attribute(i).getName(), element.attributeValue(element.attribute(i).getName()));
}
list.add(map);
}
return list;
}
/**
* 获取用户自定义域列表
* @return
*/
public List<Map<String,Object>> getUserRegionList(Element serviceNode){
List<Map<String,Object>> list = new ArrayList();
List<Element> elements = serviceNode.selectNodes("userRegion");
for(Element element:elements){
Map<String,Object> map = new HashMap();
for(int i=0;i<element.attributes().size();i++){
map.put(element.attribute(i).getName(), element.attributeValue(element.attribute(i).getName()));
}
list.add(map);
}
return list;
}
/**
* 根据标签获取配置属性列表
* @param tag,如多层标签，格式为/tag/subTag/...
* @param attribute
* @return
*/
public List getXmlParamListByTag(String tag,String attribute){
List list =new ArrayList();
List<Element> elements = root.selectNodes(tag);
for(Element element:elements){
list.add(element.attributeValue(attribute));
}
return list;
}
public static void main(String[] args) {
try {
ServiceConfigTemplateUtil serviceTemplate = new ServiceConfigTemplateUtil();
List<Map<String,Object>> list = serviceTemplate.getServiceList();
for(Map<String,Object> map :list){
System.out.println("业务配置："+map.get("id")+","+map.get("functionId")+","+map.get("serviceType")+","+map.get("tableName"));
List<Map<String,Object>> cfgList = (List<Map<String, Object>>) map.get("cfgList");
List<Map<String,Object>> userRegionList = (List<Map<String, Object>>) map.get("userRegionList");
if(cfgList!=null){
for(Map<String,Object> m:cfgList){
System.out.println("cfgList:"+m.get("cfgType")+","+m.get("tableName")+","+m.get("groupReuse")+","+m.get("groupId"));
}
}
if(userRegionList!=null){
for(Map<String,Object> n:userRegionList){
System.out.println("userRegionList:"+n.get("regionKey")+","+n.get("regionColumn")+","+n.get("handleType"));
}
}
}
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
}

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

@@ -115,6 +115,7 @@ import com.nis.web.service.configuration.AvContentCfgService;
import com.nis.web.service.configuration.BgpCfgService;
import com.nis.web.service.configuration.CachePolicyService;
import com.nis.web.service.configuration.ComplexStringCfgService;
import com.nis.web.service.configuration.ConfigSynchronizationService;
import com.nis.web.service.configuration.ControlPolicyService;
import com.nis.web.service.configuration.DdosCfgService;
import com.nis.web.service.configuration.DnsIpCfgService;
@@ -251,6 +252,8 @@ public class BaseController {
//protected ConfigGroupInfoService configGroupInfoService;
@Autowired
protected CachePolicyService cachePolicyService;
@Autowired
protected ConfigSynchronizationService configSynchronizationService;
/**
* 管理基础路径
*/

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

@@ -255,7 +255,7 @@ public class BasicProtocolController extends BaseController {
classMap.put(entity.getMenuNameCode(), AppPolicyCfg.class);
classMap.put("NTC_IP", IpPortCfg.class);
classMap.put("NTC_SUBSCRIBE_ID", NtcSubscribeIdCfg.class);
String cfgIndexInfoNoExport=",encrypted_tunnel_behavior,behaviour_type,social_app,behaviour_type,expression_type,match_method,whether_hexbinary,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
String cfgIndexInfoNoExport=",ratelimit,block_by_app_server_ip,encrypted_tunnel_behavior,behaviour_type,social_app,behaviour_type,expression_type,match_method,whether_hexbinary,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
String ipPortInfoNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"
+ ",config_time,editor,edit_time,auditor,audit_time"
+",letter,whether_area_block,classification,attribute,label"

69
src/main/java/com/nis/web/controller/configuration/ConfigSynchronizationController.java Normal file
View File

@@ -0,0 +1,69 @@
package com.nis.web.controller.configuration;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
import com.nis.domain.FunctionServiceDict;
import com.nis.domain.Page;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.web.controller.BaseController;
/**
* 配置全量同步
* @author zhangwei
*
*/
@Controller
@RequestMapping("${adminPath}/config/synchronization")
public class ConfigSynchronizationController extends BaseController {
/**
* 下发同步命令
*/
@RequestMapping(value = {"cmd"})
public String cmd(Model model,String cmd){
return "";
}
/**
* 下发同步配置
*/
@RequestMapping(value = {"send"})
public void send(Model model,HttpServletRequest request,HttpServletResponse response){
try {
configSynchronizationService.send(request,response,null);
} catch (NoSuchFieldException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (SecurityException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (IllegalArgumentException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (IllegalAccessException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (ClassNotFoundException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
/**
* 同步状态获取
*/
@RequestMapping(value = {"getStatus"})
public String getStatus(Model model){
return "";
}
}

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

@@ -293,7 +293,7 @@ public class EncryptedTunnelBehaviorController extends BaseController {
classMap.put(entity.getMenuNameCode(), AppPolicyCfg.class);
classMap.put("NTC_IP", IpPortCfg.class);
classMap.put("NTC_SUBSCRIBE_ID", NtcSubscribeIdCfg.class);
String cfgIndexInfoNoExport=",social_app,basic_protocol,expression_type,match_method,whether_hexbinary,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
String cfgIndexInfoNoExport=",ratelimit,block_by_app_server_ip,social_app,basic_protocol,expression_type,match_method,whether_hexbinary,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
String ipPortInfoNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"
+ ",config_time,editor,edit_time,auditor,audit_time"
+",letter,whether_area_block,classification,attribute,label"

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

@@ -540,7 +540,7 @@ public class WebsiteController extends BaseController{
//http配置导出
@RequestMapping(value = "exportHttp")
public String exportHttp(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportHttp(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -658,7 +658,7 @@ public class WebsiteController extends BaseController{
logger.error("http export failed",e);
addMessage(redirectAttributes,"error", "export_failed");
}
return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+entity.getFunctionId();
//return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+entity.getFunctionId();
}
//dns配置导出
@@ -756,7 +756,7 @@ public class WebsiteController extends BaseController{
//ssl配置导出
@RequestMapping(value = "exportSsl")
public String exportSsl(Model model,HttpServletRequest request,HttpServletResponse response,
public void exportSsl(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")CfgIndexInfo entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
@@ -840,7 +840,7 @@ public class WebsiteController extends BaseController{
logger.error("http export failed",e);
addMessage(redirectAttributes,"error", "export_failed");
}
return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+entity.getFunctionId();
//return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+entity.getFunctionId();
}
}

47
src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java
View File

@@ -48,6 +48,7 @@ import com.nis.domain.maat.ToMaatResult.ResponseData;
import com.nis.exceptions.CallExternalProceduresException;
import com.nis.exceptions.MaatConvertException;
import com.nis.exceptions.MultiPartNewException;
import com.nis.util.ConfigDictUtils;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.FileUtils;
@@ -414,6 +415,52 @@ public class PxyObjKeyringController extends BaseController {
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}
//pxyObjTrustedCert配置导出
@RequestMapping(value = "exportCert")
public void exportCert(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")PxyObjTrustedCaCert entity,String ids,RedirectAttributes redirectAttributes){
try {
//export data info
List<String> titleList=new ArrayList<String>();
Map<String, Class<?>> classMap=new HashMap<String, Class<?>>();
Map<String, List> dataMap=new HashMap<String, List>();
Map<String, String> noExportMap=new HashMap<String, String>();
/*//导出选中记录
* if(!StringUtil.isEmpty(ids)){
for(String id:ids.split(",")){
Long.parseLong(id);
}
//List<CfgIndexInfo> list=ipCfgService.getListByCfgIdWithName(IpPortCfg.getTablename(), entity.getFunctionId(), ids);
}else{*/
//条件导出数据大于最大导出数，只导出最大导出条数
entity.setTableName(IpPortCfg.getTablename());
Page<PxyObjTrustedCaCert> pageInfo=new Page<PxyObjTrustedCaCert>(request, response,"r");
pageInfo.setPageNo(1);
pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
Page<PxyObjTrustedCaCert> page = pxyObjKeyringService.findTrustedCertPage(pageInfo, entity);
for (PxyObjTrustedCaCert cert:page.getList()) {
if(!StringUtil.isEmpty(cert.getCompileId())){
cert.setCrlFile(ConfigDictUtils.getTrustedCrlByCerId(cert.getCompileId()));
}
}
model.addAttribute("page", page);
titleList.add(entity.getMenuNameCode());
classMap.put(entity.getMenuNameCode(), PxyObjTrustedCaCert.class);
String cfgIndexInfoNoExport=",whether_area_block,block_type,valid_identifier,do_log,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,&config_describe:cert_name-";
noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
dataMap.put(entity.getMenuNameCode(), page.getList());
/*}*/
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("pxyObjKeyring export failed",e);
addMessage(redirectAttributes, "error","export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}
@RequestMapping(value = {"/trustedCertList"})
public String trustedCertList(Model model,HttpServletRequest request,HttpServletResponse response
,@ModelAttribute("cfg")PxyObjTrustedCaCert entity

84
src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java Normal file
View File

@@ -0,0 +1,84 @@
package com.nis.web.dao.configuration;
import java.util.Date;
import java.util.List;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.ResultType;
import org.apache.ibatis.annotations.Param;
import com.nis.domain.configuration.AppByteCfg;
import com.nis.domain.configuration.AppComplexKeywordCfg;
import com.nis.domain.configuration.AppDomainCfg;
import com.nis.domain.configuration.AppHeaderCfg;
import com.nis.domain.configuration.AppHttpCfg;
import com.nis.domain.configuration.AppIdCfg;
import com.nis.domain.configuration.AppIdCfg.AppFeaturesIndex;
import com.nis.domain.configuration.AppInnerRuleCfg;
import com.nis.domain.configuration.AppIpCfg;
import com.nis.domain.configuration.AppPolicyCfg;
import com.nis.domain.configuration.AppSslCertCfg;
import com.nis.domain.configuration.AppStringCfg;
import com.nis.domain.configuration.AppTcpCfg;
import com.nis.domain.configuration.AppTopicDomainCfg;
import com.nis.domain.configuration.AvFileSampleCfg;
import com.nis.domain.configuration.BaseCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.ComplexkeywordCfg;
import com.nis.domain.configuration.DdosIpCfg;
import com.nis.domain.configuration.DnsIpCfg;
import com.nis.domain.configuration.DnsResStrategy;
import com.nis.domain.configuration.FileDigestCfg;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.PxyObjKeyring;
import com.nis.domain.configuration.PxyObjTrustedCaCert;
import com.nis.domain.configuration.PxyObjTrustedCaCrl;
import com.nis.domain.configuration.WebsiteDomainTopic;
import com.nis.web.dao.CrudDao;
import com.nis.web.dao.MyBatisDao;
/**
* 配置全量同步相关配置数据处理类
* @author zhangwei
*
*/
@MyBatisDao
public interface ConfigSynchronizationDao {
//app策略配置增删改查
// public List<AppPolicyCfg> findAppPolicyList(AppPolicyCfg entity) ;
// public List<IpPortCfg> getAppPolicyIpList(AppPolicyCfg entity);
// //app协议IP配置增删改查
// public List<AppIpCfg> findAppIpList(AppIpCfg entity) ;
// //app http特征增删改查
// public List<AppHttpCfg> findAppHttpList(AppHttpCfg entity) ;
// //app 域名配置增删改查
// public List<AppDomainCfg> findAppDomainList(AppDomainCfg entity) ;
// //app 主题网站配置增删改查
// public List<AppTopicDomainCfg> findAppTopicDomainList(AppTopicDomainCfg entity) ;
// //app 字节特征增删改查
// public List<AppByteCfg> findAppByteList(AppByteCfg entity) ;
// //app ssl证书特征配置CRUD
// public List<AppSslCertCfg> findAppSslList(AppSslCertCfg entity);
// //app header特征配置CRUD
// public List<AppHeaderCfg> findAppHeaderList(AppHeaderCfg entity);
// //域名关联表操作
// public List<WebsiteDomainTopic> getDomainDict(WebsiteDomainTopic websiteDomainTopic);
public List<CfgIndexInfo> getCfgIndexList(BaseCfg entity);
public List<IpPortCfg> getIpPortList(@Param("tableName")String tableName,@Param("compileIds")List compileIds);
public List<BaseStringCfg> getStrList(@Param("tableName")String tableName,@Param("compileIds")List compileIds);
public List<ComplexkeywordCfg> getComplexStrList(@Param("tableName")String tableName,@Param("compileIds")List compileIds);
public List<FileDigestCfg> getFileDigestList(@Param("tableName")String tableName,@Param("compileIds")List compileIds);
public List<DdosIpCfg> getDdosIpCfgList(BaseCfg entity);
public List<AvFileSampleCfg> getAvFileCfgList(BaseCfg entity);
public List<PxyObjKeyring> getPxyObjKeyringCfgList(BaseCfg entity);
public List<PxyObjTrustedCaCert> getPxyObjTrustedCertCfgList(BaseCfg entity);
public List<PxyObjTrustedCaCrl> getPxyObjTrustedCrlCfgList(BaseCfg entity);
public List<DnsResStrategy> getDnsStrategyList(BaseCfg entity);
public List<DnsIpCfg> getDnsIpCfgList(BaseCfg entity);
public List<IpPortCfg> getIpPortListByService(BaseCfg entity);
}

1357
src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml Normal file
View File

File diff suppressed because it is too large Load Diff

12
src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml
View File

@@ -37,6 +37,7 @@
<result column="antiddos_protocol" property="antiddosProtocol" jdbcType="VARCHAR" />
<result column="bps_threadshold" property="bpsThreadshold" jdbcType="BIGINT" />
<result column="pps_threadshold" property="ppsThreadshold" jdbcType="BIGINT" />
<result column="do_log" property="doLog" jdbcType="INTEGER" />
</resultMap>
<sql id="columns">
@@ -44,7 +45,7 @@
,r.protocol,r.protocol_id,r.direction,r.cfg_type,r.action,r.dest_port,r.dest_ip_address
,r.is_valid,r.is_audit,r.creator_id,r.create_time,r.editor_id
,r.edit_time,r.auditor_id,r.audit_time,r.service_id,r.request_id,
r.compile_id,r.is_area_effective,r.classify,r.attribute,r.lable
r.compile_id,r.is_area_effective,r.classify,r.attribute,r.lable,r.do_log
,r.area_effective_ids,r.function_id,r.cfg_region_code,r.antiddos_protocol,r.bps_threadshold,r.pps_threadshold
</sql>
@@ -219,7 +220,8 @@
cfg_region_code,
antiddos_protocol,
bps_threadshold,
pps_threadshold
pps_threadshold,
do_log
)values (
#{cfgDesc,jdbcType=VARCHAR},
#{action,jdbcType=INTEGER},
@@ -254,7 +256,8 @@
#{cfgRegionCode,jdbcType=INTEGER},
#{antiddosProtocol,jdbcType=VARCHAR},
#{bpsThreadshold,jdbcType=BIGINT},
#{ppsThreadshold,jdbcType=BIGINT}
#{ppsThreadshold,jdbcType=BIGINT},
#{doLog,jdbcType=INTEGER}
)
</insert>
@@ -348,6 +351,9 @@
</if>
<if test="cfgRegionCode != null " >
cfg_region_code = #{cfgRegionCode,jdbcType=INTEGER},
</if>
<if test="doLog != null " >
do_log = #{doLog,jdbcType=INTEGER},
</if>
antiddos_protocol = #{antiddosProtocol,jdbcType=VARCHAR},
bps_threadshold = #{bpsThreadshold,jdbcType=BIGINT},

557
src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java Normal file
View File

@@ -0,0 +1,557 @@
package com.nis.web.service.configuration;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import net.sf.json.JSONObject;
import org.apache.poi.ss.formula.functions.T;
import org.dom4j.Node;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import antlr.StringUtils;
import com.nis.domain.FunctionServiceDict;
import com.nis.domain.Page;
import com.nis.domain.configuration.AppPolicyCfg;
import com.nis.domain.configuration.AvFileSampleCfg;
import com.nis.domain.configuration.BaseCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.ComplexkeywordCfg;
import com.nis.domain.configuration.DdosIpCfg;
import com.nis.domain.configuration.DnsIpCfg;
import com.nis.domain.configuration.DnsResStrategy;
import com.nis.domain.configuration.FileDigestCfg;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.PxyObjKeyring;
import com.nis.domain.configuration.PxyObjTrustedCaCert;
import com.nis.domain.configuration.PxyObjTrustedCaCrl;
import com.nis.domain.maat.MaatCfg;
import com.nis.domain.maat.ToMaatBean;
import com.nis.domain.maat.ToMaatResult;
import com.nis.domain.maat.MaatCfg.DigestCfg;
import com.nis.domain.maat.MaatCfg.GroupCfg;
import com.nis.domain.maat.MaatCfg.IpCfg;
import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;
import com.nis.domain.maat.MaatCfg.StringCfg;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.DateUtils;
import com.nis.util.DictUtils;
import com.nis.util.ServiceConfigTemplateUtil;
import com.nis.util.StringUtil;
import com.nis.web.dao.configuration.ConfigSynchronizationDao;
import com.nis.web.security.UserUtils;
import com.nis.web.service.BaseService;
/**
* 配置全量同步事务类
* @author zhangwei
*
*/
@Service
public class ConfigSynchronizationService extends BaseService{
@Autowired
protected ConfigSynchronizationDao configSynchronizationDao;
private ToMaatBean maatBean;
private MaatCfg maatCfg;
private List<MaatCfg> configCompileList;
private List<GroupCfg> groupRelationList;
private List<IpCfg> ipRegionList;
private List<StringCfg> strRegionList;
private List<NumBoundaryCfg> numRegionList;
private List<DigestCfg> digestRegionList;
private List<IpCfg> areaIpRegionList;
/**
* 配置全量更新下发
* @param request
* @param response
* @throws IllegalAccessException
* @throws IllegalArgumentException
* @throws SecurityException
* @throws NoSuchFieldException
* @throws ClassNotFoundException
*/
public void send(HttpServletRequest request,HttpServletResponse response,BaseCfg cfg) throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException, ClassNotFoundException {
long start = System.currentTimeMillis();
ServiceConfigTemplateUtil serviceTemplate = new ServiceConfigTemplateUtil();
if(cfg==null){
List<Map<String,Object>> serviceList = serviceTemplate.getServiceList();
for(Map<String,Object> service:serviceList){
String tableName = service.get("tableName").toString();
String serviceType = service.get("serviceType").toString();
String className = service.get("className").toString();
String serviceId = service.get("id").toString();
BaseCfg entity = new BaseCfg();
entity.setServiceId(Integer.valueOf(serviceId));
entity.setIsAudit(1);
entity.setIsValid(1);
if("1".equals(serviceType)){//maat类配置
List<Map<String,Object>> cfgList = (List<Map<String, Object>>) service.get("cfgList");
List<Map<String,Object>> userRegionList = (List<Map<String, Object>>) service.get("userRegionList");
if("cfg_index_info".equals(tableName)){
Page<CfgIndexInfo> page=new Page<CfgIndexInfo>(request,response,Constants.MAAT_JSON_SEND_SIZE,"a");
handleNtcMaatData(cfgList,userRegionList,page,entity,request,response,false);
}else if("ddos_ip_cfg".equals(tableName)){
Page<DdosIpCfg> page=new Page<DdosIpCfg>(request,response,Constants.MAAT_JSON_SEND_SIZE,"a");
handleDdosMaatData(cfgList,userRegionList,page,entity,request,response,false);
}
}else if("2".equals(serviceType)){//回调类配置
entity.setTableName(tableName);
entity.setServiceId(Integer.valueOf(serviceId));
Page<BaseCfg> page=new Page<BaseCfg>(request,response,Constants.MAAT_JSON_SEND_SIZE,"a");
handleCallbackData(className,page,entity,request,response,false);
}
}
long end = System.currentTimeMillis();
logger.info("本次配置全量同步,开始时间："+start
+",结束时间："+end
+"，共计花费"+((end-start)/1000+"秒"));
}else{
}
}
/**
* 处理ntc业务maat类配置
* @param serviceId
* @param request
* @param response
* @throws SecurityException
* @throws NoSuchFieldException
* @throws IllegalAccessException
* @throws IllegalArgumentException
*/
public void handleNtcMaatData(List<Map<String,Object>>cfgList,List<Map<String,Object>>userRegionList,
Page<CfgIndexInfo> page,BaseCfg entity,HttpServletRequest request,HttpServletResponse response,
boolean isUpdateCfg) throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException{
boolean hasData = true;
while(hasData){
List<IpPortCfg> ipList = new ArrayList();
List<BaseStringCfg> strList = new ArrayList();
List<ComplexkeywordCfg> complexStrList = new ArrayList();
List<com.nis.domain.configuration.NumBoundaryCfg> numList = new ArrayList();
List<FileDigestCfg> fileList = new ArrayList();
maatBean = new ToMaatBean();
configCompileList = new ArrayList();
entity.setPage(page);
List<CfgIndexInfo> list = configSynchronizationDao.getCfgIndexList(entity);
if(!StringUtil.isEmpty(list)){
List<Integer> compileIds = new ArrayList();
for(CfgIndexInfo cfg:list){
compileIds.add(cfg.getCompileId());
}
if(cfgList!=null){
for(Map<String,Object> m:cfgList){
String tableName = m.get("tableName").toString();
if("1".equals(m.get("cfgType"))){
if(tableName.equals("asn_ip_cfg")){
}else{
ipList.addAll(configSynchronizationDao.getIpPortList(tableName, compileIds));
}
}else if("2".equals(m.get("cfgType"))){
strList.addAll(configSynchronizationDao.getStrList(tableName,compileIds));
}else if("3".equals(m.get("cfgType"))){
complexStrList.addAll(configSynchronizationDao.getComplexStrList(tableName,compileIds));
}else if("4".equals(m.get("cfgType"))){
}else if("5".equals(m.get("cfgType"))){
fileList.addAll(configSynchronizationDao.getFileDigestList(tableName, compileIds));
}
}
}
for(CfgIndexInfo cfg:list){
maatCfg = new MaatCfg();
maatCfg.initDefaultValue();
groupRelationList = new ArrayList();
ipRegionList = new ArrayList();
strRegionList = new ArrayList();
numRegionList = new ArrayList();
digestRegionList = new ArrayList();
areaIpRegionList = new ArrayList();
List<IpPortCfg> list1 = new ArrayList();
List<BaseStringCfg> list2 = new ArrayList();
List<ComplexkeywordCfg> list3 = new ArrayList();
List<com.nis.domain.configuration.NumBoundaryCfg> list4 = new ArrayList();
List<FileDigestCfg> list5 = new ArrayList();
String userRegion = "";
//处理自定义域
if(userRegionList!=null){
for(Map<String,Object> n:userRegionList){
Object userRegionPosition = n.get("userRegionPosition");
if(userRegionPosition!=null && (userRegionPosition.toString().equals("1")||userRegionPosition.toString().equals("0"))){
//通过反射机制获取自定义域字段值
String regionColumn = n.get("regionColumn").toString();
Class aClass = null;
if(userRegionPosition.toString().equals(("0"))){
aClass = BaseCfg.class;
}else{
aClass = CfgIndexInfo.class;
}
Object value = "";
if(entity.getServiceId().equals(517)||entity.getServiceId().equals(560)){//代理替换策略
String[] regionArray = regionColumn.split(",");
for(int r=0;r<regionArray.length;r++){
Field field = aClass.getDeclaredField(regionArray[r]);
field.setAccessible(true);
value += "/"+replaceContentEscape(field.get(cfg)==null?"":field.get(cfg).toString());//自定义域以/分割时的处理
}
userRegion += n.get("regionKey")+"="+value+Constants.USER_REGION_SPLIT;
}else{
Field field = aClass.getDeclaredField(regionColumn);
field.setAccessible(true);
value = field.get(cfg);
if(!StringUtil.isEmpty(value)){
if(StringUtil.isEmpty(n.get("regionKey"))){
userRegion = value.toString();
}else{
userRegion += n.get("regionKey")+"="+value+Constants.USER_REGION_SPLIT;
}
}
}
}
// System.out.println("userRegionList:"+n.get("regionKey")+","+n.get("regionColumn")+","+n.get("handleType"));
}
if(userRegion.endsWith(Constants.USER_REGION_SPLIT)){
userRegion = userRegion.substring(0, userRegion.length()-1);
}
}
for(IpPortCfg ip:ipList){
if(ip.getCompileId().equals(cfg.getCompileId())){
list1.add(ip);
}
}
for(BaseStringCfg str:strList){
if(str.getCompileId().equals(cfg.getCompileId())){
list2.add(str);
if(entity.getServiceId().equals(513)||entity.getServiceId().equals(515)){
if(userRegion.equals("")){
userRegion += Constants.USERREGION_DOMAIN_STR+"="+str.getCfgKeywords();
}else{
userRegion += Constants.USER_REGION_SPLIT+Constants.USERREGION_DOMAIN_STR+"="+str.getCfgKeywords();
}
}
}
}
for(ComplexkeywordCfg str:complexStrList){
if(str.getCompileId().equals(cfg.getCompileId())){
list3.add(str);
if(entity.getServiceId().equals(129) && str.getDistrict()!=null){//http监测
String dictValue = DictUtils.getDictCode(Constants.HTTP_HEADER_DICT_MODULE, str.getDistrict());
if(StringUtil.isEmpty(dictValue) || dictValue.equals("默认")){
if(userRegion.equals("")){
userRegion += Constants.HTTP_HEADER_USER_REGION_KEY+"="+str.getDistrict();
}else{
userRegion += Constants.USER_REGION_SPLIT+Constants.HTTP_HEADER_USER_REGION_KEY+"="+str.getDistrict();
}
}
}
}
}
for(com.nis.domain.configuration.NumBoundaryCfg num:numList){
if(num.getCompileId().equals(cfg.getCompileId())){
list4.add(num);
}
}
for(FileDigestCfg file:fileList){
if(file.getCompileId().equals(cfg.getCompileId())){
list5.add(file);
}
}
if(list1.size()>0){
ipList.removeAll(list1);
Map<String,List> map = cfgConvert(ipRegionList,list1,1,cfg,groupRelationList);
groupRelationList=map.get("groupList");
ipRegionList=map.get("dstList");
if(map.get("numRegionList")!=null){
numRegionList.addAll(map.get("numRegionList"));
}
}
if(list2.size()>0){
strList.removeAll(list2);
Map<String,List> map = cfgConvert(strRegionList,list2,2,cfg,groupRelationList);
groupRelationList=map.get("groupList");
strRegionList=map.get("dstList");
}
if(list3.size()>0){
complexStrList.removeAll(list3);
Map<String,List> map = cfgConvert(strRegionList,list3,3,cfg,groupRelationList);
groupRelationList=map.get("groupList");
strRegionList=map.get("dstList");
}
if(list4.size()>0){
numList.removeAll(list4);
Map<String,List> map = cfgConvert(numRegionList,list4,4,cfg,groupRelationList);
groupRelationList=map.get("groupList");
numRegionList=map.get("dstList");
}
if(list5.size()>0){
fileList.removeAll(list5);
Map<String,List> map = cfgConvert(digestRegionList,list5,5,cfg,groupRelationList);
groupRelationList=map.get("groupList");
digestRegionList=map.get("dstList");
}
BeanUtils.copyProperties(cfg, maatCfg);
maatCfg.setAction(cfg.getAction());
maatCfg.setAuditTime(cfg.getAuditTime());
maatCfg.setIpRegionList(ipRegionList);
maatCfg.setStrRegionList(strRegionList);
maatCfg.setNumRegionList(numRegionList);
maatCfg.setDigestRegionList(digestRegionList);
maatCfg.setGroupRelationList(groupRelationList);
maatCfg.setGroupNum(groupRelationList.size());
maatCfg.setAreaIpRegionList(areaIpRegionList);
maatCfg.setIsValid(cfg.getIsValid());
if(!StringUtil.isEmpty(userRegion)){
maatCfg.setUserRegion(userRegion);
}
configCompileList.add(maatCfg);
}
page.setList(list);
if(page.isLastPage()){
hasData = false;
}else{
page.setPageNo(page.getNext());
}
if(!StringUtil.isEmpty(configCompileList.size())){
maatBean.setConfigCompileList(configCompileList);
maatBean.setAuditTime(new Date());
maatBean.setCreatorName(UserUtils.getUser().getName());
maatBean.setVersion(Constants.MAAT_VERSION);
maatBean.setOpAction(Constants.INSERT_ACTION);
String json=gsonToJson(maatBean);
// System.out.println(json);
//调用服务接口配置全量更新
ToMaatResult result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,(hasData?null:"FINISHED"));
}
}else{
hasData = false;
}
}
}
/**
* 处理ddos配置
* @param serviceId
* @param request
* @param response
* @throws SecurityException
* @throws NoSuchFieldException
* @throws IllegalAccessException
* @throws IllegalArgumentException
*/
public void handleDdosMaatData(List<Map<String,Object>>cfgList,List<Map<String,Object>>userRegionList,
Page<DdosIpCfg> page,BaseCfg entity,HttpServletRequest request,HttpServletResponse response,
boolean isUpdateCfg) throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException{
boolean hasData = true;
while(hasData){
List<IpPortCfg> ipList = new ArrayList();
maatBean = new ToMaatBean();
configCompileList = new ArrayList();
entity.setPage(page);
List<DdosIpCfg> list = configSynchronizationDao.getDdosIpCfgList(entity);
if(!StringUtil.isEmpty(list)){
for(DdosIpCfg cfg:list){
maatCfg = new MaatCfg();
maatCfg.initDefaultValue();
groupRelationList = new ArrayList();
ipRegionList = new ArrayList();
strRegionList = new ArrayList();
numRegionList = new ArrayList();
digestRegionList = new ArrayList();
areaIpRegionList = new ArrayList();
List<DdosIpCfg> list1 = new ArrayList();
String userRegion = "";
//处理自定义域
if(userRegionList!=null){
for(Map<String,Object> n:userRegionList){
Object userRegionPosition = n.get("userRegionPosition");
if(userRegionPosition!=null && (userRegionPosition.toString().equals("1")||userRegionPosition.toString().equals("0"))){
//通过反射机制获取自定义域字段值
String regionColumn = n.get("regionColumn").toString();
Class aClass = null;
if(userRegionPosition.toString().equals(("0"))){
aClass = BaseCfg.class;
}else{
aClass = DdosIpCfg.class;
}
Object value = "";
Field field = aClass.getDeclaredField(regionColumn);
field.setAccessible(true);
value = field.get(cfg);
if(!StringUtil.isEmpty(value)){
if(StringUtil.isEmpty(n.get("regionKey"))){
userRegion = value.toString();
}else{
userRegion += n.get("regionKey")+"="+value+Constants.USER_REGION_SPLIT;
}
}
}
}
if(userRegion.endsWith(Constants.USER_REGION_SPLIT)){
userRegion = userRegion.substring(0, userRegion.length()-1);
}
}
list1.add(cfg);
if(list1.size()>0){
ipList.removeAll(list1);
Map<String,List> map = cfgConvert(ipRegionList,list1,1,cfg,groupRelationList);
groupRelationList=map.get("groupList");
ipRegionList=map.get("dstList");
if(map.get("numRegionList")!=null){
numRegionList.addAll(map.get("numRegionList"));
}
}
BeanUtils.copyProperties(cfg, maatCfg);
maatCfg.setAction(cfg.getAction());
maatCfg.setAuditTime(cfg.getAuditTime());
maatCfg.setIpRegionList(ipRegionList);
maatCfg.setStrRegionList(strRegionList);
maatCfg.setNumRegionList(numRegionList);
maatCfg.setDigestRegionList(digestRegionList);
maatCfg.setGroupRelationList(groupRelationList);
maatCfg.setGroupNum(groupRelationList.size());
maatCfg.setAreaIpRegionList(areaIpRegionList);
maatCfg.setIsValid(cfg.getIsValid());
if(!StringUtil.isEmpty(userRegion)){
maatCfg.setUserRegion(userRegion);
}
configCompileList.add(maatCfg);
}
page.setList(list);
if(page.isLastPage()){
hasData = false;
}else{
page.setPageNo(page.getNext());
}
if(!StringUtil.isEmpty(configCompileList.size())){
maatBean.setConfigCompileList(configCompileList);
maatBean.setAuditTime(new Date());
maatBean.setCreatorName(UserUtils.getUser().getName());
maatBean.setVersion(Constants.MAAT_VERSION);
maatBean.setOpAction(Constants.INSERT_ACTION);
String json=gsonToJson(maatBean);
// System.out.println(json);
//调用服务接口配置全量更新
ToMaatResult result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,(hasData?null:"FINISHED"));
}
}else{
hasData = false;
}
}
}
/**
* 处理app业务maat类配置
* @param serviceId
* @param request
* @param response
*/
public void handleAppMaatData(List<Map<String,Object>>cfgList,List<Map<String,Object>>userRegionList,
Page<BaseCfg> page,Object entity,HttpServletRequest request,HttpServletResponse response){
/*if(entity instanceof AppPolicyCfg){
AppPolicyCfg newEntity = entity;
entity.setPage(page);
}
boolean hasData = true;
while(hasData){
List<CfgIndexInfo> list = configSynchronizationDao.getCfgIndexList(entity);
page.setList(list);
if(page.isLastPage()){
hasData = false;
}
}*/
}
/**
* 处理回调类业务配置
* @param serviceId
* @param request
* @param response
* @throws ClassNotFoundException
*/
public void handleCallbackData(String className,
Page<BaseCfg> page,BaseCfg entity,HttpServletRequest request,HttpServletResponse response,
boolean isUpdateCfg) throws ClassNotFoundException{
boolean hasData = true;
while(hasData){
maatBean = new ToMaatBean();
configCompileList = new ArrayList();
entity.setPage(page);
List list = new ArrayList();
List newList = new ArrayList();
if(className.equals("AvFileSampleCfg")){
list = configSynchronizationDao.getAvFileCfgList(entity);
}else if(className.equals("PxyObjKeyring")){
list = configSynchronizationDao.getPxyObjKeyringCfgList(entity);
for(int i=0;i<list.size();i++){
PxyObjKeyring cfg = (PxyObjKeyring) list.get(i);
newList.add(convertCallBackProxyObjKeyring(cfg));
}
}else if(className.equals("PxyObjTrustedCaCert")){
list = configSynchronizationDao.getPxyObjTrustedCertCfgList(entity);
for(int i=0;i<list.size();i++){
PxyObjTrustedCaCert cfg = (PxyObjTrustedCaCert) list.get(i);
newList.add(convertCallBackProxyObjTrustedCa(cfg,null));
}
}else if(className.equals("PxyObjTrustedCaCrl")){
list = configSynchronizationDao.getPxyObjTrustedCrlCfgList(entity);
for(int i=0;i<list.size();i++){
PxyObjTrustedCaCrl cfg = (PxyObjTrustedCaCrl) list.get(i);
newList.add(convertCallBackProxyObjTrustedCa(null,cfg));
}
}else if(className.equals("DnsResStrategy")){
list = configSynchronizationDao.getDnsStrategyList(entity);
for(int i=0;i<list.size();i++){
DnsResStrategy cfg = (DnsResStrategy) list.get(i);
newList.add(convertCallBackDnsResStrategy(cfg));
}
}else if(className.equals("DnsIpCfg")){
list = configSynchronizationDao.getDnsIpCfgList(entity);
for(int i=0;i<list.size();i++){
DnsIpCfg cfg = (DnsIpCfg) list.get(i);
newList.add(convertCallBackIp(cfg,cfg.getGroupId()));
}
}else if(className.equals("IpPortCfg")){
list = configSynchronizationDao.getIpPortListByService(entity);
for(int i=0;i<list.size();i++){
IpPortCfg cfg = (IpPortCfg) list.get(i);
newList.add(convertCallBackIp(cfg,cfg.getGroupId()));
}
}
page.setList(list);
if(page.isLastPage()){
hasData = false;
}else{
page.setPageNo(page.getNext());
}
//调用服务接口下发配置数据
String json=gsonToJson(newList);
logger.info("回调类配置同步："+json);
//调用服务接口同步回调类配置
ToMaatResult result = ConfigServiceUtil.configSync(json,2,entity.getServiceId(),entity.getTableName(),(hasData?null:"FINISHED"));
// logger.info("回调类配置同步："+result.getMsg());
}
}
}

6
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1017,7 +1017,7 @@ domain_intercepter_ratelimit=\u57DF\u540D\u62E6\u622A\u9650\u901F
app_built_in_features_config=APP\u5185\u7F6E\u7279\u5F81\u7EF4\u62A4
PXY_INTERCEPT_PKT_BIN=\u5305\u8F7D\u8377
certificate=\u8BC1\u4E66
do_log=\u662F\u5426\u8BB0\u5F55\u65E5\u5FD7
do_log=\u8BB0\u5F55\u975E\u7ED3\u6784\u5316\u65E5\u5FD7
file_strategy=\u6587\u4EF6\u7B56\u7565
file_desc=\u6587\u4EF6\u63CF\u8FF0\t
content_type=\u5185\u5BB9\u7C7B\u578B
@@ -1308,4 +1308,6 @@ dns_sub=DNS\u5B89\u5168\u673A\u5236
action_cache=\u7F13\u5B58
action_cache_whitelist=\u7F13\u5B58\u767D\u540D\u5355
crl_issuer_null=CRL\u6587\u4EF6\u7684\u9881\u53D1\u8005\u4E3A\u7A7A
block_by_app_server_ip=Block by application server ip
block_by_app_server_ip=Block by application server ip
certificate_file=\u8BC1\u4E66\u6587\u4EF6
crl_file=Crl\u6587\u4EF6

264
src/main/resources/service/service_config.xml Normal file
View File

@@ -0,0 +1,264 @@
<?xml version="1.0" encoding="UTF-8"?>
<serviceList>
<!-- NTC或PROXY MAAT类配置开始 -->
<service id="1" functionId="3" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
</service>
<service id="16" functionId="5" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="1" tableName="asn_ip_cfg" groupReuse="true" groupId="userRegion4"></serviceCfg>
<userRegion regionKey="ASN_ID" regionColumn="userRegion5" userRegionPosition="0"></userRegion>
</service>
<service id="128" functionId="5" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="1" tableName="asn_ip_cfg" groupReuse="true" groupId="userRegion4"></serviceCfg>
<userRegion regionKey="ASN_ID" regionColumn="userRegion5" userRegionPosition="0" ></userRegion>
</service>
<service id="3" functionId="5" serviceType="2" tableName="ip_port_cfg" className="IpPortCfg" />
<service id="514" functionId="5" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<userRegion regionKey="Droprate" regionColumn="userRegion2" userRegionPosition="0"></userRegion>
</service>
<service id="517" functionId="212" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="intercept_pkt_bin" ></serviceCfg>
<userRegion regionKey="zone" regionColumn="userRegion1" userRegionPosition="0"></userRegion>
<userRegion regionKey="substitute" regionColumn="userRegion2,userRegion3" userRegionPosition="0"></userRegion>
</service>
<service id="2" functionId="6" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo">
<serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg>
</service>
<!-- <service id="129" functionId="6" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo">
<serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg>
</service> -->
<!-- <service id="17" functionId="6" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo">
<serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg>
</service> -->
<service id="152" functionId="635" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo">
<serviceCfg cfgType="2" tableName="http_body_cfg" ></serviceCfg>
</service>
<service id="40" functionId="635" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo">
<serviceCfg cfgType="2" tableName="http_body_cfg" ></serviceCfg>
</service>
<service id="129" functionId="8" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="http_body_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="http_req_head_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="http_res_head_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
<userRegion regionKey="HTTP_HEADER" regionColumn="district" userRegionPosition="2"></userRegion>
</service>
<service id="17" functionId="8" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="http_body_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="http_req_head_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="http_res_head_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
</service>
<service id="18" functionId="7" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="dns_domain_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
<userRegion regionKey="DNS_STRATEGY" regionColumn="dnsStrategyId" userRegionPosition="1"></userRegion>
</service>
<service id="130" functionId="7" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="dns_domain_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
</service>
<service id="131" functionId="34" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ssl_keyword_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
</service>
<service id="19" functionId="34" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ssl_keyword_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
</service>
<service id="66" functionId="37" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="mail_keyword_cfg" ></serviceCfg>
</service>
<service id="132" functionId="34" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="2" tableName="mail_keyword_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
</service>
<service id="20" functionId="34" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="2" tableName="mail_keyword_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
</service>
<service id="132" functionId="35" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" 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" >
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="mail_keyword_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
</service>
<service id="133" functionId="51" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ftp_keyword_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
</service>
<service id="21" functionId="51" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ftp_keyword_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
</service>
<service id="34" functionId="510" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg"></serviceCfg>
<serviceCfg cfgType="2" tableName="p2p_hash_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="p2p_keyword_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
<userRegion regionKey="P2P_IP_TYPE" regionColumn="userRegion2" userRegionPosition="0"></userRegion>
<userRegion regionKey="HASH_TYPE" regionColumn="userRegion1" userRegionPosition="0"></userRegion>
</service>
<service id="146" functionId="510" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg"></serviceCfg>
<serviceCfg cfgType="2" tableName="p2p_hash_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="p2p_keyword_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
<userRegion regionKey="P2P_IP_TYPE" regionColumn="userRegion2" userRegionPosition="0"></userRegion>
<userRegion regionKey="HASH_TYPE" regionColumn="userRegion1" userRegionPosition="0"></userRegion>
</service>
<service id="39" functionId="22" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="av_cont_url_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
</service>
<service id="151" functionId="22" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="av_cont_url_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
</service>
<service id="38" functionId="24" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="av_voip_account_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
</service>
<service id="150" functionId="24" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="av_voip_account_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
</service>
<service id="31" functionId="61" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_bgp_as_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
</service>
<service id="143" functionId="61" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_bgp_as_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
</service>
<service id="399" functionId="52" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="5" tableName="file_digest_cfg" ></serviceCfg>
</service>
<service id="273" functionId="52" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="5" tableName="file_digest_cfg" ></serviceCfg>
</service>
<service id="5" functionId="301" serviceType="1" tableName="ddos_ip_cfg" className="DdosIpCfg" >
<userRegion regionKey="protocol" regionColumn="antiddosProtocol" userRegionPosition="1"></userRegion>
<userRegion regionKey="bps_threadshold" regionColumn="bpsThreadshold" userRegionPosition="1"></userRegion>
<userRegion regionKey="pps_threadshold" regionColumn="ppsThreadshold" userRegionPosition="1"></userRegion>
</service>
<service id="512" functionId="200" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<userRegion regionKey="keyring_id" regionColumn="userRegion1" handleType="none" ></userRegion>
</service>
<service id="521" functionId="200" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
</service>
<service id="513" functionId="201" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="2" tableName=" http_url_cfg" ></serviceCfg>
<userRegion regionKey="DOMAIN_ID" regionColumn="compileId" userRegionPosition="0"></userRegion>
<userRegion regionKey="DOMAIN_STR" regionColumn="cfgKeywords" userRegionPosition="2"></userRegion>
<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" >
<serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg>
</service>
<service id="515" functionId="201" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="2" tableName=" http_url_cfg" ></serviceCfg>
<userRegion regionKey="DOMAIN_ID" regionColumn="compileId" userRegionPosition="0"></userRegion>
<userRegion regionKey="DOMAIN_STR" regionColumn="cfgKeywords" userRegionPosition="2"></userRegion>
<userRegion regionKey="Droprate" regionColumn="userRegion2" userRegionPosition="0"></userRegion>
</service>
<service id="592" functionId="210" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="http_body_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="http_req_head_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="http_res_head_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
</service>
<service id="576" functionId="207" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="http_body_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="http_req_head_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="http_res_head_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
<userRegion regionKey="code" regionColumn="userRegion1" userRegionPosition="0"></userRegion>
<userRegion regionKey="content" regionColumn="userRegion2" userRegionPosition="0"></userRegion>
<userRegion regionKey="content_file_id" regionColumn="userRegion3" userRegionPosition="0"></userRegion>
</service>
<service id="528" functionId="208" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="http_body_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="http_req_head_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="http_res_head_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
<userRegion regionKey="code" regionColumn="userRegion1" userRegionPosition="0"></userRegion>
<userRegion regionKey="ur" regionColumn="userRegion2" userRegionPosition="0"></userRegion>
<userRegion regionKey="content_file_id" regionColumn="userRegion3" userRegionPosition="0"></userRegion>
</service>
<service id="529" functionId="209" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="http_body_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="http_req_head_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="http_res_head_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
<userRegion regionKey="zone" regionColumn="userRegion1" userRegionPosition="0"></userRegion>
<userRegion regionKey="substitute" regionColumn="userRegion2,userRegion3" userRegionPosition="0"></userRegion>
</service>
<service id="750" functionId="211" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="http_req_head_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
</service>
<service id="625" functionId="213" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" >
<serviceCfg cfgType="2" tableName="common_keyword_cfg" ></serviceCfg>
<userRegion regionKey="" regionColumn="userRegion1" userRegionPosition="0"></userRegion>
</service>
<!-- NTC或PROXY MAAT类配置结束 -->
<!-- 回调类配置开始-->
<service id="261" functionId="28" serviceType="2" tableName="av_file_sample_cfg" className="AvFileSampleCfg" ></service>
<service id="389" functionId="28" serviceType="2" tableName="av_file_sample_cfg" className="AvFileSampleCfg" ></service>
<service id="262" functionId="29" serviceType="2" tableName="av_file_sample_cfg" className="AvFileSampleCfg" ></service>
<service id="390" functionId="29" serviceType="2" tableName="av_file_sample_cfg" className="AvFileSampleCfg" ></service>
<service id="263" functionId="30" serviceType="2" tableName="av_file_sample_cfg" className="AvFileSampleCfg" ></service>
<service id="391" functionId="30" serviceType="2" tableName="av_file_sample_cfg" className="AvFileSampleCfg" ></service>
<service id="264" functionId="31" serviceType="2" tableName="av_file_sample_cfg" className="AvFileSampleCfg" ></service>
<service id="392" functionId="31" serviceType="2" tableName="av_file_sample_cfg" className="AvFileSampleCfg" ></service>
<service id="520" functionId="570" serviceType="2" tableName="pxy_obj_keyring" className="PxyObjKeyring" ></service>
<service id="640" functionId="571" serviceType="2" tableName="pxy_obj_trusted_ca_cert" className="PxyObjTrustedCaCert" />
<service id="641" functionId="571" serviceType="2" tableName="pxy_obj_trusted_ca_crl" className="PxyObjTrustedCaCrl" ></service>
<service id="65" functionId="400" serviceType="2" tableName="dns_res_strategy" className="DnsResStrategy" />
<service id="64" functionId="400" serviceType="2" tableName="dns_ip_cfg" className="DnsIpCfg" />
<!-- 回调类配置结束-->
</serviceList>

13
src/main/resources/sql/20181124/add_sys_dict_of_Cfgsync Normal file
View File

@@ -0,0 +1,13 @@
INSERT INTO `sys_data_dictionary_name` (`id`, `module_name`, `mark`, `remark`, `revision`, `create_time`, `modify_time`, `status`) VALUES ('141', '配置同步状态', 'config_sync_status', '', '', '2018-11-23 10:32:08', '2018-11-23 10:32:08', '1');
INSERT INTO `sys_data_dictionary_name` (`id`, `module_name`, `mark`, `remark`, `revision`, `create_time`, `modify_time`, `status`) VALUES ('142', '配置同步当前状态', 'currrent_sync_status', '此状态在配置同步时线程定义获取综合服务端的同步状态，随时更新。', '', '2018-11-23 10:34:27', '2018-11-23 10:34:27', '1');
INSERT INTO `sys_data_dictionary_name` (`id`, `module_name`, `mark`, `remark`, `revision`, `create_time`, `modify_time`, `status`) VALUES ('143', '配置同步接口URL', 'config_sync_url', '', '', '2018-11-23 10:50:52', '2018-11-23 10:50:52', '1');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3024', '0', 'start', '开始', '0', '1', '1', '141');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3025', '1', 'init', '初始化', '0', '1', '1', '141');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3026', '2', 'doing', '进行中', '0', '1', '1', '141');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3027', '3', 'finish', '完成', '0', '1', '1', '141');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3028', '-1', 'fail', '失败', '0', '1', '1', '141');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3029', 'status', '0', '', '0', '1', '1', '142');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3030', 'get_sync_status', 'http://192.168.10.204:9999/galaxy-service/service/cfg_batch/v1/status', '', '0', '1', '1', '143');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3031', 'sync_send', 'http://192.168.10.204:9999/galaxy-service/service/cfg_batch/v1/configSources', '', '0', '1', '1', '143');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3032', 'sync_cmd', 'http://192.168.10.204:9999/galaxy-service/service/cfg_batch/v1/status', '', '0', '1', '1', '143');

1
src/main/resources/sql/20181124/alter_complex_keyword_cfg Normal file
View File

@@ -0,0 +1 @@
ALTER TABLE complex_keyword_cfg CHANGE COLUMN keywords cfg_keywords VARCHAR(2048) NOT NULL;

1
src/main/resources/sql/20181126/alter_ddos_ip_cfg_doLog.sql Normal file
View File

@@ -0,0 +1 @@
alter table ddos_ip_cfg add do_log int(11) COMMENT 'do_log:1记录所有日志2只记录结构化日志。默认是2'

16
src/main/resources/sql/20181126/update_function_region_dict.sql Normal file
View File

@@ -0,0 +1,16 @@
UPDATE
function_region_dict
SET
config_region_value = 'IR_STATIC_NOMINEE_IP',
config_desc = 'SNAT地址池管理',
config_ip_port_show = '1'
WHERE
function_id = 633 AND dict_id = 231;
UPDATE
function_region_dict
SET
config_region_value = 'IR_STATIC_NOMINEE_IP',
config_desc = 'DNAT地址池管理'
WHERE
function_id = 406 AND dict_id = 75;

4
src/main/webapp/WEB-INF/include/form/areaInfo.jsp
View File

@@ -23,12 +23,12 @@ var setSelectIndex = function(){
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_area_block"/></label>
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="isAreaEffective" value="0" class="required areaControl"
<input type="radio" name="isAreaEffective" value="0" class="required"
<c:if test="${empty _cfg.isAreaEffective or _cfg.isAreaEffective==0}">checked</c:if>
><spring:message code="all"/>
</label>
<label class="radio-inline">
<input type="radio" name="isAreaEffective" value="1" class="required areaControl"
<input type="radio" name="isAreaEffective" value="1" class="required"
<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
><spring:message code="selective"/>
</label>

28
src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp
View File

@@ -62,7 +62,6 @@ $(function(){
<input type="hidden" name="functionId" value="${_cfg.functionId}">
<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
<input type="hidden" id="protocolId" name="protocolId" value="${_cfg.protocolId}">
<input type="hidden" id="isAreaEffective" name="isAreaEffective" value="0">
<!-- 配置域类型 -->
<c:forEach items="${regionList}" var="region">
<c:if test="${_cfg.functionId eq region.functionId}">
@@ -118,7 +117,29 @@ $(function(){
</div>
</div>
</div>
<div>
<div class="row doLog">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doLog}">
<label class="radio-inline">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:when>
<c:otherwise>
<label class="radio-inline">
<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:otherwise>
</c:choose>
</c:forEach>
</div>
</div>
</div>
</div>
<h3 class="form-section">
<spring:message code="action_region" />
<small></small>
@@ -164,6 +185,9 @@ $(function(){
</div>
<!-- desc and action -->
<%@include file="/WEB-INF/include/form/dDosIpInfo.jsp" %>
<br>
<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>
<br>
<%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
</div>
<div class="form-actions">

8
src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
View File

@@ -323,6 +323,7 @@
<th class="sort-column r.cfg_desc"><spring:message code="config_describe"/></th>
<th class="sort-column r.action"><spring:message code="block_type"/></th>
<th><spring:message code="is_audit"/></th>
<th><spring:message code="do_log"/></th>
<th><spring:message code="log_total"/></th>
<th><spring:message code="whether_area_block"/></th>
@@ -375,6 +376,13 @@
<c:when test="${cfg.isAudit eq '3'}"><span indexTable="${cfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
</c:choose>
</td>
<td>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq cfg.doLog }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</td>
<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
<td>

2
src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/trustedCertList.jsp
View File

@@ -202,7 +202,7 @@
<shiro:hasPermission name="proxy:trustedCert:config">
<sys:delRow url="${ctx}/proxy/intercept/strateagy/trustedCertForm" id="contentTable" label="update"></sys:delRow>
<sys:delRow url="${ctx}/proxy/intercept/strateagy/trustedCertDelete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
<%-- <sys:delRow url="${ctx}/proxy/intercept/strateagy/exportPxy?functionId=${cfg.functionId }" searchUrl="${ctx}/proxy/intercept/strateagy/trustedCertList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow> --%>
<sys:delRow url="${ctx}/proxy/intercept/strateagy/exportCert?functionId=${cfg.functionId }" searchUrl="${ctx}/proxy/intercept/strateagy/trustedCertList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
</shiro:hasPermission>
<shiro:hasPermission name="proxy:trustedCert:confirm">
<div class="btn-group">