Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

src/main/java/com/nis/domain/Page.java

@@ -4,7 +4,7 @@
 package com.nis.domain;
 
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
@@ -13,16 +13,11 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.mapping.ResultMap;
-import org.apache.ibatis.mapping.ResultMapping;
-import org.apache.ibatis.session.SqlSessionFactory;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.nis.util.Configurations;
-import com.nis.util.Constants;
 import com.nis.util.CookieUtil;
 import com.nis.util.StringUtil;
-import com.nis.web.service.SpringContextHolder;
 
 /**
  * 分页类
@@ -52,7 +47,7 @@ public class Page<T> {
 	
 	private String orderBy = ""; // 标准查询有效， 实例： updatedate desc, name asc
 	
-	private String fields ="";//制定资源的字段
+	private String fields;//制定资源的字段
 	
 	private String where;
 
@@ -63,10 +58,9 @@ public class Page<T> {
 	private String message = ""; // 设置提示消息，显示在“共n条”之后
 
 	public Page() {
-		this.pageSize = pageSize;
+		this.pageSize = -1;
 	}
 	
-	
 	/**
 	 * 构造方法
 	 * @param request 传递 repage 参数，来记住页码
@@ -74,27 +68,11 @@ public class Page<T> {
 	 */
 	public Page(HttpServletRequest request, HttpServletResponse response){
 		
-		this(request, response,Integer.valueOf(Configurations.getIntProperty("page.pageSize", 30)));
+		this(request, response, Integer.valueOf(Configurations.getIntProperty("page.pageSize", 30)));
-		
-	}
-	/**
-	 * 构造方法
-	 * @param request 传递 repage 参数，来记住页码
-	 * @param response 用于设置 Cookie，记住页码
-	 * 
-	 */
-	public Page(HttpServletRequest request, HttpServletResponse response,Class clazz){
-		
-		this(request, response,clazz.getSimpleName(),Integer.valueOf(Configurations.getIntProperty("page.pageSize", 30)));
-		
-	}
-	public Page(HttpServletRequest request, HttpServletResponse response,int defaultPageSize){
-		
-		this(request, response,"",Integer.valueOf(Configurations.getIntProperty("page.pageSize", 30)));
 		
 	}
 
