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

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

Browse Source
This commit is contained in:
dongxiaoyan
2018-12-15 11:35:46 +08:00
parent eb11cf8371 80cc60757a
commit adecc3273d
174 changed files with 801 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/util/excel/ExportExcel.java
View File

@@ -2209,10 +2209,16 @@ public class ExportExcel {
int j=0;
sheets=new HashMap<>();
rownums=new HashMap<>();
int num=0;
for (String title : titleList) {
List<String> headerList=headerMap.get(title);
List<String> commentList=commentMap.get(title);
Sheet sheet = wb.createSheet(StringUtil.isEmpty(msgProp.get(title)) ? title:msgProp.get(title).toString());
String titleName=StringUtil.isEmpty(msgProp.get(title)) ? title:msgProp.get(title).toString();
if(num > 0){
titleName+=String.valueOf(num);
}
Sheet sheet = wb.createSheet(titleName);
num++;
rownums.put(title, 0);
sheets.put(title, sheet);
this.styles = createStyles(wb);

27
src/main/java/com/nis/web/controller/basics/AsnIpController.java
View File

@@ -81,14 +81,14 @@ public class AsnIpController extends BaseController{
public String save(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")CfgIndexInfo cfg,RedirectAttributes redirectAttributes){
try{
asnIpCfgService.saveAsnIpCfg(cfg);
addMessage(redirectAttributes,"save_success");
addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){
logger.error("信息保存失败",e);
e.printStackTrace();
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,e.getMessage());
addMessage(redirectAttributes,"error",e.getMessage());
}else {
addMessage(redirectAttributes,"save_failed");
addMessage(redirectAttributes,"error","save_failed");
}
}
@@ -100,11 +100,11 @@ public class AsnIpController extends BaseController{
try{
asnIpCfgService.update(cfg);
addMessage(redirectAttributes,"save_success");
addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){
logger.error("信息保存失败",e);
e.printStackTrace();
addMessage(redirectAttributes,"save_failed");
addMessage(redirectAttributes,"error","save_failed");
}
return "redirect:" + adminPath +"/basics/asn/list?functionId="+cfg.getFunctionId();
@@ -116,18 +116,27 @@ public class AsnIpController extends BaseController{
,RedirectAttributes redirectAttributes){
try{
asnIpCfgService.delete(isValid,ids);
addMessage(redirectAttributes,"delete_success");
addMessage(redirectAttributes,"success","delete_success");
}catch(Exception e){
logger.error("Delete failed",e);
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,e.getMessage());
addMessage(redirectAttributes,"error",e.getMessage());
}else {
addMessage(redirectAttributes,"delete_failed");
addMessage(redirectAttributes,"error","delete_failed");
}
}
return "redirect:" + adminPath +"/basics/asn/list?functionId="+functionId;
}
@RequestMapping(value = {"/ajaxDeleteAsnIp"})
public void ajaxDeleteAsnIp(String ids, HttpServletRequest request, HttpServletResponse response){
try{
asnIpCfgService.ajaxDeleteAsnIp(ids);
}catch(Exception e){
logger.error("Delete failed",e);
}
}
/**
* ajax设置Name
* @param model
@@ -206,7 +215,7 @@ public class AsnIpController extends BaseController{
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
} catch (Exception e) {
logger.error("asnIp export failed",e);
addMessage(redirectAttributes, "export_failed");
addMessage(redirectAttributes,"error","export_failed");
}
//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
}

14
src/main/java/com/nis/web/controller/basics/IpReuseIpCfgController.java
View File

@@ -70,11 +70,11 @@ public class IpReuseIpCfgController extends BaseController{
,RedirectAttributes redirectAttributes) {
try{
ipReuseIpCfgService.save(entity);;
addMessage(redirectAttributes,"save_success");
addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){
logger.error("信息保存失败",e);
e.printStackTrace();
addMessage(redirectAttributes,"save_failed");
addMessage(redirectAttributes,"error","save_failed");
}
return "redirect:" + adminPath +"/basics/vpn/list?functionId="+entity.getFunctionId();
}
@@ -86,11 +86,11 @@ public class IpReuseIpCfgController extends BaseController{
public String update(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")IpReuseIpCfg cfg,RedirectAttributes redirectAttributes){
try{
ipReuseIpCfgService.update(cfg);
addMessage(redirectAttributes,"save_success");
addMessage(redirectAttributes,"success","save_success");
}catch(Exception e){
logger.error("信息保存失败",e);
e.printStackTrace();
addMessage(redirectAttributes,"save_failed");
addMessage(redirectAttributes,"error","save_failed");
}
return "redirect:" + adminPath +"/basics/vpn/list?functionId="+cfg.getFunctionId();
}
@@ -101,13 +101,13 @@ public class IpReuseIpCfgController extends BaseController{
,RedirectAttributes redirectAttributes){
try{
ipReuseIpCfgService.delete(isValid,ids);
addMessage(redirectAttributes,"delete_success");
addMessage(redirectAttributes,"success","delete_success");
}catch(Exception e){
logger.error("Delete failed",e);
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,e.getMessage());
addMessage(redirectAttributes,"error",e.getMessage());
}else {
addMessage(redirectAttributes,"delete_failed");
addMessage(redirectAttributes,"error","delete_failed");
}
}

8
src/main/java/com/nis/web/controller/basics/PolicyGroupController.java
View File

@@ -68,10 +68,10 @@ public class PolicyGroupController extends BaseController {
try {
policyGroupInfoService.saveOrUpdate(cfg);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success","save_success");
} catch (Exception e) {
logger.error("新增失败",e);
addMessage(redirectAttributes, "save_failed");
addMessage(redirectAttributes,"error","save_failed");
}
return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList";
@@ -89,10 +89,10 @@ public class PolicyGroupController extends BaseController {
public String delete(RedirectAttributes redirectAttributes, String ids,int isValid) {
try {
policyGroupInfoService.deldete(ids,isValid);
addMessage(redirectAttributes, "delete_success");
addMessage(redirectAttributes,"success","delete_success");
} catch (Exception e) {
logger.error("删除失败",e);
addMessage(redirectAttributes, "delete_failed");
addMessage(redirectAttributes,"error","delete_failed");
}
return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList";
}

8
src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java
View File

@@ -213,10 +213,10 @@ public class ServiceDictInfoController extends BaseController {
try {
serviceDictInfoService.saveOrUpdate(serviceDictInfo);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success", "save_success");
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes, "save_failed");
addMessage(redirectAttributes,"error", "save_failed");
}
return "redirect:" + adminPath + "/basics/serviceDictInfo/list?itType="+itType;
@@ -236,10 +236,10 @@ public class ServiceDictInfoController extends BaseController {
public String delete(ServiceDictInfo serviceDictInfo, RedirectAttributes redirectAttributes, String itType, String mulitId) {
try {
serviceDictInfoService.deleteDict(mulitId);
addMessage(redirectAttributes, "delete_success");
addMessage(redirectAttributes,"success", "delete_success");
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes, "delete_failed");
addMessage(redirectAttributes,"error", "delete_failed");
}
return "redirect:" + adminPath + "/basics/serviceDictInfo/list?itType="+itType;
}

8
src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
View File

@@ -155,10 +155,10 @@ public class SysDictInfoController extends BaseController {
try {
sysDictInfoService.saveOrUpdate(sysDictInfo);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success", "save_success");
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes, "save_failed");
addMessage(redirectAttributes,"error", "save_failed");
}
return "redirect:" + adminPath + "/basics/sysDictInfo/list?itType="+itType;
@@ -175,10 +175,10 @@ public class SysDictInfoController extends BaseController {
public String delete(SysDictInfo sysDictInfo, RedirectAttributes redirectAttributes, String itType, String mulitId) {
try {
sysDictInfoService.deleteDict(mulitId);
addMessage(redirectAttributes, "delete_success");
addMessage(redirectAttributes,"success", "delete_success");
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes, "delete_failed");
addMessage(redirectAttributes,"error", "delete_failed");
}
return "redirect:" + adminPath + "/basics/sysDictInfo/list?itType="+itType;
}

16
src/main/java/com/nis/web/controller/basics/TaskInfoController.java
View File

@@ -59,22 +59,22 @@ public class TaskInfoController extends BaseController{
// 保存用户信息
logger.info(taskInfo.getId()+"修改成功");
taskInfoService.saveOrUpdate(taskInfo);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success", "save_success");
}else{
if (!"true".equals(checkTaskName(taskInfo.getTaskName()))){
logger.info(taskInfo.getTaskName()+"重复数据");
addMessage(model, "save_failed");
addMessage(model,"error", "save_failed");
return form(taskInfo, model);
}
// 保存用户信息
taskInfoService.saveOrUpdate(taskInfo);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success", "save_success");
logger.info(taskInfo.getId()+"保存成功");
}
} catch (Exception e) {
logger.error(e.getMessage());
e.printStackTrace();
addMessage(redirectAttributes, "save_failed");
addMessage(redirectAttributes,"error", "save_failed");
}
return "redirect:" + adminPath + "/basics/taskInfo/list?repage";
}
@@ -101,7 +101,7 @@ public class TaskInfoController extends BaseController{
public String taskExamine(String ids, Model model,RedirectAttributes redirectAttributes){
String[] exId = ids.split(",");
taskInfoService.taskExamine(exId);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success", "save_success");
return "redirect:" + adminPath + "/basics/taskInfo/list?repage";
}
@@ -115,7 +115,7 @@ public class TaskInfoController extends BaseController{
public String taskExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){
String[] noId = ids.split(",");
taskInfoService.taskExamineNo(noId);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success", "save_success");
return "redirect:" + adminPath + "/basics/taskInfo/list?repage";
}
@@ -129,7 +129,7 @@ public class TaskInfoController extends BaseController{
public String taskCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){
String[] canclelId = ids.split(",");
taskInfoService.taskCancelExamine(canclelId);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success", "save_success");
return "redirect:" + adminPath + "/basics/taskInfo/list?repage";
}
@@ -143,7 +143,7 @@ public class TaskInfoController extends BaseController{
public String delete(String ids, Model model,RedirectAttributes redirectAttributes){
String[] delId = ids.split(",");
taskInfoService.delete(delId);
addMessage(redirectAttributes, "delete_success");
addMessage(redirectAttributes,"success", "delete_success");
return "redirect:" + adminPath + "/basics/taskInfo/list?repage";
}

6
src/main/java/com/nis/web/controller/configuration/AppCfgController.java
View File

@@ -1077,7 +1077,7 @@ public class AppCfgController extends BaseController {
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else {
addMessage(redirectAttributes,"save_failed");
addMessage(redirectAttributes,"error","save_failed");
}
}
@@ -1202,7 +1202,7 @@ public class AppCfgController extends BaseController {
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error","request_service_failed");
}else {
addMessage(redirectAttributes,"save_failed");
addMessage(redirectAttributes,"error","save_failed");
}
}
@@ -1346,7 +1346,7 @@ public class AppCfgController extends BaseController {
websiteDomainTopic.setIsValid(Constants.VALID_YES);
appCfgService.saveDomainDict(websiteDomainTopic);
}else{
addMessage(redirectAttributes,"save_failed");
addMessage(redirectAttributes,"error","save_failed");
return "redirect:" + adminPath +"/app/topicDomainCfgList?functionId="+entity.getFunctionId();
}
}

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

@@ -23,6 +23,9 @@ public class LogSearchController extends BaseController{
* searchService: serviceId
*/
// 获取相应日志检索菜单URL
if(entity.getFunctionId()!=null && entity.getFunctionId().equals(635)){
entity.setFunctionId(8);//关键字配置的日志查询定位至http日志
}
String logUrl = menuService.getLogUrl(entity.getFunctionId());
// Integer serviceId = menuService.getServiceId(entity.getFunctionId(),entity.getAction());

4
src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
View File

@@ -67,7 +67,7 @@ public class RequestInfoController extends BaseController{
}else{
if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){
logger.info(requestInfo.getRequestNumber()+"重复数据");
addMessage(model,"error","save_failed");
addMessage(redirectAttributes,"error","save_failed");
return form(requestInfo, model);
}
// 保存用户信息
@@ -78,7 +78,7 @@ public class RequestInfoController extends BaseController{
} catch (Exception e) {
logger.error(e.getMessage());
e.printStackTrace();
addMessage(model,"error","save_failed");
addMessage(redirectAttributes,"error","save_failed");
}
return "redirect:" + adminPath + "/cfg/request/list?repage";
}

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

