Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop
This commit is contained in:
@@ -230,15 +230,15 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
|
||||
|
||||
protected Integer groupId;//仅用于copy属性使用
|
||||
protected Integer regionId;//仅用于copy属性使用
|
||||
protected Integer numberRegionGroupId;//仅用于copy属性使用
|
||||
// protected Integer numberRegionGroupId;//仅用于copy属性使用
|
||||
protected Integer numberRegionRegionId;//仅用于copy属性使用
|
||||
|
||||
public Integer getNumberRegionGroupId() {
|
||||
return numberRegionGroupId;
|
||||
}
|
||||
public void setNumberRegionGroupId(Integer numberRegionGroupId) {
|
||||
this.numberRegionGroupId = numberRegionGroupId;
|
||||
}
|
||||
// public Integer getNumberRegionGroupId() {
|
||||
// return numberRegionGroupId;
|
||||
// }
|
||||
// public void setNumberRegionGroupId(Integer numberRegionGroupId) {
|
||||
// this.numberRegionGroupId = numberRegionGroupId;
|
||||
// }
|
||||
public Integer getNumberRegionRegionId() {
|
||||
return numberRegionRegionId;
|
||||
}
|
||||
|
||||
@@ -8,13 +8,13 @@ import com.nis.util.excel.ExcelField;
|
||||
*/
|
||||
public class P2pIpTemplate extends IpAllTemplate {
|
||||
|
||||
private String userRegion1;
|
||||
private String userRegion2;
|
||||
|
||||
@ExcelField(title="p2p_ip_config_type",dictType="P2P_IP_TYPE",align=2,sort=2)
|
||||
public String getUserRegion1() {
|
||||
return userRegion1;
|
||||
public String getUserRegion2() {
|
||||
return userRegion2;
|
||||
}
|
||||
public void setUserRegion1(String userRegion1) {
|
||||
this.userRegion1 = userRegion1;
|
||||
public void setUserRegion2(String userRegion2) {
|
||||
this.userRegion2 = userRegion2;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -140,7 +140,7 @@ public class MultipartFileIntercepter extends CommonsMultipartResolver{
|
||||
fileTypes=Constants.LOGO_FILE_TYPE;
|
||||
fileMaxSize=Constants.LOGO_SINGLE_FILE_MAX_SIZE;
|
||||
}else if(functionId.equals(632)){ //人脸识别
|
||||
fileTypes=Constants.FACE_FILE_TYPE;
|
||||
fileTypes=Constants.PICTURE_FILE_TYPE;//同图片类型
|
||||
fileMaxSize=Constants.FACE_SINGLE_FILE_MAX_SIZE;
|
||||
}else if(functionId.equals(570)){ //证书管理
|
||||
fileTypes=Constants.PUBLIC_FILE_TYPE;
|
||||
|
||||
@@ -6,6 +6,7 @@ import java.util.Map.Entry;
|
||||
|
||||
import org.apache.log4j.Logger;
|
||||
|
||||
import com.beust.jcommander.internal.Lists;
|
||||
import com.nis.domain.specific.ConfigGroupInfo;
|
||||
import com.nis.web.dao.specific.ConfigGroupInfoDao;
|
||||
import com.nis.web.service.SpringContextHolder;
|
||||
@@ -48,8 +49,21 @@ public class AsnCacheUtils{
|
||||
return (Map<Long,ConfigGroupInfo>)element.getObjectValue();
|
||||
}
|
||||
public static void clearCache() {
|
||||
logger.warn("clear cache!");
|
||||
CacheUtils.getCacheManager().removeCache(ASN_NO_CACHE);
|
||||
}
|
||||
public static List<ConfigGroupInfo> getAllAsnGroup(){
|
||||
List<ConfigGroupInfo> configGroupInfos=Lists.newArrayList();
|
||||
Cache cache=getCache(ASN_NO_CACHE);
|
||||
for(Object key:cache.getKeys()) {
|
||||
Element element = getCache(ASN_NO_CACHE).get(key);
|
||||
if(element!=null) {
|
||||
Map<Long,ConfigGroupInfo> map=(Map<Long,ConfigGroupInfo>)element.getObjectValue();
|
||||
configGroupInfos.addAll(map.values());
|
||||
}
|
||||
}
|
||||
return configGroupInfos;
|
||||
}
|
||||
/**
|
||||
* 初始化缓存
|
||||
*/
|
||||
@@ -147,4 +161,9 @@ public class AsnCacheUtils{
|
||||
}
|
||||
return cache;
|
||||
}
|
||||
public static String getCacheName() {
|
||||
return ASN_NO_CACHE;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -14,6 +14,7 @@ import java.util.Comparator;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Properties;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.ArrayBlockingQueue;
|
||||
import java.util.concurrent.BlockingQueue;
|
||||
|
||||
@@ -76,7 +77,7 @@ public class ImportBigExcel extends XLSXCovertCSVReader{
|
||||
*/
|
||||
public ImportBigExcel(MultipartFile multipartFile, Integer headerNum, int sheetIndex)
|
||||
throws InvalidFormatException, IOException {
|
||||
File upFile=new File(System.currentTimeMillis()+multipartFile.getOriginalFilename());
|
||||
File upFile=new File(UUID.randomUUID()+"_"+multipartFile.getOriginalFilename());
|
||||
upFile.mkdirs();
|
||||
multipartFile.transferTo(upFile);
|
||||
if (!upFile.exists()){
|
||||
|
||||
@@ -116,7 +116,7 @@ public class CheckIpFormatThread implements Callable<String>{
|
||||
}
|
||||
if (!has) {
|
||||
errInfo.append(prop.getProperty("ratelimit") + "."
|
||||
+ String.format(prop.getProperty("must_between"), 0.001, 0.009) + ";");
|
||||
+ String.format(prop.getProperty("must_between"), 0.1, 0.9) + ";");
|
||||
}
|
||||
} catch (Exception e) {
|
||||
// TODO: handle exception
|
||||
@@ -198,11 +198,11 @@ public class CheckIpFormatThread implements Callable<String>{
|
||||
//p2p ip
|
||||
if (regionDict.getFunctionId().equals(510) && "p2p_ip".equals(regionDict.getConfigServiceType())) { // P2p
|
||||
// IP
|
||||
String userRegion1 = baseIpCfg.getUserRegion1();
|
||||
String userRegion2 = baseIpCfg.getUserRegion2();
|
||||
List<SysDataDictionaryItem> ipTypes = DictUtils.getDictList("P2P_IP_TYPE");
|
||||
boolean has = false;
|
||||
for (SysDataDictionaryItem type : ipTypes) {
|
||||
if (type.getItemCode().equals(userRegion1)) {
|
||||
if (type.getItemCode().equals(userRegion2)) {
|
||||
has = true;
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -247,7 +247,7 @@ public class HttpClientUtil {
|
||||
* @param params 参数列表
|
||||
* @return 查询结果数据json
|
||||
*/
|
||||
public static String getMsg(String destUrl, Map<String, Object> params, HttpServletRequest req) {
|
||||
public static String getMsg(String destUrl, Map<String, Object> params, HttpServletRequest req) throws IOException {
|
||||
// RequestContext requestContext = new RequestContext(req);
|
||||
|
||||
// CloseableHttpResponse response = null;
|
||||
@@ -296,7 +296,11 @@ public class HttpClientUtil {
|
||||
logger.error("获取消息失败,相应内容如下: " + result);
|
||||
logger.error("获取消息失败 ", e);
|
||||
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:");
|
||||
}
|
||||
}finally {
|
||||
if (response != null) {
|
||||
response.close();
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
@@ -1417,7 +1417,7 @@ public class BaseController {
|
||||
List<Integer> compileIds=Lists.newArrayList();
|
||||
List<Integer> regionIds=Lists.newArrayList();
|
||||
List<Integer> groupIds=Lists.newArrayList();
|
||||
List<Integer> numRegionGroupIds=Lists.newArrayList();
|
||||
// List<Integer> numRegionGroupIds=Lists.newArrayList();
|
||||
List<Integer> numRegionRegionIds=Lists.newArrayList();
|
||||
if(!regionDict.getFunctionId().equals(405)) {//app ip compileId 从config_group_info中取
|
||||
try {
|
||||
@@ -1428,7 +1428,7 @@ public class BaseController {
|
||||
}
|
||||
//需要获取数值域的id
|
||||
if(serviceDict!=null&&serviceDict.getProtocolId()!=null) {
|
||||
numRegionGroupIds = ConfigServiceUtil.getId(2,_ipPortCfgs.size());
|
||||
// numRegionGroupIds = ConfigServiceUtil.getId(2,_ipPortCfgs.size());
|
||||
numRegionRegionIds = ConfigServiceUtil.getId(3,_ipPortCfgs.size());
|
||||
}
|
||||
} catch (Exception e) {
|
||||
@@ -1468,9 +1468,9 @@ public class BaseController {
|
||||
cfg.setRegionId(regionIds.get(ind));
|
||||
}
|
||||
if(serviceDict!=null&&serviceDict.getProtocolId()!=null) {
|
||||
if(numRegionGroupIds!=null&&numRegionGroupIds.size()==_ipPortCfgs.size()) {
|
||||
cfg.setNumberRegionGroupId(numRegionGroupIds.get(ind));
|
||||
}
|
||||
// if(numRegionGroupIds!=null&&numRegionGroupIds.size()==_ipPortCfgs.size()) {
|
||||
// cfg.setNumberRegionGroupId(numRegionGroupIds.get(ind));
|
||||
// }
|
||||
if(numRegionRegionIds!=null&&numRegionRegionIds.size()==_ipPortCfgs.size()) {
|
||||
cfg.setNumberRegionRegionId(numRegionRegionIds.get(ind));
|
||||
}
|
||||
@@ -1788,7 +1788,7 @@ public class BaseController {
|
||||
}
|
||||
}
|
||||
if(e instanceof MaatConvertException||e instanceof ServiceException) {
|
||||
addMessage(redirectAttributes,"error", e.getMessage());
|
||||
addMessage(redirectAttributes,"error", "request_service_failed");
|
||||
}else {
|
||||
addMessage(redirectAttributes,"error", "import_failed");
|
||||
}
|
||||
|
||||
@@ -50,6 +50,9 @@ public class AsnIpController extends BaseController{
|
||||
|
||||
// List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(4);
|
||||
// model.addAttribute("policyGroups", policyGroups);
|
||||
AsnCacheUtils.init();
|
||||
List<ConfigGroupInfo> policyGroups=AsnCacheUtils.getAllAsnGroup();
|
||||
model.addAttribute("policyGroups", policyGroups);
|
||||
return "/basics/asnIpCfgList";
|
||||
}
|
||||
@RequestMapping(value = {"/addForm"})
|
||||
|
||||
@@ -224,7 +224,6 @@ public class AvController extends BaseController {
|
||||
||Constants.VIDEO_FILE_TYPE.contains(FileUtils.getSuffix(uploadSrcFile.getName(),false))
|
||||
||Constants.VOIP_FILE_TYPE.contains(FileUtils.getSuffix(uploadSrcFile.getName(),false))
|
||||
||Constants.SPEAKER_FILE_TYPE.contains(FileUtils.getSuffix(uploadSrcFile.getName(),false))
|
||||
||Constants.FACE_FILE_TYPE.contains(FileUtils.getSuffix(uploadSrcFile.getName(),false))
|
||||
){
|
||||
if(!validateAvDuration(uploadSrcFile)){
|
||||
addMessage(redirectAttributes,"exceeds_duration_limit");
|
||||
@@ -616,7 +615,55 @@ public class AvController extends BaseController {
|
||||
}
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 上传图片文件,调用脚本压缩图片,返回图片保存路径
|
||||
* @param cfg
|
||||
* @param functionId
|
||||
* @param redirectAttributes
|
||||
* @return
|
||||
*/
|
||||
@ResponseBody
|
||||
@RequestMapping(value = {"/sample/faceToPicture"})
|
||||
public Map faceToPicture(Model model,@RequestParam("srcFile") CommonsMultipartFile[] srcFile){
|
||||
String sep = System.getProperty("file.separator");
|
||||
String random = UUID.randomUUID()+"";
|
||||
// String srcFilePath = Constants.AV_FILE_PATH+"face"+random+sep+"srcFile";//视频源文件保存路径
|
||||
String srcFilePath = StringUtils.getUserfilesBaseDir()+"face"+sep+"picFile"+sep+random+sep;//视频生成的关键帧图片文件保存路径
|
||||
|
||||
FileUtils.createDirectory(srcFilePath);
|
||||
//保存源文件
|
||||
for (CommonsMultipartFile sinFile : srcFile) {
|
||||
String srcFileAllPath = srcFilePath+sep+random+FileUtils.getSuffix(sinFile.getOriginalFilename(), true);//新的文件名
|
||||
File uploadSrcFile = new File(srcFileAllPath);
|
||||
try {
|
||||
FileCopyUtils.copy(sinFile.getBytes(), uploadSrcFile);
|
||||
} catch (IOException e) {
|
||||
logger.error(e);
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Map map = new HashMap();
|
||||
map.put("picFilePath", srcFilePath);
|
||||
|
||||
//获取图片列表
|
||||
Collection<File> files = FileUtils.listFiles(new File(srcFilePath), null, true);
|
||||
String srcPath = null;
|
||||
for(File f:files){
|
||||
if(srcPath==null){
|
||||
srcPath = f.getName();
|
||||
}else{
|
||||
srcPath += "|"+f.getName();
|
||||
}
|
||||
}
|
||||
//将图片文件列表赋值给生成样例的源文件路径参数
|
||||
map.put("srcPath", srcPath);
|
||||
map.put("status", 1);
|
||||
map.put("msg", "success");
|
||||
|
||||
return map;
|
||||
}
|
||||
@RequestMapping(value = {"/sample/selectVedioPicture"})
|
||||
public String selectVedioPicture(Model model,HttpServletRequest request,String picFilePath,String srcPath){
|
||||
Collection<File> files = FileUtils.listFiles(new File(picFilePath), null, true);
|
||||
|
||||
@@ -24,7 +24,7 @@ import com.nis.domain.configuration.ComplexkeywordCfg;
|
||||
import com.nis.domain.configuration.IpPortCfg;
|
||||
import com.nis.domain.configuration.NtcBgpAsCfg;
|
||||
import com.nis.domain.configuration.NtcSubscribeIdCfg;
|
||||
import com.nis.exception.MaatConvertException;
|
||||
import com.nis.exceptions.MaatConvertException;
|
||||
import com.nis.util.Constants;
|
||||
import com.nis.util.StringUtils;
|
||||
import com.nis.web.controller.BaseController;
|
||||
|
||||
@@ -14,6 +14,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
|
||||
|
||||
import com.nis.domain.Page;
|
||||
import com.nis.domain.SysDataDictionaryName;
|
||||
import com.nis.util.AsnCacheUtils;
|
||||
import com.nis.util.CacheUtils;
|
||||
import com.nis.util.Constants;
|
||||
import com.nis.util.StringUtil;
|
||||
@@ -104,8 +105,12 @@ public class DictController extends BaseController {
|
||||
@ResponseBody
|
||||
@RequestMapping(value = {"refreshCache"})
|
||||
public String refreshCache(String cacheName){
|
||||
//删除字典缓存
|
||||
CacheUtils.remove(cacheName);
|
||||
if(cacheName.equals(AsnCacheUtils.getCacheName())) {
|
||||
AsnCacheUtils.clearCache();
|
||||
}else {
|
||||
//删除字典缓存
|
||||
CacheUtils.remove(cacheName);
|
||||
}
|
||||
return "success";
|
||||
}
|
||||
|
||||
|
||||
@@ -24,6 +24,11 @@
|
||||
<result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
|
||||
<result column="function_id" property="functionId" jdbcType="INTEGER" />
|
||||
<result column="do_log" property="doLog" jdbcType="INTEGER" />
|
||||
<result column="user_region1" property="userRegion1" jdbcType="VARCHAR" />
|
||||
<result column="user_region2" property="userRegion2" jdbcType="VARCHAR" />
|
||||
<result column="user_region3" property="userRegion3" jdbcType="VARCHAR" />
|
||||
<result column="user_region4" property="userRegion4" jdbcType="VARCHAR" />
|
||||
<result column="user_region5" property="userRegion5" jdbcType="VARCHAR" />
|
||||
</resultMap>
|
||||
<resultMap id="ipPortMap" type="com.nis.domain.configuration.IpPortCfg" >
|
||||
<id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
|
||||
@@ -161,7 +166,8 @@
|
||||
a.CFG_ID,a.CFG_DESC,a.ACTION,a.IS_VALID,a.IS_AUDIT,
|
||||
a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME,
|
||||
a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY,
|
||||
a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.do_log
|
||||
a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.do_log,
|
||||
a.user_region1,a.user_region2,a.user_region3,a.user_region4,a.user_region5
|
||||
</sql>
|
||||
<sql id="IpCfg_Column" >
|
||||
a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
|
||||
@@ -337,26 +343,31 @@
|
||||
SELECT LAST_INSERT_ID()
|
||||
</selectKey>
|
||||
insert into cfg_index_info(
|
||||
CFG_DESC,
|
||||
ACTION,
|
||||
IS_VALID,
|
||||
IS_AUDIT,
|
||||
CREATOR_ID,
|
||||
CREATE_TIME,
|
||||
EDITOR_ID,
|
||||
EDIT_TIME,
|
||||
AUDITOR_ID,
|
||||
AUDIT_TIME,
|
||||
SERVICE_ID,
|
||||
REQUEST_ID,
|
||||
COMPILE_ID,
|
||||
IS_AREA_EFFECTIVE,
|
||||
CLASSIFY,
|
||||
ATTRIBUTE,
|
||||
LABLE,
|
||||
AREA_EFFECTIVE_IDS,
|
||||
function_id,
|
||||
do_log
|
||||
CFG_DESC,
|
||||
ACTION,
|
||||
IS_VALID,
|
||||
IS_AUDIT,
|
||||
CREATOR_ID,
|
||||
CREATE_TIME,
|
||||
EDITOR_ID,
|
||||
EDIT_TIME,
|
||||
AUDITOR_ID,
|
||||
AUDIT_TIME,
|
||||
SERVICE_ID,
|
||||
REQUEST_ID,
|
||||
COMPILE_ID,
|
||||
IS_AREA_EFFECTIVE,
|
||||
CLASSIFY,
|
||||
ATTRIBUTE,
|
||||
LABLE,
|
||||
AREA_EFFECTIVE_IDS,
|
||||
function_id,
|
||||
do_log,
|
||||
user_region1,
|
||||
user_region2,
|
||||
user_region3,
|
||||
user_region4,
|
||||
user_region5
|
||||
)values (
|
||||
#{cfgDesc,jdbcType=VARCHAR},
|
||||
#{action,jdbcType=INTEGER},
|
||||
@@ -377,7 +388,12 @@
|
||||
#{lable,jdbcType=VARCHAR},
|
||||
#{areaEffectiveIds,jdbcType=VARCHAR},
|
||||
#{functionId,jdbcType=INTEGER},
|
||||
#{doLog,jdbcType=INTEGER}
|
||||
#{doLog,jdbcType=INTEGER},
|
||||
#{userRegion1,jdbcType=VARCHAR},
|
||||
#{userRegion2,jdbcType=VARCHAR},
|
||||
#{userRegion3,jdbcType=VARCHAR},
|
||||
#{userRegion4,jdbcType=VARCHAR},
|
||||
#{userRegion5,jdbcType=VARCHAR}
|
||||
)
|
||||
</insert>
|
||||
<!-- insert ip_port_cfg表信息 -->
|
||||
@@ -799,13 +815,8 @@
|
||||
cfg_region_code,
|
||||
expr_type,
|
||||
match_method,
|
||||
is_hexbin,
|
||||
user_region1,
|
||||
user_region2,
|
||||
user_region3,
|
||||
user_region4,
|
||||
user_region5
|
||||
)values (
|
||||
is_hexbin
|
||||
)values (
|
||||
#{cfgDesc,jdbcType=VARCHAR},
|
||||
#{action,jdbcType=INTEGER},
|
||||
0,
|
||||
@@ -830,12 +841,7 @@
|
||||
#{cfgRegionCode,jdbcType=INTEGER},
|
||||
#{exprType,jdbcType=INTEGER},
|
||||
#{matchMethod,jdbcType=INTEGER},
|
||||
#{isHexbin,jdbcType=INTEGER},
|
||||
#{userRegion1,jdbcType=VARCHAR},
|
||||
#{userRegion2,jdbcType=VARCHAR},
|
||||
#{userRegion3,jdbcType=VARCHAR},
|
||||
#{userRegion4,jdbcType=VARCHAR},
|
||||
#{userRegion5,jdbcType=VARCHAR}
|
||||
#{isHexbin,jdbcType=INTEGER}
|
||||
)
|
||||
</insert>
|
||||
|
||||
|
||||
@@ -597,11 +597,7 @@ public abstract class BaseService {
|
||||
if (baseIpCfg.getProtocolId() != null && baseIpCfg.getProtocolId() != 0) {
|
||||
if (numGroupId == 0) {
|
||||
GroupCfg group1 = new GroupCfg();
|
||||
if(baseIpCfg.getNumberRegionGroupId()!=null) {
|
||||
group1.setGroupId(baseIpCfg.getNumberRegionGroupId());
|
||||
}else {
|
||||
group1.setGroupId(ConfigServiceUtil.getId(2, 1).get(0));
|
||||
}
|
||||
group1.setGroupId(groupId);
|
||||
group1.setCompileId(baseIpCfg.getCompileId());
|
||||
group1.setAuditTime(baseIpCfg.getAuditTime());
|
||||
group1.setIsValid(baseIpCfg.getIsValid());
|
||||
@@ -1779,7 +1775,7 @@ public abstract class BaseService {
|
||||
logger.info("IP配置下发配置参数:"+json);
|
||||
//调用服务接口下发配置
|
||||
try {
|
||||
ToMaatResult result = ConfigServiceUtil.put(json, 2);
|
||||
ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
|
||||
if(result!=null){
|
||||
logger.info("IP配置配置下发响应信息:"+result.getMsg());
|
||||
}
|
||||
|
||||
@@ -693,13 +693,12 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
|
||||
Map<String, List> dataMap=new HashMap<String, List>();
|
||||
List<IpPortCfg> ipPortList = fileTransferCfgDao.getIpPortList(entity);
|
||||
for (int i = 0; i < ipPortList.size(); i++) {
|
||||
ipPortList.get(i).setUserRegion1(DictUtils.getDictLabel("P2P_IP_TYPE",ipPortList.get(i).getUserRegion1()));
|
||||
ipPortList.get(i).setUserRegion1(DictUtils.getDictLabel("P2P_IP_TYPE",entity.getUserRegion2()));
|
||||
}
|
||||
List<P2pHashCfg> hashList = fileTransferCfgDao.getP2pHashList(entity);
|
||||
for (int i = 0; i < hashList.size(); i++) {
|
||||
BaseStringCfg base =hashList.get(i);
|
||||
if(!StringUtil.isEmpty(base.getUserRegion1()))
|
||||
base.setUserRegion1(DictUtils.getDictLabel("P2P_HASH_TYPE",base.getUserRegion1()));
|
||||
base.setUserRegion1(DictUtils.getDictLabel("P2P_HASH_TYPE",entity.getUserRegion1()));
|
||||
}
|
||||
List<P2pKeywordCfg> keywordList = fileTransferCfgDao.getP2pKeywordList(entity);
|
||||
List<NtcSubscribeIdCfg> subscribeIdList = fileTransferCfgDao.getP2pSubscribeidList(entity);
|
||||
@@ -751,8 +750,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
|
||||
// 保存IP域配置信息
|
||||
if(entity.getIpPortList()!=null){
|
||||
for(IpPortCfg cfg:entity.getIpPortList()){
|
||||
BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
|
||||
cfg.setUserRegion2(null);
|
||||
BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType","userRegion1","userRegion2"});
|
||||
fileTransferCfgDao.saveIpPortCfg(cfg);
|
||||
}
|
||||
}
|
||||
@@ -761,8 +759,6 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
|
||||
for(BaseStringCfg cfg:entity.getP2pHashList()){
|
||||
if(StringUtils.isNotBlank(cfg.getCfgKeywords())){
|
||||
BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
|
||||
cfg.setUserRegion1(cfg.getUserRegion2());
|
||||
cfg.setUserRegion2(null);
|
||||
fileTransferCfgDao.saveP2pHashCfg(cfg);
|
||||
}
|
||||
}
|
||||
@@ -1008,6 +1004,18 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
|
||||
String userRegion = "";
|
||||
//存在IP域
|
||||
if(entity != null && entity.getIpPortList() != null && entity.getIpPortList().size() >0){
|
||||
userRegion += Constants.P2P_IP_TYPE_USER_REGION_KEY+"="+entity.getUserRegion2();
|
||||
}
|
||||
//存在hash域
|
||||
if(entity != null && entity.getP2pHashList() != null && entity.getP2pHashList().size() >0){
|
||||
if(!StringUtil.isEmpty(userRegion) && !StringUtil.isEmpty(entity.getUserRegion1())){
|
||||
userRegion = userRegion+Constants.USER_REGION_SPLIT+Constants.P2P_HASH_TYPE_USER_REGION_KEY+"="+entity.getUserRegion1();
|
||||
}else if(!StringUtil.isEmpty(entity.getUserRegion1())){
|
||||
userRegion += Constants.P2P_HASH_TYPE_USER_REGION_KEY+"="+entity.getUserRegion1();
|
||||
}
|
||||
}
|
||||
//存在IP域
|
||||
/*if(entity != null && entity.getIpPortList() != null && entity.getIpPortList().size() >0){
|
||||
IpPortCfg ipport=entity.getIpPortList().get(0);
|
||||
ipport.setUserRegion1(StringUtil.isEmpty(ipport.getUserRegion1()) ? "":ipport.getUserRegion1());
|
||||
userRegion += Constants.P2P_IP_TYPE_USER_REGION_KEY+"="+ipport.getUserRegion1();
|
||||
@@ -1021,7 +1029,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
|
||||
}else{
|
||||
userRegion += Constants.P2P_HASH_TYPE_USER_REGION_KEY+"="+hashCfg.getUserRegion1();
|
||||
}
|
||||
}
|
||||
}*/
|
||||
if(!StringUtil.isEmpty(userRegion)){
|
||||
maatCfg.setUserRegion(userRegion);
|
||||
}
|
||||
|
||||
@@ -104,7 +104,7 @@
|
||||
<form:select path="asnIpGroup" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
|
||||
<form:option value=""><spring:message code='asn_ip_group'/></form:option>
|
||||
<c:forEach items="${policyGroups}" var="policyGroup">
|
||||
<form:option value="${policyGroup.serviceGroupId}"><spring:message code='${policyGroup.groupName}'/></form:option>
|
||||
<form:option value="${policyGroup.groupId}"><spring:message code='${policyGroup.groupName}'/></form:option>
|
||||
</c:forEach>
|
||||
</form:select>
|
||||
</div>
|
||||
|
||||
@@ -151,7 +151,7 @@
|
||||
<shiro:hasPermission name="app:domain:config">
|
||||
<sys:delRow url="${ctx}/app/domainCfgForm" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/app/updateAppDomainCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/app/exportDomain?functionId=${cfg.functionId }&audit=${audit}&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/domainCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/app/exportDomain?functionId=${cfg.functionId }&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/domainCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="app:domain:confirm">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -152,7 +152,7 @@
|
||||
<shiro:hasPermission name="app:http:config">
|
||||
<sys:delRow url="${ctx}/app/httpCfgForm" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/app/updateAppHttpCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/app/exportAppHttp?functionId=${cfg.functionId }&audit=${audit}&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/httpCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/app/exportAppHttp?functionId=${cfg.functionId }&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/httpCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="app:http:confirm">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -155,7 +155,7 @@
|
||||
<shiro:hasPermission name="app:ip:config">
|
||||
<sys:delRow url="${ctx}/app/ipCfgForm" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/app/updateAppIpCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/app/exportAppIp?functionId=${cfg.functionId }&audit=${audit}&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/ipCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/app/exportAppIp?functionId=${cfg.functionId }&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/ipCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="app:ip:confirm">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -201,7 +201,7 @@
|
||||
<shiro:hasPermission name="${configPermissionName }">
|
||||
<sys:delRow url="${ctx}/app/feature/multiFeatureCfgForm" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/app/feature/updateAppFeatureCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/app/feature/exportFeature?functionId=${cfg.functionId }&audit=${audit}&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/feature/multiFeatureCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/app/feature/exportFeature?functionId=${cfg.functionId }&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/feature/multiFeatureCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="${confirmPermissionName }">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -215,7 +215,7 @@
|
||||
<shiro:hasPermission name="app:policy:config">
|
||||
<sys:delRow url="${ctx}/app/policyCfgForm" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/app/updateAppPolicyCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/app/exportIpAddr?functionId=${cfg.functionId }&audit=${audit}&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/policyCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/app/exportIpAddr?functionId=${cfg.functionId }&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/policyCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="app:policy:confirm">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -134,7 +134,7 @@
|
||||
<shiro:hasPermission name="app:ssl:config">
|
||||
<sys:delRow url="${ctx}/app/sslCfgForm" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/app/updateAppSslCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/app/exportAppSsl?functionId=${cfg.functionId }&audit=${audit}&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/sslCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/app/exportAppSsl?functionId=${cfg.functionId }&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/app/sslCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="app:ssl:confirm">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -132,7 +132,7 @@
|
||||
<shiro:hasPermission name="app:topic:config">
|
||||
<sys:delRow url="${ctx}/app/topicDomainCfgForm" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/app/updateAppTopicDomainCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/app/exportTop?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/app/topicDomainCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/app/exportTop?functionId=${cfg.functionId }" searchUrl="${ctx}/app/topicDomainCfgList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="app:domain:confirm">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -213,7 +213,7 @@
|
||||
<shiro:hasPermission name="avVoip:config">
|
||||
<sys:delRow url="${ctx}/ntc/av/contUrlForm" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/av/updateAvContUrlValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/av/exportStream?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/ntc/av/contUrlList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/av/exportStream?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/av/contUrlList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<%-- <sys:delRow url="${ctx}/ntc/av/voipExport?functionId=${cfg.functionId }" id="contentTable" label="export" maxRow="${page.maxExportSize }"></sys:delRow> --%>
|
||||
<shiro:hasPermission name="avVoip:confirm">
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
<title><spring:message code="${cfgName}"></spring:message></title>
|
||||
<script type="text/javascript">
|
||||
$(function(){
|
||||
|
||||
var ifSubmit=true;
|
||||
var sfd = $("#functionId").val();
|
||||
var fileType=[];
|
||||
if(sfd==28||sfd==630){
|
||||
fileType=["mp4","flv","asf","wmv","avi","mpeg","mov","dat","m4v","m4p","m4b","webm","ogv","wav","mp3"];
|
||||
}
|
||||
if(sfd==29||sfd==631){
|
||||
if(sfd==29){
|
||||
fileType=["mp4","flv","asf","wmv","avi","mpeg","mov","dat","m4v","m4p","m4b","webm","ogv"];
|
||||
}
|
||||
if(sfd==30||sfd==632){
|
||||
if(sfd==30||sfd==632||sfd==631){
|
||||
fileType=["bmp","jpg","tiff","raw","gif"];
|
||||
}
|
||||
if(sfd==31){
|
||||
@@ -45,9 +45,9 @@ $(function(){
|
||||
$("#srcFile").trigger("click");
|
||||
|
||||
});
|
||||
|
||||
|
||||
$("#srcFile").on('change',function(){
|
||||
if(sampleFileValidate(fileType,$("#srcFile").val())){
|
||||
if(sfd!=632&&sampleFileValidate(fileType,$("#srcFile").val())){
|
||||
//样例文件类型正确进行后续处理
|
||||
$("#srcFileInfo").val($("#srcFile").val());
|
||||
var videoToPicture = $("#videoToPicture").val();
|
||||
@@ -74,6 +74,65 @@ $(function(){
|
||||
var url = "${ctx}/ntc/av/sample/selectVedioPicture?picFilePath="+encodeURIComponent(data.picFilePath);
|
||||
//openPicWindow(url);
|
||||
}else{
|
||||
// alert(data.msg);
|
||||
top.$.jBox.tip(data.msg, "<spring:message code='info'/>");
|
||||
return;
|
||||
}
|
||||
|
||||
},
|
||||
error:function(jqXHR, textStatus, errorThrown){
|
||||
top.$.jBox.closeTip();
|
||||
//alert(jqXHR.responseText);
|
||||
top.$.jBox(jqXHR.responseText,{
|
||||
width: $(document).width()*0.9,
|
||||
height:$(document).height()*0.8,
|
||||
top: '10%',
|
||||
draggable:false,
|
||||
title: "Error Info", buttons:{ "close":true}
|
||||
});
|
||||
return false;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
// 人脸识别
|
||||
if(sfd==632){
|
||||
var files = $(this)[0].files;
|
||||
for(var i = 0;i < files.length;i ++) {
|
||||
var file = files[i];
|
||||
var faceName = file.name;
|
||||
var vals=sampleFileValidate(fileType,faceName)
|
||||
if (!vals){
|
||||
ifSubmit=false;
|
||||
return;
|
||||
}else{
|
||||
ifSubmit=true;
|
||||
}
|
||||
}
|
||||
if(ifSubmit){
|
||||
$("#srcFileInfo").val($("#srcFile").val());
|
||||
var srcFacePath =$("#srcPath").val();
|
||||
var fd = new FormData($('#cfgFrom')[0]);
|
||||
$.ajax({
|
||||
url: "${ctx}/ntc/av/sample/faceToPicture",
|
||||
type: "POST",
|
||||
processData: false,
|
||||
contentType: false,
|
||||
data: fd,
|
||||
async: true,
|
||||
cache: false,
|
||||
beforeSend: function(){
|
||||
loading('onloading...');
|
||||
},
|
||||
success: function(data) {
|
||||
top.$.jBox.closeTip();
|
||||
if(data.status==1){
|
||||
$("#picPath").val(data.picFilePath);
|
||||
$("#srcPath").val(data.srcPath);
|
||||
$("#showPicture").removeClass("hidden");
|
||||
var url = "${ctx}/ntc/av/sample/selectVedioPicture?picFilePath="+encodeURIComponent(data.picFilePath);
|
||||
//openPicWindow(url);
|
||||
}else{
|
||||
alert(data.msg);
|
||||
}
|
||||
|
||||
@@ -91,8 +150,8 @@ $(function(){
|
||||
return false;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
/* $("#uploadSample,#sampleFileInfo").on('click',function(){
|
||||
$("#sampleFile").trigger("click");
|
||||
@@ -127,8 +186,13 @@ $(function(){
|
||||
var srcFile = $("#srcFile").val();
|
||||
|
||||
if(srcFile!=''){
|
||||
if(!sampleFileValidate(fileType,srcFile)){
|
||||
if(!ifSubmit){
|
||||
$("#fileErrorNote").append("<label id='level-error' class='error'><spring:message code='file_in_wrong_format'/></label>");
|
||||
return false;
|
||||
}else{
|
||||
if(!sampleFileValidate(fileType,srcFile)){
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -137,7 +201,7 @@ $(function(){
|
||||
var srcPath = $("#srcPath").val();
|
||||
//var sampleUrl = $("#sampleUrl").val();
|
||||
var videoToPicture = $("#videoToPicture").val();
|
||||
if(videoToPicture=="true"){
|
||||
if(videoToPicture=="true"&&sfd!=632){
|
||||
if((srcUrl==null||srcUrl=="") && (srcPath==null || srcPath=="")){//srcUrl判断修改时未重新上传文件,srcPath判断修改时重新上传文件但未选择关键帧图片
|
||||
$("div[for='srcFileInfo']").append("<label id='level-error' class='error' for='srcFile'><spring:message code='keyframe_pic_required'></spring:message></label>");
|
||||
return false;
|
||||
@@ -204,7 +268,6 @@ function hiddenlevel(){
|
||||
|
||||
// 校验文件后缀名
|
||||
function sampleFileValidate(fileType,fileName){
|
||||
|
||||
var flag=false; //状态,检测文件后缀用
|
||||
var arr=fileType;//使用是什么格式的后缀
|
||||
var cFile=fileName;//文件的值
|
||||
@@ -306,12 +369,14 @@ function sampleFileValidate(fileType,fileName){
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="src_file"/></label>
|
||||
<div class="col-md-6">
|
||||
<%-- <input class="form-control required" type="text" name="srcUrl" value="${_cfg.srcUrl }"> --%>
|
||||
<input id="srcFile" type="file" name="srcFile" style="width: 330px;display:none" />
|
||||
<c:if test="${_cfg.functionId != 632}">
|
||||
<input id="srcFile" type="file" name="srcFile" style="width: 330px;display:none" />
|
||||
</c:if>
|
||||
<c:set var="videoToPicture" value="${fns:getDictLabel('VIDEO_TO_PICTURE', _cfg.functionId, 'false')}" />
|
||||
<input type="hidden" name="videoToPicture" id="videoToPicture" value="${videoToPicture }">
|
||||
<c:choose>
|
||||
|
||||
<c:when test="${videoToPicture}">
|
||||
<c:when test="${videoToPicture and _cfg.functionId != 632}">
|
||||
<input id="srcPath" name="srcPath" type="hidden" style="width: 330px;" />
|
||||
<div class="input-group">
|
||||
<input id="srcFileInfo" name="srcFileInfo" readonly="readonly" data-msg-required=""
|
||||
@@ -328,6 +393,26 @@ function sampleFileValidate(fileType,fileName){
|
||||
<i class="fa btn-search"></i>
|
||||
<spring:message code="show"></spring:message></button>
|
||||
</c:when>
|
||||
|
||||
<c:when test="${_cfg.functionId eq 632}">
|
||||
<input id="srcFile" type="file" name="srcFile" style="width: 330px;display:none" multiple/>
|
||||
<input id="srcPath" name="srcPath" type="hidden" style="width: 330px;"/>
|
||||
<div class="input-group">
|
||||
<input id="srcFileInfo" name="srcFileInfo" readonly="readonly" data-msg-required=""
|
||||
placeholder="<spring:message code="select_file"/>" class="required form-control" style=" background-color:transparent"
|
||||
aria-required="true" type="text" value="${_cfg.srcUrl }">
|
||||
|
||||
<div class="input-group-btn">
|
||||
<a id="uploadSrc" class="btn btn-default btn-search " href="javascript:" style=""><i class="fa fa-search"></i></a>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<input id="srcUrl" name="srcUrl" type="hidden" value="${_cfg.srcUrl }"/>
|
||||
<button type="button" id="showPicture" class="btn btn-warning hidden ">
|
||||
<i class="fa btn-search"></i>
|
||||
<spring:message code="show"></spring:message></button>
|
||||
</c:when>
|
||||
|
||||
<c:otherwise>
|
||||
<div class="input-group">
|
||||
<input id="srcFileInfo" name="srcFileInfo" readonly="readonly" data-msg-required=""
|
||||
|
||||
@@ -137,7 +137,7 @@
|
||||
<shiro:hasPermission name="avFileSample:config">
|
||||
<sys:delRow url="${ctx}/ntc/av/sample/fileSampleForm" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/av/sample/updateAvFileSampleValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<%-- <sys:delRow url="${ctx}/ntc/av/exportYsp?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/ntc/av/sample/fileSampleList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
<%-- <sys:delRow url="${ctx}/ntc/av/exportYsp?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/av/sample/fileSampleList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
--%> </shiro:hasPermission>
|
||||
<shiro:hasPermission name="avFileSample:confirm">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -205,7 +205,7 @@
|
||||
<shiro:hasPermission name="avVoip:config">
|
||||
<sys:delRow url="${ctx}/ntc/av/voipForm" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/av/updateAvVoipValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/av/exportVoip?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/ntc/av/voipList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/av/exportVoip?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/av/voipList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<%-- <sys:delRow url="${ctx}/ntc/av/voipExport?functionId=${cfg.functionId }" id="contentTable" label="export" maxRow="${page.maxExportSize }"></sys:delRow> --%>
|
||||
<shiro:hasPermission name="avVoip:confirm">
|
||||
|
||||
@@ -218,7 +218,7 @@
|
||||
<shiro:hasPermission name="basicprotocol:config">
|
||||
<sys:delRow url="${ctx}/basicprotocol/form" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/basicprotocol/updateValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/basicprotocol/exportIpAddr?functionId=${cfg.functionId }&audit=${audit}&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/basicprotocol/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/basicprotocol/exportIpAddr?functionId=${cfg.functionId }&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/basicprotocol/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="basicprotocol:confirm">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -197,7 +197,7 @@
|
||||
<shiro:hasPermission name="${requiresPermissionPrefix.concat(':config')}">
|
||||
<sys:delRow url="${ctx}${urlPrefix}/form?functionId=${cfg.functionId}&cfgName=${cfgName}" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}${urlPrefix}/delete?functionId=${cfg.functionId}&cfgName=${cfgName}" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}${urlPrefix}/export?functionId=${cfg.functionId}&audit=${audit}" id="contentTable" label="export" maxRow="${page.maxExportSize}"></sys:delRow>
|
||||
<sys:delRow url="${ctx}${urlPrefix}/export?functionId=${cfg.functionId}" id="contentTable" label="export" maxRow="${page.maxExportSize}"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="${requiresPermissionPrefix.concat(':confirm')}">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -55,14 +55,14 @@
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><spring:message code="p2p_hash_type"/></label>
|
||||
<div class="col-md-6">
|
||||
<select name="userRegion2" class="selectpicker show-tick form-control">
|
||||
<select name="userRegion1" class="selectpicker show-tick form-control">
|
||||
<option value=""><spring:message code="select"/></option>
|
||||
<c:forEach items="${fns:getDictList('P2P_HASH_TYPE')}" var="hashType">
|
||||
<option value="${hashType.itemCode}" <c:if test="${cfg.userRegion1==hashType.itemCode}">selected</c:if> ><spring:message code="${hashType.itemValue}"/></option>
|
||||
<option value="${hashType.itemCode}" <c:if test="${_cfg.userRegion1==hashType.itemCode}">selected</c:if> ><spring:message code="${hashType.itemValue}"/></option>
|
||||
</c:forEach>
|
||||
</select>
|
||||
</div>
|
||||
<div for="userRegion2"></div>
|
||||
<div for="userRegion1"></div>
|
||||
</div>
|
||||
</div>
|
||||
</c:if>
|
||||
|
||||
@@ -164,7 +164,7 @@
|
||||
<shiro:hasPermission name="ddos:ip:config">
|
||||
<sys:delRow url="${ctx}/manipulation/ddos/form" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/manipulation/ddos/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/manipulation/ddos/exportDdos?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/manipulation/ddos/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/manipulation/ddos/exportDdos?functionId=${cfg.functionId }" searchUrl="${ctx}/manipulation/ddos/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="ddos:ip:confirm">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -161,7 +161,7 @@
|
||||
<shiro:hasPermission name="dns:fake:ip:config">
|
||||
<sys:delRow url="${ctx}/cfg/dnsIp/form" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/cfg/dnsIp/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/cfg/dnsIp/exportDnsIp?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/cfg/dnsIp/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/cfg/dnsIp/exportDnsIp?functionId=${cfg.functionId }" searchUrl="${ctx}/cfg/dnsIp/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="dns:fake:ip:confirm">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -215,7 +215,7 @@
|
||||
<shiro:hasPermission name="encryptedtunnelbehav:config">
|
||||
<sys:delRow url="${ctx}/encryptedtunnelbehav/form" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/encryptedtunnelbehav/updateValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/encryptedtunnelbehav/exportIpAddr?functionId=${cfg.functionId }&audit=${audit}&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/encryptedtunnelbehav/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/encryptedtunnelbehav/exportIpAddr?functionId=${cfg.functionId }&specServiceId=${cfg.specServiceId}" searchUrl="${ctx}/encryptedtunnelbehav/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="encryptedtunnelbehav:confirm">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -214,7 +214,7 @@
|
||||
<shiro:hasPermission name="fileTransfer:fileDigest:config">
|
||||
<sys:delRow url="${ctx}/ntc/fileTransfer/fileDigestForm" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/fileTransfer/updateFileDigestValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<%-- <sys:delRow url="${ctx}/ntc/fileTransfer/exportFile?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/ntc/fileTransfer/fileDigestList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
<%-- <sys:delRow url="${ctx}/ntc/fileTransfer/exportFile?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/fileTransfer/fileDigestList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
--%> </shiro:hasPermission>
|
||||
<shiro:hasPermission name="fileTransfer:fileDigest:confirm">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -186,7 +186,7 @@
|
||||
<shiro:hasPermission name="fileTransfer:ftp:config">
|
||||
<sys:delRow url="${ctx}/ntc/fileTransfer/ftpForm" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/fileTransfer/updateFtpCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/fileTransfer/exportftp?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/ntc/fileTransfer/ftpList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/fileTransfer/exportftp?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/fileTransfer/ftpList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="fileTransfer:ftp:confirm">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -200,7 +200,7 @@
|
||||
<shiro:hasPermission name="fileTransfer:p2p:config">
|
||||
<sys:delRow url="${ctx}/ntc/fileTransfer/p2pForm" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/fileTransfer/updateP2pCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/fileTransfer/exportP2p?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/ntc/fileTransfer/p2pList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/fileTransfer/exportP2p?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/fileTransfer/p2pList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="fileTransfer:p2p:confirm">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -112,7 +112,7 @@
|
||||
<label><spring:message code='p2p_ip_config_type'/>:</label>
|
||||
<label>
|
||||
<c:forEach items="${fns:getDictList('P2P_IP_TYPE')}" var="ipType">
|
||||
<c:if test="${_cfg.ipPortList[0].userRegion1==ipType.itemCode}"><spring:message code="${ipType.itemValue}"/></c:if>
|
||||
<c:if test="${_cfg.userRegion2==ipType.itemCode}"><spring:message code="${ipType.itemValue}"/></c:if>
|
||||
</c:forEach>
|
||||
</label>
|
||||
</div>
|
||||
@@ -139,7 +139,7 @@
|
||||
<div class="form-group">
|
||||
<label><spring:message code='p2p_hash_type' />:</label><label>
|
||||
<c:forEach items="${fns:getDictList('P2P_HASH_TYPE')}" var="hashType">
|
||||
<c:if test="${_cfg.p2pHashList[0].userRegion1==hashType.itemCode}"><spring:message code="${hashType.itemValue}"/></c:if>
|
||||
<c:if test="${_cfg.userRegion1==hashType.itemCode}"><spring:message code="${hashType.itemValue}"/></c:if>
|
||||
</c:forEach>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
@@ -123,7 +123,7 @@
|
||||
<shiro:hasPermission name="proxy:intercept:config">
|
||||
<sys:delRow url="${ctx}/proxy/intercept/strateagy/form" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/proxy/intercept/strateagy/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/proxy/intercept/strateagy/exportPxy?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/proxy/intercept/strateagy/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/proxy/intercept/strateagy/exportPxy?functionId=${cfg.functionId }" searchUrl="${ctx}/proxy/intercept/strateagy/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="proxy:intercept:confirm">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -38,14 +38,14 @@
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="p2p_ip_config_type"/></label>
|
||||
<div class="col-md-6">
|
||||
<select name=userRegion1 class="selectpicker show-tick form-control required">
|
||||
<select name="userRegion2" class="selectpicker show-tick form-control required">
|
||||
<option value=""><spring:message code="select"/></option>
|
||||
<c:forEach items="${fns:getDictList('P2P_IP_TYPE')}" var="ipType">
|
||||
<option value="${ipType.itemCode}" <c:if test="${_cfg.ipPortList[0].userRegion1==ipType.itemCode}">selected</c:if> ><spring:message code="${ipType.itemValue}"/></option>
|
||||
<option value="${ipType.itemCode}" <c:if test="${_cfg.userRegion2==ipType.itemCode}">selected</c:if> ><spring:message code="${ipType.itemValue}"/></option>
|
||||
</c:forEach>
|
||||
</select>
|
||||
</div>
|
||||
<div for="userRegion1"></div>
|
||||
<div for="userRegion2"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -57,6 +57,13 @@
|
||||
$("[class~='boxSolid'][class~='ipPortList']").find(".glyphicon-remove").click();
|
||||
processAction(isAsn,$(".asn"));
|
||||
}
|
||||
//隐藏显示asn
|
||||
if($("[name='action']:checked").val()==32||$("[name='action']:checked").val()==64){
|
||||
console.log(111);
|
||||
$("h4.form-section.asn").addClass("hidden");
|
||||
}else{
|
||||
$("h4.form-section.asn").removeClass("hidden");
|
||||
}
|
||||
$(".glyphicon-plus").on("click",function(){
|
||||
if($(this).hasClass("ipPortList")){
|
||||
isAsn=0;
|
||||
@@ -137,6 +144,12 @@
|
||||
}
|
||||
|
||||
} */
|
||||
//隐藏显示asn
|
||||
if($(this).val()==32||$(this).val()==64){
|
||||
$("h4.form-section.asn").addClass("hidden");
|
||||
}else{
|
||||
$("h4.form-section.asn").removeClass("hidden");
|
||||
}
|
||||
});
|
||||
$("#serviceId").val($(".action:checked").attr("serviceId"));
|
||||
$("#protocolId").val($(".action:checked").attr("protocolId"));
|
||||
@@ -663,7 +676,7 @@ var showHideIPSECProtocol=function(obj){
|
||||
</c:if>
|
||||
<c:if test="${region.regionType eq 7 }">
|
||||
<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
|
||||
<h4 class="form-section">
|
||||
<h4 class="form-section asn">
|
||||
<spring:message code="${region.configRegionValue}" />
|
||||
<small> <span
|
||||
class="glyphicon glyphicon-plus asn ${tabName}Add"
|
||||
|
||||
@@ -201,7 +201,7 @@
|
||||
<shiro:hasPermission name="mail:config">
|
||||
<sys:delRow url="${ctx}/ntc/mail/mailForm" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/mail/updateMailCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/mail/exportmail?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/ntc/mail/mailList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/mail/exportmail?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/mail/mailList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="mail:confirm">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -145,7 +145,7 @@
|
||||
<shiro:hasPermission name="dns:res:strategy:config">
|
||||
<sys:delRow url="${ctx}/maintenance/dnsResStrategy/form" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/maintenance/dnsResStrategy/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/maintenance/dnsResStrategy/exportDns?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/maintenance/dnsResStrategy/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/maintenance/dnsResStrategy/exportDns?functionId=${cfg.functionId }" searchUrl="${ctx}/maintenance/dnsResStrategy/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="dns:res:strategy:confirm">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -129,7 +129,7 @@
|
||||
<shiro:hasPermission name="ip:mulitiplex:pool:config">
|
||||
<sys:delRow url="${ctx}/maintenance/ipMultiplexPoolCfg/form" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/maintenance/ipMultiplexPoolCfg/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/maintenance/ipMultiplexPoolCfg/exportDnat?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/maintenance/ipMultiplexPoolCfg/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/maintenance/ipMultiplexPoolCfg/exportDnat?functionId=${cfg.functionId }" searchUrl="${ctx}/maintenance/ipMultiplexPoolCfg/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="ip:mulitiplex:pool:confirm">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -147,7 +147,7 @@
|
||||
<shiro:hasPermission name="ip:mulitiplex:pool:config">
|
||||
<sys:delRow url="${ctx}/maintenance/ipMultiplexPoolCfg/snatform" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/maintenance/ipMultiplexPoolCfg/snatdelete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/maintenance/ipMultiplexPoolCfg/exportSnat?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/maintenance/ipMultiplexPoolCfg/snatlist?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/maintenance/ipMultiplexPoolCfg/exportSnat?functionId=${cfg.functionId }" searchUrl="${ctx}/maintenance/ipMultiplexPoolCfg/snatlist?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="ip:mulitiplex:pool:confirm">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -129,7 +129,7 @@
|
||||
<shiro:hasPermission name="dnat_policy:config">
|
||||
<sys:delRow url="${ctx}/manipulation/ipmulitiplex/dnatPolicyForm" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/manipulation/ipmulitiplex/dnatDelete?functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/manipulation/ipmulitiplex/exportDnat?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/manipulation/ipmulitiplex/dnatPolicyList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/manipulation/ipmulitiplex/exportDnat?functionId=${cfg.functionId }" searchUrl="${ctx}/manipulation/ipmulitiplex/dnatPolicyList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="dnat_policy:confirm">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -129,7 +129,7 @@
|
||||
<shiro:hasPermission name="snat_policy:config">
|
||||
<sys:delRow url="${ctx}/manipulation/ipmulitiplex/snatPolicyForm" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/manipulation/ipmulitiplex/snatDelete?functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/manipulation/ipmulitiplex/exportSnat?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/manipulation/ipmulitiplex/snatPolicyList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/manipulation/ipmulitiplex/exportSnat?functionId=${cfg.functionId }" searchUrl="${ctx}/manipulation/ipmulitiplex/snatPolicyList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="snat_policy:confirm">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -200,7 +200,7 @@
|
||||
<shiro:hasPermission name="other:bgp:config">
|
||||
<sys:delRow url="${ctx}/ntc/other/bgpForm" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/other/updateBgpCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/other/exportbgp?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/ntc/other/bgpList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/other/exportbgp?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/other/bgpList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="other:bgp:confirm">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -180,7 +180,7 @@
|
||||
<shiro:hasPermission name="${configPermissionName }">
|
||||
<sys:delRow url="${ctx}/proxy/cache/form" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/proxy/cache/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/proxy/cache/exportHttp?functionId=${cfg.functionId }&audit=${audit}" id="contentTable" searchUrl="${actionPath }" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/proxy/cache/exportHttp?functionId=${cfg.functionId }" id="contentTable" searchUrl="${actionPath }" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="${confirmPermissionName }">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -385,7 +385,7 @@
|
||||
<shiro:hasPermission name="${configPermissionName }">
|
||||
<sys:delRow url="${ctx}/proxy/control/httpRedirect/form" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/proxy/control/httpRedirect/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/proxy/control/httpRedirect/exportHttp?functionId=${cfg.functionId }&audit=${audit}" id="contentTable" searchUrl="${actionPath }" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/proxy/control/httpRedirect/exportHttp?functionId=${cfg.functionId }" id="contentTable" searchUrl="${actionPath }" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="${confirmPermissionName }">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -198,7 +198,7 @@
|
||||
<shiro:hasPermission name="website:dns:config">
|
||||
<sys:delRow url="${ctx}/ntc/website/dnsForm" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/website/updateDnsCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/website/exportdns?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/ntc/website/dnsList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/website/exportdns?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/website/dnsList?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="website:dns:confirm">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -356,7 +356,7 @@
|
||||
<shiro:hasPermission name="website:http:config">
|
||||
<sys:delRow url ="${ctx}/ntc/website/httpForm" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/website/updateHttpCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/website/exportHttp?functionId=${cfg.functionId }&audit=${audit}" id="contentTable" searchUrl="${ctx}/ntc/website/httpList?functionId=${cfg.functionId}" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/website/exportHttp?functionId=${cfg.functionId }" id="contentTable" searchUrl="${ctx}/ntc/website/httpList?functionId=${cfg.functionId}" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="website:http:confirm">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -197,7 +197,7 @@
|
||||
<shiro:hasPermission name="website:ssl:config">
|
||||
<sys:delRow url="${ctx}/ntc/website/sslForm" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/website/updateSslCfgValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/website/exportSsl?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/ntc/website/sslLists?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/website/exportSsl?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/website/sslLists?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="website:ssl:confirm">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -178,7 +178,7 @@
|
||||
<shiro:hasPermission name="whitelist:domain:config">
|
||||
<sys:delRow url="${ctx}/ntc/whitelist/domain/form" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/whitelist/domain/updateValid?isValid=-1&functionId=${cfg.functionId}" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/whitelist/exportdomain?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/ntc/whitelist/domain/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/whitelist/exportdomain?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/whitelist/domain/list?functionId=${cfg.functionId}" id="contentTable" maxRow="10000" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="whitelist:domain:confirm">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -198,7 +198,7 @@
|
||||
<shiro:hasPermission name="whitelist:ip:config">
|
||||
<sys:delRow url="${ctx}/ntc/whitelist/ip/form" id="contentTable" label="update"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/whitelist/updateIpValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/whitelist/exportIpAddr?functionId=${cfg.functionId }&audit=${audit}" searchUrl="${ctx}/ntc/whitelist/ip/list?functionId=${cfg.functionId}" id="contentTable" maxRow="5" label="export"></sys:delRow>
|
||||
<sys:delRow url="${ctx}/ntc/whitelist/exportIpAddr?functionId=${cfg.functionId }" searchUrl="${ctx}/ntc/whitelist/ip/list?functionId=${cfg.functionId}" id="contentTable" maxRow="5" label="export"></sys:delRow>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="whitelist:ip:confirm">
|
||||
<div class="btn-group">
|
||||
|
||||
@@ -329,6 +329,9 @@ background:#3d3d3d;
|
||||
<li>
|
||||
<a href="javascript:refreshCache('functionRegionDict')">refresh function region</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="javascript:refreshCache('asnNoCache')">refresh ASN no</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
</c:if>
|
||||
|
||||
Reference in New Issue
Block a user