-	public Page(HttpServletRequest request, HttpServletResponse response,String className, int defaultPageSize){
+	public Page(HttpServletRequest request, HttpServletResponse response, int defaultPageSize){
 		try {
 			// 设置页码参数（传递repage参数，来记住页码）
 			String no = request.getParameter("pageNo");
@@ -111,7 +89,13 @@ public class Page<T> {
 			}
 			
 			// 设置页面大小参数（传递repage参数，来记住页码大小）
-			String size = request.getParameter("pageSize");
+			String size = "";
+			if(defaultPageSize==-1){
+				size = "-1";
+			}else{
+				size = request.getParameter("pageSize");
+				
+			}
 			if (StringUtils.isNotBlank(size)) {
 				
 				if (StringUtils.isNumeric(size) || size.equals("-1")){
@@ -126,24 +110,20 @@ public class Page<T> {
 			} else {
 				this.pageSize = defaultPageSize;
 			}
-			//超出每页最大显示条数，取限制的最大条数
-			if(this.pageSize > Constants.MAX_PAGE_SIZE){
-				this.pageSize = Constants.MAX_PAGE_SIZE;
-			}
 			
 			String fields = request.getParameter("fields");
 			if (StringUtils.isNotBlank(fields)){
-				fields=getFiledsSql(className, fields);
 				this.setFields(fields);
 			}
 			
 			// 设置排序参数
 			String orderBy = request.getParameter("orderBy");
 			if (StringUtils.isNotBlank(orderBy)){
-				orderBy=getOrderBySql(className, orderBy);
 				this.setOrderBy(orderBy);
 			}
-			this.count=Integer.valueOf(Configurations.getIntProperty("page.count", -1));
+			
+			this.setWhere(getWhere(request));
+			
 			
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -334,8 +314,8 @@ public class Page<T> {
 		sb.append("<li class=\"disabled controls\"><a href=\"javascript:\">当前 ");
 		sb.append("<input type=\"text\" value=\""+pageNo+"\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)");
 		sb.append(funcName+"(this.value,"+pageSize+",'"+funcParam+"');\" onclick=\"this.select();\"/> / ");
-		sb.append("<input type=\"text\" value=\""+pageSize+"\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)");
+		sb.append("<input type=\"text\" value=\""+last+"\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)");
-		sb.append(funcName+"("+pageNo+",this.value,'"+funcParam+"');\" onclick=\"this.select();\"/> 条，");
+		sb.append(funcName+"("+pageNo+",this.value,'"+funcParam+"');\" onclick=\"this.select();\"/> 页，");
 		sb.append("共 " + count + " 条"+(message!=null?message:"")+"</a></li>\n");
 
 		sb.insert(0,"<ul>\n").append("</ul>\n");
@@ -643,138 +623,37 @@ public class Page<T> {
 	public int getMaxResults(){
 		return getPageSize();
 	}
-	/**
-	 * @Title: getFiledsSql
-	 * @Description: 将fields的属性名称替换为字段名称
-	 * @param @param mapName
-	 * @param @param fileds
-	 * @param @return
-	 * @param @throws Exception
-	 * @return Map 返回类型
-	 * @author （DDM）
-	 * @version V1.0
-	 */
-	@JsonIgnore
-	public String getFiledsSql(String mapName,String fileds) throws Exception{
-			String[] fieldsColoumn=null;
-			String orderByStr="";
-			//所有字段名
-			List<String> columnList=new ArrayList<String>();
-			//所有属性名
-			List<String> propertyList=new ArrayList<String>();
-			//属性名称为key，字段名称为value
-			Map<String, String> columnMap=new HashMap<String, String>();
 
-			if(!StringUtil.isBlank(fileds)){
+//	/**
-				//解析Fileds的字段/属性名称
+//	 * 获取 Spring data JPA 分页对象
-				fieldsColoumn=fileds.split(",");
+//	 */
-				
+//	public Pageable getSpringPage(){
-				//从resultMap中获取字段名称和属性名称
+//		List<Order> orders = new ArrayList<Order>();
-				if(fieldsColoumn != null){
+//		if (orderBy!=null){
-					SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class);
+//			for (String order : StringUtils.split(orderBy, ",")){
-					ResultMap map= sqlSessionFactory.getConfiguration().getResultMap(mapName+"Map");
+//				String[] o = StringUtils.split(order, " ");
-					List<ResultMapping> mapping= map.getResultMappings();
+//				if (o.length==1){
-					for(ResultMapping mapp:mapping){
+//					orders.add(new Order(Direction.ASC, o[0]));
-						columnList.add(mapp.getColumn().toLowerCase());
+//				}else if (o.length==2){
-						propertyList.add(mapp.getProperty());
+//					if ("DESC".equals(o[1].toUpperCase())){
-						columnMap.put(mapp.getProperty(), mapp.getColumn());
+//						orders.add(new Order(Direction.DESC, o[0]));
-					}
+//					}else{
-				}
+//						orders.add(new Order(Direction.ASC, o[0]));
-				if(fieldsColoumn != null){
+//					}
-					fileds="";
+//				}
-					for (String column : fieldsColoumn) {
+//			}
-						if(!StringUtil.isBlank(column)){
+//		}
-							column=column.trim();
+//		return new PageRequest(this.pageNo - 1, this.pageSize, new Sort(orders));
-							if(columnList.contains(column.toLowerCase())){
+//	}
-								fileds+=","+column;
+//	
-							}else if(propertyList.contains(column)){
+//	/**
-								fileds+=","+columnMap.get(column).toString();
+//	 * 设置 Spring data JPA 分页对象，转换为本系统分页对象
-							}
+//	 */
-						}
+//	public void setSpringPage(org.springframework.data.domain.Page<T> page){
-					}
+//		this.pageNo = page.getNumber();
-					if(!StringUtil.isBlank(fileds)){
+//		this.pageSize = page.getSize();
-						fileds=fileds.substring(1);
+//		this.count = page.getTotalElements();
-					}
+//		this.list = page.getContent();
-					
+//	}
-				}
-				
-			}
-		return fileds;
-	}
-	/**
-	 * @Title: getOrderBySql
-	 * @Description: 将orderBy的属性名称替换为字段名称
-	 * @param @param mapName
-	 * @param @param orderBy
-	 * @param @return
-	 * @param @throws Exception
-	 * @return Map 返回类型
-	 * @author （DDM）
-	 * @version V1.0
-	 */
-	@JsonIgnore
-	public static String getOrderBySql(String mapName,String orderBy) throws Exception{
-		String[] orderByColoumn=null;
-		//所有字段名
-		List<String> columnList=new ArrayList<String>();
-		//所有属性名
-		List<String> propertyList=new ArrayList<String>();
-		Map<String, String> columnMap=new HashMap<String, String>();
-		
-		if(!StringUtil.isBlank(orderBy)){
-			//解析orderBy的字段/属性名称
-			orderByColoumn=orderBy.split(",");
-			//从resultMap中获取字段名称和属性名称
-			if(orderByColoumn != null){
-				SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class);
-				ResultMap map= sqlSessionFactory.getConfiguration().getResultMap(mapName+"Map");
-				List<ResultMapping> mapping= map.getResultMappings();
-				for(ResultMapping mapp:mapping){
-					columnList.add(mapp.getColumn().toLowerCase());
-					propertyList.add(mapp.getProperty());
-					columnMap.put(mapp.getProperty(), mapp.getColumn());
-				}
-			}
-			if(orderByColoumn != null){
-				orderBy="";
-				for (String column : orderByColoumn) {
-					if(!StringUtil.isBlank(column)){
-						if(columnList.contains(replaceOrderBy(column))){
-							orderBy+=","+column;
-						}else if(propertyList.contains(replaceOrderBy(column))){
-							//如果是实体类名字则获取对应数据库名字+排序方式
-							orderBy+=","+columnMap.get(replaceOrderBy(column)).toString()
-									+column.replace(replaceOrderBy(column), "");
-						}
-					}
-				}
-				if(!StringUtil.isBlank(orderBy)){
-					orderBy=orderBy.substring(1);
-				}
-			}
-			
-		}
-		return orderBy;
-	}
-	/**
-	 * @Title: replaceOrderBy
-	 * @Description: 去掉orderBy中的desc和asc
-	 * @param @param str
-	 * @param @return
-	 * @return Map 返回类型
-	 * @author （DDM）
-	 * @version V1.0
-	 */
-	public static String replaceOrderBy(String str){
-		if(!StringUtil.isBlank(str)){
-			str=str.trim();
-			str=str.replace(" asc","");
-			str=str.replace(" ASC","");
-			str=str.replace(" DESC","");
-			str=str.replace(" desc","");
-			str=str.trim();
-		}
-		return str;
-	}
 	
 }

src/main/java/com/nis/util/Constants.java

@@ -6,6 +6,8 @@ import com.google.gson.GsonBuilder;
 
 public final class Constants {
 	
+	public static final int CFG_PAGE = 0;
+	public static final int AUDIT_PAGE = 1;
 	public static final String DEFAULT_CAPTCHA_PARAM = "captcha";
 	public static final String DEFAULT_MOBILE_PARAM = "mobileLogin";
 	public static final String DEFAULT_MESSAGE_PARAM = "message";

src/main/java/com/nis/web/controller/BaseController.java

@@ -1,5 +1,4 @@
 package com.nis.web.controller;
-
 import java.beans.PropertyEditorSupport;
 import java.io.IOException;
 import java.util.Date;

src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java

@@ -1,5 +1,4 @@
 package com.nis.web.controller.configuration;
-
 import java.util.Date;
 import java.util.List;
 
@@ -31,8 +30,9 @@ import com.nis.web.controller.BaseController;
 public class ComplexStringCfgController extends BaseController{
 	
 	@RequestMapping(value = {"list"})
-	public String cfgList(Model model,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("cfg")ComplexkeywordCfg cfg,HttpServletRequest request,HttpServletResponse response) {
+	public String cfgList(Model model,Integer audit,String cfgName,@ModelAttribute("cfg")ComplexkeywordCfg cfg,HttpServletRequest request,HttpServletResponse response) {
 		model.addAttribute("cfgName", cfgName);
+		model.addAttribute("audit", audit);
 		if(cfg!=null){
 			Integer serviceId=cfg.getServiceId();
 			logger.info("servcice id is "+serviceId);
@@ -44,14 +44,7 @@ public class ComplexStringCfgController extends BaseController{
 					if(!StringUtils.isBlank(tableName)){
 						logger.info("table name is "+tableName);
 						cfg.setTableName(tableName);
-						Page<ComplexkeywordCfg> searchPage=new Page<ComplexkeywordCfg>(request, response, 1);
+						Page<ComplexkeywordCfg> page = complexStringCfgService.findPage(new Page<ComplexkeywordCfg>(request, response), cfg);
-						if(pageNo!=null) searchPage.setPageNo(pageNo);
-						if(pageSize!=null) searchPage.setPageSize(pageSize);
-						if(cfg.getPage()!=null){
-							if(!StringUtils.isBlank(cfg.getPage().getOrderBy()));
-							searchPage.setOrderBy(cfg.getPage().getOrderBy());
-						}
-						Page<ComplexkeywordCfg> page = complexStringCfgService.findPage(searchPage, cfg);
 						model.addAttribute("page", page);
 						model.addAttribute("action", cfg.getAction());
 						model.addAttribute("tableName", tableName);
@@ -79,6 +72,7 @@ public class ComplexStringCfgController extends BaseController{
 		model.addAttribute("cfgName", cfgName);
 		model.addAttribute("action", action);
 		model.addAttribute("serviceId", serviceId);
+		model.addAttribute("audit", Constants.CFG_PAGE);
 		logger.info("sercice id is "+serviceId);
 		if(serviceId!=null){
 			ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId);
@@ -126,6 +120,7 @@ public class ComplexStringCfgController extends BaseController{
 		model.addAttribute("serviceId", serviceId);
 		model.addAttribute("action", action);
 		model.addAttribute("tableName", tableName);
+		model.addAttribute("audit", Constants.CFG_PAGE);
 		if(!StringUtils.isBlank(tableName)){
 			logger.info("table name is "+tableName);
 			ComplexkeywordCfg searchBean=new ComplexkeywordCfg();
@@ -183,6 +178,7 @@ public class ComplexStringCfgController extends BaseController{
 	public String saveOrUpdateStringCfg(String cfgName,Model model, ComplexkeywordCfg cfg) {
 		model.addAttribute("cfgName",cfgName);
 		model.addAttribute("cfgType","complex");
+		model.addAttribute("audit", Constants.CFG_PAGE);
 		logger.info("saveOrUpdateStringCfg loaded");
 		if(cfg==null){
 			logger.error("无法保存空的配置！");
@@ -253,6 +249,7 @@ public class ComplexStringCfgController extends BaseController{
 	@RequestMapping(value = {"auditCfg"})
 	public String auditStringCfg(String cfgName,ComplexkeywordCfg cfg,Model model) {
 		model.addAttribute("cfgName", cfgName);
+		model.addAttribute("audit", Constants.AUDIT_PAGE);
 		if(cfg==null){
 			logger.error("无法审核空的配置！");
 		}else if(!StringUtils.isBlank(cfg.getTableName())){
@@ -269,6 +266,8 @@ public class ComplexStringCfgController extends BaseController{
 					cfg.setIsValid(Constants.VALID_YES);
 				}
 				int result=complexStringCfgService.auditStringCfg(cfg);
+				model.addAttribute("serviceId", cfg.getServiceId());
+				model.addAttribute("action", cfg.getAction());
 			}
 			
 		}else if(cfg.getServiceId()!=null){
@@ -291,13 +290,15 @@ public class ComplexStringCfgController extends BaseController{
 							cfg.setIsValid(Constants.VALID_YES);
 						}
 						int result=complexStringCfgService.auditStringCfg(cfg);
+						model.addAttribute("serviceId", serviceId);
+						model.addAttribute("action", cfg.getAction());
 					}
 				}
 			}
 		}else{
 			logger.error("无法确定IP配置的表名！");
 		}
-		return "redirect:" + adminPath + "/cfg/complex/list?serviceId="+cfg.getServiceId()+"&action="+cfg.getAction()+"&cfgName"+cfgName;
+		return "redirect:" + adminPath + "/cfg/complex/list";
 	}
 	/**
 	 * 
@@ -314,6 +315,7 @@ public class ComplexStringCfgController extends BaseController{
 		model.addAttribute("cfgName", cfgName);
 		model.addAttribute("action", action);
 		model.addAttribute("cfgType","complex");
+		model.addAttribute("audit", Constants.CFG_PAGE);
 		if(!StringUtils.isBlank(tableName)){
 			int audit=complexStringCfgService.getIsAudit(tableName,cfgId);
 			//未审核时可删除

src/main/java/com/nis/web/controller/configuration/IpCfgController.java

@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -28,21 +29,27 @@ import com.nis.web.controller.BaseController;
 @Controller
 @RequestMapping("${adminPath}/cfg/ip")
 public class IpCfgController extends BaseController{
-	
+	/**
-	@RequestMapping(value = {"ipWhiteList"})
+	 * 
-	public String ipWhiteList(Model model,BaseIpCfg baseIpCfg,HttpServletRequest request,HttpServletResponse response) {
+	 * ipCfgList(配置列表与审核列表，需要根据参数判断是哪个列表，以便显示隐藏对应的界面菜单，按钮)
-		return "/cfg/ipWhiteList";
+	 * (这里描述这个方法适用条件 – 可选)
-	}
+	 * @param model
-	
+	 * @param audit
-
+	 * @param pageNo
-	@RequestMapping(value = {"ipWhiteForm"})
+	 * @param pageSize
-	public String ipWhiteForm() {
+	 * @param cfgName
-		return "/cfg/ipWhiteForm";
+	 * @param ipCfg
-	}
+	 * @param request
-	
+	 * @param response
+	 * @return 
+	 *String
+	 * @exception 
+	 * @since  1.0.0
+	 */
 	@RequestMapping(value = {"list"})
-	public String ipCfgList(Model model,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("ipCfg")BaseIpCfg ipCfg,HttpServletRequest request,HttpServletResponse response) {
+	public String ipCfgList(Model model,Integer audit,String cfgName,@ModelAttribute("ipCfg")BaseIpCfg ipCfg,HttpServletRequest request,HttpServletResponse response) {
 		model.addAttribute("cfgName", cfgName);
+		model.addAttribute("audit", audit);
 		if(ipCfg!=null){
 			Integer serviceId=ipCfg.getServiceId();
 			logger.info("servcice id is "+serviceId);
@@ -54,14 +61,7 @@ public class IpCfgController extends BaseController{
 					if(!StringUtils.isBlank(tableName)){
 						logger.info("table name is "+tableName);
 						ipCfg.setTableName(tableName);
-						Page<BaseIpCfg> searchPage=new Page<BaseIpCfg>(request, response, 1);
+						Page<BaseIpCfg> page = ipCfgService.findPage(new Page<BaseIpCfg>(request,response), ipCfg);
-						if(pageNo!=null) searchPage.setPageNo(pageNo);
-						if(pageSize!=null) searchPage.setPageSize(pageSize);
-						if(ipCfg.getPage()!=null){
-							if(!StringUtils.isBlank(ipCfg.getPage().getOrderBy()));
-							searchPage.setOrderBy(ipCfg.getPage().getOrderBy());
-						}
-						Page<BaseIpCfg> page = ipCfgService.findPage(searchPage, ipCfg);
 						model.addAttribute("page", page);
 						model.addAttribute("action", ipCfg.getAction());
 						model.addAttribute("tableName", tableName);
@@ -83,12 +83,27 @@ public class IpCfgController extends BaseController{
 		return "/cfg/ipCfgList";
 	}
 	
-
+	/**
+	 * 
+	 * ipCfgForm(新增页面初始化，只会在配置界面使用)
+	 * (这里描述这个方法适用条件 – 可选)
+	 * @param action
+	 * @param cfgName
+	 * @param serviceId
+	 * @param model
+	 * @param request
+	 * @param response
+	 * @return 
+	 *String
+	 * @exception 
+	 * @since  1.0.0
+	 */
 	@RequestMapping(value = {"form"})
 	public String ipCfgForm(int action,String cfgName,Integer serviceId,Model model,HttpServletRequest request,HttpServletResponse response) {
 		model.addAttribute("cfgName", cfgName);
 		model.addAttribute("serviceId", serviceId);
 		model.addAttribute("action", action);
+		model.addAttribute("audit", Constants.CFG_PAGE);
 		logger.info("sercice id is "+serviceId);
 		if(serviceId!=null){
 			ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId);
@@ -131,11 +146,30 @@ public class IpCfgController extends BaseController{
 		
 		return "/cfg/ipCfgForm";
 	}
+	/**
+	 * 
+	 * updateIpCfgForm(更新配置页面初始化，只会在配置界面出现)
+	 * (这里描述这个方法适用条件 – 可选)
+	 * @param tableName
+	 * @param action
+	 * @param cfgId
+	 * @param cfgName
+	 * @param serviceId
+	 * @param model
+	 * @param request
+	 * @param response
+	 * @return 
+	 *String
+	 * @exception 
+	 * @since  1.0.0
+	 */
+	@RequiresPermissions("sys:cfg:edit")
 	@RequestMapping(value = {"updateForm"})
 	public String updateIpCfgForm(String tableName,int action,long cfgId,String cfgName,Integer serviceId,Model model,HttpServletRequest request,HttpServletResponse response) {
 		model.addAttribute("cfgName", cfgName);
 		model.addAttribute("serviceId", serviceId);
 		model.addAttribute("action", action);
+		model.addAttribute("audit",Constants.CFG_PAGE);
 		if(!StringUtils.isBlank(tableName)){
 			logger.info("table name is "+tableName);
 			BaseIpCfg searchBean=new BaseIpCfg();
@@ -184,7 +218,7 @@ public class IpCfgController extends BaseController{
 	
 	/**
 	 * 
-	 * addIpCfg(新增IP配置)
+	 * addIpCfg(新增IP配置，后台保存方法)
 	 * (这里描述这个方法适用条件 – 可选)
 	 * @return 
 	 *String
@@ -195,6 +229,7 @@ public class IpCfgController extends BaseController{
 	public String saveOrUpdateIpCfg(String cfgName,Model model, BaseIpCfg ipCfg) {
 		model.addAttribute("cfgName",cfgName);
 		model.addAttribute("cfgType", "ip");
+		model.addAttribute("audit", Constants.CFG_PAGE);
 		logger.info("saveOrUpdateIpCfg loaded");
 		if(ipCfg==null){
 			logger.error("无法保存空的配置！");
@@ -255,7 +290,7 @@ public class IpCfgController extends BaseController{
 	/**
 	 * 
 	 * auditIpCfg(审核IP配置)
-	 * (这里描述这个方法适用条件 – 可选)
+	 * (审核流程只在审核页面)
 	 * @return 
 	 *String
 	 * @exception 
@@ -264,6 +299,7 @@ public class IpCfgController extends BaseController{
 	@RequestMapping(value = {"auditCfg"})
 	public String auditIpCfg(String cfgName,BaseIpCfg ipCfg,Model model) {
 		model.addAttribute("cfgName", cfgName);
+		model.addAttribute("audit", Constants.AUDIT_PAGE);
 		if(ipCfg==null){
 			logger.error("无法审核空的配置！");
 		}else if(!StringUtils.isBlank(ipCfg.getTableName())){
@@ -280,6 +316,8 @@ public class IpCfgController extends BaseController{
 					ipCfg.setIsValid(Constants.VALID_YES);
 				}
 				int result=ipCfgService.auditIpCfg(ipCfg);
+				model.addAttribute("serviceId", ipCfg.getServiceId());
+				model.addAttribute("action", ipCfg.getAction());
 			}
 		}else if(ipCfg.getServiceId()!=null){
 			int serviceId=ipCfg.getServiceId();
@@ -301,14 +339,15 @@ public class IpCfgController extends BaseController{
 							ipCfg.setIsValid(Constants.VALID_YES);
 						}
 						int result=ipCfgService.auditIpCfg(ipCfg);
-						
+						model.addAttribute("serviceId", serviceId);
+						model.addAttribute("action", ipCfg.getAction());
 					}
 				}
 			}
 		}else{
 			logger.error("无法确定IP配置的表名！");
 		}
-		return "redirect:" + adminPath + "/cfg/ip/list?serviceId="+ipCfg.getServiceId()+"&action="+ipCfg.getAction()+"&cfgName"+cfgName;
+		return "redirect:" + adminPath + "/cfg/ip/list";
 	}
 	/**
 	 * 
@@ -319,12 +358,14 @@ public class IpCfgController extends BaseController{
 	 * @exception 
 	 * @since  1.0.0
 	 */
+	@RequiresPermissions("sys:cfg:edit")
 	@RequestMapping(value = {"deleteCfg"})
 	public String deleteIpCfg(String tableName,int action,long cfgId,String cfgName,Integer serviceId,Model model) {
 			model.addAttribute("cfgName", cfgName);
 			model.addAttribute("serviceId", serviceId);
 			model.addAttribute("action", action);
 			model.addAttribute("cfgType", "ip");
+			model.addAttribute("audit", Constants.AUDIT_PAGE);
 		if(!StringUtils.isBlank(tableName)){
 			int audit=ipCfgService.getIsAudit(tableName,cfgId);
 			//未审核时可删除

src/main/java/com/nis/web/controller/configuration/NumCfgController.java

@@ -1,5 +1,4 @@
 package com.nis.web.controller.configuration;
-
 import java.util.Date;
 import java.util.List;
 
@@ -31,8 +30,9 @@ import com.nis.web.controller.BaseController;
 public class NumCfgController extends BaseController{
 	
 	@RequestMapping(value = {"list"})
-	public String cfgList(Model model,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("cfg")NumBoundaryCfg cfg,HttpServletRequest request,HttpServletResponse response) {
+	public String cfgList(Model model,Integer audit,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("cfg")NumBoundaryCfg cfg,HttpServletRequest request,HttpServletResponse response) {
 		model.addAttribute("cfgName", cfgName);
+		model.addAttribute("audit", audit);
 		if(cfg!=null){
 			Integer serviceId=cfg.getServiceId();
 			logger.info("servcice id is "+serviceId);
@@ -73,6 +73,7 @@ public class NumCfgController extends BaseController{
 		model.addAttribute("cfgName", cfgName);
 		model.addAttribute("action", action);
 		model.addAttribute("serviceId", serviceId);
+		model.addAttribute("audit", Constants.CFG_PAGE);
 		logger.info("sercice id is "+serviceId);
 		if(serviceId!=null){
 			ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId);
@@ -102,6 +103,7 @@ public class NumCfgController extends BaseController{
 		model.addAttribute("cfgName", cfgName);
 		model.addAttribute("serviceId", serviceId);
 		model.addAttribute("action", action);
+		model.addAttribute("audit", Constants.CFG_PAGE);
 		if(serviceId!=null){
 			ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId);
 			if(serviceConfigInfo!=null){
@@ -139,6 +141,7 @@ public class NumCfgController extends BaseController{
 	public String saveOrUpdateStringCfg(String cfgName,Model model, NumBoundaryCfg cfg) {
 		model.addAttribute("cfgName",cfgName);
 		model.addAttribute("cfgType","num");
+		model.addAttribute("audit", Constants.CFG_PAGE);
 		logger.info("saveOrUpdateStringCfg loaded");
 		if(cfg==null){
 			logger.error("无法保存空的配置！");
@@ -185,6 +188,7 @@ public class NumCfgController extends BaseController{
 	@RequestMapping(value = {"auditCfg"})
 	public String auditStringCfg(String cfgName,NumBoundaryCfg cfg,Model model) {
 		model.addAttribute("cfgName", cfgName);
+		model.addAttribute("audit", Constants.AUDIT_PAGE);
 		if(cfg==null){
 			logger.error("无法审核空的配置！");
 		}else if(cfg.getServiceId()!=null){
@@ -204,12 +208,14 @@ public class NumCfgController extends BaseController{
 						cfg.setIsValid(Constants.VALID_YES);
 					}
 					int result=numCfgService.auditNumCfg(cfg);
+					model.addAttribute("serviceId", serviceId);
+					model.addAttribute("action", cfg.getAction());
 				}
 			}
 		}else{
 			logger.error("无法确定IP配置的表名！");
 		}
-		return "redirect:" + adminPath + "/cfg/num/list?serviceId="+cfg.getServiceId()+"&action="+cfg.getAction()+"&cfgName"+cfgName;
+		return "redirect:" + adminPath + "/cfg/num/list";
 	}
 	/**
 	 * 
@@ -226,6 +232,7 @@ public class NumCfgController extends BaseController{
 		model.addAttribute("cfgName", cfgName);
 		model.addAttribute("action", action);
 		model.addAttribute("cfgType","num");
+		model.addAttribute("audit", Constants.CFG_PAGE);
 		if(serviceId!=null){
 			ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId);
 			if(serviceConfigInfo!=null){

src/main/java/com/nis/web/controller/configuration/RequestInfoController.java

@@ -95,7 +95,7 @@ public class RequestInfoController extends BaseController{
 	}
 
     /**
-     * 审核
+     * 审核通过
      * @param requestInfo
      * @param model
      * @return
@@ -107,6 +107,19 @@ public class RequestInfoController extends BaseController{
     	return "redirect:" + adminPath + "/cfg/request/list?repage";
     	
     }
+	/**
+	 * 审核未通过
+	 * @param requestInfo
+	 * @param model
+	 * @return
+	 */
+	@RequestMapping(value = "requestExamineNo")
+	public String requestExamineNo(RequestInfo requestInfo, Model model,RedirectAttributes redirectAttributes){
+		requestInfoService.requestExamineNo(requestInfo);
+		addMessage(redirectAttributes, "success");
+		return "redirect:" + adminPath + "/cfg/request/list?repage";
+		
+	}
 	/**
 	 * 取消审核
 	 * @param requestInfo

src/main/java/com/nis/web/controller/configuration/StringCfgController.java

@@ -1,5 +1,4 @@
 package com.nis.web.controller.configuration;
-
 import java.util.Date;
 import java.util.List;
 
@@ -31,8 +30,9 @@ import com.nis.web.controller.BaseController;
 public class StringCfgController extends BaseController{
 	
 	@RequestMapping(value = {"list"})
-	public String stringCfgList(Model model,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("cfg")BaseStringCfg stringCfg,HttpServletRequest request,HttpServletResponse response) {
+	public String stringCfgList(Model model,Integer audit,String cfgName,@ModelAttribute("cfg")BaseStringCfg stringCfg,HttpServletRequest request,HttpServletResponse response) {
 		model.addAttribute("cfgName", cfgName);
+		model.addAttribute("audit", audit);
 		if(stringCfg!=null){
 			Integer serviceId=stringCfg.getServiceId();
 			logger.info("servcice id is "+serviceId);
@@ -44,14 +44,7 @@ public class StringCfgController extends BaseController{
 					if(!StringUtils.isBlank(tableName)){
 						logger.info("table name is "+tableName);
 						stringCfg.setTableName(tableName);
-						Page<BaseStringCfg> searchPage=new Page<BaseStringCfg>(request, response, 1);
+						Page<BaseStringCfg> page = stringCfgService.findPage(new Page<BaseStringCfg>(request,response), stringCfg);
-						if(pageNo!=null) searchPage.setPageNo(pageNo);
-						if(pageSize!=null) searchPage.setPageSize(pageSize);
-						if(stringCfg.getPage()!=null){
-							if(!StringUtils.isBlank(stringCfg.getPage().getOrderBy()));
-							searchPage.setOrderBy(stringCfg.getPage().getOrderBy());
-						}
-						Page<BaseStringCfg> page = stringCfgService.findPage(searchPage, stringCfg);
 						model.addAttribute("page", page);
 						model.addAttribute("action", stringCfg.getAction());
 						model.addAttribute("tableName", tableName);
@@ -79,6 +72,7 @@ public class StringCfgController extends BaseController{
 		model.addAttribute("cfgName", cfgName);
 		model.addAttribute("action", action);
 		model.addAttribute("serviceId", serviceId);
+		model.addAttribute("audit", Constants.CFG_PAGE);
 		logger.info("sercice id is "+serviceId);
 		if(serviceId!=null){
 			ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId);
@@ -126,6 +120,7 @@ public class StringCfgController extends BaseController{
 		model.addAttribute("serviceId", serviceId);
 		model.addAttribute("action", action);
 		model.addAttribute("tableName", tableName);
+		model.addAttribute("audit", Constants.CFG_PAGE);
 		if(!StringUtils.isBlank(tableName)){
 			logger.info("table name is "+tableName);
 			BaseStringCfg searchBean=new BaseStringCfg();
@@ -183,6 +178,7 @@ public class StringCfgController extends BaseController{
 	public String saveOrUpdateStringCfg(String cfgName,Model model, BaseStringCfg stringCfg) {
 		model.addAttribute("cfgName",cfgName);
 		model.addAttribute("cfgType","string");
+		model.addAttribute("audit", Constants.CFG_PAGE);
 		logger.info("saveOrUpdateStringCfg loaded");
 		if(stringCfg==null){
 			logger.error("无法保存空的配置！");
@@ -253,6 +249,7 @@ public class StringCfgController extends BaseController{
 	@RequestMapping(value = {"auditCfg"})
 	public String auditStringCfg(String cfgName,BaseStringCfg stringCfg,Model model) {
 		model.addAttribute("cfgName", cfgName);
+		model.addAttribute("audit", Constants.AUDIT_PAGE);
 		if(stringCfg==null){
 			logger.error("无法审核空的配置！");
 		}else if(!StringUtils.isBlank(stringCfg.getTableName())){
@@ -269,6 +266,8 @@ public class StringCfgController extends BaseController{
 					stringCfg.setIsValid(Constants.VALID_YES);
 				}
 				int result=stringCfgService.auditStringCfg(stringCfg);
+				model.addAttribute("serviceId", stringCfg.getServiceId());
+				model.addAttribute("action", stringCfg.getAction());
 			}
 			
 		}else if(stringCfg.getServiceId()!=null){
@@ -291,13 +290,15 @@ public class StringCfgController extends BaseController{
 							stringCfg.setIsValid(Constants.VALID_YES);
 						}
 						int result=stringCfgService.auditStringCfg(stringCfg);
+						model.addAttribute("serviceId", serviceId);
+						model.addAttribute("action", stringCfg.getAction());
 					}
 				}
 			}
 		}else{
 			logger.error("无法确定IP配置的表名！");
 		}
-		return "redirect:" + adminPath + "/cfg/string/list?serviceId="+stringCfg.getServiceId()+"&action="+stringCfg.getAction()+"&cfgName"+cfgName;
+		return "redirect:" + adminPath + "/cfg/string/list";
 	}
 	/**
 	 * 
@@ -314,6 +315,7 @@ public class StringCfgController extends BaseController{
 		model.addAttribute("cfgName", cfgName);
 		model.addAttribute("action", action);
 		model.addAttribute("cfgType","string");
+		model.addAttribute("audit", Constants.CFG_PAGE);
 		if(!StringUtils.isBlank(tableName)){
 			int audit=stringCfgService.getIsAudit(tableName,cfgId);
 			//未审核时可删除

src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml

@@ -29,7 +29,15 @@
 		<result property="name" column="name"/>
 	    </association>
   </resultMap>
-  
+  <resultMap id="dictResultSimpleMap" type="com.nis.domain.basics.ServiceDictInfo" >
+    <id column="service_dict_id" property="serviceDictId" jdbcType="INTEGER" />
+    <result column="item_type" property="itemType" jdbcType="INTEGER" />
+    <result column="item_code" property="itemCode" jdbcType="INTEGER" />
+    <result column="item_value" property="itemValue" jdbcType="VARCHAR" />
+    <result column="item_desc" property="itemDesc" jdbcType="VARCHAR" />
+    <result column="is_leaf" property="isLeaf" jdbcType="INTEGER" />
+    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
+  </resultMap>
     <sql id="serviceDictInfoColumns">
 		s.service_dict_id AS serviceDictId,
 		s.item_type AS itemType,
@@ -44,6 +52,16 @@
 		s.editor_id AS "serviceDictEditor.id",
 		s.edit_time AS editTime
 	</sql>
+    <sql id="serviceDictInfoColumnsSimple">
+		s.service_dict_id AS serviceDictId,
+		s.item_type AS itemType,
+		s.item_code AS itemCode,
+		s.item_value AS itemValue,
+		s.item_desc AS itemDesc,
+		s.parent_id AS "parent.serviceDictId",
+		s.is_leaf AS isLeaf,
+		s.is_valid AS isValid
+	</sql>
   
   
   
@@ -260,14 +278,14 @@
   UPDATE service_dict_info s set s.is_valid = #{isValid} where s.service_dict_id = #{serviceDictId}
   </update>
   
-  <select id="findItemDict" resultMap="dictResultMap">
+  <select id="findItemDict" resultMap="dictResultSimpleMap">
    select 
-   <include refid="serviceDictInfoColumns" />
+   <include refid="serviceDictInfoColumnsSimple" />
    from service_dict_info s where   s.is_leaf = 0 and s.item_type=#{itemType} and s.is_valid=#{isValid};
    </select>
-  <select id="findAllItemDict" resultMap="dictResultMap">
+  <select id="findAllItemDict" resultMap="dictResultSimpleMap">
    select 
-   <include refid="serviceDictInfoColumns" />
+   <include refid="serviceDictInfoColumnsSimple" />
    from service_dict_info s where   s.is_leaf = 0 and s.item_type=#{itemType};
    </select>
    

src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml

@@ -166,9 +166,9 @@
 		left join sys_user e on r.editor_id=e.id
 		left join sys_user u on r.auditor_id=u.id
 		left join request_info ri on r.request_id=ri.id
-		left join service_dict_info sdic on r.classify=sdic.item_code and sdic.item_type=1 and sdic.is_valid=1 and sdic.is_leaf=0
+		left join service_dict_info sdic on r.classify=sdic.item_code and sdic.item_type=1 and sdic.is_leaf=0
-		left join service_dict_info sdia on r.attribute=sdia.item_code and sdia.item_type=1 and sdia.is_valid=1 and sdia.is_leaf=0
+		left join service_dict_info sdia on r.attribute=sdia.item_code and sdia.item_type=1 and sdia.is_leaf=0
-		left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=1 and sdil.is_valid=1 and sdil.is_leaf=0
+		left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=1 and sdil.is_leaf=0
 		<trim prefix="WHERE" prefixOverrides="AND |OR ">
 			
 			<if test="page !=null and page.where != null and page.where != ''">

src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml

@@ -246,9 +246,9 @@
 		left join sys_user e on r.editor_id=e.id
 		left join sys_user u on r.auditor_id=u.id
 		left join request_info ri on r.request_id=ri.id
-		left join service_dict_info sdic on r.classify=sdic.item_code and sdic.item_type=1 and sdic.is_valid=1 and sdic.is_leaf=0
+		left join service_dict_info sdic on r.classify=sdic.item_code and sdic.item_type=1 and sdic.is_leaf=0
-		left join service_dict_info sdia on r.attribute=sdia.item_code and sdia.item_type=1 and sdia.is_valid=1 and sdia.is_leaf=0
+		left join service_dict_info sdia on r.attribute=sdia.item_code and sdia.item_type=1 and sdia.is_leaf=0
-		left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=1 and sdil.is_valid=1 and sdil.is_leaf=0
+		left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=1 and sdil.is_leaf=0
 		<trim prefix="WHERE" prefixOverrides="AND |OR ">
 			
 			<if test="page !=null and page.where != null and page.where != ''">

src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml

@@ -169,9 +169,9 @@
 		left join sys_user e on r.editor_id=e.id
 		left join sys_user u on r.auditor_id=u.id
 		left join request_info ri on r.request_id=ri.id
-		left join service_dict_info sdic on r.classify=sdic.item_code and sdic.item_type=1 and sdic.is_valid=1 and sdic.is_leaf=0
+		left join service_dict_info sdic on r.classify=sdic.item_code and sdic.item_type=1 and sdic.is_leaf=0
-		left join service_dict_info sdia on r.attribute=sdia.item_code and sdia.item_type=1 and sdia.is_valid=1 and sdia.is_leaf=0
+		left join service_dict_info sdia on r.attribute=sdia.item_code and sdia.item_type=1 and sdia.is_leaf=0
-		left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=1 and sdil.is_valid=1 and sdil.is_leaf=0
+		left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=1 and sdil.is_leaf=0
 		<trim prefix="WHERE" prefixOverrides="AND |OR ">
 			
 			<if test="page !=null and page.where != null and page.where != ''">

src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml

@@ -162,5 +162,9 @@
     </set>
     where id = #{id,jdbcType=BIGINT} and is_audit !=1
   </update>
-  
+  <select id="findAllList" resultMap="BaseResultMap">
+	select
+		<include refid="Base_Column_List" />
+	from request_info
+  </select>
 </mapper>

src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml

@@ -1,303 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.nis.web.dao.configuration.ServiceDictInfoDao" >
-  
-  <resultMap id="dictResultMap" type="com.nis.domain.configuration.ServiceDictInfo" >
-    <id column="service_dict_id" property="serviceDictId" jdbcType="INTEGER" />
-    <result column="item_type" property="itemType" jdbcType="INTEGER" />
-    <result column="item_code" property="itemCode" jdbcType="INTEGER" />
-    <result column="item_value" property="itemValue" jdbcType="VARCHAR" />
-    <result column="item_desc" property="itemDesc" jdbcType="VARCHAR" />
-    <result column="is_leaf" property="isLeaf" jdbcType="INTEGER" />
-    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
-    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
-    <result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
-     <!-- 父id -->
-	    <association property="parent" javaType="com.nis.domain.configuration.ServiceDictInfo">
-	     <id column="service_dict_id" property="serviceDictId" jdbcType="INTEGER" />
-	    <result column="item_type" property="itemType" jdbcType="INTEGER" />
-	    <result column="item_code" property="itemCode" jdbcType="INTEGER" />
-	    <result column="item_value" property="itemValue" jdbcType="VARCHAR" />
-	    <result column="item_desc" property="itemDesc" jdbcType="VARCHAR" />
-	    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
-	    </association>
-	 <!-- 创建人员 -->
-        <association property="serviceDictCreator" javaType="com.nis.domain.SysUser">
-	     <id property="id" column="id"/>
-		<result property="loginId" column="login_id"/>
-		<result property="name" column="name"/>
-	    </association>
-	 <!-- 修改人员 -->
-        <association property="serviceDictEditor" javaType="com.nis.domain.SysUser">
-	     <id property="id" column="id"/>
-		<result property="loginId" column="login_id"/>
-		<result property="name" column="name"/>
-	    </association>
-  </resultMap>
-  <resultMap id="dictResultSimpleMap" type="com.nis.domain.configuration.ServiceDictInfo" >
-	    <id column="service_dict_id" property="serviceDictId" jdbcType="INTEGER" />
-	    <result column="item_type" property="itemType" jdbcType="INTEGER" />
-	    <result column="item_code" property="itemCode" jdbcType="INTEGER" />
-	    <result column="item_value" property="itemValue" jdbcType="VARCHAR" />
-	    <result column="item_desc" property="itemDesc" jdbcType="VARCHAR" />
-	    <result column="is_leaf" property="isLeaf" jdbcType="INTEGER" />
-	    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
-  </resultMap>
-    <sql id="serviceDictInfoColumns">
-		s.service_dict_id AS serviceDictId,
-		s.item_type AS itemType,
-		s.item_code AS itemCode,
-		s.item_value AS itemValue,
-		s.item_desc AS itemDesc,
-		s.parent_id AS "parent.serviceDictId",
-		s.is_leaf AS isLeaf,
-		s.is_valid AS isValid,
-		s.creator_id AS "serviceDictCreator.id",
-		s.create_time AS createTime,
-		s.editor_id AS "serviceDictEditor.id",
-		s.edit_time AS editTime
-	</sql>
-    <sql id="serviceDictInfoColumnsSimple">
-		s.service_dict_id AS serviceDictId,
-		s.item_type AS itemType,
-		s.item_code AS itemCode,
-		s.item_value AS itemValue,
-		s.item_desc AS itemDesc,
-		s.is_leaf AS isLeaf,
-		s.is_valid AS isValid
-	</sql>
-  
-  
-  
-  <!-- 查询顶层分页列表 (==)-->
-    <select id="findTopDictList" resultMap="dictResultMap" parameterType="com.nis.domain.configuration.ServiceDictInfo">
-	SELECT * FROM service_dict_info WHERE  is_valid=1 AND parent_id = 0
-	
-	<if test="itemValue != null and itemValue != '' " >
-      AND item_value like '%${itemValue}%'
-    </if>
-    <if test="itemCode != null and itemCode != '' " >
-      AND item_code like '%${itemCode}%'
-    </if>
-    <if test="itemType != null and itemType != '' " >
-      AND item_type = #{itemType}
-    </if>
-    <if test="beginDate !=null" >
-      AND create_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
-    </if>
-    <if test="endDate !=null" >
-       AND create_time &lt;= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY)
-    </if> 
-    
-    <choose>
-		<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-			ORDER BY ${page.orderBy}
-		</when>
-		<otherwise>
-			ORDER BY create_time desc
-		</otherwise>
-	</choose>
-    
-  </select>
-  
-   <!-- 查询顶层分页列表 (!=)-->
-<select id="findTopDictListN" resultMap="dictResultMap" parameterType="com.nis.domain.configuration.ServiceDictInfo">
-	SELECT * FROM service_dict_info WHERE  is_valid=1 AND parent_id = 0
-	
-	<if test="itemValue != null and itemValue != '' " >
-      AND item_value like '%${itemValue}%'
-    </if>
-    <if test="itemCode != null and itemCode != '' " >
-      AND item_code like '%${itemCode}%'
-    </if>
-    <if test="itemType != null and itemType != '' " >
-      AND item_type != #{itemType}
-    </if>
-    <if test="beginDate !=null" >
-      AND create_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
-    </if>
-    <if test="endDate !=null" >
-       AND create_time &lt;= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY)
-    </if> 
-    
-    <choose>
-		<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-			ORDER BY ${page.orderBy}
-		</when>
-		<otherwise>
-			ORDER BY create_time desc
-		</otherwise>
-	</choose>
-    
-  </select>
-   
-  
-  
-  
-  
-  <!-- 查出所有 -->
-      <select id="findAllDictList" resultType="serviceDictInfo">
-		SELECT
-			<include refid="serviceDictInfoColumns"/>
-		FROM service_dict_info s
-		<include refid="menuJoins"/>
-		WHERE s.is_valid =1 
-	</select>
-
-	<!-- 查询所有非叶子配置 -->
-	<select id="findAllNoLeafDictList" resultType="com.nis.domain.configuration.ServiceDictInfo" parameterType="java.lang.Integer">
-	SELECT 
-	<include refid="serviceDictInfoColumns"/>
-	FROM service_dict_info s
-	WHERE s.is_valid = 1 AND s.is_leaf = 0 AND item_type = #{itemType}
-	</select>
-
-  
-    <!-- 条件查询分页(==) -->
-        <select id="findDictSearchList" resultMap="dictResultMap" parameterType="com.nis.domain.configuration.ServiceDictInfo">
-	SELECT * FROM service_dict_info WHERE  is_valid=1  
-	
-	<if test="itemType != null and itemType != '' " >
-      AND item_type like '%${itemType}%'
-    </if>
-    <if test="itemCode != null and itemCode != '' " >
-      AND item_code like '%${itemCode}%'
-    </if>
-    <if test="itemValue!= null and itemValue != '' " >
-      AND item_value like '%${itemValue}%'
-    </if>
-    <if test="beginDate !=null" >
-      AND create_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
-    </if>
-    <if test="endDate !=null" >
-       AND create_time &lt;= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY)
-       
-    </if> 
-    
-    <choose>
-		<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-			ORDER BY ${page.orderBy}
-		</when>
-		<otherwise>
-			ORDER BY create_time desc
-		</otherwise>
-	</choose>
-    
-  </select>
-  
-      <!-- 条件查询分页(!=) -->
-        <select id="findDictSearchListN" resultMap="dictResultMap" parameterType="com.nis.domain.configuration.ServiceDictInfo">
-	SELECT * FROM service_dict_info WHERE  is_valid=1  
-	
-    <if test="itemCode != null and itemCode != '' " >
-      AND item_code like '%${itemCode}%'
-    </if>
-    <if test="itemValue!= null and itemValue != '' " >
-      AND item_value like '%${itemValue}%'
-    </if>
-    <if test="itemType != null and itemType != '' " >
-      AND item_type != ${itemType}
-    </if>
-    <if test="beginDate !=null" >
-      AND create_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
-    </if>
-    <if test="endDate !=null" >
-       AND create_time &lt;= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY)
-       
-    </if> 
-    
-    <choose>
-		<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-			ORDER BY ${page.orderBy}
-		</when>
-		<otherwise>
-			ORDER BY create_time desc
-		</otherwise>
-	</choose>
-    
-  </select>
-
-  
-  <!-- 根据主键查询字典详细信息 -->
-  
-  <select id="getDictById" resultType="com.nis.domain.configuration.ServiceDictInfo">
-  select 
-  <include refid="serviceDictInfoColumns"/>
-  from service_dict_info s where s.service_dict_id = #{serviceDictId}
-  </select>
-  
-    <!-- 根据上级id选出所有下级 -->
-  
-  <select id="getDictByParentId" resultMap="dictResultMap">
-  select *
-  from service_dict_info s where parent_id = #{parentId}
-  </select>
-  
-  
-    <!-- 根据itemCode查询字典对象列表 -->
-  
-  <select id="findByItemCode" resultType="com.nis.domain.configuration.ServiceDictInfo">
-  select 
-  <include refid="serviceDictInfoColumns"/>
-  from service_dict_info s where s.item_code = #{itemCode}
-  </select>
-  
-  
-  
-  <!-- 新增字典信息 -->
-  
-     <insert id="insertDict" parameterType="com.nis.domain.configuration.ServiceDictInfo" useGeneratedKeys="true" keyProperty="id" >
-    insert into service_dict_info (item_type, item_code, item_value, item_desc, parent_id, is_leaf, is_valid, creator_id, create_time, editor_id, edit_time)
-    values ( #{itemType,jdbcType=INTEGER}, #{itemCode,jdbcType=INTEGER}, 
-             #{itemValue,jdbcType=VARCHAR}, #{itemDesc,jdbcType=VARCHAR}, 
-             #{parent.serviceDictId,jdbcType=INTEGER}, #{isLeaf,jdbcType=INTEGER}, #{isValid,jdbcType=INTEGER}, 
-             #{serviceDictCreator.id,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
-             #{serviceDictEditor.id,jdbcType=INTEGER}, #{editTime,jdbcType=TIMESTAMP})
-  </insert>
-  
-
-  
-  <!-- 修改 -->
-  	<update id="update">
-		UPDATE service_dict_info s SET 
-	    s.service_dict_id = #{serviceDictId},
-		s.item_type = #{itemType},
-		s.item_code = #{itemCode},
-		s.item_value = #{itemValue},
-		s.item_desc = #{itemDesc},
-		s.parent_id = #{parent.serviceDictId},
-		s.is_leaf = #{isLeaf},
-		s.creator_id = #{serviceDictCreator.id},
-		s.editor_id = #{serviceDictEditor.id},
-		s.edit_time = #{editTime}
-		WHERE s.service_dict_id = #{serviceDictId}
-	</update>
-  
-  <!-- 删除 -->
-  
-  <update id="delete">
-  UPDATE service_dict_info s set s.is_valid = #{isValid} where s.service_dict_id = #{serviceDictId}
-  </update>
-  
-  <select id="findItemDict" resultMap="dictResultSimpleMap">
-   select 
-   <include refid="serviceDictInfoColumnsSimple" />
-   from service_dict_info s where   s.is_leaf = 0 and s.item_type=#{itemType} and s.is_valid=#{isValid};
-   </select>
-  <select id="findAllItemDict" resultMap="dictResultSimpleMap">
-   select 
-   <include refid="serviceDictInfoColumnsSimple" />
-   from service_dict_info s where   s.is_leaf = 0 and s.item_type=#{itemType};
-   </select>
-   
-   	<sql id="menuJoins">
-		LEFT JOIN service_dict_info p ON p.service_dict_id = s.parent_id
-    </sql>
-
-   
-   
-   
-   
-   
- 
-</mapper>

src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml

@@ -185,9 +185,9 @@
 		left join sys_user e on r.editor_id=e.id
 		left join sys_user u on r.auditor_id=u.id
 		left join request_info ri on r.request_id=ri.id
-		left join service_dict_info sdic on r.classify=sdic.item_code and sdic.item_type=1 and sdic.is_valid=1 and sdic.is_leaf=0
+		left join service_dict_info sdic on r.classify=sdic.item_code and sdic.item_type=1 and sdic.is_leaf=0
-		left join service_dict_info sdia on r.attribute=sdia.item_code and sdia.item_type=1 and sdia.is_valid=1 and sdia.is_leaf=0
+		left join service_dict_info sdia on r.attribute=sdia.item_code and sdia.item_type=1 and sdia.is_leaf=0
-		left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=1 and sdil.is_valid=1 and sdil.is_leaf=0
+		left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=1 and sdil.is_leaf=0
 		<trim prefix="WHERE" prefixOverrides="AND |OR ">
 			
 			<if test="page !=null and page.where != null and page.where != ''">

src/main/java/com/nis/web/security/FormAuthenticationFilter.java

@@ -74,14 +74,14 @@ public class FormAuthenticationFilter extends org.apache.shiro.web.filter.authc.
 		String className = e.getClass().getName(), message = "";
 		if (IncorrectCredentialsException.class.getName().equals(className)
 				|| UnknownAccountException.class.getName().equals(className)){
-			message = "用户或密码错误, 请重试.";
+			message = "loginName_error";
 		}
 		else if (e.getMessage() != null && StringUtils.startsWith(e.getMessage(), "msg:")){
 			message = StringUtils.replace(e.getMessage(), "msg:", "");
 		}
 		
 		else{
-			message = "系统出现点问题，请稍后再试！";
+			message = "system_error";
 			e.printStackTrace(); // 输出到控制台
 		}
         request.setAttribute(getFailureKeyAttribute(), className);

src/main/java/com/nis/web/service/configuration/RequestInfoService.java

@@ -67,6 +67,11 @@ public class RequestInfoService extends BaseService{
 		requestInfoDao.update(requestInfo);
 	}
 	@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
+	public void requestExamineNo(RequestInfo requestInfo){
+		requestInfo.setIsAudit(2);//审核未通过
+		requestInfoDao.update(requestInfo);
+	}
+	@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
 	public void requestCancelExamine(RequestInfo requestInfo){
 		requestInfo.setIsAudit(3);//取消审核通过
 		int update = requestInfoDao.update(requestInfo);

src/main/resources/messages/message_en.properties

@@ -97,14 +97,14 @@ service_dict_id=servicedictid
 item_type=itemtype
 item_code=itemcode
 item_value=itemvalue
-desc=desc
+desc=description
 parent_id=parentid
-is_leaf=isleaf
+is_leaf=whether subnode
-is_valid=isvalid
+is_valid=whether valid
-creator_id=creatorid
 create_time=createtime
-editor_id=editorid
 edit_time=edittime
+superior_config=superior configuration
+config_content=configuration content
 
 #============yewu end======================
 
@@ -142,11 +142,16 @@ date_list=Date List
 confirm_message=Are you sure?
 fill_loginName=Please fill in the loginName
 fill_loginPassWord=Please fill in the passWord
+loginName_error=loginName and password error,please try again.
+system_error=system error,please try again later!
 save_success=save success
 save_failed=save failed
 delete_success=delete success
 delete_failed=delete failed
 turning_page=It is turning to the page
+login_timeout=No login or login timeout,please login again,Thank you!
+captcha_error=captcha error
+enter_captcha=Please enter the captcha
 #==========message end=====================
 
 #==========yewuliexingguanli begin=====================
@@ -179,3 +184,70 @@ fill_all=fill in all
 describe=describe
 back=back
 #==========yewuliexingguanli end=====================
+
+#==========youjianguankong begin=====================
+sort=sort
+createTime_asc=order by createTime asc
+createTime_desc=order by createTime desc
+editTime_asc=order by editTime asc
+editTime_desc=order by editTime desc
+auditTime_asc=order by auditTime asc
+auditTime_desc=order by auditTime desc
+config_describe=configuration description
+match_area=matching area
+key_word=key word
+block_type=block type
+letter=letter
+whether_area_block=whether area block
+label=label
+attribute=attribute
+valid_identifier=valid identifier
+is_audit=whether audit
+creator=creator
+config_time=configuration time
+editor=editor
+edit_time=edit time
+auditor=auditor
+audit_time=audit time
+yes=yes
+no=no
+deleted=deleted
+cancel_approved=cancel approved
+
+#==========youjianguankong end=====================
+
+#==========guankongbaimingdan begin=====================
+client_ip=client ip
+server_ip=server ip
+client_port=client port
+client_port_mask=client port mask
+client_address_mask=client address mask
+server_port=server port
+server_port_mask=server port mask
+server_address_mask=server address mask
+block_addr=block address
+block_domain=block domain
+block_url=block url
+configuration=configuration
+direction=direction
+protocol=protocol
+oneway=oneway
+twoway=twoway
+arbitrary=arbitrary
+basic_config=basic configuration
+block_config=block configuration
+expression_type=expression type
+null=null
+and=&
+match_method=match method
+substring_match=substring match
+right_match=right match
+left_match=left match
+exactly_match=exactly match
+whether_hexbinary=whether HEX binary
+hex_binary=HEX binary
+case_insensitive_nohex=case insensitive and no hex
+case_sensitive_nohex=case sensitive and no hex
+area_effect_id=area effect id
+ip_type=ip type
+#==========guankongbaimingdan end=====================

src/main/resources/messages/message_zh_CN.properties

@@ -95,16 +95,17 @@ system_service_manage=\u7cfb\u7edf\u4e1a\u52a1\u7c7b\u578b\u7ba1\u7406
 #==========yewu zidian begin=====================
 service_dict_id=\u5b57\u5178ID
 item_type=\u6570\u636e\u7c7b\u578b
-item_code=\u7f16\u7801
+item_code=\u914d\u7f6e\u7f16\u7801
 item_value=\u7f16\u7801\u5bf9\u5e94\u503c
 desc=\u63cf\u8ff0\u4fe1\u606f
 parent_id=\u7236ID
 is_leaf=\u662f\u5426\u53f6\u5b50\u8282\u70b9
 is_valid=\u6709\u6548\u6807\u5fd7
-creator_id=\u521b\u5efa\u4eba\u5458
 create_time=\u914d\u7f6e\u65f6\u95f4
-editor_id=\u4fee\u6539\u4eba\u5458
 edit_time=\u4fee\u6539\u65f6\u95f4
+superior_config=\u4e0a\u7ea7\u914d\u7f6e
+config_content=\u914d\u7f6e\u5185\u5bb9
+
 #==========yewu zidian end=====================
 
 #==========laihan begin=====================
@@ -115,7 +116,7 @@ state=\u72b6\u6001
 created=\u672a\u5ba1\u6838
 examine=\u5ba1\u6838
 unapproved=\u672a\u901a\u8fc7
-approved=\u5df2\u901a\u8fc7
+approved=\u901a\u8fc7
 title=\u6807\u9898
 request_time=\u6765\u51fd\u65f6\u95f4
 operate_time=\u64cd\u4f5c\u65f6\u95f4
@@ -131,7 +132,7 @@ begin_date=\u5f00\u59cb\u65f6\u95f4
 end_date=\u7ed3\u675f\u65f6\u95f4
 delete=\u5220\u9664
 special_task=\u4e13\u9879\u4efb\u52a1
-#==========yewu zidian end=====================
+#==========laihan end=====================
 
 #==========message begin=====================
 required=\u4e0d\u80fd\u4e3a\u7a7a!
@@ -141,11 +142,15 @@ confirm_message=\u786e\u5b9a\u5417\uff1f
 fill_loginName=\u8bf7\u586b\u5199\u767b\u5f55\u8d26\u53f7
 fill_loginPassWord=\u8bf7\u586b\u5199\u767b\u5f55\u5bc6\u7801
 loginName_error=\u7528\u6237\u6216\u5bc6\u7801\u9519\u8bef, \u8bf7\u91cd\u8bd5.
+system_error=\u7cfb\u7edf\u51fa\u73b0\u70b9\u95ee\u9898\uff0c\u8bf7\u7a0d\u540e\u518d\u8bd5\uff01
 save_success=\u4fdd\u5b58\u6210\u529f
 save_failed=\u4fdd\u5b58\u5931\u8d25
 delete_success=\u5220\u9664\u6210\u529f
 delete_failed=\u5220\u9664\u5931\u8d25
 turning_page=\u6b63\u5728\u4e3a\u60a8\u8df3\u8f6c\u9875\u9762
+login_timeout=\u672a\u767b\u5f55\u6216\u767b\u5f55\u8d85\u65f6,\u8bf7\u91cd\u65b0\u767b\u5f55,\u8c22\u8c22!
+captcha_error=\u9a8c\u8bc1\u7801\u4e0d\u6b63\u786e
+enter_captcha=\u8bf7\u8f93\u5165\u9a8c\u8bc1\u7801
 #==========message end=====================
 
 #==========yewuliexingguanli begin=====================
@@ -178,3 +183,70 @@ fill_all=\u8bf7\u586b\u5199\u6240\u6709\u5b57\u6bb5
 describe=\u63cf\u8ff0
 back=\u8fd4\u56de
 #==========yewuliexingguanli end=====================
+
+#==========youjianguankong begin=====================
+sort=\u6392\u5e8f
+createTime_asc=\u6309\u521b\u5efa\u65f6\u95f4\u987a\u5e8f
+createTime_desc=\u6309\u521b\u5efa\u65f6\u95f4\u5012\u5e8f
+editTime_asc=\u6309\u4fee\u6539\u65f6\u95f4\u987a\u5e8f
+editTime_desc=\u6309\u4fee\u6539\u65f6\u95f4\u5012\u5e8f
+auditTime_asc=\u6309\u5ba1\u6838\u65f6\u95f4\u987a\u5e8f
+auditTime_desc=\u6309\u5ba1\u6838\u65f6\u95f4\u5012\u5e8f
+config_describe=\u914d\u7f6e\u63cf\u8ff0
+match_area=\u5339\u914d\u533a\u57df
+key_word=\u5173\u952e\u5b57
+block_type=\u7ba1\u63a7\u7c7b\u578b
+letter=\u6765\u51fd
+whether_area_block=\u662f\u5426\u533a\u57df\u7ba1\u63a7
+label=\u6807\u7b7e
+attribute=\u6027\u8d28
+valid_identifier=\u6709\u6548\u6807\u8bc6
+is_audit=\u662f\u5426\u5ba1\u6838
+creator=\u521b\u5efa\u4eba\u5458
+config_time=\u914d\u7f6e\u65f6\u95f4
+editor=\u4fee\u6539\u4eba\u5458
+edit_time=\u4fee\u6539\u65f6\u95f4
+auditor=\u5ba1\u6838\u4eba\u5458
+audit_time=\u5ba1\u6838\u65f6\u95f4
+yes=\u662f
+no=\u5426
+deleted=\u5df2\u5220\u9664
+cancel_approved=\u53d6\u6d88\u5ba1\u6838\u901a\u8fc7
+
+#==========youjianguankong end=====================
+
+#==========guankongbaimingdan begin=====================
+client_ip=\u6e90IP
+server_ip=\u76ee\u7684IP
+client_port=\u6e90\u7aef\u53e3
+client_port_mask=\u6e90\u7aef\u53e3\u63a9\u7801
+client_address_mask=\u6e90\u5730\u5740\u63a9\u7801
+server_port=\u76ee\u7684\u7aef\u53e3
+server_port_mask=\u76ee\u7684\u7aef\u53e3\u63a9\u7801
+server_address_mask=\u76ee\u7684\u5730\u5740\u63a9\u7801
+block_addr=\u7ba1\u63a7\u5730\u5740
+block_domain=\u7ba1\u63a7\u57df\u540d
+block_url=\u5c01\u5835\u8def\u5f84
+configuration=\u914d\u7f6e
+direction=\u65b9\u5411
+protocol=\u534f\u8bae
+oneway=\u5355\u5411
+twoway=\u53cc\u5411
+arbitrary=\u4efb\u610f
+basic_config=\u57fa\u672c\u914d\u7f6e
+block_config=\u7ba1\u63a7\u914d\u7f6e
+expression_type=\u8868\u8fbe\u5f0f\u7c7b\u578b
+null=\u65e0\u8868\u8fbe\u5f0f
+and=\u4e0e\u8868\u8fbe\u5f0f
+match_method=\u5339\u914d\u65b9\u5f0f
+substring_match=\u5b50\u4e32\u5339\u914d
+right_match=\u53f3\u5339\u914d
+left_match=\u5de6\u5339\u914d
+exactly_match=\u5b8c\u5168\u5339\u914d
+whether_hexbinary=\u662f\u5426hex\u4e8c\u8fdb\u5236
+hex_binary=HEX\u683c\u5f0f\u4e8c\u8fdb\u5236
+case_insensitive_nohex=\u5927\u5c0f\u5199\u4e0d\u654f\u611f\uff0c\u4e14\u975eHEX
+case_sensitive_nohex=\u5927\u5c0f\u5199\u654f\u611f\uff0c\u4e14\u975eHEX
+area_effect_id=\u533a\u57df\u751f\u6548id
+ip_type=ip\u7c7b\u578b
+#==========guankongbaimingdan end=====================

src/main/webapp/WEB-INF/include/form/basicInfo.jsp

@@ -1,13 +1,13 @@
  <%@ page contentType="text/html;charset=UTF-8"%>
  <%@ include file="/WEB-INF/include/taglib.jsp"%>
- <h3 class="form-section">基本配置</h3>
+ <h3 class="form-section"><spring:message code="basic_config"/></h3>
  
 <div class="row">
    <div class="col-md-6">
        <div class="form-group">
-           <label class="control-label col-md-3">来函</label>
+           <label class="control-label col-md-3"><spring:message code="letter"/></label>
-           <div class="col-md-8">
+           <div class="col-md-6">
-               <select name="requestId" data-live-search="true" data-live-search-placeholder="搜索" class="selectpicker form-control" title="--请选择--">
+               <select name="requestId" title=<spring:message code="select"/> data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control">
                	<c:forEach items="${requestInfos}" var="requestInfo">
                		<option value="${requestInfo.id}"
                		 <c:if test="${requestInfo.isValid==0 or requestInfo.isAudit==3}">disabled="disabled"</c:if>
@@ -15,14 +15,16 @@
                	</c:forEach>
                </select>
            </div>
+           <div for="requestId"></div>
        </div>
    </div>
    <!--/span-->
    <div class="col-md-6">
        <div class="form-group">
-           <label class="control-label col-md-3">分类</label>
+           <label class="control-label col-md-3"><spring:message code="type"/></label>
-           <div class="col-md-8">
+           <div class="col-md-6">
-           	 <select name="classify" multiple class="selectpicker form-control" title="--请选择--">
+           	 <select name="classify" multiple class="selectpicker form-control" title=<spring:message code="select"/>>
+               	
                	<c:forEach items="${fls}" var="fl">
                		<c:choose>
                			<c:when test="${_cfg.classify==null or _cfg.classify==''}">
@@ -54,9 +56,9 @@
  <div class="row">
      <div class="col-md-6">
          <div class="form-group">
-             <label class="control-label col-md-3">性质</label>
+             <label class="control-label col-md-3"><spring:message code="attribute"/></label>
-             <div class="col-md-8">
+             <div class="col-md-6">
-                <select name="attribute" multiple class="selectpicker form-control" title="--请选择--">
+                <select name="attribute" multiple class="selectpicker form-control" title=<spring:message code="select"/>>
                		<c:forEach items="${xzs}" var="xz">
 	               		<c:choose>
 	               			<c:when test="${_cfg.attribute==null or _cfg.attribute==''}">
@@ -78,9 +80,9 @@
      </div>
      <div class="col-md-6">
          <div class="form-group">
-             <label class="control-label col-md-3">标签</label>
+             <label class="control-label col-md-3"><spring:message code="label"/></label>
-             <div class="col-md-8">
+             <div class="col-md-6">
-                <select name="lable" multiple class="selectpicker form-control" title="--请选择--">
+                <select name="lable" multiple class="selectpicker form-control" title=<spring:message code="select"/>>
                		<c:forEach items="${lables}" var="lable">
 	               		<c:choose>
 	               			<c:when test="${_cfg.lable==null or _cfg.lable==''}">
@@ -108,7 +110,7 @@
      <div class="col-md-6">
          <div class="form-group">
              <label class="control-label col-md-3">生效范围</label>
-             <div class="col-md-8">
+             <div class="col-md-6">
                  <select class="form-control">
                      <option>Country 1</option>
                      <option>Country 2</option>

src/main/webapp/WEB-INF/include/form/complexInfo.jsp

@@ -1,18 +1,19 @@
 <%@ page contentType="text/html;charset=UTF-8"%>
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
-<h3 class="form-section">管控配置</h3>
+<h3 class="form-section"><spring:message code="block_config"/></h3>
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">配置描述</label>
+            <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
             <div class="col-md-8">
                 <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
             </div>
         </div>
     </div>
+    
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3">匹配区域</label>
+            <label class="control-label col-md-3"><spring:message code="match_area"/></label>
             <div class="col-md-8">
             	 <input class="form-control" type="text" name="district" value="${_cfg.district}">
             </div>
@@ -22,7 +23,7 @@
 <div class="row">
 	<div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3">关键词</label>
+            <label class="control-label col-md-3"><spring:message code="key_word"/></label>
             <div class="col-md-8">
             	 <input class="form-control" type="text" name="keywords" value="${_cfg.keywords}">
             </div>
@@ -47,17 +48,17 @@
     </div> --%>
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">是否区域管控</label>
+            <label class="control-label col-md-3"><spring:message code="whether_area_block"/></label>
             <div class="col-md-8">
             	<label class="radio-inline">
             		<input type="radio" name="isAreaEffective" value="1"
             			<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
-            		>是
+            		><spring:message code="yes"/>
             	</label>
             	<label class="radio-inline">
             		<input type="radio" name="isAreaEffective" value="0"
             			<c:if test="${_cfg.isAreaEffective==0}">checked</c:if>
-            		>否
+            		><spring:message code="no"/>
             	</label>
                 <%-- <input class="form-control" type="text" name="isAreaEffective" value="${_cfg.isAreaEffective}"> --%>
             </div>
@@ -67,30 +68,30 @@
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">表达式类型</label>
+            <label class="control-label col-md-3"><spring:message code="expression_type"/></label>
             <div class="col-md-8">
             	<label class="radio-inline">
-            		<input type="radio" name="exprType " value="1"
+            		<input type="radio" name="exprType" value="1"
             			<c:if test="${_cfg.exprType==1}">checked</c:if>
-            		>与表达式
+            		><spring:message code="and"/>
             	</label>
             	<label class="radio-inline">
             		<input type="radio" name="exprType" value="0"
             			<c:if test="${_cfg.exprType==0}">checked</c:if>
-            		>无表达式
+            		><spring:message code="null"/>
             	</label>
             </div>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3">匹配方式</label>
+            <label class="control-label col-md-3"><spring:message code="match_method"/></label>
             <div class="col-md-8">
-            	<select name="matchMethod" class="selectpicker select2 form-control" title="--请选择--" >
+            	<select name="matchMethod" class="selectpicker select2 form-control" title=<spring:message code="select"/> >
-					<option value="0" <c:if test="${_cfg.matchMethod==0 }">selected</c:if>><spring:message code="子串匹配"></spring:message></option>
+					<option value="0" <c:if test="${_cfg.matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>
-					<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="右匹配"></spring:message></option>
+					<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
-					<option value="2" <c:if test="${_cfg.matchMethod==2 }">selected</c:if>><spring:message code="左匹配"></spring:message></option>
+					<option value="2" <c:if test="${_cfg.matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>
-					<option value="3" <c:if test="${_cfg.matchMethod==3 }">selected</c:if>><spring:message code="完全匹配"></spring:message></option>
+					<option value="3" <c:if test="${_cfg.matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>
 				</select>
             </div>
         </div>
@@ -99,19 +100,19 @@
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">是否hex二进制</label>
+            <label class="control-label col-md-3"><spring:message code="whether_hexbinary"/></label>
             <div class="col-md-8">
-            	<select name="isHexbin" class="selectpicker select2 form-control" title="--请选择--" >
+            	<select name="isHexbin" class="selectpicker select2 form-control" title=<spring:message code="select"/> >
-					<option value="0" <c:if test="${_cfg.isHexbin==0 }">selected</c:if>><spring:message code="大小写不敏感，且非HEX"></spring:message></option>
+					<option value="0" <c:if test="${_cfg.isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
-					<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="HEX格式二进制"></spring:message></option>
+					<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
-					<option value="2" <c:if test="${_cfg.isHexbin==2 }">selected</c:if>><spring:message code="大小写敏感，且非HEX"></spring:message></option>
+					<option value="2" <c:if test="${_cfg.isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
 				</select>
             </div>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3">区域生效id</label>
+            <label class="control-label col-md-3"><spring:message code="area_effect_id"></spring:message></label>
             <div class="col-md-8">
                  <input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
             </div>

src/main/webapp/WEB-INF/include/form/ipInfo.jsp

@@ -1,124 +1,136 @@
 <%@ page contentType="text/html;charset=UTF-8"%>
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
-<h3 class="form-section">管控配置</h3>
+<h3 class="form-section"><spring:message code="block_config"/></h3>
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">配置描述</label>
+            <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
-                <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
+                <input class="form-control" type="text" id="cfgDesc" name="cfgDesc" value="${_cfg.cfgDesc}">
             </div>
+            <div for="cfgDesc"></div>
         </div>
     </div>
     <div class="col-md-6">
-        <div class="form-group ">
+        <div class="form-group">
-            <label class="control-label col-md-3">ip类型</label>
+            <label class="control-label col-md-3"><spring:message code="ip_type"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
-            	 <select name="ipType" class="selectpicker show-tick form-control" title="--请选择--">
+            	 <select name="ipType" class="selectpicker show-tick form-control" title=<spring:message code="select"/>>
                    <option value="4" <c:if test="${_cfg.ipType==4}">selected</c:if> >V4</option>
                    <option value="6" <c:if test="${_cfg.ipType==6}">selected</c:if>>V6</option>
                  </select>
                  <!--  <input class="form-control" type="text"  value="${_cfg.ipType}">-->
             </div>
+            <div for="ipType"></div>
         </div>
     </div>
 </div>
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">源IP地址</label>
+            <label class="control-label col-md-3"><spring:message code="client_ip"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
                 <input class="form-control" type="text" name="srcIp" value="${_cfg.srcIp}">
             </div>
+            <div for="srcIp"></div>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3">源地址掩码</label>
+            <label class="control-label col-md-3"><spring:message code="client_address_mask"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
                  <input class="form-control" type="text" name="srcIpMask" value="${_cfg.srcIpMask}">
             </div>
+            <div for="srcIpMask"></div>
         </div>
     </div>
 </div>
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">源端口</label>
+            <label class="control-label col-md-3"><spring:message code="client_port"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
                 <input class="form-control" type="text" name="srcPort" value="${_cfg.srcPort}">
             </div>
+            <div for="srcPort"></div>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3">源端口掩码</label>
+            <label class="control-label col-md-3"><spring:message code="client_port_mask"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
                  <input class="form-control" type="text" name="srcPortMask" value="${_cfg.srcPortMask}">
             </div>
+            <div for="srcPortMask"></div>
         </div>
     </div>
 </div>
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">目的IP地址</label>
+            <label class="control-label col-md-3"><spring:message code="server_ip"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
                 <input class="form-control" type="text" name="dstIp" value="${_cfg.dstIp}">
             </div>
+            <div for="dstIp"></div>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3">目的地址掩码</label>
+            <label class="control-label col-md-3"><spring:message code="server_address_mask"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
                  <input class="form-control" type="text" name="dstIpMask" value="${_cfg.dstIpMask}">
             </div>
+            <div for="dstIpMask"></div>
         </div>
     </div>
 </div>
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">目的端口</label>
+            <label class="control-label col-md-3"><spring:message code="server_port"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
                 <input class="form-control" type="text" name="dstPort" value="${_cfg.dstPort}">
             </div>
+            <div for="dstPort"></div>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3">目的端口掩码</label>
+            <label class="control-label col-md-3"><spring:message code="server_port_mask"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
                  <input class="form-control" type="text" name="dstPortMask" value="${_cfg.dstPortMask}">
             </div>
+            <div for="dstPortMask"></div>
         </div>
     </div>
 </div>
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">方向</label>
+            <label class="control-label col-md-3"><spring:message code="direction"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
-            	<select name="direction" class="selectpicker show-tick form-control" title="--请选择--">
+            	<select name="direction" class="selectpicker show-tick form-control" title=<spring:message code="select"/>>
                    <option value="0" <c:if test="${_cfg.direction==0}">selected</c:if>>0</option>
                    <option value="1" <c:if test="${_cfg.direction==1}">selected</c:if>>1</option>
                  </select>
                 <%-- <input class="form-control" type="text" name="direction" value="${_cfg.direction}"> --%>
             </div>
+            <div for="direction"></div>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3">协议</label>
+            <label class="control-label col-md-3"><spring:message code="protocol"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
-            	<select name="protocol" class="selectpicker show-tick form-control" title="--请选择--">
+            	<select name="protocol" class="selectpicker show-tick form-control" title=<spring:message code="select"/>>
                    <option value="6" <c:if test="${_cfg.protocol==6}">selected</c:if>>TCP</option>
                    <option value="17" <c:if test="${_cfg.protocol==17}">selected</c:if>>UDP</option>
-                   <option value="0" <c:if test="${_cfg.protocol==0}">selected</c:if>>任意</option>
+                   <option value="0" <c:if test="${_cfg.protocol==0}">selected</c:if>><spring:message code="arbitrary"/></option>
                 </select>
                 <%-- <input class="form-control" type="text" name="protocol" value="${_cfg.protocol}"> --%>
             </div>
+            <div for="protocol"></div>
         </div>
     </div>
 </div>
@@ -126,15 +138,15 @@
     <div class="col-md-6">
         <div class="form-group">
             <label class="control-label col-md-3">协议ID</label>
-            <div class="col-md-8">
+            <div class="col-md-6">
                 <input class="form-control" type="text" name="protocolId" value="${_cfg.protocolId}" readonly="readonly">
             </div>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3">管控类型</label>
+            <label class="control-label col-md-3">管控类型</div>
-            <div class="col-md-8">
+            <div class="col-md-6">
             	 <select name="action" class="selectpicker select2 form-control" readonly="readonly">
             	 	<option value="1" <c:if test="${_cfg.action==1}">selected</c:if><c:if test="${_cfg.action!=1}">disabled="disabled"</c:if> >阻断</option>
             	 	<option value="2" <c:if test="${_cfg.action==2}">selected</c:if><c:if test="${_cfg.action!=2}">disabled="disabled"</c:if> >监测</option>
@@ -151,28 +163,30 @@
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">是否区域管控</label>
+            <label class="control-label col-md-3"><spring:message code="whether_area_block"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
             	<label class="radio-inline">
             		<input type="radio" name="isAreaEffective" value="1"
             			<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
-            		>是
+            		><spring:message code="yes"/>
             	</label>
             	<label class="radio-inline">
             		<input type="radio" name="isAreaEffective" value="0"
             			<c:if test="${_cfg.isAreaEffective==0}">checked</c:if>
-            		>否
+            		><spring:message code="no"/>
             	</label>
                 <%-- <input class="form-control" type="text" name="isAreaEffective" value="${_cfg.isAreaEffective}"> --%>
             </div>
+            <div for="isAreaEffective"></div>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3">区域生效id</label>
+            <label class="control-label col-md-3"><spring:message code="area_effect_id"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
                  <input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
             </div>
+            <div for="areaEffectiveIds"></div>
         </div>
     </div>
 </div>

src/main/webapp/WEB-INF/include/form/stringInfo.jsp

@@ -1,10 +1,10 @@
 <%@ page contentType="text/html;charset=UTF-8"%>
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
-<h3 class="form-section">管控配置</h3>
+<h3 class="form-section"><spring:message code="block_config"/></h3>
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">配置描述</label>
+            <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
             <div class="col-md-8">
                 <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
             </div>
@@ -12,7 +12,7 @@
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3">配置关键词</label>
+            <label class="control-label col-md-3"><spring:message code="key_word"/></label>
             <div class="col-md-8">
             	 <input class="form-control" type="text" name="cfgKeywords" value="${_cfg.cfgKeywords}">
             </div>
@@ -22,15 +22,15 @@
 <div class="row">
 	<div class="col-md-6">
 	    <div class="form-group ">
-	            <label class="control-label col-md-3">管控类型</label>
+	            <label class="control-label col-md-3"><spring:message code="block_type"/></label>
 	            <div class="col-md-8">
             	 <select name="action" class="selectpicker select2 form-control" readonly="readonly">
-            	 	<option value="1" <c:if test="${_cfg.action==1}">selected</c:if><c:if test="${_cfg.action!=1}">disabled="disabled"</c:if> >阻断</option>
+            	 	<option value="1" <c:if test="${_cfg.action==1}">selected</c:if><c:if test="${_cfg.action!=1}">disabled="disabled"</c:if> ><spring:message code="block"/></option>                       
-            	 	<option value="2" <c:if test="${_cfg.action==2}">selected</c:if><c:if test="${_cfg.action!=2}">disabled="disabled"</c:if> >监测</option>
+            	 	<option value="2" <c:if test="${_cfg.action==2}">selected</c:if><c:if test="${_cfg.action!=2}">disabled="disabled"</c:if> ><spring:message code="monitor"/></option>                     
-            	 	<option value="5" <c:if test="${_cfg.action==5}">selected</c:if><c:if test="${_cfg.action!=5}">disabled="disabled"</c:if> >封堵白名单</option>
+            	 	<option value="5" <c:if test="${_cfg.action==5}">selected</c:if><c:if test="${_cfg.action!=5}">disabled="disabled"</c:if> ><spring:message code="block_white_list"/></option>            
-            	 	<option value="6" <c:if test="${_cfg.action==6}">selected</c:if><c:if test="${_cfg.action!=6}">disabled="disabled"</c:if> >监测白名单</option>
+            	 	<option value="6" <c:if test="${_cfg.action==6}">selected</c:if><c:if test="${_cfg.action!=6}">disabled="disabled"</c:if> ><spring:message code="monitor_white_list"/></option>          
-            	 	<option value="7" <c:if test="${_cfg.action==7}">selected</c:if><c:if test="${_cfg.action!=7}">disabled="disabled"</c:if> >封堵监测都白名单</option>
+            	 	<option value="7" <c:if test="${_cfg.action==7}">selected</c:if><c:if test="${_cfg.action!=7}">disabled="disabled"</c:if> ><spring:message code="block_monitor_white_list"/></option>
-            	 	<option value="8" <c:if test="${_cfg.action==8}">selected</c:if><c:if test="${_cfg.action!=8}">disabled="disabled"</c:if> >灰名单</option>
+            	 	<option value="8" <c:if test="${_cfg.action==8}">selected</c:if><c:if test="${_cfg.action!=8}">disabled="disabled"</c:if> ><spring:message code="grey_list"/></option>                   
             	 </select>
                  <%-- <input class="form-control" type="hidden" name="action" value="${_cfg.action}"> --%>
             	</div>
@@ -38,17 +38,17 @@
     </div>
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">是否区域管控</label>
+            <label class="control-label col-md-3"><spring:message code="whether_area_block"/></label>
             <div class="col-md-8">
             	<label class="radio-inline">
             		<input type="radio" name="isAreaEffective" value="1"
             			<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
-            		>是
+            		><spring:message code="yes"/>
             	</label>
             	<label class="radio-inline">
             		<input type="radio" name="isAreaEffective" value="0"
             			<c:if test="${_cfg.isAreaEffective==0}">checked</c:if>
-            		>否
+            		><spring:message code="no"/>
             	</label>
                 <%-- <input class="form-control" type="text" name="isAreaEffective" value="${_cfg.isAreaEffective}"> --%>
             </div>
@@ -58,30 +58,30 @@
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">表达式类型</label>
+            <label class="control-label col-md-3"><spring:message code="expression_type"/></label>
             <div class="col-md-8">
             	<label class="radio-inline">
-            		<input type="radio" name="exprType " value="1"
+            		<input type="radio" name="exprType" value="1"
             			<c:if test="${_cfg.exprType==1}">checked</c:if>
-            		>与表达式
+            		><spring:message code="and"/>
             	</label>
             	<label class="radio-inline">
             		<input type="radio" name="exprType" value="0"
             			<c:if test="${_cfg.exprType==0}">checked</c:if>
-            		>无表达式
+            		><spring:message code="null"/>
             	</label>
             </div>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3">匹配方式</label>
+            <label class="control-label col-md-3"><spring:message code="match_method"/></label>
             <div class="col-md-8">
             	<select name="matchMethod" class="selectpicker select2 form-control" title="--请选择--" >
-					<option value="0" <c:if test="${_cfg.matchMethod==0 }">selected</c:if>><spring:message code="子串匹配"></spring:message></option>
+					<option value="0" <c:if test="${_cfg.matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>   
-					<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="右匹配"></spring:message></option>
+					<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>       
-					<option value="2" <c:if test="${_cfg.matchMethod==2 }">selected</c:if>><spring:message code="左匹配"></spring:message></option>
+					<option value="2" <c:if test="${_cfg.matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>        
-					<option value="3" <c:if test="${_cfg.matchMethod==3 }">selected</c:if>><spring:message code="完全匹配"></spring:message></option>
+					<option value="3" <c:if test="${_cfg.matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>     
 				</select>
             </div>
         </div>
@@ -90,19 +90,19 @@
 <div class="row">
     <div class="col-md-6">
         <div class="form-group">
-            <label class="control-label col-md-3">是否hex二进制</label>
+            <label class="control-label col-md-3"><spring:message code="whether_hexbinary"/></label>
             <div class="col-md-8">
-            	<select name="isHexbin" class="selectpicker select2 form-control" title="--请选择--" >
+            	<select name="isHexbin" class="selectpicker select2 form-control" title=<spring:message code="select"/> >
-					<option value="0" <c:if test="${_cfg.isHexbin==0 }">selected</c:if>><spring:message code="大小写不敏感，且非HEX"></spring:message></option>
+					<option value="0" <c:if test="${_cfg.isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
-					<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="HEX格式二进制"></spring:message></option>
+					<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
-					<option value="2" <c:if test="${_cfg.isHexbin==2 }">selected</c:if>><spring:message code="大小写敏感，且非HEX"></spring:message></option>
+					<option value="2" <c:if test="${_cfg.isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
 				</select>
             </div>
         </div>
     </div>
     <div class="col-md-6">
         <div class="form-group ">
-            <label class="control-label col-md-3">区域生效id</label>
+            <label class="control-label col-md-3"><spring:message code="area_effect_id"></spring:message></label>
             <div class="col-md-8">
                  <input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
             </div>

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

@@ -141,13 +141,13 @@
 
 	<div class="theme-panel hidden-xs hidden-sm">
 		
-		<button type="button" class="btn btn-default" onclick="history.go(-1)">返回</button>
+		<button type="button" class="btn btn-default" onclick="history.go(-1)"><spring:message code="back"/></button>
 
 	</div>
 		
 		
 	<h3 class="page-title">
-		配置管理 
+		<spring:message code="configuration_manage"/>
 	</h3>
 
 	<div class="row">
@@ -155,7 +155,7 @@
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<div class="caption">
-						<i class="fa fa-gift"></i>配置<shiro:hasPermission name="sys:menu:edit">${not empty serviceDictInfo.serviceDictId?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:menu:edit">查看</shiro:lacksPermission></div>
+						<i class="fa fa-gift"></i><shiro:hasPermission name="sys:menu:edit">${not empty serviceDictInfo.serviceDictId?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:menu:edit"><spring:message code="show"/></shiro:lacksPermission></div>
 					<div class="tools">
 						<!-- <a href="javascript:;" class="collapse"> </a>
 						<a href="#portlet-config" data-toggle="modal" class="config"> </a>
@@ -174,14 +174,14 @@
 							<form:hidden path="serviceDictId"/>
 							<sys:message content="${message}"/>
 							<div class="form-group">
-								<label class="col-md-3 control-label">上级配置:</label>
+								<label class="col-md-3 control-label"><spring:message code="superior_config"/>:</label>
 								<div class="col-md-4">
 					                <sys:treeselect id="serviceDictInfo" name="parent.serviceDictId" value="${serviceDictInfo.parent.serviceDictId}" labelName="parent.itemValue" labelValue="${serviceDictInfo.parent.itemValue eq '根节点'?'根节点':fns:getServiceDictInfoById(serviceDictInfo.parent.serviceDictId).itemValue}"
 										title="菜单" url="/basics/serviceDictInfo/treeData?itType=${itType}" extId="${serviceDictInfo.serviceDictId}" cssClass="required form-control"/>
 								</div>
 							</div>
 							<div class="form-group">
-								<label class="col-md-3 control-label radio-lable"><font color="red">*</font> 数据类型:</label>
+								<label class="col-md-3 control-label radio-lable"><font color="red">*</font> <spring:message code="item_type"/>:</label>
 								<div class="col-md-4">
 				                    <select id="itemType" name="itemType" class="form-control">
 					                    <c:forEach items="${fns:getDictList('SERVICE_DICT_ITM_TYPE')}" var="dict">
@@ -203,13 +203,13 @@
 								</div>
 							</div> --%>
 							<div class="form-group">
-								<label class="col-md-3 control-label"><font color="red">*</font>配置内容:</label>
+								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="config_content"/>:</label>
 								<div class="col-md-4">
 									<form:input path="itemValue" htmlEscape="false" maxlength="2000" class="form-control"/>
 								</div>
 							</div>
 							<div class="form-group">
-								<label class="col-md-3 control-label"><font color="red">*</font>是否为叶子节点:</label>
+								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="is_leaf"/>:</label>
 								<div class="col-md-4">
 									<%-- <form:radiobuttons path="isLeaf" items="${fns:getDictOption('SYS_YES_NO')}" /> --%>
 									<form:select path="isLeaf"  class="form-control">
@@ -218,7 +218,7 @@
 								</div>
 							</div>
 							<div class="form-group">
-								<label class="col-md-3 control-label">描述信息:</label>
+								<label class="col-md-3 control-label"><spring:message code="desc"/>:</label>
 								<div class="col-md-4">
 									<form:textarea path="itemDesc" htmlEscape="false" maxlength="2000" class="form-control"/>
 								</div>
@@ -226,8 +226,8 @@
 							<div class="form-actions">
 								<div class="row">
 									<div class="col-md-offset-3 col-md-9">
-										<shiro:hasPermission name="sys:menu:edit"><button type="submit" class="btn btn-circle blue">保存</button></shiro:hasPermission>
+										<shiro:hasPermission name="sys:menu:edit"><button type="submit" class="btn btn-circle blue"><spring:message code="submit"/></button></shiro:hasPermission>
-										<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)">Cancel</button>
+										<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)"><spring:message code="cancel"/></button>
 									</div>
 								</div>
 							</div>

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

@@ -12,13 +12,13 @@
 
 	<div class="theme-panel hidden-xs hidden-sm">
 		
-		<button type="button" class="btn btn-default" onclick="history.go(-1)">返回</button>
+		<button type="button" class="btn btn-default" onclick="history.go(-1)"><spring:message code="back"/></button>
 
 	</div>
 		
 		
 	<h3 class="page-title">
-		配置管理 
+		<spring:message code="configuration_manage"/>
 	</h3>
 
 	<div class="row">
@@ -26,7 +26,7 @@
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<div class="caption">
-						<i class="fa fa-gift"></i>配置查看</div>
+						<i class="fa fa-gift"></i><spring:message code="show"/></div>
 				</div>
 				
 				<div class="portlet-body form">
@@ -39,37 +39,37 @@
 							<form:hidden path="serviceDictId"/>
 							<sys:message content="${message}"/>
 							<div class="form-group">
-								<label class="col-md-3 control-label">上级配置:</label>
+								<label class="col-md-3 control-label"><spring:message code="superior_config"/>:</label>
 								<div class="col-md-4">
 								  <input value="${serviceDictInfo.parent.serviceDictId == 0?'根节点':fns:getServiceDictInfoById(serviceDictInfo.parent.serviceDictId).itemValue}" maxlength="50" class="form-control" readonly="readonly"/>
 							    </div>
 							</div>
 							<div class="form-group">
-								<label class="col-md-3 control-label radio-lable"><font color="red">*</font> 数据类型:</label>
+								<label class="col-md-3 control-label radio-lable"><font color="red">*</font> <spring:message code="item_type"/>:</label>
 								<div class="col-md-4">
 								  <input value="${fns:getDictLabel('SERVICE_DICT_ITM_TYPE',serviceDictInfo.itemType,'0')}" maxlength="50" class="form-control" readonly="readonly"/>
 								</div>
 							</div>
 							<div class="form-group">
-								<label class="col-md-3 control-label"><font color="red">*</font>编码:</label>
+								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="item_code"/>:</label>
 								<div class="col-md-4">
 								  <input value="${serviceDictInfo.itemCode}" maxlength="50" class="form-control" readonly="readonly"/>
 								</div>
 							</div>
 							<div class="form-group">
-								<label class="col-md-3 control-label"><font color="red">*</font>编码对应值:</label>
+								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="item_value"/>:</label>
 								<div class="col-md-4">
 								  <input value="${serviceDictInfo.itemValue}" maxlength="50" class="form-control" readonly="readonly"/>
 								</div>
 							</div>
 							<div class="form-group">
-								<label class="col-md-3 control-label"><font color="red">*</font>是否叶子节点:</label>
+								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="is_leaf"/>:</label>
 								<div class="col-md-4">
 								  <input value="${fns:getDictLabel('SYS_YES_NO',serviceDictInfo.isValid,'0')}" maxlength="50" class="form-control" readonly="readonly"/>
 								</div>
 							</div>
 							<div class="form-group">
-								<label class="col-md-3 control-label">描述信息:</label>
+								<label class="col-md-3 control-label"><spring:message code="desc"/>:</label>
 								<div class="col-md-4">
 									<form:textarea path="itemDesc" htmlEscape="false" maxlength="2000" class="form-control"/>
 								</div>

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

@@ -39,11 +39,11 @@
 	<div class="theme-panel hidden-xs hidden-sm">
 		<button type="button" class="btn btn-default" onclick="location='${ctx}/basics/serviceDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button>
 		<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/basics/serviceDictInfo/form?itType=${itType}'">新增配置</button>
+			onClick="javascript:window.location='${ctx}/basics/serviceDictInfo/form?itType=${itType}'"><spring:message code="add"/></button>
 	</div>
 	
 		<h3 class="page-title">
-			配置管理
+			<spring:message code="configuration_manage"/>
 		</h3>
 	
 		<div class="row">
@@ -51,7 +51,7 @@
 				<div class="portlet box blue">
 					<div class="portlet-title">
 						<div class="caption">
-							<i class="fa fa-cogs"></i>列表信息
+							<i class="fa fa-cogs"></i><spring:message code="date_list"/>
 						</div>
 					</div>
 					<div class="portlet-body">
@@ -62,11 +62,11 @@
 									<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 									<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 									<div class="col-md-12">
-										<label class="search-lable">配置内容:</label><input id="itemValue" name="itemValue" type="text" maxlength="25" class="input-medium" value="${serviceDictInfo.itemValue}"/>
+										<label class="search-lable"><spring:message code="config_content"/>:</label><input id="itemValue" name="itemValue" type="text" maxlength="25" class="input-medium" value="${serviceDictInfo.itemValue}"/>
-										<label class="search-lable">配置编码:</label><input id="itemCode" name="itemCode" type="text" maxlength="25" class="input-medium" value="${serviceDictInfo.itemCode}"/>
+										<label class="search-lable"><spring:message code="item_code"/>:</label><input id="itemCode" name="itemCode" type="text" maxlength="25" class="input-medium" value="${serviceDictInfo.itemCode}"/>
-					                     <label class="search-lable itemType">数据类型:</label> 
+					                     <label class="search-lable itemType"><spring:message code="item_type"/>:</label> 
                                            <select id="itemType" name="itemType"  >
-							                   	<option value="" selected="selected">-请选择-</option>
+							                   	<option value="" selected="selected"><spring:message code="select"/></option>
 							                    <c:forEach items="${fns:getDictList('SERVICE_DICT_ITM_TYPE')}" var="dict">
 							                       <c:forEach items="${intArr}" var="itTemp">
 							                        <c:if test="${dict.itemCode eq itTemp}"> 
@@ -88,7 +88,7 @@
 									 </div>
 								  </form:form>
 									<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><th>创建时间</th><th>最近修改人员</th><th>最近修改时间</th><shiro:hasPermission name="sys:menu:edit"><th>操作</th></shiro:hasPermission></tr></thead>
+										<thead><tr><th><spring:message code="config_content"/></th><th><spring:message code="item_code"/></th><th><spring:message code="desc"/></th><th><spring:message code="item_type"/></th><th><spring:message code="is_leaf"/></th><th><spring:message code="creator"/></th><th><spring:message code="create_time"/></th><th><spring:message code="editor"/></th><th><spring:message code="edit_time"/></th><shiro:hasPermission name="sys:menu:edit"><th><spring:message code="operation"/></th></shiro:hasPermission></tr></thead>
 										<tbody><c:forEach items="${list}" var="serviceDictInfo">
 											<tr id="${serviceDictInfo.serviceDictId}" pId="${serviceDictInfo.parent.serviceDictId ne 0?serviceDictInfo.parent.serviceDictId:0}">
 												<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemValue}</a></td>
@@ -106,14 +106,14 @@
 												<td><fmt:formatDate value="${serviceDictInfo.editTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 												<td>
 													<div class="btn-group btn-xs">
-													    <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#">操作<span class="caret"></span></a>
+													    <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#"><spring:message code="operation"/><span class="caret"></span></a>
 													      <ul class="dropdown-menu btn-xs">
-													         <li><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0&itType=${itType}">查看</a></li>
+													         <li><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0&itType=${itType}"><spring:message code="show"/></a></li>
 													         <shiro:hasPermission name="sys:dict:edit">
-														        <li><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)">修改</a></li>
+														        <li><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)"><spring:message code="edit"/></a></li>
 													         </shiro:hasPermission>
 													         <shiro:hasPermission name="sys:dict:edit">
-													       	 	<li><a href="${ctx}/basics/serviceDictInfo/delete?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)">删除</a></li>
+													       	 	<li><a href="${ctx}/basics/serviceDictInfo/delete?serviceDictId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)"><spring:message code="delete"/></a></li>
 															 </shiro:hasPermission>
 													    
 													      </ul>

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

@@ -141,13 +141,13 @@
 
 	<div class="theme-panel hidden-xs hidden-sm">
 		
-		<button type="button" class="btn btn-default" onclick="history.go(-1)">返回</button>
+		<button type="button" class="btn btn-default" onclick="history.go(-1)"><spring:message code="back"/></button>
 
 	</div>
 		
 		
 	<h3 class="page-title">
-		配置管理 
+	<spring:message code="effect_range"/>
 	</h3>
 
 	<div class="row">
@@ -155,7 +155,7 @@
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<div class="caption">
-						<i class="fa fa-gift"></i>配置<shiro:hasPermission name="sys:menu:edit">${not empty sysDictInfo.sysDictId?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:menu:edit">查看</shiro:lacksPermission></div>
+						<i class="fa fa-gift"></i><shiro:hasPermission name="sys:menu:edit">${not empty sysDictInfo.sysDictId?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:menu:edit"><spring:message code="show"/></shiro:lacksPermission></div>
 					<div class="tools">
 						<!-- <a href="javascript:;" class="collapse"> </a>
 						<a href="#portlet-config" data-toggle="modal" class="config"> </a>
@@ -174,14 +174,14 @@
 							<form:hidden path="sysDictId"/>
 							<sys:message content="${message}"/>
 							<div class="form-group">
-								<label class="col-md-3 control-label">上级配置:</label>
+								<label class="col-md-3 control-label"><spring:message code="superior_config"/>:</label>
 								<div class="col-md-4">
 					                <sys:treeselect id="sysDictInfo" name="parent.sysDictId" value="${sysDictInfo.parent.sysDictId}" labelName="parent.itemValue" labelValue="${sysDictInfo.parent.itemValue eq '根节点'?'根节点':fns:getSysDictInfoById(sysDictInfo.parent.sysDictId).itemValue}"
 										title="菜单" url="/basics/sysDictInfo/treeData?itType=${itType}" extId="${sysDictInfo.sysDictId}" cssClass="required form-control"/>
 								</div>
 							</div>
 							<div class="form-group">
-								<label class="col-md-3 control-label radio-lable"><font color="red">*</font> 数据类型:</label>
+								<label class="col-md-3 control-label radio-lable"><font color="red">*</font> <spring:message code="item_type"/>:</label>
 								<div class="col-md-4">
 				                    <select id="itemType" name="itemType" class="form-control">
 					                    <c:forEach items="${fns:getDictList('SYS_DICT_ITM_TYPE')}" var="dict">
@@ -203,13 +203,13 @@
 								</div>
 							</div> --%>
 							<div class="form-group">
-								<label class="col-md-3 control-label"><font color="red">*</font>配置内容:</label>
+								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="config_content"/>:</label>
 								<div class="col-md-4">
 									<form:input path="itemValue" htmlEscape="false" maxlength="2000" class="form-control"/>
 								</div>
 							</div>
 							<div class="form-group">
-								<label class="col-md-3 control-label"><font color="red">*</font>是否为叶子节点:</label>
+								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="is_leaf"/>:</label>
 								<div class="col-md-4">
 									<%-- <form:radiobuttons path="isLeaf" items="${fns:getDictOption('SYS_YES_NO')}" /> --%>
 									<form:select path="isLeaf"  class="form-control">
@@ -218,7 +218,7 @@
 								</div>
 							</div>
 							<div class="form-group">
-								<label class="col-md-3 control-label">描述信息:</label>
+								<label class="col-md-3 control-label"><spring:message code="desc"/>:</label>
 								<div class="col-md-4">
 									<form:textarea path="itemDesc" htmlEscape="false" maxlength="2000" class="form-control"/>
 								</div>
@@ -226,8 +226,8 @@
 							<div class="form-actions">
 								<div class="row">
 									<div class="col-md-offset-3 col-md-9">
-										<shiro:hasPermission name="sys:menu:edit"><button type="submit" class="btn btn-circle blue">保存</button></shiro:hasPermission>
+										<shiro:hasPermission name="sys:menu:edit"><button type="submit" class="btn btn-circle blue"><spring:message code="submit"/></button></shiro:hasPermission>
-										<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)">Cancel</button>
+										<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)"><spring:message code="cancel"/></button>
 									</div>
 								</div>
 							</div>

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

@@ -39,11 +39,11 @@
 	<div class="theme-panel hidden-xs hidden-sm">
 		<button type="button" class="btn btn-default" onclick="location='${ctx}/basics/sysDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button>
 		<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/basics/sysDictInfo/form?itType=${itType}'">新增配置</button>
+			onClick="javascript:window.location='${ctx}/basics/sysDictInfo/form?itType=${itType}'"><spring:message code="add"/></button>
 	</div>
 	
 		<h3 class="page-title">
-			配置管理
+			<spring:message code="effect_range"/>
 		</h3>
 	
 		<div class="row">
@@ -51,7 +51,7 @@
 				<div class="portlet box blue">
 					<div class="portlet-title">
 						<div class="caption">
-							<i class="fa fa-cogs"></i>列表信息
+							<i class="fa fa-cogs"></i><spring:message code="date_list"/>
 						</div>
 					</div>
 					<div class="portlet-body">
@@ -62,11 +62,11 @@
 									<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 									<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 									<div class="col-md-12">
-										<label class="search-lable">配置内容:</label><input id="itemValue" name="itemValue" type="text" maxlength="25" class="input-medium" value="${sysDictInfo.itemValue}"/>
+										<label class="search-lable"><spring:message code="config_content"/>:</label><input id="itemValue" name="itemValue" type="text" maxlength="25" class="input-medium" value="${sysDictInfo.itemValue}"/>
-										<label class="search-lable">配置编码:</label><input id="itemCode" name="itemCode" type="text" maxlength="25" class="input-medium" value="${sysDictInfo.itemCode}"/>
+										<label class="search-lable"><spring:message code="item_code"/>:</label><input id="itemCode" name="itemCode" type="text" maxlength="25" class="input-medium" value="${sysDictInfo.itemCode}"/>
-					                     <label class="search-lable itemType">数据类型:</label> 
+					                     <label class="search-lable itemType"><spring:message code="item_value"/>:</label> 
                                            <select id="itemType" name="itemType"  >
-							                   	<option value="" selected="selected">-请选择-</option>
+							                   	<option value="" selected="selected"><spring:message code="select"/></option>
 							                    <c:forEach items="${fns:getDictList('SYS_DICT_ITM_TYPE')}" var="dict">
 							                       <c:forEach items="${intArr}" var="itTemp">
 							                        <c:if test="${dict.itemCode eq itTemp}"> 
@@ -88,7 +88,7 @@
 									 </div>
 								  </form:form>
 									<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><th>创建时间</th><th>最近修改人员</th><th>最近修改时间</th><shiro:hasPermission name="sys:menu:edit"><th>操作</th></shiro:hasPermission></tr></thead>
+										<thead><tr><th><spring:message code="config_content"/></th><th><spring:message code="item_code"/></th><th><spring:message code="desc"/></th><th><spring:message code="item_type"/></th><th><spring:message code="is_leaf"/></th><th><spring:message code="creator"/></th><th><spring:message code="create_time"/></th><th><spring:message code="editor"/></th><th><spring:message code="edit_time"/></th><shiro:hasPermission name="sys:menu:edit"><th><spring:message code="operation"/></th></shiro:hasPermission></tr></thead>
 										<tbody><c:forEach items="${list}" var="sysDictInfo">
 											<tr id="${sysDictInfo.sysDictId}" pId="${sysDictInfo.parent.sysDictId ne 0?sysDictInfo.parent.sysDictId:0}">
 												<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0">${sysDictInfo.itemValue}</a></td>
@@ -106,14 +106,14 @@
 												<td><fmt:formatDate value="${sysDictInfo.editTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 												<td>
 													<div class="btn-group btn-xs">
-													    <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#">操作<span class="caret"></span></a>
+													    <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#"><spring:message code="operation"/><span class="caret"></span></a>
 													      <ul class="dropdown-menu btn-xs">
-													         <li><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0&itType=${itType}">查看</a></li>
+													         <li><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0&itType=${itType}"><spring:message code="show"/></a></li>
 													         <shiro:hasPermission name="sys:dict:edit">
-														        <li><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)">修改</a></li>
+														        <li><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)"><spring:message code="edit"/></a></li>
 													         </shiro:hasPermission>
 													         <shiro:hasPermission name="sys:dict:edit">
-													       	 	<li><a href="${ctx}/basics/sysDictInfo/delete?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)">删除</a></li>
+													       	 	<li><a href="${ctx}/basics/sysDictInfo/delete?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)"><spring:message code="delete"/></a></li>
 															 </shiro:hasPermission>
 													    
 													      </ul>

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

@@ -5,6 +5,20 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet"/>
 <script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/bootstrap-select.min.js"></script>
+<c:choose>
+	<c:when test="${cookie.Language.value eq 'zh_CN'}">
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-zh_CN.min.js"></script>
+	</c:when>
+	<c:when test="${cookie.Language.value eq 'en'}">
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
+	</c:when>
+	<c:when test="${cookie.Language.value eq 'ru_RU'}">
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-ru_RU.min.js"></script>
+	</c:when>
+	<c:otherwise>
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
+	</c:otherwise>
+</c:choose>
 <script type="text/javascript">
 $(function(){
 	$("#save").on("click",function(){
@@ -31,7 +45,7 @@ $(function(){
                   <div class="portlet-title">
                      <div class="caption">
                          <i class="fa fa-gift"></i>
-                        <c:if test="${empty _cfg.cfgId}"><spring:message code="新增"></spring:message></c:if>
+                        <c:if test="${empty _cfg.cfgId}"><spring:message code="add"></spring:message></c:if>
 						<c:if test="${not empty _cfg.cfgId}"><spring:message code="edit"></spring:message></c:if>
 					</div>
                       <!-- <div class="tools">
@@ -49,29 +63,11 @@ $(function(){
                             <c:if test="${not empty _cfg.cfgId}">
                             	<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
                             </c:if>
+                            <input type="hidden" name="audit" value="${audit}">  
                             <input type="hidden" name="tableName" value="${_cfg.tableName}">  
                             <input type="hidden" name="serviceId" value="${_cfg.serviceId}">  
                             <input type="hidden" name="cfgName" value="${cfgName}">  
                             <input type="hidden" name="action" value="${_cfg.action}">  
-                            <!--  <div class="row">
-							    <div class="col-md-6">
-							        <div class="form-group">
-							            <label class="control-label col-md-3">IP地址</label>
-							            <div class="col-md-8">
-							                <input class="form-control" type="text">
-							            </div>
-							        </div>
-							    </div>
-							    <div class="col-md-6">
-							        <div class="form-group ">
-							            <label class="control-label col-md-3">配置名称</label>
-							            <div class="col-md-8">
-							                 <input class="form-control" type="text">
-							            </div>
-							        </div>
-							    </div>
-							</div>
-                               -->
                               <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
                               
                             
@@ -81,8 +77,8 @@ $(function(){
                                   <div class="col-md-6">
                                       <div class="row">
                                           <div class="col-md-offset-3 col-md-8">
-                                              <button id="save" type="submit" class="btn green">保存</button>
+                                              <button id="save" type="submit" class="btn green"><spring:message code="submit"/></button>
-                                              <button id="cancel" type="button" class="btn default">Cancel</button>
+                                              <button id="cancel" type="button" class="btn default"><spring:message code="cancel"/></button>
                                           </div>
                                       </div>
                                   </div>

src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp

@@ -5,6 +5,20 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet"/>
 <script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/bootstrap-select.min.js"></script>
+<c:choose>
+	<c:when test="${cookie.Language.value eq 'zh_CN'}">
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-zh_CN.min.js"></script>
+	</c:when>
+	<c:when test="${cookie.Language.value eq 'en'}">
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
+	</c:when>
+	<c:when test="${cookie.Language.value eq 'ru_RU'}">
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-ru_RU.min.js"></script>
+	</c:when>
+	<c:otherwise>
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
+	</c:otherwise>
+</c:choose>
 <script>
  	$(document).ready(function() {
 		
@@ -24,8 +38,10 @@
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
 		<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/complex/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button>
+		<c:if test="${audit==0}">
 		<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/cfg/complex/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="新增"></spring:message></button>
+			onClick="javascript:window.location='${ctx}/cfg/complex/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="add"></spring:message></button>
+		</c:if>
 	</div>
 
 	<h3 class="page-title">
@@ -37,7 +53,7 @@
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<div class="caption">
-						<i class="fa fa-cogs"></i><spring:message code="列表"></spring:message>
+						<i class="fa fa-cogs"></i><spring:message code="date_list"></spring:message>
 					</div>
 					<div class="tools">
 						<!-- <a href="javascript:;" class="collapse" data-original-title=""
@@ -51,19 +67,20 @@
 				<div class="portlet-body">
 					<div class="row" >
 						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/cfg/complex/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}" method="post" class="form-search">
+							<input id="audit" name="audit" type="hidden" value="${audit}"/>
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<div class="col-md-12">
-								<spring:message code="state"/> : <form:select path="isAudit" class="selectpicker select2" title="--请选择--" >
+								<spring:message code="state"/> : <form:select path="isAudit" class="selectpicker select2">
-									<form:option value=""></form:option>
+									<form:option value=""><spring:message code="select"/></form:option>
 									<form:option value="0"><spring:message code="created"></spring:message></form:option>
 									<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 									<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-									<form:option value="3"><spring:message code="取消审核通过"></spring:message></form:option>
+									<form:option value="3"><spring:message code="cancel"></spring:message></form:option>
 								</form:select>
-								<spring:message code="函号"/> :
+								<spring:message code="request_number"/> :
-								<form:select path="requestId" class="selectpicker select2" title="--请选择--" data-live-search="true" data-live-search-placeholder="搜索">
+								<form:select path="requestId" class="selectpicker select2" data-live-search="true" data-live-search-placeholder="search">
-									<form:option value=""></form:option>
+									<form:option value=""><spring:message code="select"/></form:option>
 									<c:forEach items="${requestInfos}" var="requestInfo" >
 										<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
 									</c:forEach>
@@ -71,16 +88,16 @@
 								<button type="button" class="btn btn-default btn-sm" onclick="return page()">
 								<i class="fa fa-edit"></i><spring:message code="search"></spring:message>
 								</button>
-								<spring:message code="排序"/> : 
+								<spring:message code="sort"/> : 
-								<form:select path="page.orderBy" class="selectpicker select2" title="--请选择--">
+								<select name="orderBy" class="selectpicker select2">
-									<form:option value=""></form:option>
+									<option value=""><spring:message code="select"/></option>
-									<form:option value="createTime asc">按创建时间顺序</form:option>
+									<option value="createTime asc" <c:if test="${page.orderBy eq 'createTime asc' }">selected</c:if> ><spring:message code="createTime_asc"/></option>
-									<form:option value="createTime desc">按创建时间倒序</form:option>
+									<option value="createTime desc" <c:if test="${page.orderBy eq 'createTime desc' }">selected</c:if> ><spring:message code="createTime_desc"/></option>
-									<form:option value="editTime asc">按修改时间顺序</form:option>
+									<option value="editTime asc" <c:if test="${page.orderBy eq 'editTime asc' }">selected</c:if> ><spring:message code="editTime_asc"/></option>
-									<form:option value="editTime desc">按修改时间倒序</form:option>
+									<option value="editTime desc" <c:if test="${page.orderBy eq 'editTime desc' }">selected</c:if> ><spring:message code="editTime_desc"/></option>
-									<form:option value="auditTime asc">按审核时间顺序</form:option>
+									<option value="auditTime asc" <c:if test="${page.orderBy eq 'auditTime asc' }">selected</c:if> ><spring:message code="auditTime_asc"/></option>
-									<form:option value="auditTime desc">按审核时间倒序</form:option>
+									<option value="auditTime desc" <c:if test="${page.orderBy eq 'auditTime desc' }">selected</c:if> ><spring:message code="auditTime_desc"/></option>
-								</form:select>
+								</select>
 							</div>
 						</form:form>
 					</div>
@@ -88,27 +105,27 @@
 						<table class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
 								<tr>
-									<th>配置ID</th>
+									<th><spring:message code="seq"/></th>
-									<th>配置描述</th>
+									<th><spring:message code="config_describe"/></th>
-									<th>匹配区域</th>
+									<th><spring:message code="match_area"/></th>
-									<th>关键字</th>
+									<th><spring:message code="key_word"/></th>
-									<th>管控类型</th>
+									<th><spring:message code="block_type"/></th>
 									<!-- <th>业务id</th> -->
-									<th>来函</th>
+									<th><spring:message code="letter"/></th>
 									<!-- <th>编译id</th> -->
-									<th>是否区域管控</th>
+									<th><spring:message code="whether_area_block"/></th>
-									<th>分类</th>
+									<th><spring:message code="type"/></th>
-									<th>性质</th>
+									<th><spring:message code="attribute"/></th>
-									<th>标签</th>
+									<th><spring:message code="label"/></th>
 									<!-- <th>区域生效id</th> -->
-									<th>有效标识</th>
+									<th><spring:message code="valid_identifier"/></th>
-									<th>是否审核</th>
+									<th><spring:message code="is_audit"/></th>
-									<th>创建人员</th>
+									<th><spring:message code="creator"/></th>
-									<th>配置时间</th>
+									<th><spring:message code="config_time"/></th>
-									<th>修改人员</th>
+									<th><spring:message code="editor"/></th>
-									<th>修改时间</th>
+									<th><spring:message code="edit_time"/></th>
-									<th>审核人员</th>
+									<th><spring:message code="auditor"/></th>
-									<th>审核时间</th>
+									<th><spring:message code="audit_time"/></th>
 									<th><spring:message code="operation"></spring:message></th>
 								</tr>
 							</thead>
@@ -120,19 +137,19 @@
 									<td>${cfg.district }</td>
 									<td>${cfg.keywords }</td>
 									<td>
-										<c:if test="${1 eq cfg.action }">阻断</c:if>
+										<c:if test="${1 eq cfg.action }"><spring:message code="block"/></c:if>
-										<c:if test="${2 eq cfg.action }">监测</c:if>
+										<c:if test="${2 eq cfg.action }"><spring:message code="monitor"/></c:if>
-										<c:if test="${5 eq cfg.action }">封堵白名单</c:if>
+										<c:if test="${5 eq cfg.action }"><spring:message code="block_white_list"/></c:if>
-										<c:if test="${6 eq cfg.action }">监测白名单</c:if>
+										<c:if test="${6 eq cfg.action }"><spring:message code="monitor_white_list"/></c:if>
-										<c:if test="${7 eq cfg.action }">封堵监测白名单</c:if>
+										<c:if test="${7 eq cfg.action }"><spring:message code="block_monitor_white_list"/></c:if>
-										<c:if test="${8 eq cfg.action }">灰名单</c:if>
+										<c:if test="${8 eq cfg.action }"><spring:message code="grey_list"/></c:if>
 									</td>
 									<%-- <td>${cfg.serviceId }</td> --%>
 									<td>${cfg.requestName }</td>
 									<%-- <td>${cfg.compileId }</td> --%>
 									<td>
-										<c:if test="${cfg.isAreaEffective==0}">否</c:if>
+										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isAreaEffective==1}">是</c:if>
+										<c:if test="${cfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
 									</td>
 									<td>
 									<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId">
@@ -160,16 +177,16 @@
 									</td>
 									<%-- <td>${cfg.areaEffectiveIds }</td> --%>
 									<td>
-										<c:if test="${cfg.isValid==0}">否</c:if>
+										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isValid==1}">是</c:if>
+										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
-										<c:if test="${cfg.isValid==-1}">已删除</c:if>
+										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
 									<td>
 										<c:choose>
 											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
 											<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
 											<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="取消审核通过"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
 									<td>${cfg.creatorName }</td>
@@ -182,26 +199,28 @@
 										<div class="btn-group btn-xs">
 									      <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#"><spring:message code="operation"></spring:message><span class="caret"></span></a>
 									      <ul class="dropdown-menu btn-xs">
-								      <!-- 审核未通过可修改 -->
+									      <c:if test="${audit==0}">
-								        	<c:choose>
+									      	<c:choose>
+									      		<c:when test="${cfg.isAudit eq '2'}">
+									      			<li><a href="${ctx}/cfg/complex/updateForm?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure？', this.href)"><spring:message code="edit"></spring:message></a></li>
+									      		</c:when>
+									      		<c:when test="${cfg.isAudit eq '0'}">
+									      			<li><a href="${ctx}/cfg/complex/updateForm?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure？', this.href)"><spring:message code="edit"></spring:message></a></li>
+									      			<li><a href="${ctx}/cfg/complex/deleteCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="delete"></spring:message></a></li>
+									      		</c:when>
+									      	</c:choose>
+									      </c:if>
+									      <c:if test="${audit==1}">
+									      	<c:choose>
 									        	<c:when test="${cfg.isAudit eq '1'}">
 											        <li><a href="${ctx}/cfg/complex/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&isAudit=3&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="cancel"></spring:message></a></li>
 									        	</c:when>
 									        	<c:when test="${cfg.isAudit eq '0'}">
+									        		<li><a href="${ctx}/cfg/complex/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="approved"></spring:message></a></li>
 									        		<li><a href="${ctx}/cfg/complex/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&isAudit=2&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="unapproved"></spring:message></a></li>
-									        		<li><a href="${ctx}/cfg/complex/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="approved"></spring:message></a></li>
-									        		<li><a href="${ctx}/cfg/complex/deleteCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="delete"></spring:message></a></li>
 									        	</c:when>
-									        	<c:when test="${cfg.isAudit eq '2'}">
-									        		<li><a href="${ctx}/cfg/complex/updateForm?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure？', this.href)"><spring:message code="edit"></spring:message></a></li>
-									        		<li><a href="${ctx}/cfg/complex/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="approved"></spring:message></a></li>
-									        		<li><a href="${ctx}/cfg/complex/deleteCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="delete"></spring:message></a></li>
-									        	</c:when>
-									        	<c:otherwise>
-											        <li><a href="${ctx}/cfg/complex/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="approved"></spring:message></a></li>
-								        			<li><a href="${ctx}/cfg/complex/deleteCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="delete"></spring:message></a></li>
-									        	</c:otherwise>
 								        	</c:choose>
+									      </c:if>
 									      </ul>
 									    </div>
 									</td>

src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp

@@ -5,6 +5,20 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet"/>
 <script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/bootstrap-select.min.js"></script>
+<c:choose>
+	<c:when test="${cookie.Language.value eq 'zh_CN'}">
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-zh_CN.min.js"></script>
+	</c:when>
+	<c:when test="${cookie.Language.value eq 'en'}">
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
+	</c:when>
+	<c:when test="${cookie.Language.value eq 'ru_RU'}">
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-ru_RU.min.js"></script>
+	</c:when>
+	<c:otherwise>
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
+	</c:otherwise>
+</c:choose>
 <script type="text/javascript">
 $(function(){
 	$("#save").on("click",function(){
@@ -61,6 +75,106 @@ $(function(){
 			}
 		}
 	}); 		
+	$("#ipCfgFrom").validate({
+		rules: {
+			cfgDesc: {
+				required: true,
+			},
+			ipType: {
+				required: true,
+			},
+			srcIp: {
+				required: true,
+			},
+			srcIpMask: {
+				required: true,
+			},
+			srcPort: {
+				required: true,
+			},
+			srcPortMask: {
+				required: true,
+			},
+			dstIp: {
+				required: true,
+			},
+			dstIpMask: {
+				required: true,
+			},
+			dstPort: {
+				required: true,
+			},
+			dstPortMask: {
+				required: true,
+			},
+			direction: {
+				required: true,
+			},
+			protocol: {
+				required: true,
+			},
+			isAreaEffective: {
+				required: true,
+			},
+			requestId: {
+				required: true,
+			}
+			
+			
+		},
+		messages: {
+			cfgDesc: {
+				required: '<spring:message code="required"/>',
+			},
+			ipType: {
+				required: '<spring:message code="required"/>',
+			},
+			srcIp: {
+				required: '<spring:message code="required"/>',
+			},
+			srcIpMask: {
+				required: '<spring:message code="required"/>',
+			},
+			srcPort: {
+				required: '<spring:message code="required"/>',
+			},
+			srcPortMask: {
+				required: '<spring:message code="required"/>',
+			},
+			dstIp: {
+				required: '<spring:message code="required"/>',
+			},
+			dstIpMask: {
+				required: '<spring:message code="required"/>',
+			},
+			dstPort: {
+				required: '<spring:message code="required"/>',
+			},
+			dstPortMask: {
+				required: '<spring:message code="required"/>',
+			},
+			direction: {
+				required: '<spring:message code="required"/>',
+			},
+			protocol: {
+				required: '<spring:message code="required"/>',
+			},
+			isAreaEffective: {
+				required: '<spring:message code="required"/>',
+			},
+			requestId: {
+				required: '<spring:message code="required"/>',
+			}
+		},
+		errorPlacement: function(error,element){
+			$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
+		},
+		submitHandler: function(form){
+			//loading('onloading...');
+			form.submit();
+		},
+		errorContainer: "#messageBox",
+	});
 });
 </script>
 </head>
@@ -78,7 +192,7 @@ $(function(){
                   <div class="portlet-title">
                      <div class="caption">
                          <i class="fa fa-gift"></i>
-                        <c:if test="${empty _cfg.cfgId}"><spring:message code="新增"></spring:message></c:if>
+                        <c:if test="${empty _cfg.cfgId}"><spring:message code="add"></spring:message></c:if>
 						<c:if test="${not empty _cfg.cfgId}"><spring:message code="edit"></spring:message></c:if>
 					</div>
                       <!-- <div class="tools">
@@ -129,8 +243,8 @@ $(function(){
                                   <div class="col-md-6">
                                       <div class="row">
                                           <div class="col-md-offset-3 col-md-8">
-                                              <button id="save" type="submit" class="btn green">保存</button>
+                                              <button id="save" type="submit" class="btn green"><spring:message code="submit"/></button>
-                                              <button id="cancel" type="button" class="btn default">Cancel</button>
+                                              <button id="cancel" type="button" class="btn default"><spring:message code="cancel"/></button>
                                           </div>
                                       </div>
                                   </div>

src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp

@@ -5,6 +5,20 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet"/>
 <script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/bootstrap-select.min.js"></script>
+<c:choose>
+	<c:when test="${cookie.Language.value eq 'zh_CN'}">
+		<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-zh_CN.min.js"></script>
+	</c:when>
+	<c:when test="${cookie.Language.value eq 'en'}">
+		<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
+	</c:when>
+	<c:when test="${cookie.Language.value eq 'ru_RU'}">
+		<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-ru_RU.min.js"></script>
+	</c:when>
+	<c:otherwise>
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
+	</c:otherwise>
+</c:choose>
 <script>
  	$(document).ready(function() {
 		
@@ -23,9 +37,12 @@
 
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
-		<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/ip/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button>
+		<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/ip/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&audit=${audit}'"><spring:message code="refresh"></spring:message></button>
-		<button type="button" class="btn btn-primary"
+		<c:if test="${audit==0}">
-			onClick="javascript:window.location='${ctx}/cfg/ip/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="新增"></spring:message></button>
+			<button type="button" class="btn btn-primary"
+			onClick="javascript:window.location='${ctx}/cfg/ip/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&audit=${audit}'"><spring:message code="add"></spring:message></button>
+		</c:if>
+		
 	</div>
 
 	<h3 class="page-title">
@@ -37,7 +54,7 @@
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<div class="caption">
-						<i class="fa fa-cogs"></i><spring:message code="详情"></spring:message>
+						<i class="fa fa-cogs"></i><spring:message code="date_list"></spring:message>
 					</div>
 					<div class="tools">
 						<!-- <a href="javascript:;" class="collapse" data-original-title=""
@@ -50,20 +67,21 @@
 				</div>
 				<div class="portlet-body">
 					<div class="row" >
-						<form:form id="searchForm" modelAttribute="ipCfg" action="${ctx}/cfg/ip/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}" method="post" class="form-search">
+						<form:form id="searchForm" modelAttribute="ipCfg" action="${ctx}/cfg/ip/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&audit=${audit}" method="post" class="form-search">
+							<input id="audit" name="audit" type="hidden" value="${audit}"/>
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<div class="col-md-12">
-								<spring:message code="state"/> : <form:select path="isAudit" class="selectpicker select2" title="--请选择--" >
+								<spring:message code="state"/> : <form:select path="isAudit" class="selectpicker select2">
-									<form:option value=""></form:option>
+									<form:option value=""><spring:message code="select"/></form:option>
 									<form:option value="0"><spring:message code="created"></spring:message></form:option>
 									<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 									<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-									<form:option value="3"><spring:message code="取消审核通过"></spring:message></form:option>
+									<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 								</form:select>
-								<spring:message code="函号"/> :
+								<spring:message code="request_number"/> :
-								<form:select path="requestId" class="selectpicker select2" title="--请选择--" data-live-search="true" data-live-search-placeholder="搜索">
+								<form:select path="requestId" class="selectpicker select2" data-live-search="true" data-live-search-placeholder="search">
-									<form:option value=""></form:option>
+									<form:option value=""><spring:message code="select"/></form:option>
 									<c:forEach items="${requestInfos}" var="requestInfo" >
 										<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
 									</c:forEach>
@@ -71,16 +89,16 @@
 								<button type="button" class="btn btn-default btn-sm" onclick="return page()">
 								<i class="fa fa-edit"></i><spring:message code="search"></spring:message>
 								</button>
-								<spring:message code="排序"/> : 
+								<spring:message code="sort"/> : 
-								<form:select path="page.orderBy" class="selectpicker select2" title="--请选择--">
+								<select name="orderBy" class="selectpicker select2">
-									<form:option value=""></form:option>
+									<option value=""><spring:message code="select"/></option>
-									<form:option value="createTime asc">按创建时间顺序</form:option>
+									<option value="createTime asc" <c:if test="${page.orderBy eq 'createTime asc' }">selected</c:if> ><spring:message code="createTime_asc"/></option>
-									<form:option value="createTime desc">按创建时间倒序</form:option>
+									<option value="createTime desc" <c:if test="${page.orderBy eq 'createTime desc' }">selected</c:if> ><spring:message code="createTime_desc"/></option>
-									<form:option value="editTime asc">按修改时间顺序</form:option>
+									<option value="editTime asc" <c:if test="${page.orderBy eq 'editTime asc' }">selected</c:if> ><spring:message code="editTime_asc"/></option>
-									<form:option value="editTime desc">按修改时间倒序</form:option>
+									<option value="editTime desc" <c:if test="${page.orderBy eq 'editTime desc' }">selected</c:if> ><spring:message code="editTime_desc"/></option>
-									<form:option value="auditTime asc">按审核时间顺序</form:option>
+									<option value="auditTime asc" <c:if test="${page.orderBy eq 'auditTime asc' }">selected</c:if> ><spring:message code="auditTime_asc"/></option>
-									<form:option value="auditTime desc">按审核时间倒序</form:option>
+									<option value="auditTime desc" <c:if test="${page.orderBy eq 'auditTime desc' }">selected</c:if> ><spring:message code="auditTime_desc"/></option>
-								</form:select>
+								</select>
 							</div>
 						</form:form>
 					</div>
@@ -88,37 +106,37 @@
 						<table class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
 								<tr>
-									<th>序列</th>
+									<th><spring:message code="seq"/></th>
-									<th>配置描述</th>
+									<th><spring:message code="config_describe"/></th>
-									<th>ip类型</th>
+									<th>ip<spring:message code="type"/></th>
-									<th>源IP地址</th>
+									<th><spring:message code="client_ip"/></th>
-									<th>源地址掩码</th>
+									<th><spring:message code="client_address_mask"/></th>
-									<th>源端口</th>
+									<th><spring:message code="client_port"/></th>
-									<th>源端口掩码</th>
+									<th><spring:message code="client_port_mask"/></th>
-									<th>目的IP地址</th>
+									<th><spring:message code="server_ip"/></th>
-									<th>目的地址掩码</th>
+									<th><spring:message code="server_address_mask"/></th>
-									<th>目的端口</th>
+									<th><spring:message code="server_port"/></th>
-									<th>目的端口掩码</th>
+									<th><spring:message code="server_port_mask"/></th>
-									<th>方向</th>
+									<th><spring:message code="direction"/></th>
-									<th>协议</th>
+									<th><spring:message code="protocol"/></th>
 									<!-- <th>协议ID</th> -->
-									<th>管控类型</th>
+									<th><spring:message code="block_type"/></th>
 									<!-- <th>业务id</th> -->
-									<th>来函</th>
+									<th><spring:message code="letter"/></th>
 									<!-- <th>编译id</th> -->
-									<th>是否区域管控</th>
+									<th><spring:message code="whether_area_block"/></th>
-									<th>分类</th>
+									<th><spring:message code="type"/></th>
-									<th>性质</th>
+									<th><spring:message code="attribute"/></th>
-									<th>标签</th>
+									<th><spring:message code="label"/></th>
 									<!-- <th>区域生效id</th> -->
-									<th>有效标识</th>
+									<th><spring:message code="valid_identifier"/></th>
-									<th>是否审核</th>
+									<th><spring:message code="is_audit"/></th>
-									<th>创建人员</th>
+									<th><spring:message code="creator"/></th>
-									<th>配置时间</th>
+									<th><spring:message code="config_time"/></th>
-									<th>修改人员</th>
+									<th><spring:message code="editor"/></th>
-									<th>修改时间</th>
+									<th><spring:message code="edit_time"/></th>
-									<th>审核人员</th>
+									<th><spring:message code="auditor"/></th>
-									<th>审核时间</th>
+									<th><spring:message code="audit_time"/></th>
 									<th><spring:message code="operation"></spring:message></th>
 								</tr>
 							</thead>
@@ -136,23 +154,30 @@
 									<td>${ipCfg.dstIpMask }</td>
 									<td>${ipCfg.dstPort }</td>
 									<td>${ipCfg.dstPortMask }</td>
-									<td>${ipCfg.direction }</td>
+									<td>
-									<td>${ipCfg.protocol }</td>
+									<c:if test="${ipCfg.direction==0}"><spring:message code="twoway"/></c:if>
+									<c:if test="${ipCfg.direction==1}"><spring:message code="oneway"/></c:if>
+									</td>
+									<td>
+									<c:if test="${ipCfg.protocol==6}"><spring:message code="TCP"/></c:if>	
+									<c:if test="${ipCfg.protocol==17}"><spring:message code="UDP"/></c:if>	
+									<c:if test="${ipCfg.protocol==0}"><spring:message code="arbitrary"/></c:if>	
+									</td>
 									<%-- <td>${ipCfg.protocolId }</td> --%>
 									<td>
-										<c:if test="${1 eq ipCfg.action }">阻断</c:if>
+										<c:if test="${1 eq ipCfg.action }"><spring:message code="block"/></c:if>                   
-										<c:if test="${2 eq ipCfg.action }">监测</c:if>
+										<c:if test="${2 eq ipCfg.action }"><spring:message code="monitor"/></c:if>                 
-										<c:if test="${5 eq ipCfg.action }">封堵白名单</c:if>
+										<c:if test="${5 eq ipCfg.action }"><spring:message code="block_white_list"/></c:if>        
-										<c:if test="${6 eq ipCfg.action }">监测白名单</c:if>
+										<c:if test="${6 eq ipCfg.action }"><spring:message code="monitor_white_list"/></c:if>      
-										<c:if test="${7 eq ipCfg.action }">封堵监测白名单</c:if>
+										<c:if test="${7 eq ipCfg.action }"><spring:message code="block_monitor_white_list"/></c:if>
-										<c:if test="${8 eq ipCfg.action }">灰名单</c:if>
+										<c:if test="${8 eq ipCfg.action }"><spring:message code="grey_list"/></c:if>               
 									</td>
 									<%-- <td>${ipCfg.serviceId }</td> --%>
 									<td>${ipCfg.requestName }</td>
 									<%-- <td>${ipCfg.compileId }</td> --%>
 									<td>
-										<c:if test="${ipCfg.isAreaEffective==0}">否</c:if>
+										<c:if test="${ipCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
-										<c:if test="${ipCfg.isAreaEffective==1}">是</c:if>
+										<c:if test="${ipCfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
 									</td>
 									<td>
 									<c:forEach items="${fn:split(ipCfg.classify,',')}" var="classifyId">
@@ -180,16 +205,16 @@
 									</td>
 									<%-- <td>${ipCfg.areaEffectiveIds }</td> --%>
 									<td>
-										<c:if test="${ipCfg.isValid==0}">否</c:if>
+										<c:if test="${ipCfg.isValid==0}"><spring:message code="no"/></c:if>
-										<c:if test="${ipCfg.isValid==1}">是</c:if>
+										<c:if test="${ipCfg.isValid==1}"><spring:message code="yes"/></c:if>
-										<c:if test="${ipCfg.isValid==-1}">已删除</c:if>
+										<c:if test="${ipCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
 									<td>
 										<c:choose>
 											<c:when test="${ipCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
 											<c:when test="${ipCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
 											<c:when test="${ipCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${ipCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="取消审核通过"></spring:message></span></c:when>
+											<c:when test="${ipCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
 									<td>${ipCfg.creatorName }</td>
@@ -202,26 +227,28 @@
 										<div class="btn-group btn-xs">
 									      <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#"><spring:message code="operation"></spring:message><span class="caret"></span></a>
 									      <ul class="dropdown-menu btn-xs">
-								      <!-- 审核未通过可修改 -->
+									      <c:if test="${audit==0}">
-								        	<c:choose>
+									      	<c:choose>
+									      		<c:when test="${ipCfg.isAudit eq '2'}">
+									      			<li><a href="${ctx}/cfg/ip/updateForm?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure？', this.href)"><spring:message code="edit"></spring:message></a></li>
+									      		</c:when>
+									      		<c:when test="${ipCfg.isAudit eq '0'}">
+									      			<li><a href="${ctx}/cfg/ip/updateForm?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure？', this.href)"><spring:message code="edit"></spring:message></a></li>
+									      			<li><a href="${ctx}/cfg/ip/deleteCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="delete"></spring:message></a></li>
+									      		</c:when>
+									      	</c:choose>
+									      </c:if>
+									      <c:if test="${audit==1}">
+									      	<c:choose>
 									        	<c:when test="${ipCfg.isAudit eq '1'}">
 											        <li><a href="${ctx}/cfg/ip/auditCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&isAudit=3&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="cancel"></spring:message></a></li>
 									        	</c:when>
 									        	<c:when test="${ipCfg.isAudit eq '0'}">
+									        		<li><a href="${ctx}/cfg/ip/auditCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="approved"></spring:message></a></li>
 									        		<li><a href="${ctx}/cfg/ip/auditCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&isAudit=2&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="unapproved"></spring:message></a></li>
-									        		<li><a href="${ctx}/cfg/ip/auditCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="approved"></spring:message></a></li>
-									        		<li><a href="${ctx}/cfg/ip/deleteCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="delete"></spring:message></a></li>
 									        	</c:when>
-									        	<c:when test="${ipCfg.isAudit eq '2'}">
-									        		<li><a href="${ctx}/cfg/ip/updateForm?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure？', this.href)"><spring:message code="edit"></spring:message></a></li>
-									        		<li><a href="${ctx}/cfg/ip/auditCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="approved"></spring:message></a></li>
-									        		<li><a href="${ctx}/cfg/ip/deleteCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="delete"></spring:message></a></li>
-									        	</c:when>
-									        	<c:otherwise>
-											        <li><a href="${ctx}/cfg/ip/auditCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="approved"></spring:message></a></li>
-								        			<li><a href="${ctx}/cfg/ip/deleteCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="delete"></spring:message></a></li>
-									        	</c:otherwise>
 								        	</c:choose>
+									      </c:if>
 									      </ul>
 									    </div>
 									</td>

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

@@ -5,7 +5,7 @@
 <title>结果跳转页</title>
 <script type="text/javascript">
 $(document).ready(function() {
-	setTimeout("javascript:window.location.href='${ctx}/cfg/${cfgType}/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'",1000);
+	setTimeout("javascript:window.location.href='${ctx}/cfg/${cfgType}/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&audit=${audit}'",1000);
 });
 </script>
 </head>

src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp

@@ -5,6 +5,20 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet"/>
 <script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/bootstrap-select.min.js"></script>
+<c:choose>
+	<c:when test="${cookie.Language.value eq 'zh_CN'}">
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-zh_CN.min.js"></script>
+	</c:when>
+	<c:when test="${cookie.Language.value eq 'en'}">
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
+	</c:when>
+	<c:when test="${cookie.Language.value eq 'ru_RU'}">
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-ru_RU.min.js"></script>
+	</c:when>
+	<c:otherwise>
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
+	</c:otherwise>
+</c:choose>
 <script type="text/javascript">
 $(function(){
 	$("#save").on("click",function(){
@@ -31,7 +45,7 @@ $(function(){
                   <div class="portlet-title">
                      <div class="caption">
                          <i class="fa fa-gift"></i>
-                        <c:if test="${empty _cfg.cfgId}"><spring:message code="新增"></spring:message></c:if>
+                        <c:if test="${empty _cfg.cfgId}"><spring:message code="add"></spring:message></c:if>
 						<c:if test="${not empty _cfg.cfgId}"><spring:message code="edit"></spring:message></c:if>
 					</div>
                       <!-- <div class="tools">
@@ -49,6 +63,7 @@ $(function(){
                             <c:if test="${not empty _cfg.cfgId}">
                             	<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
                             </c:if>
+                            <input id="audit" name="audit" type="hidden" value="${audit}"/>
                             <input type="hidden" name="tableName" value="${_cfg.tableName}">  
                             <input type="hidden" name="serviceId" value="${_cfg.serviceId}">  
                             <input type="hidden" name="cfgName" value="${cfgName}">  
@@ -80,8 +95,8 @@ $(function(){
                                   <div class="col-md-6">
                                       <div class="row">
                                           <div class="col-md-offset-3 col-md-8">
-                                              <button id="save" type="submit" class="btn green">保存</button>
+                                              <button id="save" type="submit" class="btn green"><spring:message code="submit"/></button>
-                                              <button id="cancel" type="button" class="btn default">Cancel</button>
+                                              <button id="cancel" type="button" class="btn default"><spring:message code="cancel"/></button>
                                           </div>
                                       </div>
                                   </div>

src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp

@@ -5,6 +5,20 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet"/>
 <script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/bootstrap-select.min.js"></script>
+<c:choose>
+	<c:when test="${cookie.Language.value eq 'zh_CN'}">
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-zh_CN.min.js"></script>
+	</c:when>
+	<c:when test="${cookie.Language.value eq 'en'}">
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
+	</c:when>
+	<c:when test="${cookie.Language.value eq 'ru_RU'}">
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-ru_RU.min.js"></script>
+	</c:when>
+	<c:otherwise>
+	<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
+	</c:otherwise>
+</c:choose>
 <script>
  	$(document).ready(function() {
 		
@@ -24,8 +38,10 @@
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
 		<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/string/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button>
-		<button type="button" class="btn btn-primary"
+		<c:if test="${audit==0}">
-			onClick="javascript:window.location='${ctx}/cfg/string/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="新增"></spring:message></button>
+			<button type="button" class="btn btn-primary"
+			onClick="javascript:window.location='${ctx}/cfg/string/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="add"></spring:message></button>
+		</c:if>
 	</div>
 
 	<h3 class="page-title">
@@ -37,7 +53,7 @@
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<div class="caption">
-						<i class="fa fa-cogs"></i><spring:message code="详情"></spring:message>
+						<i class="fa fa-cogs"></i><spring:message code="date_list"></spring:message>
 					</div>
 					<div class="tools">
 						<!-- <a href="javascript:;" class="collapse" data-original-title=""
@@ -51,6 +67,7 @@
 				<div class="portlet-body">
 					<div class="row" >
 						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/cfg/string/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}" method="post" class="form-search">
+							<input id="audit" name="audit" type="hidden" value="${audit}"/>
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<div class="col-md-12">
@@ -59,11 +76,11 @@
 									<form:option value="0"><spring:message code="created"></spring:message></form:option>
 									<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 									<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-									<form:option value="3"><spring:message code="取消审核通过"></spring:message></form:option>
+									<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 								</form:select>
-								<spring:message code="函号"/> :
+								<spring:message code="request_number"/> :
-								<form:select path="requestId" class="selectpicker select2" title="--请选择--" data-live-search="true" data-live-search-placeholder="搜索">
+								<form:select path="requestId" class="selectpicker select2" data-live-search="true" data-live-search-placeholder="search">
-									<form:option value=""></form:option>
+									<form:option value=""><spring:message code="select"/></form:option>
 									<c:forEach items="${requestInfos}" var="requestInfo" >
 										<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
 									</c:forEach>
@@ -71,16 +88,16 @@
 								<button type="button" class="btn btn-default btn-sm" onclick="return page()">
 								<i class="fa fa-edit"></i><spring:message code="search"></spring:message>
 								</button>
-								<spring:message code="排序"/> : 
+								<spring:message code="sort"/> : 
-								<form:select path="page.orderBy" class="selectpicker select2" title="--请选择--">
+								<select name="orderBy" class="selectpicker select2">
-									<form:option value=""></form:option>
+									<option value=""><spring:message code="select"/></option>
-									<form:option value="createTime asc">按创建时间顺序</form:option>
+									<option value="createTime asc" <c:if test="${page.orderBy eq 'createTime asc' }">selected</c:if> ><spring:message code="createTime_asc"/></option>
-									<form:option value="createTime desc">按创建时间倒序</form:option>
+									<option value="createTime desc" <c:if test="${page.orderBy eq 'createTime desc' }">selected</c:if> ><spring:message code="createTime_desc"/></option>
-									<form:option value="editTime asc">按修改时间顺序</form:option>
+									<option value="editTime asc" <c:if test="${page.orderBy eq 'editTime asc' }">selected</c:if> ><spring:message code="editTime_asc"/></option>
-									<form:option value="editTime desc">按修改时间倒序</form:option>
+									<option value="editTime desc" <c:if test="${page.orderBy eq 'editTime desc' }">selected</c:if> ><spring:message code="editTime_desc"/></option>
-									<form:option value="auditTime asc">按审核时间顺序</form:option>
+									<option value="auditTime asc" <c:if test="${page.orderBy eq 'auditTime asc' }">selected</c:if> ><spring:message code="auditTime_asc"/></option>
-									<form:option value="auditTime desc">按审核时间倒序</form:option>
+									<option value="auditTime desc" <c:if test="${page.orderBy eq 'auditTime desc' }">selected</c:if> ><spring:message code="auditTime_desc"/></option>
-								</form:select>
+								</select>
 							</div>
 						</form:form>
 					</div>
@@ -88,26 +105,26 @@
 						<table class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
 								<tr>
-									<th>序列</th>
+									<th><spring:message code="seq"/></th>
-									<th>配置描述</th>
+									<th><spring:message code="config_describe"/></th>
-									<th>配置关键词</th>
+									<th><spring:message code="key_word"/></th>
-									<th>管控类型</th>
+									<th><spring:message code="block_type"/></th>
 									<!-- <th>业务id</th> -->
-									<th>来函</th>
+									<th><spring:message code="letter"/></th>
 									<!-- <th>编译id</th> -->
-									<th>是否区域管控</th>
+									<th><spring:message code="whether_area_block"/></th>
-									<th>分类</th>
+									<th><spring:message code="type"/></th>
-									<th>性质</th>
+									<th><spring:message code="attribute"/></th>
-									<th>标签</th>
+									<th><spring:message code="label"/></th>
 									<!-- <th>区域生效id</th> -->
-									<th>有效标识</th>
+									<th><spring:message code="valid_identifier"/></th>
-									<th>是否审核</th>
+									<th><spring:message code="is_audit"/></th>
-									<th>创建人员</th>
+									<th><spring:message code="creator"/></th>
-									<th>配置时间</th>
+									<th><spring:message code="config_time"/></th>
-									<th>修改人员</th>
+									<th><spring:message code="editor"/></th>
-									<th>修改时间</th>
+									<th><spring:message code="edit_time"/></th>
-									<th>审核人员</th>
+									<th><spring:message code="auditor"/></th>
-									<th>审核时间</th>
+									<th><spring:message code="audit_time"/></th>
 									<th><spring:message code="operation"></spring:message></th>
 								</tr>
 							</thead>
@@ -118,19 +135,19 @@
 									<td>${cfg.cfgDesc }</td>
 									<td>${cfg.cfgKeywords }</td>
 									<td>
-										<c:if test="${1 eq cfg.action }">阻断</c:if>
+										<c:if test="${1 eq cfg.action }"><spring:message code="block"/></c:if>                   
-										<c:if test="${2 eq cfg.action }">监测</c:if>
+										<c:if test="${2 eq cfg.action }"><spring:message code="monitor"/></c:if>                 
-										<c:if test="${5 eq cfg.action }">封堵白名单</c:if>
+										<c:if test="${5 eq cfg.action }"><spring:message code="block_white_list"/></c:if>        
-										<c:if test="${6 eq cfg.action }">监测白名单</c:if>
+										<c:if test="${6 eq cfg.action }"><spring:message code="monitor_white_list"/></c:if>      
-										<c:if test="${7 eq cfg.action }">封堵监测白名单</c:if>
+										<c:if test="${7 eq cfg.action }"><spring:message code="block_monitor_white_list"/></c:if>
-										<c:if test="${8 eq cfg.action }">灰名单</c:if>
+										<c:if test="${8 eq cfg.action }"><spring:message code="grey_list"/></c:if>               
 									</td>
 									<%-- <td>${cfg.serviceId }</td> --%>
 									<td>${cfg.requestName }</td>
 									<%-- <td>${cfg.compileId }</td> --%>
 									<td>
-										<c:if test="${cfg.isAreaEffective==0}">否</c:if>
+										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isAreaEffective==1}">是</c:if>
+										<c:if test="${cfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
 									</td>
 									<td>
 									<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId">
@@ -158,16 +175,16 @@
 									</td>
 									<%-- <td>${cfg.areaEffectiveIds }</td> --%>
 									<td>
-										<c:if test="${cfg.isValid==0}">否</c:if>
+										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isValid==1}">是</c:if>
+										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
-										<c:if test="${cfg.isValid==-1}">已删除</c:if>
+										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
 									<td>
 										<c:choose>
 											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
 											<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
 											<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="取消审核通过"></spring:message></span></c:when>
+											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
 									<td>${cfg.creatorName }</td>
@@ -180,26 +197,28 @@
 										<div class="btn-group btn-xs">
 									      <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#"><spring:message code="operation"></spring:message><span class="caret"></span></a>
 									      <ul class="dropdown-menu btn-xs">
-								      <!-- 审核未通过可修改 -->
+								      		<c:if test="${audit==0}">
-								        	<c:choose>
+									      	<c:choose>
+									      		<c:when test="${cfg.isAudit eq '2'}">
+									      			<li><a href="${ctx}/cfg/string/updateForm?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure？', this.href)"><spring:message code="edit"></spring:message></a></li>
+									      		</c:when>
+									      		<c:when test="${cfg.isAudit eq '0'}">
+									      			<li><a href="${ctx}/cfg/string/updateForm?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure？', this.href)"><spring:message code="edit"></spring:message></a></li>
+									      			<li><a href="${ctx}/cfg/string/deleteCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="delete"></spring:message></a></li>
+									      		</c:when>
+									      	</c:choose>
+									      </c:if>
+									      <c:if test="${audit==1}">
+									      	<c:choose>
 									        	<c:when test="${cfg.isAudit eq '1'}">
 											        <li><a href="${ctx}/cfg/string/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&isAudit=3&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="cancel"></spring:message></a></li>
 									        	</c:when>
 									        	<c:when test="${cfg.isAudit eq '0'}">
+									        		<li><a href="${ctx}/cfg/string/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="approved"></spring:message></a></li>
 									        		<li><a href="${ctx}/cfg/string/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&isAudit=2&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="unapproved"></spring:message></a></li>
-									        		<li><a href="${ctx}/cfg/string/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="approved"></spring:message></a></li>
-									        		<li><a href="${ctx}/cfg/string/deleteCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="delete"></spring:message></a></li>
 									        	</c:when>
-									        	<c:when test="${cfg.isAudit eq '2'}">
-									        		<li><a href="${ctx}/cfg/string/updateForm?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure？', this.href)"><spring:message code="edit"></spring:message></a></li>
-									        		<li><a href="${ctx}/cfg/string/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="approved"></spring:message></a></li>
-									        		<li><a href="${ctx}/cfg/string/deleteCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="delete"></spring:message></a></li>
-									        	</c:when>
-									        	<c:otherwise>
-											        <li><a href="${ctx}/cfg/string/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="approved"></spring:message></a></li>
-								        			<li><a href="${ctx}/cfg/string/deleteCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="delete"></spring:message></a></li>
-									        	</c:otherwise>
 								        	</c:choose>
+									      </c:if>
 									      </ul>
 									    </div>
 									</td>

src/main/webapp/WEB-INF/views/login.jsp

@@ -22,6 +22,7 @@
         <link href="${pageContext.request.contextPath}/static/global/plugins/simple-line-icons/simple-line-icons.min.css" rel="stylesheet" type="text/css" />
         <link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
         <link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-switch/css/bootstrap-switch.min.css" rel="stylesheet" type="text/css" />
+        <link href="${pageContext.request.contextPath}/static/global/plugins/jquery-validation/1.11.0/jquery.validate.min.css" type="text/css" rel="stylesheet" />
         <!-- END GLOBAL MANDATORY STYLES -->
         <!-- BEGIN THEME GLOBAL STYLES -->
         <link href="${pageContext.request.contextPath}/static/global/css/components.min.css" rel="stylesheet" id="style_components" type="text/css" />
@@ -80,7 +81,7 @@
             <p>
 				<div id="messageBox" class="alert alert-danger ${empty message ? 'hide' : ''}">
 					<span class="label label-danger">ERROR:&nbsp;&nbsp;</span>
-					<label id="loginError" class="error">${message}</label>
+					<label id="loginError" class="error"><spring:message code="${message}"></spring:message></label>
 				</div>
 			</p>
 				
@@ -106,6 +107,9 @@
         <script src="${pageContext.request.contextPath}/static/global/plugins/jquery-slimscroll/jquery.slimscroll.min.js" type="text/javascript"></script>
         <script src="${pageContext.request.contextPath}/static/global/plugins/jquery.blockui.min.js" type="text/javascript"></script>
         <script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-switch/js/bootstrap-switch.min.js" type="text/javascript"></script>
+        <script src="${pageContext.request.contextPath}/static/global/plugins/jquery-validation/1.11.0/jquery.validate.min.js" type="text/javascript"></script>
+		<script src="${pageContext.request.contextPath}/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js" type="text/javascript"></script>
+        <script src="${pageContext.request.contextPath}/static/global/scripts/jeesite.js" type="text/javascript"></script>
         <!-- END CORE PLUGINS -->
         <!-- BEGIN THEME GLOBAL SCRIPTS -->
         <script src="${pageContext.request.contextPath}/static/global/scripts/app.min.js" type="text/javascript"></script>
@@ -124,8 +128,8 @@
                         captcha: {remote: "${pageContext.request.contextPath}/validateCode"}
     				},
     				messages: {
-    					username: {required: "请填写用户名..."},password: {required: "请填写密码..."},
+    					username: {required: '<spring:message code="fill_loginName"/>...'},password: {required: '<spring:message code="fill_loginPassWord"/>...'},
-    					captcha: {remote: "验证码不正确...", required: "请填写验证码..."}
+    					captcha: {remote: '<spring:message code="captcha_error"/>...', required: '<spring:message code="enter_captcha"/>...'}
     				},
     				errorLabelContainer: "#messageBox",
     				errorPlacement: function(error, element) {
@@ -133,12 +137,10 @@
     				} 
     			});
                 
-                
-                
              // 如果在框架或在对话框中，则弹出提示并跳转到首页
         		if(self.frameElement && self.frameElement.tagName == "IFRAME" || $('#left').length > 0 || $('.jbox').length > 0){
-        			alert('未登录或登录超时。请重新登录，谢谢！');
+        			alertx("<spring:message code='login_timeout'/>");
-        			top.location = "${pageContext.request.contextPath }";
+        			window.setTimeout(function () { top.location = "${pageContext.request.contextPath }"; }, 5000);
         		}
                 
                 

src/main/webapp/static/global/scripts/jeesite.js

@@ -106,7 +106,7 @@ function showTip(mess, type, timeout, lazytime){
 // 显示加载框
 function loading(mess){
 	if (mess == undefined || mess == ""){
-		mess = "正在提交，请稍等...";
+		mess = "OnLoading...";
 	}
 	resetTip();
 	top.$.jBox.tip(mess,'loading',{opacity:0});
@@ -114,7 +114,7 @@ function loading(mess){
 
 // 警告对话框
 function alertx(mess, closed){
-	top.$.jBox.info(mess, '提示', {closed:function(){
+	top.$.jBox.info(mess, 'Waring', {closed:function(){
 		if (typeof closed == 'function') {
 			closed();
 		}
@@ -124,7 +124,7 @@ function alertx(mess, closed){
 
 // 确认对话框
 function confirmx(mess, href, closed){
-	top.$.jBox.confirm(mess,'系统提示',function(v,h,f){
+	top.$.jBox.confirm(mess,'System Prompt',function(v,h,f){
 		if(v=='ok'){
 			if (typeof href == 'function') {
 				href();
@@ -147,7 +147,7 @@ function promptx(title, lable, href, closed){
 	top.$.jBox("<div class='form-search' style='padding:20px;text-align:center;'>" + lable + "：<input type='text' id='txt' name='txt'/></div>", {
 			title: title, submit: function (v, h, f){
 	    if (f.txt == '') {
-	        top.$.jBox.tip("请输入" + lable + "。", 'error');
+	        top.$.jBox.tip("Please input" + lable + "。", 'error');
 	        return false;
 	    }
 		if (typeof href == 'function') {