@@ -100,7 +100,7 @@ public class IpMultiplexPoolCfgController extends BaseController {
if(!StringUtil.isEmpty(ids)){
ipMultiplexPoolCfgService.delete(isAudit,isValid,ids,functionId);
}
addMessage(redirectAttributes,"delete_success");
addMessage(redirectAttributes,"success","delete_success");
}catch(Exception e){
logger.error(e);
addMessage(redirectAttributes,"error", "delete_failed");

6
src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
View File

@@ -270,7 +270,7 @@ public class AvController extends BaseController {
||Constants.SPEAKER_FILE_TYPE.contains(FileUtils.getSuffix(uploadSrcFile.getName(),false))
){
if(!validateAvDuration(uploadSrcFile)){
addMessage(redirectAttributes,"exceeds_duration_limit");
addMessage(redirectAttributes,"error","exceeds_duration_limit");
logger.error("The duration of uploaded files exceeds the limit("+Constants.AV_DURATION_LIMIT+"s).");
throw new MultiPartNewException(this.getMsgProp().getProperty("exceeds_duration_limit"));
}
@@ -289,6 +289,8 @@ public class AvController extends BaseController {
addMessage(redirectAttributes,"error","request_service_failed");
}else if(e instanceof CallExternalProceduresException) {
addMessage(redirectAttributes,"error","call_external_procedures_failed");
}else if(e instanceof MultiPartNewException) {
addMessage(redirectAttributes,"error",e.getMessage());
}else{
addMessage(redirectAttributes,"error","save_failed");
}
@@ -319,7 +321,7 @@ public class AvController extends BaseController {
@RequestMapping(value = {"/sample/updateAvFileSampleValid"})
public String updateAvFileSampleValid(Integer isAudit,Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes){
avCfgService.updateAvFileSampleValid(isAudit,isValid,ids);
addMessage(redirectAttributes,"delete_success");
addMessage(redirectAttributes,"success","delete_success");
return "redirect:" + adminPath +"/ntc/av/sample/fileSampleList?functionId="+functionId;
}
//修改文件样例配置审核状态

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

@@ -146,7 +146,7 @@ public class FileTransferCfgController extends BaseController{
public String updateFtpCfgValid(Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
try {
fileTransferCfgService.updateFtpCfgValid(isValid,ids,functionId);
addMessage(redirectAttributes,"delete_success");
addMessage(redirectAttributes,"success","delete_success");
} catch (Exception e) {
if(e instanceof MaatConvertException) {
e.printStackTrace();
@@ -460,15 +460,42 @@ public class FileTransferCfgController extends BaseController{
@RequestMapping(value = {"saveP2pCfg"})
@RequiresPermissions(value={"fileTransfer:p2p:config"})
public String saveP2pCfg(Model model,HttpServletRequest request,HttpServletResponse response,String ids,CfgIndexInfo entity) {
fileTransferCfgService.saveP2pCfg(entity);
public String saveP2pCfg(Model model,HttpServletRequest request,HttpServletResponse response,
String ids,CfgIndexInfo entity,RedirectAttributes redirectAttributes) {
try {
fileTransferCfgService.saveP2pCfg(entity);
addMessage(redirectAttributes,"success","save_success");
} catch (Exception e) {
if(e instanceof MaatConvertException) {
e.printStackTrace();
logger.error("P2P信息保存失败",e);
addMessage(redirectAttributes,"error","request_service_failed");
}else {
e.printStackTrace();
logger.error("P2P信息保存失败",e);
addMessage(redirectAttributes,"error","save_failed");
}
}
return "redirect:" + adminPath +"/ntc/fileTransfer/p2pList?functionId="+entity.getFunctionId();
}
@RequestMapping(value = {"updateP2pCfgValid"})
@RequiresPermissions(value={"fileTransfer:p2p:config"})
public String updateP2pCfgValid(Integer isValid,String ids,Integer functionId) {
fileTransferCfgService.updateP2pCfgValid(isValid,ids,functionId);
public String updateP2pCfgValid(Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes) {
try {
fileTransferCfgService.updateP2pCfgValid(isValid,ids,functionId);
addMessage(redirectAttributes,"success","delete_success");
} catch (Exception e) {
if(e instanceof MaatConvertException) {
e.printStackTrace();
logger.info("P2P配置删除失败："+e.getMessage());;
addMessage(redirectAttributes,"error","request_service_failed");
}else {
e.printStackTrace();
logger.error("P2P配置删除失败",e);
addMessage(redirectAttributes,"error","delete_failed");
}
}
return "redirect:" + adminPath +"/ntc/fileTransfer/p2pList?functionId="+functionId;
}
@@ -540,6 +567,7 @@ public class FileTransferCfgController extends BaseController{
entity.setFunctionId(functionId);
try {
fileTransferCfgService.auditP2pCfg(entity,isAudit);
addMessage(redirectAttributes,"success","audit_success");
} catch ( Exception e) {
e.printStackTrace();
logger.info("p2p配置下发失败："+e.getMessage());

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

@@ -192,7 +192,7 @@ public class InterceptController extends CommonController{
public String updateInterceptIpValid(Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
try {
interceptCfgService.updatInterceptValid(isValid,ids,functionId);
addMessage(redirectAttributes,"error","delete_success");
addMessage(redirectAttributes,"success","delete_success");
} catch (Exception e) {
logger.error("intercept ip delete failed",e);
addMessage(redirectAttributes,"error","delete_failed");

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

@@ -531,7 +531,7 @@ public class PxyObjKeyringController extends BaseController {
try {
boolean certFileflag=validCertFileContent(certFileI,"-incert");
if(!certFileflag){
addMessage(redirectAttributes,"save_failed");
addMessage(redirectAttributes,"error","save_failed");
logger.error(certFileI.getOriginalFilename()+" file non Certificate file format ");
throw new MultiPartNewException(this.getMsgProp().getProperty("certificate_file_error"));
}
@@ -618,7 +618,7 @@ public class PxyObjKeyringController extends BaseController {
if( crlFileI != null){
boolean certFileflag=validCertFileContent(crlFileI,"-incrl");
if(!certFileflag){
addMessage(redirectAttributes,"save_failed");
addMessage(redirectAttributes,"error","save_failed");
logger.error(crlFileI.getOriginalFilename()+" file non crl file format ");
throw new MultiPartNewException(this.getMsgProp().getProperty("crl_file_error"));
}

2
src/main/java/com/nis/web/controller/dashboard/DashboardController.java
View File

@@ -168,7 +168,7 @@ public class DashboardController extends BaseController{
} catch (Exception e) {
e.printStackTrace();
logger.error("活跃IP统计错误"+e);
addMessage(redirectAttributes,"request_service_failed");
addMessage(redirectAttributes,"error","request_service_failed");
}
model.addAttribute("ipActiveList", ipActiveList);

63
src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
View File

@@ -115,9 +115,9 @@ public class TrafficStatisticsInfoController extends BaseController {
public String bandwidthList(Model model){
Calendar cal = Calendar. getInstance ();
cal.setTime(new Date());
String now = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ).format(cal.getTime());//获取到完整的时间
String now = new SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());//获取到完整的时间
cal.set(Calendar.HOUR_OF_DAY, cal.get(Calendar.HOUR_OF_DAY) - 1);
String oneHoursAgo = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ).format(cal.getTime());
String oneHoursAgo = new SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());
model.addAttribute("beginDate", oneHoursAgo);
model.addAttribute("endDate", now);
return "/dashboard/trafficBandwidthList";
@@ -126,7 +126,14 @@ public class TrafficStatisticsInfoController extends BaseController {
* 流量统计滚动动作查看详情页面
*/
@RequestMapping(value={"trafficBlockList","trafficMonitorList"})
public String serviceBlockList(@RequestParam("searchAction")String searchAction,HttpServletRequest request, HttpServletResponse response, Model model){
public String serviceBlockList(@RequestParam("searchAction")String searchAction,Model model){
Calendar cal = Calendar. getInstance ();
cal.setTime(new Date());
String now = new SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());//获取到完整的时间
cal.set(Calendar.HOUR_OF_DAY, cal.get(Calendar.HOUR_OF_DAY) - 1);
String oneHoursAgo = new SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());
model.addAttribute("beginDate", oneHoursAgo);
model.addAttribute("endDate", now);
model.addAttribute("searchAction", searchAction);
return "/dashboard/trafficActionTransList";
}
@@ -135,12 +142,13 @@ public class TrafficStatisticsInfoController extends BaseController {
*/
@RequestMapping(value="actionEntranceTrans")
@ResponseBody
public List actionTrans(@RequestParam("searchAction")String searchAction){
public List actionTrans(String beginDate,String endDate,@RequestParam("searchAction")String searchAction){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
List resultList = new ArrayList();
String url = Constants.DASHBOARD_URL+Constants.NTC_ACTION_ENTRANCE_REPORT;
url=url+"?searchAction="+searchAction;
try {
url = urlAddDate(url,beginDate,endDate);
String string = HttpClientUtil.get(url);
Gson gson = new GsonBuilder().create();
fromJsonList = gson.fromJson(string, new TypeToken<Map>(){}.getType());
@@ -153,13 +161,23 @@ public class TrafficStatisticsInfoController extends BaseController {
}
return resultList;
}
/**
*
*
* url路径时间参数格式化
* @param url
* @param beginDate
* @param endDate
* @return
* @throws URISyntaxException
*/
public String urlAddDate(String url,String beginDate,String endDate) throws URISyntaxException{
if(StringUtil.isBlank(beginDate)||StringUtil.isBlank(endDate)){
Calendar cal = Calendar. getInstance ();
cal.setTime(new Date());
endDate = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ).format(cal.getTime());//获取到完整的时间
endDate = new SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());//获取到完整的时间
cal.set(Calendar.HOUR_OF_DAY, cal.get(Calendar.HOUR_OF_DAY) - 1);
beginDate = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ).format(cal.getTime());
beginDate = new SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());
}
URIBuilder uriBuilder = new URIBuilder(url);
uriBuilder.addParameter("beginDate",beginDate);
@@ -239,11 +257,11 @@ public class TrafficStatisticsInfoController extends BaseController {
public String protocolTypeList(Model model){
Calendar cal = Calendar. getInstance ();
cal.setTime(new Date());
String now = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ).format(cal.getTime());//获取到完整的时间
String now = new SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());//获取到完整的时间
cal.set(Calendar.HOUR_OF_DAY, cal.get(Calendar.HOUR_OF_DAY) - 1);
String oneHoursAgo = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ).format(cal.getTime());
model.addAttribute("searchFoundStartTime", oneHoursAgo);
model.addAttribute("searchFoundEndTime", now);
String oneHoursAgo = new SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());
model.addAttribute("beginDate", oneHoursAgo);
model.addAttribute("endDate", now);
return "/dashboard/trafficProtocolTypeList";
}
/**
@@ -251,16 +269,12 @@ public class TrafficStatisticsInfoController extends BaseController {
*/
@RequestMapping(value="protocolList")
@ResponseBody
public List protocolList(Model model,@RequestParam(required=false)String searchFoundStartTime,@RequestParam(required=false)String searchFoundEndTime){
public List protocolList(Model model,@RequestParam(required=false)String beginDate,@RequestParam(required=false)String endDate){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
List list = new ArrayList();
String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_PROTOCOL_LIST;
try {
if(!StringUtil.isBlank(searchFoundStartTime)&&!StringUtil.isBlank(searchFoundEndTime)){
searchFoundStartTime=URLEncoder.encode(searchFoundStartTime, "UTF-8");
searchFoundEndTime=URLEncoder.encode(searchFoundEndTime, "UTF-8");
url+="?searchFoundStartTime="+searchFoundStartTime+"&searchFoundEndTime="+searchFoundEndTime;
}
url=urlAddDate(url,beginDate,endDate);
String string = HttpClientUtil.get(url);
Gson gson = new GsonBuilder().create();
fromJsonList = gson.fromJson(string, new TypeToken<Map>(){}.getType());
@@ -311,7 +325,14 @@ public class TrafficStatisticsInfoController extends BaseController {
* App类型详细列表
*/
@RequestMapping(value="appTypeList")
public String appTypeList(){
public String appTypeList(Model model){
Calendar cal = Calendar. getInstance ();
cal.setTime(new Date());
String now = new SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());//获取到完整的时间
cal.set(Calendar.HOUR_OF_DAY, cal.get(Calendar.HOUR_OF_DAY) - 1);
String oneHoursAgo = new SimpleDateFormat( "yyyy-MM-dd HH:mm:00" ).format(cal.getTime());
model.addAttribute("beginDate", oneHoursAgo);
model.addAttribute("endDate", now);
return "/dashboard/trafficAppTypeList";
}
/**
@@ -319,16 +340,12 @@ public class TrafficStatisticsInfoController extends BaseController {
*/
@RequestMapping(value="appList")
@ResponseBody
public List appList(@RequestParam(value="searchFoundStartTime",required=false)String searchFoundStartTime,@RequestParam(value="searchFoundEndTime",required=false)String searchFoundEndTime){
public List appList(@RequestParam(value="beginDate",required=false)String beginDate,@RequestParam(value="endDate",required=false)String endDate){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
List list = new ArrayList();
String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_APP_LIST;
try {
if(!StringUtil.isBlank(searchFoundStartTime)&&!StringUtil.isBlank(searchFoundEndTime)){
searchFoundStartTime=URLEncoder.encode(searchFoundStartTime, "UTF-8");
searchFoundEndTime=URLEncoder.encode(searchFoundEndTime, "UTF-8");
url+="?searchFoundStartTime="+searchFoundStartTime+"&searchFoundEndTime="+searchFoundEndTime;
}
url=urlAddDate(url,beginDate,endDate);
String string = HttpClientUtil.get(url);
Gson gson = new GsonBuilder().create();
fromJsonList = gson.fromJson(string, new TypeToken<Map>(){}.getType());

32
src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsReportController.java
View File

@@ -94,23 +94,29 @@ public class TrafficStatisticsReportController extends BaseController {
model.addAttribute("accountList", accountList);
if(StringUtil.isBlank(account)&&accountList!=null&&accountList.size()>0&&!"3".equals(searchBusinessType)) {
Map accountMap = (Map) accountList.get(0);
String firstAccount=(String) accountMap.get("account");
String userString = HttpClientUtil.get(userUrl+"&searchAccount="+firstAccount);
// 指定用户 查询
Gson usergson = new GsonBuilder().create();
userJsonList = usergson.fromJson(userString, new TypeToken<Map>(){}.getType());
userList = (ArrayList) userJsonList.get("data");
String firstAccount="";
if(accountMap!=null&&accountMap.get("account")!=null){
firstAccount=(String) accountMap.get("account");
String userString = HttpClientUtil.get(userUrl+"&searchAccount="+firstAccount);
// 指定用户 查询
Gson usergson = new GsonBuilder().create();
userJsonList = usergson.fromJson(userString, new TypeToken<Map>(){}.getType());
userList = (ArrayList) userJsonList.get("data");
}
model.addAttribute("userList", userList);
model.addAttribute("searchAccount", firstAccount);
}
if(StringUtil.isBlank(nasIp)&&nasIpList!=null&&nasIpList.size()>0&&!"2".equals(searchBusinessType)) {
Map IpMap = (Map) nasIpList.get(0);
String firstIp=(String) IpMap.get("nasIp");
String ipString = HttpClientUtil.get(ipUrl+"&searchNasIp="+firstIp);
// 指定IP查询
Gson ipgson = new GsonBuilder().create();
ipJsonList = ipgson.fromJson(ipString, new TypeToken<Map>(){}.getType());
ipList = (ArrayList) ipJsonList.get("data");
Map ipMap = (Map) nasIpList.get(0);
String firstIp="";
if(ipMap!=null&&ipMap.get("nasIp")!=null){
firstIp=(String) ipMap.get("nasIp");
String ipString = HttpClientUtil.get(ipUrl+"&searchNasIp="+firstIp);
// 指定IP查询
Gson ipgson = new GsonBuilder().create();
ipJsonList = ipgson.fromJson(ipString, new TypeToken<Map>(){}.getType());
ipList = (ArrayList) ipJsonList.get("data");
}
model.addAttribute("ipList", ipList);
model.addAttribute("searchNasIp", firstIp);

8
src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java
View File

@@ -159,10 +159,10 @@ public class SpecificServiceCfgController extends BaseController {
RedirectAttributes redirectAttributes) {
try {
specificServiceCfgService.saveOrUpdate(specificServiceCfg);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success", "save_success");
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes, "save_failed");
addMessage(redirectAttributes,"error", "save_failed");
}
return "redirect:" + adminPath + "/specific/specificServiceCfg/list?cfgType="+specificServiceCfg.getCfgType();
}
@@ -179,10 +179,10 @@ public class SpecificServiceCfgController extends BaseController {
public String delete(SpecificServiceCfg specificServiceCfg, RedirectAttributes redirectAttributes, String mulitId){
try{
specificServiceCfgService.delete(mulitId);
addMessage(redirectAttributes,"delete_success");
addMessage(redirectAttributes,"success","delete_success");
}catch (Exception e){
e.printStackTrace();
addMessage(redirectAttributes,"delete_failed");
addMessage(redirectAttributes,"error","delete_failed");
}
return "redirect:"+adminPath+"/specific/specificServiceCfg/list";

10
src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java
View File

@@ -95,10 +95,10 @@ public class SpecificServiceHostCfgController extends BaseController {
public String saveOrUpdate(SpecificServiceHostCfg specificServiceHostCfg,Model model,RedirectAttributes redirectAttributes){
try {
specificServiceHostCfgService.saveOrUpdate(specificServiceHostCfg);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success", "save_success");
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes, "save_failed");
addMessage(redirectAttributes,"error", "save_failed");
}
return "redirect:"+adminPath+"/specific/specificServiceHostCfg/list";
}
@@ -114,10 +114,10 @@ public class SpecificServiceHostCfgController extends BaseController {
public String delete(SpecificServiceHostCfg specificServiceHostCfg, RedirectAttributes redirectAttributes, String mulitId){
try{
specificServiceHostCfgService.delete(mulitId);
addMessage(redirectAttributes,"delete_success");
addMessage(redirectAttributes,"success","delete_success");
}catch (Exception e){
e.printStackTrace();
addMessage(redirectAttributes,"delete_failed");
addMessage(redirectAttributes,"error","delete_failed");
}
return "redirect:"+adminPath+"/specific/specificServiceHostCfg/list";
@@ -148,7 +148,7 @@ public class SpecificServiceHostCfgController extends BaseController {
write(request,response, fileName).dispose();
return null;
} catch (Exception e) {
addMessage(redirectAttributes, msgProp.getProperty("import_template_failed")+e.getMessage());
addMessage(redirectAttributes,"error", msgProp.getProperty("import_template_failed")+e.getMessage());
}
return "redirect:"+adminPath+"/specific/specificServiceHostCfg/list";
}

4
src/main/java/com/nis/web/controller/sys/AreaController.java
View File

@@ -70,7 +70,7 @@ public class AreaController extends BaseController {
@RequestMapping(value = "saveOrUpdate")
public String saveOrUpdate(SysArea sysArea, Model model, RedirectAttributes redirectAttributes) {
areaService.saveOrUpdate(sysArea);
addMessage(redirectAttributes, "保存区域'" + sysArea.getName() + "'成功");
addMessage(redirectAttributes,"success", "保存区域'" + sysArea.getName() + "'成功");
String id = sysArea.getParentId().equals(0l) ? "" : String.valueOf(sysArea.getParentId());
return "redirect:" + adminPath + "/sys/area/list?id="+id+"&parentIds="+sysArea.getParent().getParentIds();
@@ -82,7 +82,7 @@ public class AreaController extends BaseController {
public String delete(SysArea area, RedirectAttributes redirectAttributes) {
areaService.delete(area);
addMessage(redirectAttributes, "删除区域成功");
addMessage(redirectAttributes,"success", "删除区域成功");
return "redirect:" + adminPath + "/sys/area/list?id="+area.getParentId()+"&parentIds="+area.getParent().getParentIds();
}

8
src/main/java/com/nis/web/controller/sys/DictController.java
View File

@@ -68,10 +68,10 @@ public class DictController extends BaseController {
dictService.saveOrUpdate(sysDictName);
//删除字典缓存
CacheUtils.remove(Constants.CACHE_DICT_MAP);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success", "save_success");
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes, "save_failed");
addMessage(redirectAttributes,"error", "save_failed");
}
return "redirect:" + adminPath + "/sys/dict/list";
@@ -85,10 +85,10 @@ public class DictController extends BaseController {
dictService.deleteDict(id);
//删除字典缓存
CacheUtils.remove(Constants.CACHE_DICT_MAP);
addMessage(redirectAttributes, "delete_success");
addMessage(redirectAttributes,"success", "delete_success");
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes, "delete_failed");
addMessage(redirectAttributes,"error", "delete_failed");
}

6
src/main/java/com/nis/web/controller/sys/MenuController.java
View File

@@ -71,12 +71,12 @@ public class MenuController extends BaseController {
@RequestMapping(value = "saveOrUpdate")
public String saveOrUpdate(SysMenu menu, Model model, RedirectAttributes redirectAttributes) {
if(!UserUtils.getUser().isAdmin()){
addMessage(redirectAttributes, "越权操作，只有超级管理员才能添加或修改数据！");
addMessage(redirectAttributes,"error", "越权操作，只有超级管理员才能添加或修改数据！");
return "redirect:" + adminPath + "/sys/role/?repage";
}
menuService.saveOrUpdateMenu(menu);
addMessage(redirectAttributes, "保存菜单'" + menu.getName() + "'成功");
addMessage(redirectAttributes,"success", "保存菜单'" + menu.getName() + "'成功");
return "redirect:" + adminPath + "/sys/menu/";
}
@@ -89,7 +89,7 @@ public class MenuController extends BaseController {
// addMessage(redirectAttributes, "删除菜单失败, 不允许删除顶级菜单或编号为空");
// }else{
menuService.deleteMenu(menu);
addMessage(redirectAttributes, "删除菜单成功");
addMessage(redirectAttributes,"success", "删除菜单成功");
// }
return "redirect:" + adminPath + "/sys/menu/";
}

4
src/main/java/com/nis/web/controller/sys/OfficeController.java
View File

@@ -99,7 +99,7 @@ public class OfficeController extends BaseController {
public String saveOrUpdate(SysOffice office, Model model, RedirectAttributes redirectAttributes) {
officeService.saveOrUpdate(office);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success", "save_success");
String id = office.getParentId().equals(0l) ? "" : String.valueOf(office.getParentId());
return "redirect:" + adminPath + "/sys/office/list?id="+id+"&parentIds="+office.getParentIds();
@@ -114,7 +114,7 @@ public class OfficeController extends BaseController {
// addMessage(redirectAttributes, "删除机构失败, 不允许删除顶级机构或编号空");
// }else{
officeService.delete(office);
addMessage(redirectAttributes, "delete_success");
addMessage(redirectAttributes,"success", "delete_success");
// }
String id = office.getParentId().equals(0l) ? "" : String.valueOf(office.getParentId());

14
src/main/java/com/nis/web/controller/sys/RoleController.java
View File

@@ -143,11 +143,11 @@ public class RoleController extends BaseController {
public String saveOrUpdate(SysRole role, Model model, RedirectAttributes redirectAttributes) {
if (!"true".equals(checkName(role.getOldName(), role.getName()))){
addMessage(model, "save_failed");
addMessage(redirectAttributes,"error", "save_failed");
return form(role, model);
}
roleService.saveOrUpdate(role);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success", "save_success");
return "redirect:" + adminPath + "/sys/role/?repage";
}
@@ -155,7 +155,7 @@ public class RoleController extends BaseController {
@RequestMapping(value = "delete")
public String delete(SysRole role, RedirectAttributes redirectAttributes) {
roleService.deleteRole(role);
addMessage(redirectAttributes, "delete_success");
addMessage(redirectAttributes,"success", "delete_success");
return "redirect:" + adminPath + "/sys/role/?repage";
}
@@ -195,16 +195,16 @@ public class RoleController extends BaseController {
if (UserUtils.getUser().getId().equals(userId)) {
/*format(getMsgProp().get("single_file_upload_size_error").toString(),
role.getName(),user.getName());*/
addMessage(redirectAttributes, "无法从角色【" + role.getName() + "】中移除用户【" + user.getName() + "】自己！");
addMessage(redirectAttributes,"error", "无法从角色【" + role.getName() + "】中移除用户【" + user.getName() + "】自己！");
}else {
if (user.getUserRoleList().size() <= 1){
addMessage(redirectAttributes, "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除失败！这已经是该用户的唯一角色，不能移除。");
addMessage(redirectAttributes,"error", "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除失败！这已经是该用户的唯一角色，不能移除。");
}else{
Boolean flag = systemService.outUserInRole(role, user);
if (!flag) {
addMessage(redirectAttributes, "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除失败！");
addMessage(redirectAttributes,"error", "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除失败！");
}else {
addMessage(redirectAttributes, "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除成功！");
addMessage(redirectAttributes,"success", "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除成功！");
}
}
}

12
src/main/java/com/nis/web/controller/sys/UserController.java
View File

@@ -97,7 +97,7 @@ public class UserController extends BaseController{
return form(user, model);
}*/
if (!"true".equals(checkLoginName(user.getOldLoginId(), user.getLoginId()))){
addMessage(model, "save_failed");
addMessage(redirectAttributes,"error", "save_failed");
return form(user, model);
}
// 角色数据有效性验证，过滤不在授权内的角色
@@ -115,7 +115,7 @@ public class UserController extends BaseController{
if (user.getLoginId().equals(UserUtils.getUser().getLoginId())){
UserUtils.clearCache();
}
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success", "save_success");
return "redirect:" + adminPath + "/sys/user/list?repage";
}
@@ -125,12 +125,12 @@ public class UserController extends BaseController{
public String delete(SysUser user, RedirectAttributes redirectAttributes) {
if (UserUtils.getUser().getId().equals(user.getId())){
addMessage(redirectAttributes, "delete_failed");
addMessage(redirectAttributes,"error", "delete_failed");
}else if (user.isAdmin()){
addMessage(redirectAttributes, "delete_failed_admin");
addMessage(redirectAttributes,"error", "delete_failed_admin");
}else{
userService.deleteUser(user);
addMessage(redirectAttributes, "delete_success");
addMessage(redirectAttributes,"success", "delete_success");
}
return "redirect:" + adminPath + "/sys/user/list?repage";
}
@@ -205,7 +205,7 @@ public class UserController extends BaseController{
new ExportExcel("用户数据", SysUser.class).setDataList(getMsgProp(),page.getList(),null).write(response, fileName).dispose();
return null;
} catch (Exception e) {
addMessage(redirectAttributes, "导出用户失败！失败信息："+e.getMessage());
addMessage(redirectAttributes,"error", "导出用户失败！失败信息："+e.getMessage());
}
return "redirect:" + adminPath + "/sys/user/list?repage";
}

4
src/main/java/com/nis/web/dao/UserDao.xml
View File

@@ -22,7 +22,7 @@
</select>
<select id="getUserByLoginName" resultMap="userResultMap">
select
SELECT
id,
login_id,
name,
@@ -31,7 +31,7 @@
email,
create_time,
status
from sys_user where login_id=#{loginName}
FROM sys_user WHERE login_id=#{loginName} AND status != 0
</select>
<!-- map 转为对象 -->

1
src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java
View File

@@ -25,4 +25,5 @@ public interface AsnIpCfgDao extends CrudDao<AsnIpCfg>{
public int deleteByAsnGroup(@Param("asnId")String asnNo);
public int insertBatch(List<AsnIpCfg> list);
public Varibles getVaribles(@Param("name")String name);
public void ajaxDeleteAsnIp(@Param("ids")String ids);
}

3
src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml
View File

@@ -407,6 +407,9 @@
</delete>
<update id="delete" parameterType="java.lang.String" >
delete from asn_ip_cfg where cfg_id in (${ids})
</update>
<update id="ajaxDeleteAsnIp" parameterType="java.lang.String" >
delete from asn_ip_cfg where asn_ip_group in (${ids})
</update>
<select id="findOtherIps" resultType="java.lang.Integer" parameterType="java.lang.Integer">
select 1 from asn_ip_cfg where is_valid=1 and asn_ip_group=#{groupId} and cfg_id !=#{cfgId} limit 1

5
src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml
View File

@@ -197,9 +197,12 @@
<if test="isValid != null">
AND r.is_valid=#{isValid,jdbcType=INTEGER}
</if>
<if test="dnsStrategyId != null">
<if test="dnsStrategyId != null and dnsStrategyId ==0">
AND r.dns_strategy_id=#{dnsStrategyId,jdbcType=INTEGER}
</if>
<if test="dnsStrategyId != null and dnsStrategyId !=0">
and r.dns_strategy_id in (select t.res_group_1_id from dns_res_strategy t where cfg_id=#{dnsStrategyId,jdbcType=INTEGER})
</if>
</where>
</select>

4
src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml
View File

@@ -450,9 +450,9 @@
<if test="isValid !=null">
AND r.is_valid = #{isValid,jdbcType=INTEGER}
</if>
<!-- <if test="isValid == null">
<if test="isValid == null">
AND r.is_valid != -1
</if> -->
</if>
<if test="functionId != null">
AND r.function_id = #{functionId,jdbcType=INTEGER}
</if>

11
src/main/java/com/nis/web/service/basics/AsnIpCfgService.java
View File

@@ -353,9 +353,9 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void delete(Integer isValid,String ids) {
for(String id:ids.split(",")) {
/*for(String id:ids.split(",")) {
Long.parseLong(id);
}
}*/
List<AsnIpCfg> issuedList=new ArrayList<>();
List<AsnIpCfg> asnIpCfgList= asnIpCfgDao.getByIds(ids);
@@ -373,7 +373,9 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
asnIpCfgDao.delete(ids);
//已经下发过的,调用分组复用配置删除接口
// splitAndSend(issuedList,Constants.VALID_NO);
asnIPRegionSendToMaat(issuedList,Constants.VALID_NO);
if(issuedList.size() > 0){
asnIPRegionSendToMaat(issuedList,Constants.VALID_NO);
}
}
// public List<ConfigGroupInfo> findPolicyGroupInfosByType(Integer groupId) {
@@ -463,4 +465,7 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
asnNoList.clear();
}
}
public void ajaxDeleteAsnIp(String ids) {
asnIpCfgDao.ajaxDeleteAsnIp(ids);
}
}

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

@@ -674,7 +674,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
}
}
//只有审核通过的配置需要下发失效动作
if(cfgIndexInfo.getIsAudit().equals(3)){
if(cfgIndexInfo.getIsAudit().equals(1)){
maatCfg.setCompileId(cfgIndexInfo.getCompileId());
maatCfg.setServiceId(cfgIndexInfo.getServiceId());
maatCfg.setIsValid(0);//无效

4
src/main/java/com/nis/web/service/specific/SpecificServiceCfgService.java
View File

@@ -87,6 +87,10 @@ public class SpecificServiceCfgService extends BaseService{
group.setGroupName(specificServiceCfg.getSpecServiceName());
group.setIsIssued(0);
group.setGroupType(1);
if(specificServiceCfg.getCfgType()==1) {
Integer compileId = ConfigServiceUtil.getId(1, 1).get(0);
group.setCompileId(compileId);
}
configGroupInfoDao.insertConfigGroupInfo(group);
}
if(specificServiceCfg.getSpecServiceId()==null){//新增

13
src/main/resources/messages/message_en.properties
View File

@@ -217,8 +217,8 @@ select=Please Select
date_list=Data List
confirm_message=Confirm?
export_confirm_message=The maximum number of data exported
fill_loginName=Please Enter Login Account
fill_loginPassWord=Please Enter Login Password
fill_loginName=Username
fill_loginPassWord=Password
loginName_error=Account or password wrong ,Please try again.
system_error=There is a problem in the system. Please try again later!
save_success=Save Success
@@ -612,7 +612,7 @@ version=Version
encrypt_mode=Encrypt Mode
hmac=Has HMAC
tunnel_type=Tunnel Type
log_total=Log Total Amount
log_total=Total logs
host_key=Host Key
host_cookie=Host Cookie
mac=Message Authentication Code
@@ -1359,8 +1359,11 @@ log_search_http_monit=HTTP Monitor
log_search_http_reject=HTTP Block
log_search_keyword_monit=Keyword Monitor
log_search_keyword_reject=Keyword Block
radius_log=RADIUS Identify
message_type=Message Type
radius_log=Radius Identify
message_type=Code
nas_ip=NAS IP Address
framed_ip=Framed IP Address
log_user_name=User Name
av_tips=The system does not support the index information of audio and video coding in the tail of the audio and video files. The system does not support video with resolution greater than 1080P.
asn_ip_group_delete=\uFF08IP configuration under this ASN group will also be deleted.)
keyword_log_tips=Deduplicate http body keywords log,for the control status of http body keywords is not ideal, configure the http url of the hit keyword as URL control configuration.

16
src/main/resources/messages/message_ru.properties
View File

@@ -217,8 +217,8 @@ select=\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435
date_list=\u0421\u043F\u0438\u0441\u043E\u043A \u0434\u0430\u043D\u043D\u044B\u0445
confirm_message=\u041F\u043E\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044C?
export_confirm_message=\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0435 \u043A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u044D\u043A\u0441\u043F\u043E\u0440\u0442\u0438\u0440\u0443\u0435\u043C\u044B\u0445 \u0434\u0430\u043D\u043D\u044B\u0445
fill_loginName=\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043B\u043E\u0433\u0438\u043D
fill_loginPassWord=\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043F\u0430\u0440\u043E\u043B\u044C
fill_loginName=\u041B\u043E\u0433\u0438\u043D
fill_loginPassWord=\u041F\u0430\u0440\u043E\u043B\u044C
loginName_error=\u041B\u043E\u0433\u0438\u043D \u0438\u043B\u0438 \u043F\u0430\u0440\u043E\u043B\u044C \u043D\u0435\u0432\u0435\u0440\u043D\u044B, \u043F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437.
system_error=\u0412 \u0441\u0438\u0441\u0442\u0435\u043C\u0435 \u0432\u043E\u0437\u043D\u0438\u043A\u043B\u0430 \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u0430, \u043F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435 \u043F\u043E\u0437\u0436\u0435!
save_success=\u0423\u0441\u043F\u0435\u0448\u043D\u043E\u0435 \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u0438\u0435
@@ -612,7 +612,7 @@ version=\u0412\u0435\u0440\u0441\u0438\u044F
encrypt_mode=\u0420\u0435\u0436\u0438\u043C \u0448\u0438\u0444\u0440\u043E\u0432\u0430\u043D\u0438\u044F
hmac=\u0418\u043C\u0435\u0435\u0442 HMAC
tunnel_type=\u0422\u0438\u043F \u0442\u0443\u043D\u043D\u0435\u043B\u044F
log_total=\u041E\u0431\u0449\u0430\u044F \u0441\u0443\u043C\u043C\u0430 \u0436\u0443\u0440\u043D\u0430\u043B\u0430
log_total=\u0421\u0443\u043C\u043C\u0430 \u0416\u0443\u0440\u043D\u0430\u043B\u0430
host_key=\u041A\u043B\u044E\u0447 \u0445\u043E\u0441\u0442\u0430
host_cookie=Cookie \u0445\u043E\u0441\u0442\u0430
mac=\u041A\u043E\u0434 \u0430\u0443\u0442\u0435\u043D\u0442\u0438\u0444\u0438\u043A\u0430\u0446\u0438\u0438 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u044F
@@ -1153,7 +1153,7 @@ ip_reuse_policy_object=\u041E\u0431\u044A\u0435\u043A\u0442 \u043F\u043E\u043B\u
area_group_manage=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u0440\u0435\u0433\u0438\u043E\u043D\u0430\u043C\u0438 \u043F\u043E \u0433\u0440\u0443\u043F\u043F\u0435
stream_media_protocol=\u041F\u0440\u043E\u0442\u043E\u043A\u043E\u043B \u043F\u043E\u0442\u043E\u043A\u043E\u0432\u043E\u0433\u043E \u043C\u0443\u043B\u044C\u0442\u0438\u043C\u0435\u0434\u0438\u0430
new_link=\u041D\u043E\u0432\u0430\u044F \u0441\u0441\u044B\u043B\u043A\u0430
active_link=\u041E\u0442\u043A\u043B\u044E\u0447\u0435\u043D\u0430\u044F
active_link=\u041E\u0442\u043A\u043B\u044E\u0447\u0435\u043D\u0430\u044F \u0441\u0441\u044B\u043B\u043A\u0430
traffic_ipactive_hour_trend=\u0410\u043A\u0442\u0438\u0432\u043D\u044B\u0439 IP \u0422\u041E\u041F 10 \u0442\u0435\u043D\u0434\u0435\u043D\u0446\u0438\u044F \u0432 \u0442\u0435\u0447\u0435\u043D\u0438\u0435 \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0435\u0433\u043E \u043E\u0434\u043D\u043E\u0433\u043E \u0447\u0430\u0441\u0430
traffic_ipactive_hour_max=\u0410\u043A\u0442\u0438\u0432\u043D\u044B\u0439 IP TOP10 \u043C\u0430\u043A\u0441\u0438\u043C\u0443\u043C \u0437\u0430 \u043E\u0434\u0438\u043D \u0447\u0430\u0441
ip_addr=IP
@@ -1363,3 +1363,11 @@ log_search_http_monit=HTTP \u041C\u043E\u043D\u0438\u0442\u043E\u0440\u0438\u043
log_search_http_reject=HTTP \u0411\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435
log_search_keyword_monit=\u041C\u043E\u043D\u0438\u0442\u043E\u0440\u0438\u043D\u0433 \u041A\u043B\u044E\u0447\u0435\u0432\u044B\u0445 \u0421\u043B\u043E\u0432
log_search_keyword_reject=\u0411\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u041A\u043B\u044E\u0447\u0435\u0432\u044B\u0445 \u0421\u043B\u043E\u0432
radius_log=Radius Identify
message_type=Code
nas_ip=NAS IP Address
framed_ip=Framed IP Address
log_user_name=User Name
av_tips=\u041A\u043E\u0433\u0434\u0430 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F \u0438\u043D\u0434\u0435\u043A\u0441\u0430 \u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F \u0430\u0443\u0434\u0438\u043E \u0438 \u0432\u0438\u0434\u0435\u043E \u043D\u0430\u0445\u043E\u0434\u0438\u0442\u0441\u044F \u0432 \u043A\u043E\u043D\u0446\u0435 \u0444\u0430\u0439\u043B\u0430 \u0438\u043B\u0438 \u0432\u0438\u0434\u0435\u043E \u0441 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043D\u0438\u0435\u043C \u0431\u043E\u043B\u0435\u0435 1080p., \u0441\u0438\u0441\u0442\u0435\u043C\u0430 \u043D\u0435 \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044F.
asn_ip_group_delete=\uFF08IP configuration under this ASN group will also be deleted.)
keyword_log_tips=\u041A\u043E\u0433\u0434\u0430 \u0440\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442 \u0443\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u044F \u043A\u043B\u044E\u0447\u0435\u0432\u044B\u043C\u0438 \u0441\u043B\u043E\u0432\u0430\u043C\u0438 \u0432\u0435\u0431-\u0441\u0442\u0440\u0430\u043D\u0438\u0446\u044B \u043F\u043B\u043E\u0445\u0438\u043C, \u0441 \u043F\u043E\u043C\u043E\u0449\u044C\u044E \u0434\u0435\u0434\u0443\u043F\u043B\u0438\u043A\u0430\u0446\u0438\u043E\u043D\u043D\u043E\u0433\u043E \u0436\u0443\u0440\u043D\u0430\u043B\u0430 \u0434\u0430\u043D\u043D\u043E\u0439 \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 \u0432\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044E <20>\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 URL<52> \u0434\u043B\u044F \u043F\u043E\u0434\u0430\u0432\u0448\u0435\u0433\u043E \u0432\u0435\u0431-\u0441\u0430\u0439\u0442\u0430.

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

@@ -1359,8 +1359,11 @@ log_search_http_monit=HTTP\u76D1\u6D4B
log_search_http_reject=HTTP\u963B\u65AD
log_search_keyword_monit=\u5173\u952E\u5B57\u76D1\u6D4B
log_search_keyword_reject=\u5173\u952E\u5B57\u963B\u65AD
radius_log=RADIUS\u534F\u8BAE
message_type=\u62A5\u6587\u7C7B\u578B
nas_ip=NAS\u63A5\u5165IP
framed_ip=\u670D\u52A1\u5668\u4E0B\u53D1\u7684\u7528\u6237\u5730\u5740
log_user_name=\u7528\u6237\u540D
radius_log=Radius \u534F\u8BAE
message_type=Code
nas_ip=NAS IP Address
framed_ip=Framed IP Address
log_user_name=User Name
av_tips=\u5BF9\u4E8E\u97F3\u89C6\u9891\u7F16\u7801\u7684\u7D22\u5F15\u4FE1\u606F\u5728\u97F3\u89C6\u9891\u6587\u4EF6\u5C3E\u90E8\u7684\u60C5\u51B5\uFF0C\u672C\u7CFB\u7EDF\u4E0D\u4E88\u652F\u6301\uFF0C\u5BF9\u4E8E\u5206\u8FA8\u7387\u5927\u4E8E4\u5146\u7684\u89C6\u9891\uFF0C\u672C\u7CFB\u7EDF\u4E0D\u4E88\u652F\u6301
asn_ip_group_delete=(\u8BE5ASN\u7EC4\u4E0B\u7684IP\u914D\u7F6E\u4E5F\u4F1A\u88AB\u5220\u9664)
keyword_log_tips=\u6E05\u6D17\u540E\u7F51\u9875\u5173\u952E\u5B57\u65E5\u5FD7\uFF0C\u7F51\u9875\u5173\u952E\u5B57\u7BA1\u63A7\u72B6\u51B5\u4E0D\u7406\u60F3\u65F6\uFF0C\u53EF\u5C06\u6E05\u6D17\u540E\u5EFA\u8BAE\u7ED9\u51FA\u7684\u547D\u4E2D\u5173\u952E\u5B57\u7F51\u9875\u914D\u7F6E\u4E3AURL\u7BA1\u63A7

6
src/main/resources/scripts/auto_del_file.sh Normal file
View File

@@ -0,0 +1,6 @@
#!/bin/sh
tomcat_install_dir=/home/ceiec/webTomcat
find $tomcat_install_dir/logs/ -mtime +30 -name "*.log" -exec rm -rf {} \;
find $tomcat_install_dir/logs/ -mtime +30 -name "*.txt" -exec rm -rf {} \;
find $tomcat_install_dir/logs/ -mtime +30 -name "*catalina.out.*" -exec rm -rf {} \;
find $tomcat_install_dir/webapps/ntc/WEB-INF/log/ -mtime +30 -name "*.log" -exec rm -rf {} \;

29
src/main/resources/scripts/cut_nginx_logs.sh Normal file
View File

@@ -0,0 +1,29 @@
#!/bin/bash
#function:cut nginx log files
#set the path to nginx log files
log_files_path="/home/ceiec/nginx/logs/"
log_files_dir=${log_files_path}
#set nginx log files you want to cut
log_files_name=(access )
#set the path to nginx.
nginx_sbin="/home/ceiec/nginx/sbin/nginx"
#Set how long you want to save
save_days=30
############################################
#Please do not modify the following script #
############################################
#mkdir -p $log_files_dir
log_files_num=${#log_files_name[@]}
#cut nginx log files
for((i=0;i<$log_files_num;i++));do
mv ${log_files_path}${log_files_name[i]}.log ${log_files_dir}${log_files_name[i]}.log_$(date -d "yesterday" +"%Y-%m-%d")
done
#delete 30 days ago nginx log files
find $log_files_path -mtime +$save_days -exec rm -rf {} \;
#restart nginx
#$nginx_sbin -s reload
systemctl restart nginx

8
src/main/resources/scripts/help Normal file
View File

@@ -0,0 +1,8 @@
crontab -e
00 00 * * * /bin/sh /home/ceiec/nginx/sbin/cut_nginx_logs.sh
0 1 * * * /home/ceiec/webTomcat/bin/splitCatalinaOut.sh >/dev/null 2>&1
0 2 * * * /home/ceiec/webTomcat/bin/auto_del_file.sh >/dev/null 2>&1
/etc/rc.d/rc.local
ng_daemon.sh
redis_daemon.sh
servieDaemon.sh

11
src/main/resources/scripts/ng_daemon.sh Normal file
View File

@@ -0,0 +1,11 @@
#! /bin/bash
nginxPath=/usr/local/nginx
pidFile=$nginxPath/logs/nginx.pid
logPath=$nginxPath/logs/daemon.log
while true;do
if [ ! -f $pidFile ]; then
echo "时间：`date '+%Y-%m-%d %T'` nginx进程不存在,开始启动nginx" >> $logPath
systemctl start nginx
fi
sleep 60
done

11
src/main/resources/scripts/redis_daemon.sh Normal file
View File

@@ -0,0 +1,11 @@
#! /bin/bash
redisPath=/home/ceiec/redis/instances/6379
pidFile=$redisPath/redis.pid
logPath=$redisPath/log/daemon.log
while true;do
if [ ! -f $pidFile ]; then
echo "时间：`date '+%Y-%m-%d %T'` redis进程不存在,开始启动redis" >> $logPath
systemctl start redis
fi
sleep 5
done

22
src/main/resources/scripts/servieDaemon.sh Normal file
View File

@@ -0,0 +1,22 @@
#!/bin/bash
##tomcat安装位置
tomcatPath=/home/ceiec/webTomcat
#tomcatPath=/opt/mesasoft/tomcat
##下面的不要改了,默认即可
tomcatProcess=$tomcatPath/bin/bootstrap.jar
tomcatName=$tomcatPath
logPath=$tomcatPath/logs/daemon.log
echo $logPath
while true;do
count=`ps -ef|grep ${tomcatProcess} |grep -v grep`
if [ $? -ne 0 ]
then
echo "时间：`date '+%Y-%m-%d %T'` "$tomcatName"进程不存在,开始启动"$tomcatName >> $logPath
rm -rf $tomcatPath/work
nohup $tomcatPath/bin/startup.sh &
else
echo "时间：`date '+%Y-%m-%d %T'` "$tomcatName"进程存在" >> $logPath
fi
sleep 60
done

12
src/main/resources/scripts/splitCatalinaOut.sh Normal file
View File

@@ -0,0 +1,12 @@
#!/bin/bash
# split catalina.out by day
cd `dirname $0`
d=`date +%Y%m%d`
d1=`date -d'1 day ago' +%Y%m%d`
d7=`date -d'7 day ago' +%Y%m%d`
d30=`date -d'30 day ago' +%Y%m%d`
cd ../logs/
cp catalina.out catalina.out.${d1}
echo "" > catalina.out
rm -rf catalina.out.${d30}

4
src/main/resources/sql/20181212/add_data_dictionary.sql
View File

@@ -7,8 +7,8 @@ INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_d
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3948', '4', 'Accounting-Request', '', '0', '1', '1', '149');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3949', '5', 'Accounting-Response', '', '0', '1', '1', '149');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3950', '11', 'Access-Challenge', '', '0', '1', '1', '149');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3951', '12', 'Status-Server (experimental)', '', '0', '1', '1', '149');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3952', '13', 'Status-Client (experimental)', '', '0', '1', '1', '149');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3951', '12', 'Status-Server—Experimental', '', '0', '1', '1', '149');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3952', '13', 'Status-Client—Experimental', '', '0', '1', '1', '149');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3953', '40', 'Disconnect-Request', '', '0', '1', '1', '149');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3954', '41', 'Disconnect-ACK', '', '0', '1', '1', '149');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3955', '42', 'Disconnect-NAK', '', '0', '1', '1', '149');

2
src/main/resources/sql/20181212/add_sys_menu.sql
View File

@@ -1,2 +1,2 @@
#添加 RADIUS协议日志
INSERT INTO `sys_menu` (`id`, `parent_id`, `parent_ids`, `code`, `name`, `sort`, `href`, `target`, `icon`, `is_show`, `permission`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `del_flag`, `menu_bg`, `quick_action`, `is_top`, `function_id`) VALUES ('1179', '1131', '0,1,152,1131,', 'radius_log', 'RADIUS协议日志', '80', '/log/ntc/radiusLogs', '', '', '1', '', '1', '2018-12-12 15:14:37', '1', '2018-12-12 15:14:37', '', '1', NULL, '0', '0', '650');
INSERT INTO `sys_menu` (`id`, `parent_id`, `parent_ids`, `code`, `name`, `sort`, `href`, `target`, `icon`, `is_show`, `permission`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `del_flag`, `menu_bg`, `quick_action`, `is_top`, `function_id`) VALUES ('1179', '1131', '0,1,152,1131,', 'radius_log', 'RADIUS协议日志', '80', '/log/ntc/radiusLogs', '', '', '1', '', '1', '2018-12-12 15:14:37', '1', '2018-12-12 15:14:37', '', '1', NULL, '0', '0', '');

18
src/main/webapp/WEB-INF/tags/sys/message.tag
View File

@@ -15,7 +15,19 @@
</style>
<script type="text/javascript">top.$.jBox.closeTip();</script>
<c:if test="${not empty content}">
<c:if test="${not empty type}"><c:set var="ctype" value="${type}"/></c:if><c:if test="${empty type}"><c:set var="ctype" value="${(!fn:containsIgnoreCase(content,'失败') && !fn:containsIgnoreCase(content,'failed') && !fn:containsIgnoreCase(content,'Exception') && !fn:containsIgnoreCase(content,'null')&& !fn:containsIgnoreCase(content,'出错')&& !fn:containsIgnoreCase(content,'error'))?'success':'error'}"/></c:if>
<div id="messageBox" class="alert alert-${ctype}" style="max-height:220px;overflow-y:auto;overflow-x:hidden;"><button data-dismiss="alert" class="close">×</button><spring:message code="${content}"/></div>
<script type="text/javascript">if(!top.$.jBox.tip.mess) {top.$.jBox.tip.mess=1;/* top.$.jBox.tip("<spring:message code='${content}'/>","${ctype}",{persistent:true,opacity:0}); */$("#messageBox").show();}</script>
<c:if test="${not empty type}">
<c:set var="ctype" value="${type}"/>
</c:if>
<c:if test="${empty type}">
<c:set var="ctype" value="${(!fn:containsIgnoreCase(content,'失败') && !fn:containsIgnoreCase(content,'failed') && !fn:containsIgnoreCase(content,'Exception') && !fn:containsIgnoreCase(content,'null')&& !fn:containsIgnoreCase(content,'出错')&& !fn:containsIgnoreCase(content,'error'))?'success':'error'}"/>
</c:if>
<div id="messageBox" class="alert alert-${ctype}" style="max-height:220px;overflow-y:auto;overflow-x:hidden;"><button data-dismiss="alert" class="close">×</button>
<spring:message code="${content}"/></div>
<script type="text/javascript">
if(!top.$.jBox.tip.mess) {
top.$.jBox.tip.mess=1;
/* top.$.jBox.tip("<spring:message code='${content}'/>","${ctype}",{persistent:true,opacity:0}); */
$("#messageBox").show();
}</script>
</c:if>

36
src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp
View File

@@ -46,6 +46,7 @@
if(str.substr(str.length-1)== ','){
ids = str.substr(0,str.length-1);
}
var canDel=true;
var tip='<spring:message code="can_not_delete_issued_asn_group"/>';
if(serviceGroupIds.length>0){
@@ -60,7 +61,7 @@
}
}
});
if(canDel){
/* if(canDel){ // 不能删除包含ASN IP的 ASN组
$.ajax({
type:'post',
url:'${ctx}/basics/policyGroup/ajaxHasAsnIPs',
@@ -73,11 +74,35 @@
}
}
});
}
} */
}
if(canDel){
window.location = url+"&ids="+ids;
}else{
var added = "";
if(serviceGroupIds.length != 0){
added = "<spring:message code='asn_ip_group_delete'/>";
}
top.$.jBox.confirm("<spring:message code='confirm_message'/>"+added,"<spring:message code='info'/>",function(v,h,f){
if(v=="ok"){
if(serviceGroupIds.length != 0){
$.ajax({
type:'post',
url:'${ctx}/basics/asn/ajaxDeleteAsnIp',
data:{"ids":serviceGroupIds.join(',')},
async:false,
success:function(data,textStatus){
if(textStatus == "success"){
window.location = url+"&ids="+ids;
}
}
});
}else{
window.location = url+"&ids="+ids;
}
}
},{buttonsFocus:1});
top.$('.jbox-body .jbox-icon').css('top','55px');
}else{
$.jBox.tip(tip);
return false;
}
@@ -159,6 +184,7 @@
<a href="javascript:void(0);" class="btn btn-default" onclick="deletes('${ctx}/basics/policyGroup/delete?isValid=0')" data-toggle="tooltip" data-placement="top">
<i class="fa fa-trash"> <spring:message code="delete"/></i>
</a>
<%-- <sys:delRow url="${ctx}/basics/asn/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow> --%>
<%-- </shiro:hasPermission> --%>
<a class="btn btn-icon-only btn-default setfields tooltips"
@@ -211,7 +237,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

2
src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp
View File

@@ -199,7 +199,7 @@ label.errorShow {
<!-- BEGIN FORM-->
<form:form id="inputForm" modelAttribute="serviceDictInfo" action="${ctx}/basics/serviceDictInfo/saveOrUpdate?itType=${itType}" method="post" class="form-horizontal">
<form:hidden path="serviceDictId"/>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="form-group <c:if test="${itType==5 }"> hidden </c:if> " >
<label class="col-md-3 control-label"><spring:message code="superior_config"/>:</label>
<div class="col-md-4">

2
src/main/webapp/WEB-INF/views/basics/serviceDictInfo.jsp
View File

@@ -37,7 +37,7 @@
<!-- BEGIN FORM-->
<form:form id="inputForm" modelAttribute="serviceDictInfo" action="${ctx}/basics/serviceDictInfo/saveOrUpdate" method="post" class="form-horizontal">
<form:hidden path="serviceDictId"/>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="superior_config"/>:</label>
<div class="col-md-4">

2
src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp
View File

@@ -265,7 +265,7 @@
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="treeTable" class="table table-striped table-bordered table-condensed text-nowrap">

2
src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp
View File

@@ -143,7 +143,7 @@
<!-- BEGIN FORM-->
<form:form id="inputForm" modelAttribute="sysDictInfo" action="${ctx}/basics/sysDictInfo/saveOrUpdate?itType=${itType}" method="post" class="form-horizontal">
<form:hidden path="sysDictId"/>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<c:if test="${specType == null or specType!=3 }">
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code="superior_config"/>:</label>

2
src/main/webapp/WEB-INF/views/basics/sysDictInfo.jsp
View File

@@ -37,7 +37,7 @@
<!-- BEGIN FORM-->
<form:form id="inputForm" modelAttribute="sysDictInfo" action="${ctx}/basics/sysDictInfo/saveOrUpdate" method="post" class="form-horizontal">
<form:hidden path="sysDictId"/>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<c:if test="${specType == null or specType!=3 }">
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="superior_config"/>:</label>

2
src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
View File

@@ -294,7 +294,7 @@
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="treeTable" class="table table-striped table-bordered table-condensed text-nowrap">

2
src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp
View File

@@ -22,7 +22,7 @@
<div class="portlet-body form">
<!-- BEGIN FORM-->
<form:form action="${ctx}/basics/taskInfo/saveOrUpdate" modelAttribute="taskInfo" class="form-horizontal" id="inputForm" method="post" >
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<input type="hidden" name="id" value="${taskInfo.id}"/>
<div class="form-body">
<div class="form-group">

2
src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
View File

@@ -153,7 +153,7 @@
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">

2
src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileList.jsp
View File

@@ -240,7 +240,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">

1
src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp
View File

@@ -32,6 +32,7 @@ $(function(){
var isHexbin=$(this).val();
if(isHexbin == 1){
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
keywords=keywords.replace("***and***","");
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
$(this).parents(".form-body").find(
"div[for='"

1
src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
View File

@@ -32,6 +32,7 @@ $(function(){
var isHexbin=$(this).val();
if(isHexbin == 1){
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
keywords=keywords.replace("***and***","");
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
$(this).parents(".form-body").find(
"div[for='"

2
src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
View File

@@ -302,7 +302,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

2
src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp
View File

@@ -348,7 +348,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

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

@@ -32,6 +32,7 @@ $(function(){
var isHexbin=$(this).val();
if(isHexbin == 1){
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
keywords=keywords.replace("***and***","");
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
$(this).parents(".form-body").find(
"div[for='"
@@ -53,6 +54,13 @@ $(function(){
errorContainer: "#messageBox",
});
});
function changeDistrict(obj){
if("others"==obj.val()){
obj.parent().siblings(".otherValue").prop("type","text");
}else{
obj.parent().siblings(".otherValue").prop("type","hidden");
}
}
</script>
</head>
<body>

2
src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
View File

@@ -54,7 +54,7 @@
<div class="page-content">
<div class="theme-panel hidden-xs hidden-sm">
<shiro:hasPermission name="app:http:config">
<shiro:hasPermission name="app:ssl:config">
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/app/sslCfgForm?functionId=${cfg.functionId}'">
<i class="fa fa-plus"></i>

2
src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
View File

@@ -269,7 +269,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

2
src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp
View File

@@ -278,7 +278,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

2
src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
View File

@@ -330,7 +330,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

2
src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
View File

@@ -362,7 +362,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

5
src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
View File

@@ -313,6 +313,7 @@ function sampleFileValidate(fileType,fileName){
<spring:message code="${_cfg.menuNameCode }"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">
<div class="portlet box blue">
@@ -446,7 +447,11 @@ function sampleFileValidate(fileType,fileName){
class="fileNoteInfo" data-icon="&#xe08b;" style="cursor:default"></span>
<div for="srcFileInfo"></div>
<div id="fileErrorNote"></div>
</div>
<div style="margin-bottom:5px">
<span style="color: red;font-size: 16px;letter-spacing: 0px;"> <spring:message code="av_tips"></spring:message></span>
</div>
</div>
<%-- <div class="col-md-6">
<div class="form-group">

4
src/main/webapp/WEB-INF/views/cfg/av/fileSampleSubList.jsp
View File

@@ -31,7 +31,7 @@
<label><spring:message code='src_file' />:</label>
<a href="javascript:;" data-original-title="${cfg.srcUrl}"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fns:abbr(cfg.srcUrl,100)}
${fns:abbr(cfg.srcUrl,40)}
</a>
</div>
</div>
@@ -42,7 +42,7 @@
<label><spring:message code='sample_file' />:</label>
<a href="${cfg.sampleUrl }" target="_blank" data-original-title="${cfg.sampleUrl }"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fn:substring(cfg.sampleUrl,0,100) }
${fn:substring(cfg.sampleUrl,0,40) }
</a>
</div>
</div>

2
src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
View File

@@ -330,7 +330,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">

2
src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
View File

@@ -328,7 +328,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

2
src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
View File

@@ -285,7 +285,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">

2
src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp
View File

@@ -87,7 +87,7 @@ $(function(){
</div>
</div>
<div class="portlet-body form">
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }"/>
<shiro:hasPermission name="avSignSample:preset">
<form id="presetFrom" action="${ctx}/ntc/av/sample/auditAvSignSample" method="get" class="form-horizontal">
<input type="hidden" name="functionId" value="${functionId }">

2
src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
View File

@@ -354,7 +354,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

2
src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp
View File

@@ -267,7 +267,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">

2
src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
View File

@@ -339,7 +339,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">

5
src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
View File

@@ -123,7 +123,10 @@
<input type="radio"
name="${cfgName}.exprType" value="${exprType }"
class="required"
<c:if test="${stat.index == 0 }"> checked </c:if>
<%-- <c:if test="${stat.index == 0 }"> checked </c:if> --%>
<c:if test="${cfg.exprType eq exprType || (empty cfg.exprType && exprType eq 0)}">
checked
</c:if>
>
<spring:message code="${exprTypeC.itemValue }" />
</label>

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

@@ -312,7 +312,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

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

@@ -309,7 +309,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

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

@@ -362,7 +362,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">

22
src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestLogSubList.jsp
View File

@@ -2,6 +2,7 @@
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<html>
<head>
<script src="${pageContext.request.contextPath}/static/global/scripts/app.min.js" type="text/javascript"></script>
<script>
$(document).ready(function() {
//$("div[name='tabTitle"+index+"']").get(0).click();
@@ -10,6 +11,7 @@
<style type="text/css">
</style>
</head>
<c:forEach items="${tabList}" var="region" varStatus="regionStatus">
<div id="${region[1]}Title${index}" onclick="switchSubCfgTabInfo('${region[1]}',${index})"
class="col-md-1 tabInfo" name="tabTitle${index }">
@@ -23,24 +25,24 @@
<c:set value="${_cfg}" var="cfg"></c:set>
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
<div class="row" style="margin-top: 5px;">
<div class="row">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='digest' />:</label>
<a href="javascript:;" title="${cfg.digest}"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fns:abbr(cfg.digest,40)}
</a>
<label><spring:message code='file_url' />:</label>
<a href="${cfg.fileUrl}" data-original-title="${cfg.fileUrl}"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fns:abbr(cfg.fileUrl,40)}
</a>
</div>
</div>
</div>
<div class="row">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='file_url' />:</label>
<a href="${cfg.fileUrl }" target="_blank" title="${cfg.fileUrl }"
<label><spring:message code='digest' />:</label>
<a href="javascript:;" target="_blank" data-original-title="${cfg.digest}"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fn:substring(cfg.fileUrl,0,40) }
${fn:substring(cfg.digest,0,40) }
</a>
</div>
</div>
@@ -69,7 +71,7 @@
</div>
</div>
</div>
</c:if>
</c:if>
</c:if>
</c:forEach>
</html>

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

@@ -334,7 +334,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

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

@@ -348,7 +348,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

2
src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
View File

@@ -349,7 +349,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

1
src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp
View File

@@ -109,7 +109,6 @@
</div>
</div>
</div>
</div>
</c:if>
</c:forEach>
</c:if>

2
src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp
View File

@@ -293,7 +293,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">

2
src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
View File

@@ -275,7 +275,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

2
src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp
View File

@@ -295,7 +295,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

2
src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/list.jsp
View File

@@ -221,7 +221,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

2
src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/userView.jsp
View File

@@ -31,7 +31,7 @@
<div class="form-body">
<!-- BEGIN FORM-->
<form:form id="inputForm" modelAttribute="user" action="#" method="post" class="form-horizontal">
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="row">
<div class="col-md-6">
<div class="form-group">

16
src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatSubList.jsp
View File

@@ -26,7 +26,7 @@
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
<div class="row" style="margin-top: 5px;">
<div class="col-md-4">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='original_dest_ip'/>:</label>
<label>
@@ -34,7 +34,9 @@
</label>
</div>
</div>
<div class="col-md-4">
</div>
<div class="row">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='original_dest_port'/>:</label>
<label>
@@ -42,9 +44,9 @@
</label>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-4">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='translated_dest_ip'/>:</label>
<label>
@@ -52,14 +54,16 @@
</label>
</div>
</div>
<div class="col-md-4">
</div>
<div class="row">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='translated_dest_port'/>:</label> <label> ${cfg.destPort }</label>
</div>
</div>
</div>
<div class="row">
<div class="col-md-4">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='protocol'/>:</label>
<label>

7
src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatSubList.jsp
View File

@@ -26,7 +26,7 @@
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
<div class="row" style="margin-top: 5px;">
<div class="col-md-4">
<div class="col-md-10">
<div class="form-group">
<label><spring:message code='address_pool'/>:</label>
<label>
@@ -38,7 +38,9 @@
</label>
</div>
</div>
<div class="col-md-4">
</div>
<div class="row">
<div class="col-md-10">
<div class="form-group">
<label><spring:message code='user_type'/>:</label>
<label>
@@ -54,6 +56,7 @@
</label>
</div>
</div>
</div>
<div class="row">
<div class="col-md-4">

2
src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
View File

@@ -348,7 +348,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

2
src/main/webapp/WEB-INF/views/cfg/proxy/cache/list.jsp vendored
View File

@@ -335,7 +335,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

2
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
View File

@@ -540,7 +540,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

2
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp
View File

@@ -262,7 +262,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">

2
src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp
View File

@@ -270,7 +270,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

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

@@ -22,7 +22,7 @@
<div class="portlet-body form">
<!-- BEGIN FORM-->
<form:form action="${ctx}/cfg/request/saveOrUpdate" modelAttribute="requestInfo" class="form-horizontal" id="inputForm" method="post" >
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<input type="hidden" name="id" value="${requestInfo.id}"/>
<div class="form-body">
<div class="form-group">

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

@@ -165,7 +165,7 @@
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">

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

@@ -11,7 +11,7 @@ $(document).ready(function() {
</head>
<body>
<div class="page-content">
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
</div>
</body>
</html>

Some files were not shown because too many files have changed in this diff Show More