Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop
This commit is contained in:
zhanghongqing
@@ -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;
|
||||
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -677,6 +677,8 @@ public final class Constants {
|
||||
public static String INTERCEPT_IP_RATELIMIT_DROPRATE_USER_REGION_KEY=Configurations.getStringProperty("Droprate", "Droprate");
|
||||
public static String INTERCEPT_IP_RATELIMIT_BANDWITH_USER_REGION_KEY=Configurations.getStringProperty("Bandwidth", "Bandwidth");
|
||||
public static String INTERCEPT_DOMAN_INTENSITY_USER_REGION_KEY=Configurations.getStringProperty("intercept_domain_intensity", "DOMAIN_INTENSITY");
|
||||
//APP VIGNORE
|
||||
public static String APP_VIGNORE_USER_REGION_KEY=Configurations.getStringProperty("app_vignore_user_region_key", "VIGNORE");
|
||||
|
||||
//大屏统计分析查询接口URL
|
||||
public static final String DASHBOARD_URL = Configurations.getStringProperty("dashboardUrl","dashboardUrl");
|
||||
|
||||
137
src/main/java/com/nis/util/ServiceConfigTemplateUtil.java
Normal file
137
src/main/java/com/nis/util/ServiceConfigTemplateUtil.java
Normal 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();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
/**
|
||||
* 管理基础路径
|
||||
*/
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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 "";
|
||||
}
|
||||
}
|
||||
@@ -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"
|
||||
|
||||
@@ -2066,13 +2066,13 @@
|
||||
USER_REGION2 =#{userRegion2,jdbcType=VARCHAR},
|
||||
<!-- </if>
|
||||
<if test="userRegion3 != null and userRegion3 != ''"> -->
|
||||
USER_REGION1 =#{userRegion3,jdbcType=VARCHAR},
|
||||
USER_REGION3 =#{userRegion3,jdbcType=VARCHAR},
|
||||
<!-- </if>
|
||||
<if test="userRegion4 != null and userRegion4 != ''"> -->
|
||||
USER_REGION1 =#{userRegion4,jdbcType=VARCHAR},
|
||||
USER_REGION4 =#{userRegion4,jdbcType=VARCHAR},
|
||||
<!-- </if>
|
||||
<if test="userRegion5 != null and userRegion5 != ''"> -->
|
||||
USER_REGION1 =#{userRegion5,jdbcType=VARCHAR},
|
||||
USER_REGION5 =#{userRegion5,jdbcType=VARCHAR},
|
||||
<!-- </if> -->
|
||||
DO_LOG=#{doLog,jdbcType=INTEGER},
|
||||
<if test="exprType != null">
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -225,8 +225,8 @@
|
||||
)values (
|
||||
#{cfgDesc,jdbcType=VARCHAR},
|
||||
#{action,jdbcType=INTEGER},
|
||||
0,
|
||||
0,
|
||||
#{isValid,jdbcType=INTEGER},
|
||||
#{isAudit,jdbcType=INTEGER},
|
||||
#{creatorId,jdbcType=INTEGER},
|
||||
#{createTime,jdbcType=TIMESTAMP},
|
||||
#{editorId,jdbcType=INTEGER},
|
||||
|
||||
@@ -224,8 +224,8 @@
|
||||
)values (
|
||||
#{cfgDesc,jdbcType=VARCHAR},
|
||||
#{action,jdbcType=INTEGER},
|
||||
0,
|
||||
0,
|
||||
#{isValid,jdbcType=INTEGER},
|
||||
#{isAudit,jdbcType=INTEGER},
|
||||
#{creatorId,jdbcType=INTEGER},
|
||||
#{createTime,jdbcType=TIMESTAMP},
|
||||
#{editorId,jdbcType=INTEGER},
|
||||
|
||||
@@ -768,8 +768,8 @@
|
||||
)values (
|
||||
#{cfgDesc,jdbcType=VARCHAR},
|
||||
#{action,jdbcType=INTEGER},
|
||||
0,
|
||||
0,
|
||||
#{isValid,jdbcType=INTEGER},
|
||||
#{isAudit,jdbcType=INTEGER},
|
||||
#{creatorId,jdbcType=INTEGER},
|
||||
#{createTime,jdbcType=TIMESTAMP},
|
||||
#{editorId,jdbcType=INTEGER},
|
||||
@@ -830,8 +830,8 @@
|
||||
)values (
|
||||
#{cfgDesc,jdbcType=VARCHAR},
|
||||
#{action,jdbcType=INTEGER},
|
||||
0,
|
||||
0,
|
||||
#{isValid,jdbcType=INTEGER},
|
||||
#{isAudit,jdbcType=INTEGER},
|
||||
#{creatorId,jdbcType=INTEGER},
|
||||
#{createTime,jdbcType=TIMESTAMP},
|
||||
#{editorId,jdbcType=INTEGER},
|
||||
|
||||
@@ -964,6 +964,23 @@ public class AppCfgService extends BaseService {
|
||||
if (entity.getBehavCode() != null) {
|
||||
userRegion += Constants.USER_REGION_SPLIT + Constants.BEHAV_ID_REGION + "=" + entity.getBehavCode();
|
||||
}
|
||||
|
||||
// 限速业务需要设置
|
||||
if (Constants.RATELIMIT_ACTION.equals(entity.getAction())) {
|
||||
entity.setUserRegion1(StringUtil.isEmpty(entity.getUserRegion1()) ? "0":entity.getUserRegion1());
|
||||
//限速 需要发Droprate=0.001 ，暂不支持Bandwidth=200kbps
|
||||
if(entity.getUserRegion1().equals("0")){//丢包率
|
||||
entity.setUserRegion2(StringUtil.isEmpty(entity.getUserRegion2()) ? "":entity.getUserRegion2());
|
||||
userRegion+=Constants.USER_REGION_SPLIT +Constants.INTERCEPT_IP_RATELIMIT_DROPRATE_USER_REGION_KEY+"="+entity.getUserRegion2();
|
||||
}else if(entity.getUserRegion1().equals("1")){//带宽
|
||||
entity.setUserRegion3(StringUtil.isEmpty(entity.getUserRegion3()) ? "":entity.getUserRegion3());
|
||||
userRegion+=Constants.USER_REGION_SPLIT +Constants.INTERCEPT_IP_RATELIMIT_BANDWITH_USER_REGION_KEY+"="+entity.getUserRegion3();
|
||||
}
|
||||
}
|
||||
//VIGNORE=1
|
||||
if(StringUtil.isEmpty(entity.getUserRegion4())){
|
||||
userRegion+=Constants.USER_REGION_SPLIT +Constants.APP_VIGNORE_USER_REGION_KEY+"=1";
|
||||
}
|
||||
} else if (Constants.SPECIFIC_SERVICE_CFG_TYPE_BASIC_PROTOCOL.equalsIgnoreCase(configType)) {
|
||||
userRegion = Constants.PROTO_ID_REGION + "=" + entity.getAppCode();
|
||||
} else if (Constants.SPECIFIC_SERVICE_CFG_TYPE_ENCRYPTED_TUNNEL_BEHAVIOR.equalsIgnoreCase(configType)) {
|
||||
@@ -973,14 +990,6 @@ public class AppCfgService extends BaseService {
|
||||
}
|
||||
|
||||
}
|
||||
// 限速业务需要设置
|
||||
String actionCode = DictUtils.getDictCode("SERVICE_ACTION", "action_ratelimit");
|
||||
if (!actionCode.equals("默认")) {
|
||||
if (entity.getAction().equals(Integer.parseInt(actionCode))) {
|
||||
userRegion += Constants.USER_REGION_SPLIT + Constants.RATE_LIMIT_REGION + "="
|
||||
+ entity.getRatelimit();
|
||||
}
|
||||
}
|
||||
maatCfg.setUserRegion(userRegion);
|
||||
configCompileList.add(maatCfg);
|
||||
maatBean.setConfigCompileList(configCompileList);
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1311,4 +1311,5 @@ resp_body=Response Body
|
||||
dns_sub=DNS Security
|
||||
action_cache=Cache
|
||||
action_cache_whitelist=Cache Bypass
|
||||
crl_issuer_null=Issuer of CRL file is empty
|
||||
crl_issuer_null=Issuer of CRL file is empty
|
||||
block_by_app_server_ip=Block by application server ip
|
||||
@@ -1311,4 +1311,5 @@ resp_body=Response Body\u3001
|
||||
dns_sub=DNS Security
|
||||
action_cache=\u043A\u044D\u0448
|
||||
action_cache_whitelist=\u0431\u0430\u0439\u043F\u0430\u0441 \u043A\u044D\u0448\u0430
|
||||
crl_issuer_null=CRL\u6587\u4EF6\u7684\u9881\u53D1\u8005\u4E3A\u7A7A
|
||||
crl_issuer_null=CRL\u6587\u4EF6\u7684\u9881\u53D1\u8005\u4E3A\u7A7A
|
||||
block_by_app_server_ip=Block by application server ip
|
||||
@@ -1307,4 +1307,5 @@ resp_body=\u539F\u59CB\u5E94\u7B54\u4F53
|
||||
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
|
||||
crl_issuer_null=CRL\u6587\u4EF6\u7684\u9881\u53D1\u8005\u4E3A\u7A7A
|
||||
block_by_app_server_ip=Block by application server ip
|
||||
@@ -556,4 +556,5 @@ max_allowed_packet=1048576
|
||||
#http client\u8FDE\u63A5\u6C60\u76F8\u5173\u53C2\u6570\uFF0Chttp_max_connection:\u6700\u5927\u8FDE\u63A5\u6570\uFF0Cdefault_max_perroute:\u6BCF\u4E2A\u4E3B\u673A\u5730\u5740\u7684\u5E76\u53D1\u6570\uFF0Cpoolcm_socket_timeout:socket\u8D85\u65F6\u65F6\u95F4
|
||||
http_max_connection=1000
|
||||
default_max_perroute=100
|
||||
poolcm_socket_timeout=3000
|
||||
poolcm_socket_timeout=3000
|
||||
app_vignore_user_region_key=VIGNORE
|
||||
264
src/main/resources/service/service_config.xml
Normal file
264
src/main/resources/service/service_config.xml
Normal 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
13
src/main/resources/sql/20181124/add_sys_dict_of_Cfgsync
Normal 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');
|
||||
@@ -0,0 +1 @@
|
||||
ALTER TABLE complex_keyword_cfg CHANGE COLUMN keywords cfg_keywords VARCHAR(2048) NOT NULL;
|
||||
@@ -0,0 +1,10 @@
|
||||
#add app ratelimit dict data
|
||||
INSERT INTO `sys_data_dictionary_name`(`id`, `module_name`, `mark`, `remark`, `revision`, `create_time`, `modify_time`, `status`) VALUES (144, 'APP限速', 'APP_RATE_LIMIT', '', '', '2018-11-26 10:54:08', '2018-11-26 10:54:08', 1);
|
||||
INSERT INTO `sys_data_dictionary_item`(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES (3129, '0.05', '0.05', '0.05', 1, 1, 1, 144);
|
||||
INSERT INTO `sys_data_dictionary_item`(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES (3130, '0.1', '0.1', '0.1', 2, 1, 1, 144);
|
||||
INSERT INTO `sys_data_dictionary_item`(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES (3131, '0.15', '0.15', '0.15', 3, 1, 1, 144);
|
||||
INSERT INTO `sys_data_dictionary_item`(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES (3132, '0.2', '0.2', '0.2', 4, 1, 1, 144);
|
||||
INSERT INTO `sys_data_dictionary_item`(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES (3133, '0.25', '0.25', '0.25', 5, 1, 1, 144);
|
||||
INSERT INTO `sys_data_dictionary_item`(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES (3134, '0.3', '0.3', '0.3', 6, 1, 1, 144);
|
||||
INSERT INTO `sys_data_dictionary_item`(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES (3135, '0.35', '0.35', '0.35', 7, 1, 1, 144);
|
||||
INSERT INTO `sys_data_dictionary_item`(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES (3136, '0.4', '0.4', '0.4', 8, 1, 1, 144);
|
||||
@@ -5,13 +5,16 @@
|
||||
<title><spring:message code="${cfgName}"></spring:message></title>
|
||||
<script type="text/javascript">
|
||||
$(function(){
|
||||
$(".ratelimitAction").find("input[name='userRegion1']").on("change",function(){
|
||||
switchRateLimitType();
|
||||
});
|
||||
$(".action").on("change", function() {
|
||||
$("#serviceId").val($(this).attr("serviceId"));
|
||||
$("#protocolId").val($(this).attr("protocolId"));
|
||||
if($(".action:checked").val()==64){
|
||||
$("#ratelimit").show();
|
||||
$(".ratelimitAction").removeClass("hidden");
|
||||
}else{
|
||||
$("#ratelimit").hide();
|
||||
$(".ratelimitAction").addClass("hidden");
|
||||
}
|
||||
if(($(".action:checked").val()==1) || ($(".action:checked").val()==16)){
|
||||
$(".subscribeId").show();
|
||||
@@ -26,9 +29,9 @@ $(function(){
|
||||
$("#serviceId").val($(".action:checked").attr("serviceId"));
|
||||
$("#protocolId").val($(".action:checked").attr("protocolId"));
|
||||
if($(".action:checked").val()==64){
|
||||
$("#ratelimit").show();
|
||||
$(".ratelimitAction").removeClass("hidden");
|
||||
}else{
|
||||
$("#ratelimit").hide();
|
||||
$(".ratelimitAction").addClass("hidden");
|
||||
}
|
||||
if(($(".action:checked").val()==1) || ($(".action:checked").val()==16)){
|
||||
$(".subscribeId").show();
|
||||
@@ -86,8 +89,8 @@ $(function(){
|
||||
if($("[name='behavCode']")&&$("[name='behavCode']").val()!=""){
|
||||
$("input[name='exprType']").val(1);
|
||||
}
|
||||
if($("input[name='ratelimit']").is(":hidden")){
|
||||
$("input[name='ratelimit']").val("");
|
||||
if($(".ratelimitAction").is(":hidden")){
|
||||
$(".ratelimitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
|
||||
}
|
||||
loading('onloading...');
|
||||
form.submit();
|
||||
@@ -104,6 +107,21 @@ $(function(){
|
||||
ajaxBehaviour($(this).val());
|
||||
});
|
||||
});
|
||||
|
||||
//限流方式
|
||||
var switchRateLimitType=function(){
|
||||
//0 丢包率 1 带宽
|
||||
var rateLimitType=$(".ratelimitAction").find("input[name='userRegion1']:checked").val();
|
||||
if(rateLimitType == 0){
|
||||
$(".droprate").removeClass("hidden");
|
||||
$(".bandwith").addClass("hidden");
|
||||
}
|
||||
if(rateLimitType == 1){
|
||||
$(".droprate").addClass("hidden");
|
||||
$(".bandwith").removeClass("hidden");
|
||||
}
|
||||
|
||||
}
|
||||
var ajaxBehaviour=function(val){
|
||||
var pathName=window.document.location.pathname.substring(0,window.document.location.pathname.indexOf("/nis")+4);
|
||||
var request=$.ajax({
|
||||
@@ -292,22 +310,75 @@ var delContent = function(contentClassName, addBtnClassName) {
|
||||
<div for="action"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6" id="ratelimit">
|
||||
<div class="form-group ">
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ratelimit"/></label>
|
||||
<div class="col-md-6">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3">
|
||||
<input type="checkbox" name="userRegion4" class="child-checks" <c:if test="${_cfg.userRegion4 eq '1' }">checked</c:if> value="1">
|
||||
</label>
|
||||
<div class="col-md-6">
|
||||
<select name="ratelimit" data-live-search="true" class="selectpicker form-control required">
|
||||
<option value="" ><spring:message code="selected"/></option>
|
||||
<c:forEach items="${fns:getDictList('RATE_LIMIT')}" var="ratelimitC">
|
||||
<option value="${ratelimitC.itemCode}" <c:if test="${_cfg.ratelimit==ratelimitC.itemCode || (_cfg.ratelimit==null && ratelimitC.itemCode eq '0.1')}">selected</c:if>><spring:message code="${ratelimitC.itemValue}"/></option>
|
||||
</c:forEach>
|
||||
</select>
|
||||
<label class="control-label">
|
||||
<spring:message code="block_by_app_server_ip"/>
|
||||
</label>
|
||||
</div>
|
||||
<div for="ratelimit"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div for="userRegion4"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row ratelimitAction hidden">
|
||||
<h4 class="form-section">
|
||||
<spring:message code="action_region" />
|
||||
<small></small>
|
||||
</h4>
|
||||
<div class="col-md-6 hidden">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="limit_rate_type"/></label>
|
||||
<div class="col-md-6">
|
||||
<label class="radio-inline">
|
||||
<input type="radio"
|
||||
name="userRegion1" value="0"
|
||||
<%-- <c:if test="${(userRegion1 eq 0) || (empty userRegion1)}"> --%>
|
||||
checked
|
||||
<%-- </c:if> --%>
|
||||
class="required" >
|
||||
<spring:message code="ratelimit" />
|
||||
</label>
|
||||
<%-- <label class="radio-inline">
|
||||
<input type="radio"
|
||||
name="userRegion1" value="1"
|
||||
<c:if test="${(userRegion1 eq 1)}">
|
||||
checked
|
||||
</c:if>
|
||||
class="required" >
|
||||
<spring:message code="bandwith" />
|
||||
</label> --%>
|
||||
</div>
|
||||
<div for="userRegion1"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6 droprate">
|
||||
<div class="form-group ">
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ratelimit"/></label>
|
||||
<div class="col-md-6">
|
||||
<select name="userRegion2" data-live-search="true" class="selectpicker form-control required">
|
||||
<option value="" ><spring:message code="selected"/></option>
|
||||
<c:forEach items="${fns:getDictList('APP_RATE_LIMIT')}" var="ratelimitC">
|
||||
<option value="${ratelimitC.itemCode}" <c:if test="${_cfg.userRegion2==ratelimitC.itemCode || (_cfg.userRegion2==null && ratelimitC.itemCode eq '0.1')}">selected</c:if>><spring:message code="${ratelimitC.itemValue}"/></option>
|
||||
</c:forEach>
|
||||
</select>
|
||||
</div>
|
||||
<div for="userRegion2"></div>
|
||||
</div>
|
||||
</div>
|
||||
<%-- <div class="col-md-6 bandwith">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="bandwith"/></label>
|
||||
<div class="col-md-6">
|
||||
<input class="form-control required number" type="text" name="userRegion3" value="${_cfg.userRegion3 }">
|
||||
</div>
|
||||
<div for="userRegion3"></div>
|
||||
</div>
|
||||
</div> --%>
|
||||
</div>
|
||||
</c:if>
|
||||
<!-- subscribeId配置 -->
|
||||
<div class="subscribeId" >
|
||||
|
||||
@@ -372,6 +372,7 @@
|
||||
<th class="sort-column r.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
|
||||
<th class="sort-column r.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
|
||||
<th><spring:message code="ratelimit"/></th>
|
||||
<th><spring:message code="block_by_app_server_ip"/></th>
|
||||
<th class="sort-column r.action"><spring:message code="block_type"/></th>
|
||||
<th><spring:message code="social_app"/></th>
|
||||
<th><spring:message code="behaviour_type"/></th>
|
||||
@@ -403,13 +404,21 @@
|
||||
<td>${cfg.cfgDesc }</td>
|
||||
<td>
|
||||
<c:if test="${cfg.action eq 64}">
|
||||
<c:forEach items="${fns:getDictList('RATE_LIMIT')}" var="ratelimitC">
|
||||
<c:if test="${cfg.ratelimit==ratelimitC.itemCode}">
|
||||
<c:forEach items="${fns:getDictList('APP_RATE_LIMIT')}" var="ratelimitC">
|
||||
<c:if test="${cfg.userRegion2==ratelimitC.itemCode}">
|
||||
<spring:message code="${ratelimitC.itemValue}"/>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
</c:if>
|
||||
</td>
|
||||
<td>
|
||||
<c:if test="${cfg.userRegion4 eq '1'}">
|
||||
<spring:message code="yes"/>
|
||||
</c:if>
|
||||
<c:if test="${empty cfg.userRegion4}">
|
||||
<spring:message code="no"/>
|
||||
</c:if>
|
||||
</td>
|
||||
<td>
|
||||
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
|
||||
<c:if test="${dict.itemCode eq cfg.action }">
|
||||
|
||||
@@ -123,7 +123,20 @@
|
||||
|
||||
});
|
||||
|
||||
|
||||
//限流方式
|
||||
var switchRateLimitType=function(){
|
||||
//0 丢包率 1 带宽
|
||||
var rateLimitType=$(".ratelimitAction").find("input[name='userRegion1']:checked").val();
|
||||
if(rateLimitType == 0){
|
||||
$(".droprate").removeClass("hidden");
|
||||
$(".bandwith").addClass("hidden");
|
||||
}
|
||||
if(rateLimitType == 1){
|
||||
$(".droprate").addClass("hidden");
|
||||
$(".bandwith").removeClass("hidden");
|
||||
}
|
||||
|
||||
}
|
||||
//业务窗口打开
|
||||
var addContent = function(obj, contentClassName) {
|
||||
var showDiv = $(obj).parent().parent().next();
|
||||
|
||||
@@ -493,7 +493,7 @@ $(function(){
|
||||
var ns = s.replace(/\t|\r|\n/mg, "");
|
||||
$(this).val(ns);
|
||||
});*/
|
||||
$("input[name*='userRegion']").addClass("invisibleChar");
|
||||
$("input[name*='userRegion'][type='text']").addClass("invisibleChar");
|
||||
$("#cancel").on("click",function(){
|
||||
window.history.back();
|
||||
return false;
|
||||
@@ -787,20 +787,6 @@ var setDefaultMatchMethod=function (obj){
|
||||
$(obj).parents(".row").parent(".row").find("select[name$='matchMethod']").selectpicker("refresh");
|
||||
}
|
||||
}
|
||||
//限流方式
|
||||
var switchRateLimitType=function(){
|
||||
//0 丢包率 1 带宽
|
||||
var rateLimitType=$(".ratelimitAction").find("input[name='userRegion1']:checked").val();
|
||||
if(rateLimitType == 0){
|
||||
$(".droprate").removeClass("hidden");
|
||||
$(".bandwith").addClass("hidden");
|
||||
}
|
||||
if(rateLimitType == 1){
|
||||
$(".droprate").addClass("hidden");
|
||||
$(".bandwith").removeClass("hidden");
|
||||
}
|
||||
|
||||
}
|
||||
var switchIpType=function(obj){
|
||||
var type=$(obj).val();
|
||||
var row=$(obj).parents('.row');
|
||||
|
||||
Reference in New Issue
Block a user