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

查漏补缺 addMessage() messageType;

Browse Source
This commit is contained in:
zhangwq
2018-12-13 14:01:06 +08:00
parent 6dab8a5950
commit 46efc3320d
82 changed files with 174 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
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,13 +116,13 @@ 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");
}
}
@@ -206,7 +206,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();
}
}

4
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"));
}
@@ -319,7 +319,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());

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);

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(model,"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(model,"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 转为对象 -->

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

@@ -211,7 +211,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">

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>

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>

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">

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">

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>

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">

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>

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

@@ -346,7 +346,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/website/sslList.jsp
View File

@@ -345,7 +345,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/whitelist/domainList.jsp
View File

@@ -326,7 +326,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/dashboard/trafficIpActiveList.jsp
View File

@@ -29,7 +29,7 @@
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<h3 class="page-title">
<spring:message code="traffic_ipactive_hour_max"></spring:message>
</h3>

2
src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp
View File

@@ -174,7 +174,7 @@
<div class="col-md-12">
<div class="portlet">
<div class="portlet-body">
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<!-- top -->
<%-- <div class="row">
<div class="col-md-6">

2
src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp
View File

@@ -80,7 +80,7 @@
});
});
</script>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive show-two">
<table id="contentTable" style="width: 35%;" class="table table-hover table-striped table-bordered table-condensed text-nowrap">
<thead>

2
src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
View File

@@ -276,7 +276,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/specific/specificServiceHostCfgForm.jsp
View File

@@ -107,7 +107,7 @@ function selectP(){
<form:form id="inputForm" modelAttribute="specificServiceHostCfg" action="${ctx}/specific/specificServiceHostCfg/saveOrUpdate" method="post" class="form-horizontal" >
<div class="form-body row">
<form:hidden path="hostId" class="form-control" />
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }"/>
<div class="row">
<div class="col-md-6">
<div class="form-group">

2
src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp
View File

@@ -372,7 +372,7 @@
<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/sys/areaForm.jsp
View File

@@ -31,7 +31,7 @@
</ul><br/>
<form:form id="inputForm" modelAttribute="sysArea" action="${ctx}/sys/area/saveOrUpdate" method="post" class="form-horizontal">
<form:hidden path="id"/>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="control-group">
<label class="control-label">上级区域:</label>
<div class="controls">

2
src/main/webapp/WEB-INF/views/sys/areaIndex.jsp
View File

@@ -11,7 +11,7 @@
<script src="${ctxStatic}/jquery-ztree/3.5.12/js/jquery.ztree.all-3.5.min.js" type="text/javascript"></script>
</head>
<body>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div id="content" class="row-fluid">
<div id="left" class="accordion-group">
<div class="accordion-heading">

2
src/main/webapp/WEB-INF/views/sys/areaList.jsp
View File

@@ -49,7 +49,7 @@
<li class="active"><a href="${ctx}/sys/area/list?id=${sysArea.id}&parentIds=${sysArea.parentIds}">区域列表</a></li>
<shiro:hasPermission name="sys:area:edit"><li><a href="${ctx}/sys/area/form?parent.id=${sysArea.id}">区域添加</a></li></shiro:hasPermission>
</ul>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<table id="treeTable" class="table table-striped table-bordered table-condensed">
<thead><tr><th>区域名称</th><th>区域编码</th><th>区域类型</th><th>经度</th><th>纬度</th><th>备注</th><shiro:hasPermission name="sys:area:edit"><th>操作</th></shiro:hasPermission></tr></thead>
<tbody id="treeTableList"></tbody>

2
src/main/webapp/WEB-INF/views/sys/cfgOperationLogList.jsp
View File

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

2
src/main/webapp/WEB-INF/views/sys/dictForm.jsp
View File

@@ -134,7 +134,7 @@
<form:hidden path="id"/>
<form:hidden path="revision"/>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="alert alert-error hide">

2
src/main/webapp/WEB-INF/views/sys/dictList.jsp
View File

@@ -272,7 +272,7 @@
</form:form>
</div>
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }" />
<table id="contentTable1" class="table table-striped table-bordered table-condensed">
<thead>

2
src/main/webapp/WEB-INF/views/sys/ipLocation.jsp
View File

@@ -33,7 +33,7 @@
<body>
<form:form id="inputForm" action="${ctx}/sys/ipLocation/search" method="post" class="form-horizontal">
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="control-group">
<label class="control-label">IP地址:</label>

2
src/main/webapp/WEB-INF/views/sys/menuForm.jsp
View File

@@ -57,7 +57,7 @@
<!-- BEGIN FORM-->
<form:form id="inputForm" modelAttribute="menu" action="${ctx}/sys/menu/saveOrUpdate" method="post" class="form-horizontal">
<form:hidden path="id"/>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code="parent_menu"></spring:message>:</label>
<div class="col-md-4">

2
src/main/webapp/WEB-INF/views/sys/menuList.jsp
View File

@@ -84,7 +84,7 @@
<div class="col-md-12">
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }"/>
<form id="listForm" method="post">
<table id="treeTable"
class="table table-striped table-bordered table-condensed">

2
src/main/webapp/WEB-INF/views/sys/officeIndex.jsp
View File

@@ -30,7 +30,7 @@
<h5 class="page-header"></h5>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="row">

2
src/main/webapp/WEB-INF/views/sys/officeList.jsp
View File

@@ -63,7 +63,7 @@
<%-- <shiro:hasPermission name="sys:office:edit"><li><a href="${ctx}/sys/office/form?parent.id=${sysOffice.id}">机构添加</a></li></shiro:hasPermission> --%>
<!-- </ul> -->
<div class="">
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<table id="treeTable" class="table table-striped table-bordered table-condensed">
<thead><tr><th><spring:message code="org_name"/></th><th><spring:message code="belong_area"/></th><th><spring:message code="org_coding"/></th><th><spring:message code="level"/></th><th><spring:message code="org_type"/></th><th><spring:message code="org_duty_type"/></th><th><spring:message code="remarks"/></th><shiro:hasPermission name="sys:office:edit"><th><spring:message code="operation"/></th></shiro:hasPermission></tr></thead>
<tbody id="treeTableList"></tbody>