diff --git a/src/main/java/com/nis/domain/specific/SpecificServiceCfg.java b/src/main/java/com/nis/domain/specific/SpecificServiceCfg.java
new file mode 100644
index 000000000..fe5101587
--- /dev/null
+++ b/src/main/java/com/nis/domain/specific/SpecificServiceCfg.java
@@ -0,0 +1,154 @@
+package com.nis.domain.specific;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.nis.domain.BaseEntity;
+import com.nis.util.Configurations;
+
+/**
+ * 系统特定服务信息表-记录特定服务信息(specific_service_cfg)
+ * @author zsl
+ *
+ */
+public class SpecificServiceCfg extends BaseEntity<SpecificServiceCfg>{
+
+	private static final long serialVersionUID = -1133644323636425766L;
+	
+	private Integer specServiceId;  //spec_service_id	协议ID	int	N	主键，初始化
+	//private Integer specServiceCode; //协议编码	int	N	暂定，以后可扩展  1000：微信 , 1001：QQ
+	private String specServiceName; //spec_service_name	协议名称	varchar(64)	N	
+	private String specServiceDesc; //spec_service_desc	协议描述	varchar2(64)	N	
+	private Integer isValid; //is_valid	有效标志	int	N	1-有效 0-无效
+	private Date opTime; //op_time	操作时间	date	N	
+	private SpecificServiceCfg parent; //parent_id	父节点id	int	N	0表示一级节点
+	private Integer isLeaf; //is_leaf	是否是叶子节点	int	N	0否，1是，只有一级填0
+	private Integer groupId; //group_id	maat端配置分组id	int	N	缺省0，表示未与maat分组同步
+	
+	private Date beginDate;		// 开始日期
+	private Date endDate;		// 结束日期
+	private String showSequence;  //显示序号
+	
+	public Integer getSpecServiceId() {
+		return specServiceId;
+	}
+	public void setSpecServiceId(Integer specServiceId) {
+		this.specServiceId = specServiceId;
+	}
+	public String getSpecServiceName() {
+		return specServiceName;
+	}
+	public void setSpecServiceName(String specServiceName) {
+		this.specServiceName = specServiceName;
+	}
+	public String getSpecServiceDesc() {
+		return specServiceDesc;
+	}
+	public void setSpecServiceDesc(String specServiceDesc) {
+		this.specServiceDesc = specServiceDesc;
+	}
+	public Integer getIsValid() {
+		return isValid;
+	}
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	public Date getOpTime() {
+		return opTime;
+	}
+	public void setOpTime(Date opTime) {
+		this.opTime = opTime;
+	}
+	public SpecificServiceCfg getParent() {
+		return parent;
+	}
+	public void setParent(SpecificServiceCfg parent) {
+		this.parent = parent;
+	}
+	public Integer getIsLeaf() {
+		return isLeaf;
+	}
+	public void setIsLeaf(Integer isLeaf) {
+		this.isLeaf = isLeaf;
+	}
+	public Integer getGroupId() {
+		return groupId;
+	}
+	public void setGroupId(Integer groupId) {
+		this.groupId = groupId;
+	}
+	public Date getBeginDate() {
+		return beginDate;
+	}
+	public void setBeginDate(Date beginDate) {
+		this.beginDate = beginDate;
+	}
+	public Date getEndDate() {
+		return endDate;
+	}
+	public void setEndDate(Date endDate) {
+		this.endDate = endDate;
+	}
+	public String getShowSequence() {
+		return showSequence;
+	}
+	public void setShowSequence(String showSequence) {
+		this.showSequence = showSequence;
+	}
+	@JsonIgnore
+	public static void sortList(List<SpecificServiceCfg> list, List<SpecificServiceCfg> allList, Integer parentId, boolean cascade) {
+	
+		for(int i=0;i<allList.size();i++){
+			SpecificServiceCfg ss = allList.get(i);
+			System.out.println("处理"+ss.getSpecServiceName()+"id:"+ss.getSpecServiceId()+"父ID:"+ss.getParent().getSpecServiceId()+"条件》》"+parentId);
+			if(ss!=null&&ss.getParent()!=null&&ss.getParent().getSpecServiceId()!=null&&ss.getParent().getSpecServiceId().equals(parentId)){
+				list.add(ss);
+				System.out.println("list加入"+ss.getSpecServiceName()+"id:"+ss.getSpecServiceId()+"父ID:"+ss.getParent().getSpecServiceId());
+				if(cascade){
+					for(int j=0;j<allList.size();j++){
+						SpecificServiceCfg child = allList.get(j);
+						if(child!=null&&child.getParent()!=null&&child.getParent().getSpecServiceId()!=null&&child.getParent().getSpecServiceId().equals(ss.getSpecServiceId())){
+							sortList(list,allList,ss.getSpecServiceId(),true);
+							break;
+						}
+					}
+				}
+			}
+			
+		}
+		
+	}
+	//处理下级序号
+	public static void addChildrenSeq(List<SpecificServiceCfg> list,Integer parentId){
+		    int countNo = 1;
+			for(int i=0; i<list.size(); i++){
+				SpecificServiceCfg ss = list.get(i);
+				if(ss.getParent()!=null && ss.getParent().getSpecServiceId()!=null
+						&& ss.getParent().getSpecServiceId().equals(parentId)){
+					//找出该父类
+					for(SpecificServiceCfg se:list){
+						if(se.getSpecServiceId()==parentId){
+							ss.setShowSequence(se.getShowSequence()+Configurations.getStringProperty("childrenMark", ".")+countNo);
+							countNo++;
+						}
+					}
+					//继续获取子节点
+					for (int j=0; j<list.size(); j++){
+						SpecificServiceCfg child = list.get(j);
+						if (child.getParent()!=null && child.getParent().getSpecServiceId()!=null
+								&& child.getParent().getSpecServiceId().equals(ss.getSpecServiceId())){
+							addChildrenSeq(list, ss.getSpecServiceId());
+							break;
+						}
+					}
+				}
+				
+			}
+			
+	}
+
+	
+	
+
+}
diff --git a/src/main/java/com/nis/domain/specific/SpecificServiceHostCfg.java b/src/main/java/com/nis/domain/specific/SpecificServiceHostCfg.java
new file mode 100644
index 000000000..3446c93db
--- /dev/null
+++ b/src/main/java/com/nis/domain/specific/SpecificServiceHostCfg.java
@@ -0,0 +1,236 @@
+package com.nis.domain.specific;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.nis.domain.BaseEntity;
+import com.nis.domain.SysUser;
+
+/**
+ * 系统特定服务信息表-记录特定服务信息(specific_service_cfg)
+ * @author zsl
+ *
+ */
+public class SpecificServiceHostCfg extends BaseEntity<SpecificServiceHostCfg>{
+
+	private static final long serialVersionUID = -301627652860717175L;
+	
+	private Integer hostId; //host_id	配置ID	bigint	N	主键，自增
+	private Integer specServiceId; //spec_service_id	协议id	int	N	protocol_info_cfg.protocol_id
+	private Integer ipType; //ip地址类型 ipV4=4 ipV6=6
+	private String srcIp; //src_ip	源IP地址	varchar(64)	N	缺省0.0.0.0值表示任意
+	private String srcIpMask; //src_ip_mask	源地址掩码	varchar(64)	N	IPV4:255.255.255.255表示无掩码，即精确IP匹配，0.0.0.0值表示任意；
+	                          //IPV6：FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF表示无掩码，::（两个半角冒号）表示任意。非0掩码值必须是2的指数幂，下同。
+	private String srcPort; //src_port	源端口	varchar(6)	N	0表示任意值
+	private String srcPortMask; //src_port_mask	源端口掩码	varchar(6)	N	65535表示无掩码，即精确端口匹配，0表示任意
+	private String dstIp; //dst_ip	目的IP地址	varchar(64)	N	缺省0.0.0.0值表示任意
+	private String dstIpMask; //dst_ip_mask	目的地址掩码	varchar(64)	N	同源ip地址掩码
+	private String dstPort; //dst_port	目的端口	varchar(6)	N	目的端口,0表示任意值
+	private String dstPortMask; //dst_port_mask	目的端口掩码	varchar(6)	N	同源端口掩码
+	private Integer direction;; //direction	方向	int	N	0双向，1单向，默认缺省为双向。
+	private Integer protocol; //protocol	协议	int	N	6表示tcp,17表示udp，0表示任意
+	private Integer isValid; //is_valid	有效标识	int	N	0无效，1有效
+    private Integer isAudit; //is_audit	是否审核	int	N	0未审核，1审核通过，2审核未通过，3取消审核通过（即删除）
+	private SysUser creator; //creator_id	创建人员	int	N	取自sys_user.id
+	private Date createTime; //create_time	配置时间	date	N	
+	private SysUser editor; //editor_id	修改人员	int	Y	取自sys_user.id
+	private Date editTime; //edit_time	修改时间	date	Y	
+	private SysUser auditor; //auditor_id	审核人员	int	Y	取自sys_user.id
+	private Date auditTime; //audit_time	审核时间	date	Y	
+	
+	
+	
+	
+	private Date beginDate;
+	private Date endDate;
+	private Date editBeginDate;
+	private Date editEndDate;
+	private Date auditBeginDate;
+	private Date auditEndDate;
+	
+	
+	public Integer getHostId() {
+		return hostId;
+	}
+	public void setHostId(Integer hostId) {
+		this.hostId = hostId;
+	}
+	public Integer getSpecServiceId() {
+		return specServiceId;
+	}
+	public void setSpecServiceId(Integer specServiceId) {
+		this.specServiceId = specServiceId;
+	}
+	public Integer getIpType() {
+		return ipType;
+	}
+	public void setIpType(Integer ipType) {
+		this.ipType = ipType;
+	}
+	public String getSrcIp() {
+		return srcIp;
+	}
+	public void setSrcIp(String srcIp) {
+		this.srcIp = srcIp;
+	}
+	public String getSrcIpMask() {
+		return srcIpMask;
+	}
+	public void setSrcIpMask(String srcIpMask) {
+		this.srcIpMask = srcIpMask;
+	}
+	public String getSrcPort() {
+		return srcPort;
+	}
+	public void setSrcPort(String srcPort) {
+		this.srcPort = srcPort;
+	}
+	public String getSrcPortMask() {
+		return srcPortMask;
+	}
+	public void setSrcPortMask(String srcPortMask) {
+		this.srcPortMask = srcPortMask;
+	}
+	public String getDstIp() {
+		return dstIp;
+	}
+	public void setDstIp(String dstIp) {
+		this.dstIp = dstIp;
+	}
+	public String getDstIpMask() {
+		return dstIpMask;
+	}
+	public void setDstIpMask(String dstIpMask) {
+		this.dstIpMask = dstIpMask;
+	}
+	public String getDstPort() {
+		return dstPort;
+	}
+	public void setDstPort(String dstPort) {
+		this.dstPort = dstPort;
+	}
+	public String getDstPortMask() {
+		return dstPortMask;
+	}
+	public void setDstPortMask(String dstPortMask) {
+		this.dstPortMask = dstPortMask;
+	}
+	public Integer getDirection() {
+		return direction;
+	}
+	public void setDirection(Integer direction) {
+		this.direction = direction;
+	}
+	public Integer getProtocol() {
+		return protocol;
+	}
+	public void setProtocol(Integer protocol) {
+		this.protocol = protocol;
+	}
+	public Integer getIsValid() {
+		return isValid;
+	}
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	public Integer getIsAudit() {
+		return isAudit;
+	}
+	public void setIsAudit(Integer isAudit) {
+		this.isAudit = isAudit;
+	}
+	public SysUser getCreator() {
+		return creator;
+	}
+	public void setCreator(SysUser creator) {
+		this.creator = creator;
+	}
+	public Date getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	public SysUser getEditor() {
+		return editor;
+	}
+	public void setEditor(SysUser editor) {
+		this.editor = editor;
+	}
+	public Date getEditTime() {
+		return editTime;
+	}
+	public void setEditTime(Date editTime) {
+		this.editTime = editTime;
+	}
+	public SysUser getAuditor() {
+		return auditor;
+	}
+	public void setAuditor(SysUser auditor) {
+		this.auditor = auditor;
+	}
+	public Date getAuditTime() {
+		return auditTime;
+	}
+	public void setAuditTime(Date auditTime) {
+		this.auditTime = auditTime;
+	}
+	
+	
+
+	public Date getBeginDate() {
+		return beginDate;
+	}
+	public void setBeginDate(Date beginDate) {
+		this.beginDate = beginDate;
+	}
+	public Date getEndDate() {
+		return endDate;
+	}
+	public void setEndDate(Date endDate) {
+		this.endDate = endDate;
+	}
+	public Date getEditBeginDate() {
+		return editBeginDate;
+	}
+	public void setEditBeginDate(Date editBeginDate) {
+		this.editBeginDate = editBeginDate;
+	}
+	public Date getEditEndDate() {
+		return editEndDate;
+	}
+	public void setEditEndDate(Date editEndDate) {
+		this.editEndDate = editEndDate;
+	}
+	public Date getAuditBeginDate() {
+		return auditBeginDate;
+	}
+	public void setAuditBeginDate(Date auditBeginDate) {
+		this.auditBeginDate = auditBeginDate;
+	}
+	public Date getAuditEndDate() {
+		return auditEndDate;
+	}
+	public void setAuditEndDate(Date auditEndDate) {
+		this.auditEndDate = auditEndDate;
+	}
+	/**
+	 * 处理数据
+	 * @param list
+	 * @param sourceList
+	 * @param ParentId
+	 * @param cascade
+	 */
+	@JsonIgnore
+	public static void sort(List<SpecificServiceHostCfg> list, List<SpecificServiceHostCfg> sourceList, Integer ParentId, boolean cascade){
+		
+	}
+	
+	
+	
+	
+	
+	
+
+}
diff --git a/src/main/java/com/nis/util/ConfigDictUtils.java b/src/main/java/com/nis/util/ConfigDictUtils.java
index 25c2c1db9..8ce743a12 100644
--- a/src/main/java/com/nis/util/ConfigDictUtils.java
+++ b/src/main/java/com/nis/util/ConfigDictUtils.java
@@ -11,9 +11,11 @@ import com.nis.domain.SysDataDictionaryItem;
 import com.nis.domain.SysDataDictionaryName;
 import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.domain.basics.SysDictInfo;
+import com.nis.domain.specific.SpecificServiceCfg;
 import com.nis.web.dao.SysDictDao;
 import com.nis.web.dao.basics.ServiceDictInfoDao;
 import com.nis.web.dao.basics.SysDictInfoDao;
+import com.nis.web.dao.specific.SpecificServiceCfgDao;
 import com.nis.web.service.SpringContextHolder;
 
 
@@ -29,6 +31,7 @@ public class ConfigDictUtils {
 	
 	private final static ServiceDictInfoDao serviceDictInfoDao = SpringContextHolder.getBean(ServiceDictInfoDao.class);
 	private final static SysDictInfoDao sysDictInfoDao = SpringContextHolder.getBean(SysDictInfoDao.class);
+	private final static SpecificServiceCfgDao specificServiceCfgDao = SpringContextHolder.getBean(SpecificServiceCfgDao.class);
 
 	/**
 	 * 根据主键查询配置详情
@@ -47,6 +50,15 @@ public class ConfigDictUtils {
 	public static SysDictInfo getSysDictInfoById(Integer sysDictId){
 		return sysDictInfoDao.getDictById(sysDictId);
 	}
+	
+	/**
+	 * 根据主键查询配置详情
+	 * @param sysDictId
+	 * @return
+	 */
+	public static SpecificServiceCfg getBySpecServiceId(Integer specServiceId){
+		return specificServiceCfgDao.getBySpecServiceId(specServiceId);
+	}
 	/**
 	 * 根据计算公式计算数据结果
 	 * @param sysDictId
diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java
index efcecff49..f69a64dd9 100644
--- a/src/main/java/com/nis/web/controller/BaseController.java
+++ b/src/main/java/com/nis/web/controller/BaseController.java
@@ -40,6 +40,8 @@ import com.nis.web.service.configuration.SslCfgService;
 import com.nis.web.service.configuration.StringCfgService;
 import com.nis.web.service.configuration.TunnelCfgService;
 import com.nis.web.service.configuration.WebCfgService;
+import com.nis.web.service.specific.SpecificServiceCfgService;
+import com.nis.web.service.specific.SpecificServiceHostCfgService;
 import com.nis.web.service.systemService.ServiceConfigInfoService;
 import com.nis.web.service.systemService.SystemServiceService;
 
@@ -121,6 +123,10 @@ public class BaseController {
 	protected NumCfgService numCfgService;
 	@Autowired
 	protected ComplexStringCfgService complexStringCfgService;
+	@Autowired
+	protected SpecificServiceCfgService specificServiceCfgService;
+	@Autowired
+	protected SpecificServiceHostCfgService specificServiceHostCfgService;
 	/**
 	 * 管理基础路径
 	 */
diff --git a/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java b/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java
index 595c55950..d55e82581 100644
--- a/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java
+++ b/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java
@@ -77,79 +77,7 @@ public class ServiceDictInfoController extends BaseController {
 		for(int i=0;i<strArr.length;i++){
 			intArr[i] = Integer.valueOf(strArr[i]); 
 		}
-		if(serviceDictInfo.getItemType()!=null){
-			model.addAttribute("selectedType", serviceDictInfo.getItemType());
-		}else{
-			model.addAttribute("selectedType", selectedType);
-			serviceDictInfo.setItemType(selectedType);
-		}
-		//查询符合条件总数
-		List<ServiceDictInfo> showTotalCount = serviceDictInfoService.findAllDictSearchList(serviceDictInfo,intArr);
-		model.addAttribute("showTotalCount", showTotalCount.size());
 		
-		//查出顶层分页数据
-		Page<ServiceDictInfo> page = serviceDictInfoService.findTopDictList(new Page<ServiceDictInfo>(request, response), serviceDictInfo,intArr);
-		//植入序号
-		for(int i=0;i<page.getList().size();i++){
-		    page.getList().get(i).setShowSequence(""+(i+1+((page.getPageNo()-1)*page.getPageSize())));
-		}
-		model.addAttribute("page", page);
-		//查出所有数据
-		List<ServiceDictInfo> allList = serviceDictInfoService.findAllDictList();
-		//处理数据，保留顶层中的所有下层数据
-		List<ServiceDictInfo> list = Lists.newArrayList();
-		for(int i=allList.size()-1;i>=0;i--){
-			ServiceDictInfo se = allList.get(i);
-			if(se!=null&&se.getParent()!=null&&se.getParent().getServiceDictId()!=null&&se.getParent().getServiceDictId()==0){
-				allList.remove(se);
-			}
-		}
-		allList.addAll(page.getList());
-		ServiceDictInfo.sortList(list,allList,0,true);
-		
-		//处理下级序号
-		ServiceDictInfo.addChildrenSeq(list, 0);
-		model.addAttribute("itType", itType);
-		model.addAttribute("intArr", Arrays.asList(intArr));
-		model.addAttribute("list", list);
-		return "/basics/serviceDictList";
-	}
-	
-	
-	/**
-	 * 查询业务辅助表-业务字典信息列表(含条件查询)
-	 * @param serviceDictInfo
-	 * @param request
-	 * @param response
-	 * @param model
-	 * @return
-	 */
-	@RequiresPermissions("sys:dict:view")
-	@RequestMapping(value = {"searchList"})
-	public String searchList(String itType, ServiceDictInfo serviceDictInfo,HttpServletRequest request, HttpServletResponse response, Model model,Integer selectedType) {
-		if(StringUtils.strIsBlank(serviceDictInfo.getItemValue())
-				&&StringUtils.strIsBlank(serviceDictInfo.getItemCode())
-				&&serviceDictInfo.getBeginDate()==null
-				&&serviceDictInfo.getEndDate()==null
-				&&serviceDictInfo.getEditBeginDate()==null
-				&&serviceDictInfo.getEditEndDate()==null){
-			if(serviceDictInfo.getItemType()!=null){
-				selectedType = serviceDictInfo.getItemType();
-				return "redirect:"+ adminPath + "/basics/serviceDictInfo/list?itType="+itType+"&selectedType="+selectedType+"&isFilterAction="+serviceDictInfo.getIsFilterAction();
-			}
-			return "redirect:"+ adminPath + "/basics/serviceDictInfo/list?itType="+itType+"&isFilterAction="+serviceDictInfo.getIsFilterAction();
-		}
-		String[] strArr = itType.split("-");
-		Integer[] intArr = new Integer[strArr.length];
-		for(int i=0;i<strArr.length;i++){
-			intArr[i] = Integer.valueOf(strArr[i]); 
-		}
-		if(serviceDictInfo.getItemType()!=null){
-			model.addAttribute("selectedType", serviceDictInfo.getItemType());
-		}else{
-			model.addAttribute("selectedType", selectedType);
-			serviceDictInfo.setItemType(selectedType);
-		}
 		String searchType = null;
 		String searchContent = null;
 		if(!StringUtils.isBlank(serviceDictInfo.getItemCode())){
@@ -163,46 +91,46 @@ public class ServiceDictInfoController extends BaseController {
 		model.addAttribute("searchType", searchType);
 		model.addAttribute("searchContent", searchContent);
 		
-		//先查出条件查询所有数据（注意顺序）
-		List<ServiceDictInfo> allList = serviceDictInfoService.findAllDictSearchList(serviceDictInfo,intArr);
+		Page<ServiceDictInfo> pageCondition = new Page<ServiceDictInfo>(request, response);
+		//查询符合条件总数
+		List<ServiceDictInfo> allList = serviceDictInfoService.findAllServiceDictInfo(serviceDictInfo,intArr,pageCondition.getOrderBy());
 		model.addAttribute("showTotalCount", allList.size());
-		//查出条件查询顶层分页数据
-		Page<ServiceDictInfo> page = serviceDictInfoService.findDictTopSearchList(new Page<ServiceDictInfo>(request, response), serviceDictInfo,intArr);
-		//植入序号
-		for(int i=0;i<page.getList().size();i++){
-			page.getList().get(i).setShowSequence(""+(i+1+((page.getPageNo()-1)*page.getPageSize())));
+		
+		//查出顶层分页数据
+		Page<ServiceDictInfo> page = serviceDictInfoService.findTopDictList(pageCondition, serviceDictInfo,intArr);
+		// 植入序号
+		for (int i = 0; i < page.getList().size(); i++) {
+			page.getList().get(i).setShowSequence("" + (i + 1 + ((page.getPageNo() - 1) * page.getPageSize())));
 		}
 		model.addAttribute("page", page);
 		
-		//处理数据，保留顶层中的所有下层数据
-		List<ServiceDictInfo> list = Lists.newArrayList();
-		//取出主键优化处理
-		List<Integer> tempList = Lists.newArrayList();
-				for(ServiceDictInfo se:page.getList()){
-					if(se!=null&&se.getServiceDictId()!=null){
-						tempList.add(se.getServiceDictId());
-					}
-				}
-		//删除所有重复
-		for(int i=allList.size()-1;i>=0;i--){
-			ServiceDictInfo se = allList.get(i);
-			if(se!=null&&se.getServiceDictId()!=null){
-				if(tempList.contains(se.getServiceDictId())||se.getParent().getServiceDictId()==0){
-					allList.remove(se);
-				}
+		// 删除顶层数据、取出id 优化处理
+		List<Integer> intList = Lists.newArrayList();
+		
+		for(ServiceDictInfo tempSe : page.getList()) {
+			if (tempSe != null) {
+				intList.add(tempSe.getServiceDictId());
 			}
 		}
 		
+		for (int i = allList.size() - 1; i >= 0; i--) {
+			ServiceDictInfo se = allList.get(i);
+			if(se!=null&&intList.contains(se.getServiceDictId())||(se!=null&&se.getParent().getServiceDictId()==0)){
+				allList.remove(se);
+			}
+		}
+		
+		List<ServiceDictInfo> list = Lists.newArrayList();
+		
 		allList.addAll(page.getList());
 		ServiceDictInfo.sortList(list,allList,0,true);
+		
 		//处理下级序号
 		ServiceDictInfo.addChildrenSeq(list, 0);
-		//serviceDictInfo.setItemType(selectedType);
 		model.addAttribute("itType", itType);
 		model.addAttribute("intArr", Arrays.asList(intArr));
 		model.addAttribute("list", list);
-       
-		return "/basics/serviceDictInfoSearchList";
+		return "/basics/serviceDictList";
 	}
 	
 	
diff --git a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
index 55232636e..1a38e57a2 100644
--- a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
+++ b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
@@ -76,77 +76,8 @@ public class SysDictInfoController extends BaseController {
 		for(int i=0;i<strArr.length;i++){
 			intArr[i] = Integer.valueOf(strArr[i]); 
 		}
-		if(sysDictInfo.getItemType()!=null){
-			model.addAttribute("selectedType", sysDictInfo.getItemType());
-		}else{
-			model.addAttribute("selectedType", selectedType);
-			sysDictInfo.setItemType(selectedType);
-		}
-		//查询符合条件总数
-		List<SysDictInfo> showTotalCount = sysDictInfoService.findAllDictSearchList(sysDictInfo,intArr);
-		model.addAttribute("showTotalCount", showTotalCount.size());
-		
-		//查出顶层分页数据
-		Page<SysDictInfo> page = sysDictInfoService.findTopDictList(new Page<SysDictInfo>(request, response), sysDictInfo,intArr);
-		//植入序号
-		for(int i=0;i<page.getList().size();i++){
-			page.getList().get(i).setShowSequence(""+(i+1+((page.getPageNo()-1)*page.getPageSize())));
-		}
-		model.addAttribute("page", page);
-		//查出所有数据
-		List<SysDictInfo> allList = sysDictInfoService.findAllDictList();
-		//处理数据，保留顶层中的所有下层数据
-		List<SysDictInfo> list = Lists.newArrayList();
-		for(int i=allList.size()-1;i>=0;i--){
-			SysDictInfo se = allList.get(i);
-			if(se!=null&&se.getParent()!=null&&se.getParent().getSysDictId()!=null&&se.getParent().getSysDictId()==0){
-				allList.remove(se);
-			 }	
-		}
-		allList.addAll(page.getList());
-		SysDictInfo.sortList(list,allList,0,true);
-		
-		//处理下级序号
-		SysDictInfo.addChildrenSeq(list, 0);
-		model.addAttribute("itType", itType);
-		model.addAttribute("intArr", Arrays.asList(intArr));
-		model.addAttribute("list", list);
-		return "/basics/sysDictList";
-	}
-	
-	/**
-	 * 查询业务辅助表-系统字典信息列表(含条件查询)
-	 * @param sysDictInfo
-	 * @param request
-	 * @param response
-	 * @param model
-	 * @return
-	 */
-	@RequiresPermissions("sys:dict:view")
-	@RequestMapping(value = {"searchList"})
-	public String searchList(String itType, SysDictInfo sysDictInfo,HttpServletRequest request, HttpServletResponse response, Model model, Integer selectedType) {
-		if(StringUtils.strIsBlank(sysDictInfo.getItemValue())
-				&&StringUtils.strIsBlank(sysDictInfo.getItemCode())
-				&&sysDictInfo.getBeginDate()==null
-				&&sysDictInfo.getEndDate()==null
-				&&sysDictInfo.getEditBeginDate()==null
-				&&sysDictInfo.getEditEndDate()==null){
-			if(sysDictInfo.getItemType()!=null){
-				selectedType = sysDictInfo.getItemType();
-				return "redirect:"+ adminPath + "/basics/sysDictInfo/list?itType="+itType+"&selectedType="+selectedType+"&isFilterAction="+sysDictInfo.getIsFilterAction();
-			}
-			return "redirect:"+ adminPath + "/basics/sysDictInfo/list?itType="+itType+"&isFilterAction="+sysDictInfo.getIsFilterAction();
-		}
-		String[] strArr = itType.split("-");
-		Integer[] intArr = new Integer[strArr.length];
-		for(int i=0;i<strArr.length;i++){
-			intArr[i] = Integer.valueOf(strArr[i]); 
-		}
-		if(sysDictInfo.getItemType()!=null){
-			model.addAttribute("selectedType", sysDictInfo.getItemType());
-		}else{
-			model.addAttribute("selectedType", selectedType);
-			sysDictInfo.setItemType(selectedType);
+		if(intArr.length==1){
+			model.addAttribute("specType", intArr[0]);
 		}
 		String searchType = null;
 		String searchContent = null;
@@ -160,70 +91,52 @@ public class SysDictInfoController extends BaseController {
 		}
 		model.addAttribute("searchType", searchType);
 		model.addAttribute("searchContent", searchContent);
-		//先查出条件查询所有数据（注意顺序）
-		List<SysDictInfo> allList = sysDictInfoService.findAllDictSearchList(sysDictInfo,intArr);
+		if(sysDictInfo.getItemType()!=null){
+			model.addAttribute("selectedType", sysDictInfo.getItemType());
+		}else{
+			model.addAttribute("selectedType", selectedType);
+			sysDictInfo.setItemType(selectedType);
+		}
+		Page<SysDictInfo> pageCondition = new Page<SysDictInfo>(request, response);
+		
+		//查询符合条件总数
+		List<SysDictInfo> allList = sysDictInfoService.findAllSysDictInfo(sysDictInfo,intArr,pageCondition.getOrderBy());
 		model.addAttribute("showTotalCount", allList.size());
-		//查出条件查询顶层分页数据
-		Page<SysDictInfo> page = sysDictInfoService.findDictTopSearchList(new Page<SysDictInfo>(request, response), sysDictInfo,intArr);
+		
+		//查出顶层分页数据
+		Page<SysDictInfo> page = sysDictInfoService.findTopDictList(pageCondition, sysDictInfo,intArr);
 		//植入序号
 		for(int i=0;i<page.getList().size();i++){
 			page.getList().get(i).setShowSequence(""+(i+1+((page.getPageNo()-1)*page.getPageSize())));
 		}
 		model.addAttribute("page", page);
-				
-		//处理数据，保留顶层中的所有下层数据
+		
+		//处理数据，取出主键优化处理
+		List<Integer> intList = Lists.newArrayList();
+		for(SysDictInfo se:page.getList()){
+			if(se!=null){
+				intList.add(se.getSysDictId());
+			}
+		}
+		
 		List<SysDictInfo> list = Lists.newArrayList();
-		//取出主键优化处理
-		List<Integer> tempList = Lists.newArrayList();
-				for(SysDictInfo se:page.getList()){
-					if(se!=null&&se.getSysDictId()!=null){
-						tempList.add(se.getSysDictId());
-					 }
-				}
-				//删除所有重复
-				for(int i=allList.size()-1;i>=0;i--){
-					SysDictInfo se = allList.get(i);
-					//System.out.println("删前顺序"+se.getSysDictId());
-					if(se!=null&&se.getSysDictId()!=null){
-						if(tempList.contains(se.getSysDictId())||se.getParent().getSysDictId()==0){
-							allList.remove(se);
-						}
-					}
-				}
-				
-			/*	for(int i=allList.size()-1;i>=0;i--){
-					SysDictInfo se = allList.get(i);
-					System.out.println("删后顺序"+se.getSysDictId());
-				}*/
-		
-		
+		for(int i=allList.size()-1;i>=0;i--){
+			SysDictInfo se = allList.get(i);
+			if(se!=null&&intList.contains(se.getSysDictId())||(se!=null&&se.getParent().getSysDictId()==0)){
+				allList.remove(se);
+			 }	
+		}
 		allList.addAll(page.getList());
 		SysDictInfo.sortList(list,allList,0,true);
 		
-		
 		//处理下级序号
 		SysDictInfo.addChildrenSeq(list, 0);
-		/*for(int i=list.size()-1;i>=0;i--){
-			SysDictInfo se = list.get(i);
-			System.out.println("最终顺序"+se.getSysDictId()+":"+se.getParent().getSysDictId());
-		}*/
-		
 		model.addAttribute("itType", itType);
 		model.addAttribute("intArr", Arrays.asList(intArr));
 		model.addAttribute("list", list);
-       
-		return "/basics/sysDictInfoSearchList";
+		return "/basics/sysDictList";
 	}
 	
-	
-	
-	
-	
-	
-	
-	
-	
-	
 	/**
 	 * 进入添加或修改页面
 	 * @param sysDictInfo
@@ -254,6 +167,9 @@ public class SysDictInfoController extends BaseController {
 		for(int i=0;i<strArr.length;i++){
 			intArr[i] = Integer.valueOf(strArr[i]); 
 		}
+		if(intArr.length==1){
+			model.addAttribute("specType", intArr[0]);
+		}
 		model.addAttribute("intArr", Arrays.asList(intArr));
 		model.addAttribute("sysDictInfo", sysDictInfo);
 		model.addAttribute("itType", itType);
diff --git a/src/main/java/com/nis/web/controller/basics/TaskInfoController.java b/src/main/java/com/nis/web/controller/basics/TaskInfoController.java
index 6b30fd483..ca89c515f 100644
--- a/src/main/java/com/nis/web/controller/basics/TaskInfoController.java
+++ b/src/main/java/com/nis/web/controller/basics/TaskInfoController.java
@@ -5,6 +5,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -37,6 +38,7 @@ public class TaskInfoController extends BaseController{
 	/**
 	 * 进入用户添加或修改页面
 	 */
+	@RequiresPermissions("basics:taskInfo:edit")
 	@RequestMapping(value={"form"})
 	public String form(TaskInfo taskInfo, Model model) {
 		if(taskInfo.getId()!=null){
@@ -51,6 +53,7 @@ public class TaskInfoController extends BaseController{
 	/**
 	 * 新增/修改
 	 */
+	@RequiresPermissions("basics:taskInfo:edit")
 	@RequestMapping(value = "saveOrUpdate")
 	public String saveOrUpdate(TaskInfo taskInfo, HttpServletRequest request, Model model, RedirectAttributes redirectAttributes) {
 		try {
@@ -96,6 +99,7 @@ public class TaskInfoController extends BaseController{
      * @param model
      * @return
      */
+	@RequiresPermissions("basics:taskInfo:edit")
 	@RequestMapping(value = "taskExamine")
     public String taskExamine(String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] exId = ids.split(",");
@@ -110,6 +114,7 @@ public class TaskInfoController extends BaseController{
 	 * @param model
 	 * @return
 	 */
+	@RequiresPermissions("basics:taskInfo:edit")
 	@RequestMapping(value = "taskExamineNo")
 	public String taskExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] noId = ids.split(",");
@@ -124,6 +129,7 @@ public class TaskInfoController extends BaseController{
 	 * @param model
 	 * @return
 	 */
+	@RequiresPermissions("basics:taskInfo:edit")
 	@RequestMapping(value = "taskCancelExamine")
 	public String taskCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] canclelId = ids.split(",");
@@ -138,6 +144,7 @@ public class TaskInfoController extends BaseController{
 	 * @param model
 	 * @return
 	 */
+	@RequiresPermissions("basics:taskInfo:edit")
 	@RequestMapping(value = "delete")
 	public String delete(String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] delId = ids.split(",");
diff --git a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
index c20c7c975..0fb3745cf 100644
--- a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
+++ b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
@@ -5,6 +5,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -38,6 +39,7 @@ public class RequestInfoController extends BaseController{
 	/**
 	 * 进入用户添加或修改页面
 	 */
+	@RequiresPermissions("cfg:requestInfo:edit")
 	@RequestMapping(value={"form"})
 	public String form(RequestInfo requestInfo, Model model) {
 		TaskInfo taskInfo = new TaskInfo();
@@ -55,6 +57,7 @@ public class RequestInfoController extends BaseController{
 	/**
 	 * 新增/修改
 	 */
+	@RequiresPermissions("cfg:requestInfo:edit")
 	@RequestMapping(value = "saveOrUpdate")
 	public String saveOrUpdate(RequestInfo requestInfo, HttpServletRequest request, Model model, RedirectAttributes redirectAttributes) {
 		try {
@@ -100,6 +103,7 @@ public class RequestInfoController extends BaseController{
      * @param model
      * @return
      */
+	@RequiresPermissions("cfg:requestInfo:edit")
 	@RequestMapping(value = "requestExamine")
     public String requestExamine(String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] exId = ids.split(",");
@@ -114,6 +118,7 @@ public class RequestInfoController extends BaseController{
 	 * @param model
 	 * @return
 	 */
+	@RequiresPermissions("cfg:requestInfo:edit")
 	@RequestMapping(value = "requestExamineNo")
 	public String requestExamineNo(String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] noId = ids.split(",");
@@ -128,6 +133,7 @@ public class RequestInfoController extends BaseController{
 	 * @param model
 	 * @return
 	 */
+	@RequiresPermissions("cfg:requestInfo:edit")
 	@RequestMapping(value = "requestCancelExamine")
 	public String requestCancelExamine(String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] canclelId = ids.split(",");
@@ -142,6 +148,7 @@ public class RequestInfoController extends BaseController{
 	 * @param model
 	 * @return
 	 */
+	@RequiresPermissions("cfg:requestInfo:edit")
 	@RequestMapping(value = "delete")
 	public String delete(String ids, Model model,RedirectAttributes redirectAttributes){
 		String[] delId = ids.split(",");
diff --git a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java
new file mode 100644
index 000000000..c59599481
--- /dev/null
+++ b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java
@@ -0,0 +1,292 @@
+package com.nis.web.controller.specific;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.nis.domain.Page;
+import com.nis.domain.specific.SpecificServiceCfg;
+import com.nis.util.StringUtil;
+import com.nis.util.StringUtils;
+import com.nis.web.controller.BaseController;
+
+@Controller
+@RequestMapping(value = "${adminPath}/specific/specificServiceCfg")
+public class SpecificServiceCfgController extends BaseController {
+
+/*	@ModelAttribute
+	public SpecificServiceCfg get(@RequestParam(required=false)Integer specServiceId) {
+		if (!StringUtil.isEmpty(specServiceId)) {
+			SpecificServiceCfg ss = specificServiceCfgService.getBySpecServiceId(specServiceId);
+			return ss==null?new SpecificServiceCfg():ss;
+		} else {
+			return new SpecificServiceCfg();
+		}
+	}*/
+
+	/**
+	 * 查出分页列表
+	 * 
+	 * @param specificServiceCfg
+	 * @param request
+	 * @param response
+	 * @param model
+	 * @return
+	 */
+	@RequiresPermissions("sys:dict:view")
+	@RequestMapping(value = "list")
+	public String list(SpecificServiceCfg specificServiceCfg, HttpServletRequest request, HttpServletResponse response,
+			Model model) {
+		String searchType = null;
+		String searchContent = null;
+		if(specificServiceCfg.getSpecServiceId()!=null){
+			searchType = "specServiceId";
+			searchContent = specificServiceCfg.getSpecServiceId().toString();
+		}
+		if(!StringUtils.isBlank(specificServiceCfg.getSpecServiceName())){
+			searchType = "specServiceName";
+			searchContent = specificServiceCfg.getSpecServiceName();
+		}
+		if(!StringUtils.isBlank(specificServiceCfg.getSpecServiceDesc())){
+			searchType = "specServiceDesc";
+			searchContent = specificServiceCfg.getSpecServiceDesc();
+		}
+		if(specificServiceCfg.getGroupId()!=null){
+			searchType = "groupId";
+			searchContent = specificServiceCfg.getGroupId().toString();
+		}
+		model.addAttribute("searchType", searchType);
+		model.addAttribute("searchContent", searchContent);
+		
+		Page<SpecificServiceCfg> pageCondition = new Page<SpecificServiceCfg>(request, response);
+		// 取出所有符合条件的数据
+		List<SpecificServiceCfg> allList = specificServiceCfgService.findAllSpecificServiceCfg(specificServiceCfg,pageCondition.getOrderBy());
+		model.addAttribute("showTotalCount", allList.size());
+		// 取出所有符合条件的顶层分页
+		Page<SpecificServiceCfg> page = specificServiceCfgService
+				.findTopPage(pageCondition, specificServiceCfg);
+		// 植入序号
+		for (int i = 0; i < page.getList().size(); i++) {
+			page.getList().get(i).setShowSequence("" + (i + 1 + ((page.getPageNo() - 1) * page.getPageSize())));
+		}
+		model.addAttribute("page", page);
+		// 删除顶层数据、取出id 优化处理
+		List<Integer> intList = Lists.newArrayList();
+		for (SpecificServiceCfg tempSS : page.getList()) {
+			if (tempSS != null) {
+				intList.add(tempSS.getSpecServiceId());
+			}
+		}
+		for (int i = allList.size() - 1; i >= 0; i--) {
+			SpecificServiceCfg ss = allList.get(i);
+			if ((ss != null && intList.contains(ss.getSpecServiceId())) || (ss != null && ss.getParent().getSpecServiceId() == 0)) {
+				allList.remove(ss);
+			}
+		}
+
+		allList.addAll(page.getList());
+		
+		List<SpecificServiceCfg> list = Lists.newArrayList();
+		SpecificServiceCfg.sortList(list, allList, 0, true);
+		//处理下级序号
+		SpecificServiceCfg.addChildrenSeq(list, 0);
+		
+		model.addAttribute("list", list);
+
+		return "/specific/specificServiceCfgList";
+	}
+
+	/**
+	 * 进入查看或新增、修改页面
+	 * 
+	 * @param specificServiceCfg
+	 * @param model
+	 * @param doAction
+	 * @param mulitId
+	 * @return
+	 */
+	@RequestMapping(value = { "form" })
+	public String form(SpecificServiceCfg specificServiceCfg, Model model, String doAction, String mulitId) {
+		
+		Integer id = 0;
+		if (mulitId != null) {
+			String[] ids = mulitId.split(",");
+			id = Integer.valueOf(ids[0]);
+		}
+		if (id != 0) {
+			specificServiceCfg = specificServiceCfgService.getBySpecServiceId(id);
+		}
+		if (specificServiceCfg == null || specificServiceCfg.getParent() == null
+				|| specificServiceCfg.getParent().getSpecServiceId() == 0) {
+			SpecificServiceCfg parent = new SpecificServiceCfg();
+			parent.setSpecServiceId(0);
+			parent.setSpecServiceName("根节点");
+			specificServiceCfg.setParent(parent);
+		}
+		model.addAttribute("specificServiceCfg", specificServiceCfg);
+		if (doAction != null && doAction.equals("0")) {
+			return "/specific/specificServiceCfgInfo";
+		}
+		return "/specific/specificServiceCfgForm";
+	}
+
+	/**
+	 * 新增或保存
+	 * @param specificServiceCfg
+	 * @param model
+	 * @param redirectAttributes
+	 * @return
+	 */
+	@RequiresPermissions("sys:dict:edit")
+	@RequestMapping(value="saveOrUpdate")
+	public String saveOrUpdate(SpecificServiceCfg specificServiceCfg, Model model,
+			RedirectAttributes redirectAttributes,Integer oldId) {
+		try {
+			specificServiceCfgService.saveOrUpdate(specificServiceCfg,oldId);
+			addMessage(redirectAttributes, "保存成功");
+		} catch (Exception e) {
+			e.printStackTrace();
+			addMessage(redirectAttributes, "保存失败！");
+		}
+		return "redirect:" + adminPath + "/specific/specificServiceCfg/list";
+	}
+	
+	/**
+	 * 删除
+	 * @param specificServiceCfg
+	 * @param redirectAttributes
+	 * @param mulitId
+	 * @return
+	 */
+	@RequestMapping(value="delete")
+	public String delete(SpecificServiceCfg specificServiceCfg, RedirectAttributes redirectAttributes, String mulitId){
+		try{
+			specificServiceCfgService.delete(mulitId);
+			addMessage(redirectAttributes,"删除成功");
+		}catch (Exception e){
+			e.printStackTrace();
+			addMessage(redirectAttributes,"删除失败");
+		}
+		
+		return "redirect:"+adminPath+"/specific/specificServiceCfg/list";
+	}
+	
+	/**
+	 * 父节点选择树形结构
+	 * @param extId
+	 * @param isShowHide
+	 * @param response
+	 * @return
+	 */
+	@RequiresPermissions("user")
+	@ResponseBody
+	@RequestMapping(value = "treeData")
+	public List<Map<String, Object>> treeData(@RequestParam(required=false) String extId,@RequestParam(required=false) String isShowHide, HttpServletResponse response){
+		List<Map<String, Object>> mapList = Lists.newArrayList();
+		Map<String, Object> map2 = Maps.newHashMap();
+		map2.put("id", 0);
+		map2.put("pId", 0);
+		map2.put("name","根节点");
+		//map2.put("placeholder","0");
+		mapList.add(map2);
+		List<SpecificServiceCfg> list = specificServiceCfgService.findAllSpecificServiceCfg(new SpecificServiceCfg(),"");
+		for (int i=0; i<list.size(); i++){
+			SpecificServiceCfg specificServiceCfg = list.get(i);
+			if(StringUtils.isBlank(extId)||(extId!=null&&!extId.equals(specificServiceCfg.getSpecServiceId().toString()))){
+				if(specificServiceCfg.getIsValid().equals(0)||specificServiceCfg.getIsLeaf().equals(1)){
+					continue;
+				}
+				Map<String, Object> map = Maps.newHashMap();
+				map.put("id", specificServiceCfg.getSpecServiceId());
+				map.put("pId", specificServiceCfg.getParent().getSpecServiceId());
+				map.put("name",specificServiceCfg.getSpecServiceName());
+				mapList.add(map);
+			}
+		}
+		return mapList;
+	}
+	
+	/**
+	 * 校验协议id是否重复
+	 * @param specServiceId
+	 * @param oldId
+	 * @return
+	 */
+	@ResponseBody
+	@RequestMapping(value = "isIdRepeat")
+	public boolean isIdRepeat(String specServiceId,String oldId){
+		if(oldId!=null){
+			if(oldId.trim().equals(specServiceId)){
+				return true;
+			}
+		}
+		if(specServiceId!=null){
+			SpecificServiceCfg ss = specificServiceCfgService.getBySpecServiceId(Integer.valueOf(specServiceId));
+		    if(ss==null){
+		    	return true;
+		    }
+		}
+		
+		
+		return false;
+	}
+	
+	
+	/**
+	 * 校验叶子节点无上级不得选为叶子节点
+	 * @param specServiceId
+	 * @param oldId
+	 * @return
+	 */
+	@ResponseBody
+	@RequestMapping(value = "ajaxLeafHasTree")
+	public boolean ajaxLeafHasTree(Integer parentId, Integer newIsLeaf){
+		if(parentId==null||parentId==0){
+			if(newIsLeaf==0){
+				return true;
+			}
+		}
+		if(parentId!=null&parentId!=0){
+			return true;
+		}
+		return false;
+	}
+	
+	
+	/**
+	 * 校验叶子节点有下级不得更改为叶子节点
+	 * @param parent
+	 * @param newIsLeaf
+	 * @return
+	 */
+	@ResponseBody
+	@RequestMapping(value = "ajaxLeafChange")
+	public boolean ajaxLeafChange(Integer parent,Integer newIsLeaf){
+		if(parent==null){
+			return true;
+		}
+		List<SpecificServiceCfg> list = specificServiceCfgService.getChildrenById(parent);
+		if(list==null||list.size()==0){
+			return true;
+		}else{
+			if(newIsLeaf==0){
+				return true;
+			}
+		}
+		return false;
+	}
+	
+}
diff --git a/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java b/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java
new file mode 100644
index 000000000..2b649b788
--- /dev/null
+++ b/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java
@@ -0,0 +1,149 @@
+package com.nis.web.controller.specific;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.google.common.collect.Lists;
+import com.nis.domain.Page;
+import com.nis.domain.specific.SpecificServiceHostCfg;
+import com.nis.util.StringUtil;
+import com.nis.web.controller.BaseController;
+
+@Controller
+@RequestMapping(value = "${adminPath}/specific/specificServiceHostCfg")
+public class SpecificServiceHostCfgController extends BaseController {
+	
+
+	@ModelAttribute
+	public SpecificServiceHostCfg get(@RequestParam(required=false) Integer hostId) {
+		if (!StringUtil.isEmpty(hostId)){
+			return specificServiceHostCfgService.getDictByHostId(hostId);
+		}else{
+			return new SpecificServiceHostCfg();
+		}
+	}
+	
+	/**
+	 * 分页查询
+	 * @param specificServiceHostCfg
+	 * @param request
+	 * @param response
+	 * @param model
+	 * @return
+	 */
+	@RequiresPermissions("sys:dict:view")
+	@RequestMapping(value = "list")
+	public String list(SpecificServiceHostCfg specificServiceHostCfg, HttpServletRequest request, HttpServletResponse response,
+			Model model) {
+		
+		//查出分页数据
+		Page<SpecificServiceHostCfg> page = specificServiceHostCfgService.findSpecHostList(new Page<SpecificServiceHostCfg>(request, response), specificServiceHostCfg);
+        model.addAttribute("page", page);
+        //查出所有
+        List<SpecificServiceHostCfg> list = specificServiceHostCfgService.getAll();
+        List<Integer> listSpecServiceId = Lists.newArrayList();
+        List<String> listSrcIp = Lists.newArrayList();
+        List<String> listDstIp = Lists.newArrayList();
+        for(SpecificServiceHostCfg ssh:list){
+        	if(ssh!=null&&ssh.getSpecServiceId()!=null&&(!listSpecServiceId.contains(ssh.getSpecServiceId()))){
+        		listSpecServiceId.add(ssh.getSpecServiceId());
+        	}
+        	if(ssh!=null&&ssh.getSrcIp()!=null&&(!listSrcIp.contains(ssh.getSrcIp()))){
+        		listSrcIp.add(ssh.getSrcIp());
+        	}
+        	if(ssh!=null&&ssh.getDstIp()!=null&&(!listDstIp.contains(ssh.getDstIp()))){
+        		listDstIp.add(ssh.getDstIp());
+        	}
+        }
+        model.addAttribute("listSpecServiceId", listSpecServiceId);
+        model.addAttribute("listSrcIp", listSrcIp);
+        model.addAttribute("listDstIp", listDstIp);
+		return "/specific/specificServiceHostCfgList";
+	}
+	
+	/**
+	 * 进入查看、修改或新增页面
+	 * @param specificServiceHostCfg
+	 * @param request
+	 * @param response
+	 * @param model
+	 * @return
+	 */
+	@RequiresPermissions("sys:dict:view")
+	@RequestMapping(value = "form")
+	public String form(SpecificServiceHostCfg specificServiceHostCfg, HttpServletRequest request, HttpServletResponse response, Model model) {
+		
+		return "/specific/specificServiceHostCfgForm";
+	}
+	
+	/**
+	 * 新增或修改
+	 * @param specificServiceHostCfg
+	 * @param model
+	 * @param redirectAttributes
+	 * @param mulitId
+	 * @return
+	 */
+	@RequestMapping(value = "saveOrUpdate")
+	public String saveOrUpdate(SpecificServiceHostCfg specificServiceHostCfg,Model model,RedirectAttributes redirectAttributes){
+		try {
+			specificServiceHostCfgService.saveOrUpdate(specificServiceHostCfg);
+			addMessage(redirectAttributes, "保存成功");
+		} catch (Exception e) {
+			e.printStackTrace();
+			addMessage(redirectAttributes, "保存失败！");
+		}
+		return "redirect:"+adminPath+"/specific/specificServiceHostCfg/list";
+	}
+	/**
+	 * 删除
+	 * @param specificServiceHostCfg
+	 * @param redirectAttributes
+	 * @param mulitId
+	 * @return
+	 */
+	@RequestMapping(value="delete")
+	public String delete(SpecificServiceHostCfg specificServiceHostCfg, RedirectAttributes redirectAttributes, String mulitId){
+		try{
+			specificServiceHostCfgService.delete(mulitId);
+			addMessage(redirectAttributes,"删除成功");
+		}catch (Exception e){
+			e.printStackTrace();
+			addMessage(redirectAttributes,"删除失败");
+		}
+		
+		return "redirect:"+adminPath+"/specific/specificServiceHostCfg/list";
+	}
+	/**
+	 * 校验spec_service_id重复
+	 * @param newId
+	 * @param oldId
+	 */
+	@ResponseBody
+	@RequestMapping(value = "isSpecServiceIdRepeat")
+	public boolean isSpecServiceIdRepeat(String newId,String oldId){
+		if(oldId!=null){
+			oldId.trim().equals(newId);
+			return true;
+		}else{
+			SpecificServiceHostCfg sshc = specificServiceHostCfgService.getBySpecServiceId(Integer.valueOf(newId));
+			if(sshc==null){
+				return true;
+			}
+		}
+		return false;
+	}
+}
diff --git a/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.java b/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.java
index 8516bd740..03da7ab3c 100644
--- a/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.java
+++ b/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.java
@@ -13,17 +13,32 @@ import com.nis.web.dao.MyBatisDao;
 public interface ServiceDictInfoDao extends CrudDao<ServiceDictInfo> {
 	
 	/**
-	 * 查询顶层字典列表（无条件查询(==)）
+	 * 查询顶层字典列表（==）
 	 * @param serviceDictInfo
 	 * @return
 	 */
 	List<ServiceDictInfo> findTopDictList(ServiceDictInfo serviceDictInfo);
 	/**
-	 * 查询顶层字典列表（无条件查询(!=)）
+	 * 查询顶层字典列表（!=）
 	 * @param serviceDictInfo
 	 * @return
 	 */
 	List<ServiceDictInfo> findTopDictListN(ServiceDictInfo serviceDictInfo);
+	/**
+	 * findAllServiceDictInfo
+	 */
+	/**
+	 * 查询所有字典列表（==）
+	 * @param serviceDictInfo
+	 * @return
+	 */
+	List<ServiceDictInfo> findAllServiceDictInfo(@Param("serviceDictInfo")ServiceDictInfo serviceDictInfo,@Param("orderBy")String orderBy);
+	/**
+	 * 查询所有字典列表（!=）
+	 * @param serviceDictInfo
+	 * @return
+	 */
+	List<ServiceDictInfo> findAllServiceDictInfoN(@Param("serviceDictInfo")ServiceDictInfo serviceDictInfo,@Param("orderBy")String orderBy);
 	/**
 	 * 查出所有有效数据
 	 */
@@ -38,32 +53,6 @@ public interface ServiceDictInfoDao extends CrudDao<ServiceDictInfo> {
 	 * @return
 	 */
 	List<ServiceDictInfo> getDictByParentId(Integer parentId);
-	/**
-	 * 查询条件查询顶层字典列表（含条件查询(==)）
-	 * @param serviceDictInfo
-	 * @return
-	 */
-	List<ServiceDictInfo> findDictTopSearchList(ServiceDictInfo serviceDictInfo);
-	/**
-	 * 查询条件查询顶层字典列表（含条件查询(!=)）
-	 * @param serviceDictInfo
-	 * @return
-	 */
-	List<ServiceDictInfo> findDictTopSearchListN(ServiceDictInfo serviceDictInfo);
-	/**
-	 * 查询条件查询所有字典列表（含条件查询(==)）
-	 * @param serviceDictInfo
-	 * @return
-	 */
-	List<ServiceDictInfo> findAllDictSearchList(ServiceDictInfo serviceDictInfo);
-	/**
-	 * 查询条件查询所有字典列表（含条件查询(!=)）
-	 * @param serviceDictInfo
-	 * @return
-	 */
-	List<ServiceDictInfo> findAllDictSearchListN(ServiceDictInfo serviceDictInfo);
-	
-
     /**
      * 添加字典信息
      * @param serviceDictInfo
diff --git a/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml b/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml
index 8534c417b..1248f2295 100644
--- a/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml
@@ -68,102 +68,7 @@
   
   
   <!-- 查询顶层分页列表 (==)-->
-    <select id="findTopDictList" resultMap="dictResultMap" parameterType="com.nis.domain.basics.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;= #{endDate,jdbcType=TIMESTAMP}
-    </if> 
-     <if test="editBeginDate !=null" >
-      AND edit_time &gt;= #{editBeginDate,jdbcType=TIMESTAMP}
-    </if>
-    <if test="editEndDate !=null" >
-       AND edit_time &lt;= #{editEndDate,jdbcType=TIMESTAMP}
-    </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.basics.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;= #{endDate,jdbcType=TIMESTAMP}
-    </if> 
-     <if test="editBeginDate !=null" >
-      AND edit_time &gt;= #{editBeginDate,jdbcType=TIMESTAMP}
-    </if>
-    <if test="editEndDate !=null" >
-       AND edit_time &lt;= #{editEndDate,jdbcType=TIMESTAMP}
-    </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 AND s.parent_id != 0
-	</select>
-
-	<!-- 查询所有非叶子配置 -->
-	<select id="findAllNoLeafDictList" resultType="com.nis.domain.basics.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}
-	ORDER BY s.create_time desc
-	</select>
-
-  <!-- 条件查询顶层分页(==) -->
-        <select id="findDictTopSearchList" resultMap="dictResultMap" parameterType="com.nis.domain.basics.ServiceDictInfo">
+ <select id="findTopDictList" resultMap="dictResultMap" parameterType="com.nis.domain.basics.ServiceDictInfo">
 	SELECT * FROM service_dict_info s WHERE  s.is_valid=1  
 	
     <if test="itemCode != null and itemCode != '' " >
@@ -204,12 +109,12 @@
 			    <if test="endDate !=null" >
 			       AND s2.create_time &lt;= #{endDate,jdbcType=TIMESTAMP}
 			    </if> 
-			         <if test="editBeginDate !=null" >
-      AND edit_time &gt;= #{editBeginDate,jdbcType=TIMESTAMP}
-    </if>
-    <if test="editEndDate !=null" >
-       AND edit_time &lt;= #{editEndDate,jdbcType=TIMESTAMP}
-    </if> 
+			    <if test="editBeginDate !=null" >
+			      AND edit_time &gt;= #{editBeginDate,jdbcType=TIMESTAMP}
+			    </if>
+			    <if test="editEndDate !=null" >
+			       AND edit_time &lt;= #{editEndDate,jdbcType=TIMESTAMP}
+			    </if> 
                 )
      <choose>
 		<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -222,8 +127,8 @@
     
   </select>
   
-   <!-- 条件查询顶层分页(!=) -->
-        <select id="findDictTopSearchListN" resultMap="dictResultMap" parameterType="com.nis.domain.basics.ServiceDictInfo">
+   <!-- 查询顶层分页列表 (!=)-->
+ <select id="findTopDictListN" resultMap="dictResultMap" parameterType="com.nis.domain.basics.ServiceDictInfo">
 	SELECT * FROM service_dict_info s WHERE  s.is_valid=1  
 	
     <if test="itemCode != null and itemCode != '' " >
@@ -265,11 +170,11 @@
 			       AND s2.create_time &lt;= #{endDate,jdbcType=TIMESTAMP}
 			    </if> 
 			    <if test="editBeginDate !=null" >
-				   AND edit_time &gt;= #{editBeginDate,jdbcType=TIMESTAMP}
+			      AND edit_time &gt;= #{editBeginDate,jdbcType=TIMESTAMP}
 			    </if>
-				<if test="editEndDate !=null" >
-				   AND edit_time &lt;= #{editEndDate,jdbcType=TIMESTAMP}
-				</if> 
+			    <if test="editEndDate !=null" >
+			       AND edit_time &lt;= #{editEndDate,jdbcType=TIMESTAMP}
+			    </if> 
                 )
      <choose>
 		<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -281,62 +186,98 @@
 	</choose> 
     
   </select>
-  
-  
-  
-    <!-- 条件查询所有列表 (==)-->
-    <select id="findAllDictSearchList" resultMap="dictResultMap" parameterType="com.nis.domain.basics.ServiceDictInfo">
+   
+      <!-- 查询所有列表 (==)-->
+    <select id="findAllServiceDictInfo" resultMap="dictResultMap">
 	SELECT * FROM service_dict_info WHERE  is_valid=1 
 	
-	<if test="itemValue != null and itemValue != '' " >
-      AND item_value like '%${itemValue}%'
+	<if test="serviceDictInfo.itemValue != null and serviceDictInfo.itemValue != '' " >
+      AND item_value like '%${serviceDictInfo.itemValue}%'
     </if>
-    <if test="itemCode != null and itemCode != '' " >
-      AND item_code like '%${itemCode}%'
+    <if test="serviceDictInfo.itemCode != null and serviceDictInfo.itemCode != '' " >
+      AND item_code like '%${serviceDictInfo.itemCode}%'
     </if>
-    <if test="itemType != null and itemType != '' " >
-      AND item_type = #{itemType}
+    <if test="serviceDictInfo.itemType != null and serviceDictInfo.itemType != '' " >
+      AND item_type = #{serviceDictInfo.itemType}
     </if>
-    <if test="beginDate !=null" >
-      AND create_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
+    <if test="serviceDictInfo.beginDate !=null" >
+      AND create_time &gt;= #{serviceDictInfo.beginDate,jdbcType=TIMESTAMP}
     </if>
-    <if test="endDate !=null" >
-       AND create_time &lt;= #{endDate,jdbcType=TIMESTAMP}
+    <if test="serviceDictInfo.endDate !=null" >
+       AND create_time &lt;= #{serviceDictInfo.endDate,jdbcType=TIMESTAMP}
     </if> 
-    <if test="editBeginDate !=null" >
-      AND edit_time &gt;= #{editBeginDate,jdbcType=TIMESTAMP}
+    <if test="serviceDictInfo.editBeginDate !=null" >
+      AND edit_time &gt;= #{serviceDictInfo.editBeginDate,jdbcType=TIMESTAMP}
     </if>
-    <if test="editEndDate !=null" >
-       AND edit_time &lt;= #{editEndDate,jdbcType=TIMESTAMP}
+    <if test="serviceDictInfo.editEndDate !=null" >
+       AND edit_time &lt;= #{serviceDictInfo.editEndDate,jdbcType=TIMESTAMP}
     </if> 
+      <choose>
+		<when test="orderBy != null and orderBy != ''">
+			ORDER BY ${orderBy}
+		</when>
+		<otherwise>
+			ORDER BY create_time desc
+		</otherwise>
+	</choose> 
   </select>
   
-   <!-- 条件查询所有列表 (!=)-->
-<select id="findAllDictSearchListN" resultMap="dictResultMap" parameterType="com.nis.domain.basics.ServiceDictInfo">
+   <!-- 查询所有列表 (!=)-->
+<select id="findAllServiceDictInfoN" resultMap="dictResultMap">
 	SELECT * FROM service_dict_info WHERE  is_valid=1
 	
-	<if test="itemValue != null and itemValue != '' " >
-      AND item_value like '%${itemValue}%'
+	<if test="serviceDictInfo.itemValue != null and serviceDictInfo.itemValue != '' " >
+      AND item_value like '%${serviceDictInfo.itemValue}%'
     </if>
-    <if test="itemCode != null and itemCode != '' " >
-      AND item_code like '%${itemCode}%'
+    <if test="serviceDictInfo.itemCode != null and serviceDictInfo.itemCode != '' " >
+      AND item_code like '%${serviceDictInfo.itemCode}%'
     </if>
-    <if test="itemType != null and itemType != '' " >
-      AND item_type != #{itemType}
+    <if test="serviceDictInfo.itemType != null and serviceDictInfo.itemType != '' " >
+      AND item_type != #{serviceDictInfo.itemType}
     </if>
-    <if test="beginDate !=null" >
-      AND create_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
+    <if test="serviceDictInfo.beginDate !=null" >
+      AND create_time &gt;= #{serviceDictInfo.beginDate,jdbcType=TIMESTAMP}
     </if>
-    <if test="endDate !=null" >
-       AND create_time &lt;= #{endDate,jdbcType=TIMESTAMP}
+    <if test="serviceDictInfo.endDate !=null" >
+       AND create_time &lt;= #{serviceDictInfo.endDate,jdbcType=TIMESTAMP}
     </if> 
-         <if test="editBeginDate !=null" >
-      AND edit_time &gt;= #{editBeginDate,jdbcType=TIMESTAMP}
+         <if test="serviceDictInfo.editBeginDate !=null" >
+      AND edit_time &gt;= #{serviceDictInfo.editBeginDate,jdbcType=TIMESTAMP}
     </if>
-    <if test="editEndDate !=null" >
-       AND edit_time &lt;= #{editEndDate,jdbcType=TIMESTAMP}
+    <if test="serviceDictInfo.editEndDate !=null" >
+       AND edit_time &lt;= #{serviceDictInfo.editEndDate,jdbcType=TIMESTAMP}
     </if> 
+     <choose>
+		<when test="orderBy != null and orderBy != ''">
+			ORDER BY ${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 AND s.parent_id != 0
+	</select>
+
+	<!-- 查询所有非叶子配置 -->
+	<select id="findAllNoLeafDictList" resultType="com.nis.domain.basics.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}
+	ORDER BY s.create_time desc
+	</select>
+
+  
+
+  
    
   
       
diff --git a/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.java b/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.java
index 41badab51..0d6597782 100644
--- a/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.java
+++ b/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.java
@@ -2,6 +2,8 @@ package com.nis.web.dao.basics;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.nis.domain.basics.SysDictInfo;
 import com.nis.web.dao.CrudDao;
 import com.nis.web.dao.MyBatisDao;
@@ -12,48 +14,35 @@ public interface SysDictInfoDao extends CrudDao<SysDictInfo> {
 	
 	
 	/**
-	 * 查询顶层字典列表（无条件查询(==)）
+	 * 查询顶层字典列表（==)）
 	 * @param sysDictInfo
 	 * @return
 	 */
 	List<SysDictInfo> findTopDictList(SysDictInfo sysDictInfo);
 	/**
-	 * 查询顶层字典列表（无条件查询(!=)）
+	 * 查询顶层字典列表（!=）
 	 * @param sysDictInfo
 	 * @return
 	 */
 	List<SysDictInfo> findTopDictListN(SysDictInfo sysDictInfo);
-
+	/**
+	 * 查询所有字典列表（含条件查询(==)）
+	 * @param sysDictInfo
+	 * @return
+	 */
+	List<SysDictInfo> findAllSysDictInfo(@Param("sysDictInfo")SysDictInfo sysDictInfo,@Param("orderBy")String orderBy);
+	/**
+	 * 查询所有字典列表（含条件查询(!=)）
+	 * @param sysDictInfo
+	 * @return
+	 */
+	List<SysDictInfo> findAllSysDictInfoN(@Param("sysDictInfo")SysDictInfo sysDictInfo,@Param("orderBy")String orderBy);
 	/**
 	 * 查出所有有效数据
 	 * @param sysDictInfo
 	 * @return
 	 */
 	List<SysDictInfo> findAllDictList(SysDictInfo sysDictInfo);
-	/**
-	 * 查询条件查询顶层字典列表（含条件查询(==)）
-	 * @param sysDictInfo
-	 * @return
-	 */
-	List<SysDictInfo> findDictTopSearchList(SysDictInfo sysDictInfo);
-	/**
-	 * 查询条件查询顶层字典列表（含条件查询(!=)）
-	 * @param sysDictInfo
-	 * @return
-	 */
-	List<SysDictInfo> findDictTopSearchListN(SysDictInfo sysDictInfo);
-	/**
-	 * 查询字典列表（含条件查询(==)）
-	 * @param sysDictInfo
-	 * @return
-	 */
-	List<SysDictInfo> findAllDictSearchList(SysDictInfo sysDictInfo);
-	/**
-	 * 查询字典列表（含条件查询(!=)）
-	 * @param sysDictInfo
-	 * @return
-	 */
-	List<SysDictInfo> findAllDictSearchListN(SysDictInfo sysDictInfo);
     /**
      * 添加字典信息
      * @param sysDictInfo
@@ -66,8 +55,6 @@ public interface SysDictInfoDao extends CrudDao<SysDictInfo> {
 	 * @return
 	 */
 	SysDictInfo getDictById(Integer sysDictId);
-	
-
 	/**
 	 * 查询所有的非叶子配置
 	 * @param itemType
diff --git a/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml b/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml
index 736bea552..b3193b41b 100644
--- a/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml
@@ -50,79 +50,6 @@
 		LEFT JOIN sys_dict_info p ON p.sys_dict_id = s.parent_id
     </sql>
   
-   <!-- 查询顶层分页列表 (==)-->
-    <select id="findTopDictList" resultMap="dictResultMap" parameterType="com.nis.domain.basics.SysDictInfo">
-	SELECT * FROM sys_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;= #{endDate,jdbcType=TIMESTAMP}
-    </if> 
-     <if test="editBeginDate !=null" >
-      AND edit_time &gt;= #{editBeginDate,jdbcType=TIMESTAMP}
-    </if>
-    <if test="editEndDate !=null" >
-       AND edit_time &lt;= #{editEndDate,jdbcType=TIMESTAMP}
-    </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.basics.SysDictInfo">
-	SELECT * FROM sys_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;= #{endDate,jdbcType=TIMESTAMP}
-    </if> 
-     <if test="editBeginDate !=null" >
-      AND edit_time &gt;= #{editBeginDate,jdbcType=TIMESTAMP}
-    </if>
-    <if test="editEndDate !=null" >
-       AND edit_time &lt;= #{editEndDate,jdbcType=TIMESTAMP}
-    </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="sysDictInfo">
 		SELECT
@@ -132,8 +59,8 @@
 		WHERE s.is_valid =1 
 	</select>
 	
-	   <!-- 条件查询顶层分页(==) -->
-        <select id="findDictTopSearchList" resultMap="dictResultMap" parameterType="com.nis.domain.basics.SysDictInfo">
+	   <!-- 查询顶层分页(==) -->
+        <select id="findTopDictList" resultMap="dictResultMap" parameterType="com.nis.domain.basics.SysDictInfo">
 	SELECT * FROM sys_dict_info s WHERE  s.is_valid=1  
 	
     <if test="itemCode != null and itemCode != '' " >
@@ -192,8 +119,8 @@
     
   </select>
   
-  	   <!-- 条件查询顶层分页(!=) -->
-        <select id="findDictTopSearchListN" resultMap="dictResultMap" parameterType="com.nis.domain.basics.SysDictInfo">
+  	   <!-- 查询顶层分页(!=) -->
+        <select id="findTopDictListN" resultMap="dictResultMap" parameterType="com.nis.domain.basics.SysDictInfo">
 	SELECT * FROM sys_dict_info s WHERE  s.is_valid=1  
 	
     <if test="itemCode != null and itemCode != '' " >
@@ -252,57 +179,73 @@
     
   </select>
 	
-	  <!-- 条件查询所有(==) -->
-        <select id="findAllDictSearchList" resultMap="dictResultMap" parameterType="com.nis.domain.basics.SysDictInfo">
+	  <!-- 查询所有(==) -->
+        <select id="findAllSysDictInfo" resultMap="dictResultMap">
 	SELECT * FROM sys_dict_info WHERE  is_valid=1  
 	
-	<if test="itemType != null and itemType != '' " >
-      AND item_type = ${itemType}
+	<if test="sysDictInfo.itemType != null and sysDictInfo.itemType != '' " >
+      AND item_type = ${sysDictInfo.itemType}
     </if>
-    <if test="itemCode != null and itemCode != '' " >
-      AND item_code like '%${itemCode}%'
+    <if test="sysDictInfo.itemCode != null and sysDictInfo.itemCode != '' " >
+      AND item_code like '%${sysDictInfo.itemCode}%'
     </if>
-    <if test="itemValue!= null and itemValue != '' " >
-      AND item_value like '%${itemValue}%'
+    <if test="sysDictInfo.itemValue!= null and sysDictInfo.itemValue != '' " >
+      AND item_value like '%${sysDictInfo.itemValue}%'
     </if>
-    <if test="beginDate !=null" >
-      AND create_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
+    <if test="sysDictInfo.beginDate !=null" >
+      AND create_time &gt;= #{sysDictInfo.beginDate,jdbcType=TIMESTAMP}
     </if>
-    <if test="endDate !=null" >
-       AND create_time &lt;= #{endDate,jdbcType=TIMESTAMP}
+    <if test="sysDictInfo.endDate !=null" >
+       AND create_time &lt;= #{sysDictInfo.endDate,jdbcType=TIMESTAMP}
     </if> 
-    <if test="editBeginDate !=null" >
-      AND edit_time &gt;= #{editBeginDate,jdbcType=TIMESTAMP}
+    <if test="sysDictInfo.editBeginDate !=null" >
+      AND edit_time &gt;= #{sysDictInfo.editBeginDate,jdbcType=TIMESTAMP}
     </if>
-    <if test="editEndDate !=null" >
-       AND edit_time &lt;= #{editEndDate,jdbcType=TIMESTAMP}
+    <if test="sysDictInfo.editEndDate !=null" >
+       AND edit_time &lt;= #{sysDictInfo.editEndDate,jdbcType=TIMESTAMP}
     </if> 
+     <choose>
+		<when test="orderBy != null and orderBy != ''">
+			ORDER BY ${orderBy}
+		</when>
+		<otherwise>
+			ORDER BY create_time desc
+		</otherwise>
+	</choose> 
   </select>
-  	  <!-- 条件查询所有(!=) -->
-        <select id="findAllDictSearchListN" resultMap="dictResultMap" parameterType="com.nis.domain.basics.SysDictInfo">
+  	  <!-- 查询所有(!=) -->
+        <select id="findAllSysDictInfoN" resultMap="dictResultMap">
 	SELECT * FROM sys_dict_info WHERE  is_valid=1  
 	
-	<if test="itemType != null and itemType != '' " >
-      AND item_type = ${itemType}
+	<if test="sysDictInfo.itemType != null and sysDictInfo.itemType != '' " >
+      AND item_type = ${sysDictInfo.itemType}
     </if>
-    <if test="itemCode != null and itemCode != '' " >
-      AND item_code like '%${itemCode}%'
+    <if test="sysDictInfo.itemCode != null and sysDictInfo.itemCode != '' " >
+      AND item_code like '%${sysDictInfo.itemCode}%'
     </if>
-    <if test="itemValue!= null and itemValue != '' " >
-      AND item_value like '%${itemValue}%'
+    <if test="sysDictInfo.itemValue!= null and sysDictInfo.itemValue != '' " >
+      AND item_value like '%${sysDictInfo.itemValue}%'
     </if>
-    <if test="beginDate !=null" >
-      AND create_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
+    <if test="sysDictInfo.beginDate !=null" >
+      AND create_time &gt;= #{sysDictInfo.beginDate,jdbcType=TIMESTAMP}
     </if>
-    <if test="endDate !=null" >
-       AND create_time &lt;= #{endDate,jdbcType=TIMESTAMP}
+    <if test="sysDictInfo.endDate !=null" >
+       AND create_time &lt;= #{sysDictInfo.endDate,jdbcType=TIMESTAMP}
     </if> 
-    <if test="editBeginDate !=null" >
-      AND edit_time &gt;= #{editBeginDate,jdbcType=TIMESTAMP}
+    <if test="sysDictInfo.editBeginDate !=null" >
+      AND edit_time &gt;= #{sysDictInfo.editBeginDate,jdbcType=TIMESTAMP}
     </if>
-    <if test="editEndDate !=null" >
-       AND edit_time &lt;= #{editEndDate,jdbcType=TIMESTAMP}
+    <if test="sysDictInfo.editEndDate !=null" >
+       AND edit_time &lt;= #{sysDictInfo.editEndDate,jdbcType=TIMESTAMP}
     </if> 
+    <choose>
+		<when test="orderBy != null and orderBy != ''">
+			ORDER BY ${orderBy}
+		</when>
+		<otherwise>
+			ORDER BY create_time desc
+		</otherwise>
+	</choose>
   </select>
   
   <!-- 根据主键查询字典详细信息 -->
diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
index aa64cb5cb..890f20906 100644
--- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
@@ -39,6 +39,7 @@
 		u.name AS editorName,
 		r.edit_time AS editTime,
 		e.name AS currentName,
+		e.name AS auditorName,
 		r.audit_time AS auditTime,
 		t.task_name AS taskName
 	from request_info r
@@ -46,7 +47,7 @@
 	left join sys_user u on r.editor_id=u.id
 	left join sys_user e on r.auditor_id=e.id
 	left join task_info t on r.task_id=t.id
-	where r.is_valid=1 and r.is_audit !=3
+	where r.is_valid!=-1 and r.is_audit !=3
 	<if test="requestTitle != null and requestTitle != ''">
 			AND r.request_title like 
 				<if test="dbName == 'mysql'">CONCAT('%',#{requestTitle}, '%')</if>
@@ -56,7 +57,8 @@
 				<if test="dbName == 'mysql'">CONCAT('%',#{requestContent},'%')</if>
 	</if>
 	<if test="requestNumber != null and requestNumber != ''">
-			AND r.request_number=#{requestNumber}
+			AND r.request_number like
+			<if test="dbName == 'mysql'">CONCAT('%',#{requestNumber},'%')</if>
 	</if>
 	<if test="isAudit != null">
 			AND r.is_audit=${isAudit}
@@ -65,9 +67,18 @@
 			AND r.request_time between #{beginDate} and #{endDate}
  	</if>
 	<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
-			AND (r.create_time between #{dobeginDate} and #{doendDate}) or (r.audit_time between #{dobeginDate} and #{doendDate})
-	</if> 
-	order by r.request_time desc
+			AND r.edit_time between #{dobeginDate} and #{doendDate}
+	</if>
+	
+	<choose>
+		<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+			ORDER BY ${page.orderBy}
+		</when>
+		<otherwise>
+			ORDER BY r.create_time desc
+		</otherwise>
+	</choose>
+	
   </select>
   <!-- 根据来函号查询 -->
   <select id="getRequestInfoByRequestNumber" parameterType="java.lang.String" resultMap="BaseResultMap">
@@ -78,10 +89,31 @@
   </select>
   <!-- 根据来id查询 -->
   <select id="getRequestInfoById" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List"/>
-    from request_info
-    where id = #{id,jdbcType=BIGINT}
+    	select
+		r.id AS id,
+		r.task_id AS taskId,
+		r.request_number AS requestNumber,
+		r.request_org AS requestOrg,
+		r.request_time AS requestTime,
+		r.request_title AS requestTitle,
+		r.request_content AS requestContent,
+		r.is_valid AS isValid,
+		r.is_audit AS isAudit,
+		s.name AS creatorName,
+		r.create_time AS createTime,
+		u.name AS editorName,
+		r.edit_time AS editTime,
+		e.name AS currentName,
+		e.name AS auditorName,
+		r.audit_time AS auditTime,
+		t.task_name AS taskName
+	from request_info r
+	left join sys_user s on r.creator_id=s.id
+	left join sys_user u on r.editor_id=u.id
+	left join sys_user e on r.auditor_id=e.id
+	left join task_info t on r.task_id=t.id
+	where r.is_valid!=-1 and r.is_audit !=3
+    and r.id = #{id,jdbcType=BIGINT}
   </select>
   <!-- 新增 -->
   <insert id="insert" parameterType="com.nis.domain.configuration.RequestInfo">
@@ -98,31 +130,32 @@
 		editor_id, 
 		edit_time, 
 		auditor_id,
-		audit_time
+		audit_time,
+		task_id
 	)
     values (#{requestNumber,jdbcType=VARCHAR}, #{requestOrg,jdbcType=VARCHAR}, 
       #{requestTime,jdbcType=DATE}, #{requestTitle,jdbcType=VARCHAR}, #{requestContent,jdbcType=VARCHAR}, 
       #{isValid,jdbcType=INTEGER}, #{isAudit,jdbcType=INTEGER}, #{creatorId,jdbcType=INTEGER}, 
       #{createTime,jdbcType=DATE}, #{editorId,jdbcType=INTEGER}, #{editTime,jdbcType=DATE}, 
-      #{auditorId,jdbcType=INTEGER}, #{auditTime,jdbcType=DATE})
+      #{auditorId,jdbcType=INTEGER}, #{auditTime,jdbcType=DATE}, #{taskId,jdbcType=BIGINT})
   </insert>
    <!--修改  -->
   <update id="update" parameterType="com.nis.domain.configuration.RequestInfo">
     update request_info
     <set>
-      <if test="requestNumber != null">
+      <if test="requestNumber != null and requestNumber!=''" >
         request_number = #{requestNumber,jdbcType=VARCHAR},
       </if>
-      <if test="requestOrg != null">
+      <if test="requestOrg != null and requestOrg!=''">
         request_org = #{requestOrg,jdbcType=VARCHAR},
       </if>
       <if test="requestTime != null">
         request_time = #{requestTime,jdbcType=DATE},
       </if>
-      <if test="requestTitle != null">
+      <if test="requestTitle != null and requestTitle!=''">
         request_title = #{requestTitle,jdbcType=VARCHAR},
       </if>
-      <if test="requestContent != null">
+      <if test="requestContent != null and requestContent!=''">
         request_content = #{requestContent,jdbcType=VARCHAR},
       </if>
       <if test="isValid != null">
@@ -149,6 +182,9 @@
       <if test="auditTime != null">
         audit_time = #{auditTime,jdbcType=DATE},
       </if>
+      <if test="taskId != null">
+        task_id = #{taskId},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
diff --git a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
index 3e373d774..e64cd5a6b 100644
--- a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml
@@ -20,13 +20,14 @@
     id, task_name, task_org, task_time, task_desc, is_valid, is_audit, creator_id, create_time, 
     editor_id, edit_time, auditor_id, audit_time
   </sql>
-  
+  <!-- 查询有效且通过审核 -->
   <select id="findList" parameterType="com.nis.domain.configuration.TaskInfo" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
-    from task_info
+    from task_info t
+    where is_valid =1 and is_audit =1
     <if test="id!=null">
-   	where id = #{id,jdbcType=BIGINT}
+   		AND id = #{id,jdbcType=BIGINT}
     </if>
   </select>
   
@@ -36,6 +37,7 @@
 		r.id AS id,
 		r.task_name AS taskName,
 		r.task_org AS taskOrg,
+		r.task_desc AS taskDesc,
 		r.task_time AS taskTime,
 		r.is_valid AS isValid,
 		r.is_audit AS isAudit,
@@ -43,13 +45,13 @@
 		r.create_time AS createTime,
 		u.name AS editorName,
 		r.edit_time AS editTime,
-		e.name AS currentName,
+		e.name AS auditorName,
 		r.audit_time AS auditTime
 	from task_info r
 	left join sys_user s on r.creator_id=s.id
 	left join sys_user u on r.editor_id=u.id
 	left join sys_user e on r.auditor_id=e.id
-	where r.is_valid=1 and r.is_audit !=3
+	where r.is_valid!=-1 and r.is_audit !=3
 	<if test="taskName != null and taskName != ''">
 			AND r.task_name like 
 				<if test="dbName == 'mysql'">CONCAT('%',#{taskName}, '%')</if>
@@ -61,9 +63,16 @@
 			AND r.task_time between #{beginDate} and #{endDate}
  	</if>
 	<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
-			AND (r.create_time between #{dobeginDate} and #{doendDate}) or (r.audit_time between #{dobeginDate} and #{doendDate})
+			AND r.edit_time between #{dobeginDate} and #{doendDate}
 	</if> 
-	order by r.task_time desc
+	<choose>
+		<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+			ORDER BY ${page.orderBy}
+		</when>
+		<otherwise>
+			ORDER BY r.create_time desc
+		</otherwise>
+	</choose>
   </select>
   <!-- 根据来函号查询 -->
   <select id="getTaskInfoByTaskName" parameterType="java.lang.String" resultMap="BaseResultMap">
diff --git a/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.java b/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.java
new file mode 100644
index 000000000..f8168198c
--- /dev/null
+++ b/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.java
@@ -0,0 +1,46 @@
+package com.nis.web.dao.specific;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.nis.domain.specific.SpecificServiceCfg;
+import com.nis.web.dao.CrudDao;
+import com.nis.web.dao.MyBatisDao;
+
+@MyBatisDao
+public interface SpecificServiceCfgDao extends CrudDao<SpecificServiceCfg> {
+	
+	/**
+	 * 根据id查出对象
+	 * @param specServiceId
+	 * @return
+	 */
+	SpecificServiceCfg getBySpecServiceId(Integer specServiceId);
+	/**
+	 * 查询所有符合条件顶层分页列表
+	 * @param specificServiceCfg
+	 */
+	List<SpecificServiceCfg> findTopPage(SpecificServiceCfg specificServiceCfg);
+	/**
+	 * 查询所有符合条件的数据
+	 * @param specificServiceCfg
+	 * @return
+	 */
+	List<SpecificServiceCfg> findAllSpecificServiceCfg(@Param("specificServiceCfg")SpecificServiceCfg specificServiceCfg,@Param("orderBy")String orderBy);
+	/**
+	 * 修改配置信息
+	 * @param specificServiceCfg
+	 * @param oldId
+	 */
+	void update(@Param("specificServiceCfg")SpecificServiceCfg specificServiceCfg, @Param("oldId")Integer oldId);
+	/**
+	 * 根据specServiceId查询所有下级
+	 * @param specServiceId
+	 * @return
+	 */
+	List<SpecificServiceCfg> getChildrenById(Integer specServiceId);
+
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml b/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml
new file mode 100644
index 000000000..a4830378a
--- /dev/null
+++ b/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml
@@ -0,0 +1,151 @@
+<?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.specific.SpecificServiceCfgDao" >
+  
+  <resultMap id="CFGResultMap" type="com.nis.domain.specific.SpecificServiceCfg" >
+    <id column="spec_service_id" property="specServiceId" jdbcType="INTEGER" />
+    <result column="spec_service_name" property="specServiceName" jdbcType="VARCHAR" />
+    <result column="spec_service_desc" property="specServiceDesc" jdbcType="VARCHAR" />
+    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
+    <result column="op_time" property="opTime" jdbcType="TIMESTAMP" />
+    <result column="is_leaf" property="isLeaf" jdbcType="INTEGER" />
+    <result column="group_id" property="groupId" jdbcType="INTEGER" />
+     <!-- 父id -->
+	    <association property="parent" javaType="com.nis.domain.specific.SpecificServiceCfg">
+	     <id column="parent_id" property="specServiceId" jdbcType="INTEGER" />
+	    </association>
+  </resultMap>
+
+    <sql id="specificServiceCfgColumns">
+		s.spec_service_id AS specServiceId,
+		s.spec_service_name AS specServiceName,
+		s.spec_service_desc AS specServiceDesc,
+		s.is_valid AS isValid,
+		s.op_time AS opTime,
+		s.parent_id AS "parent.specServiceId",
+		s.is_leaf AS isLeaf,
+		s.group_id AS groupId
+	</sql>
+  
+  
+  <!-- 根据id查出对象 -->
+  <select id="getBySpecServiceId" resultType="com.nis.domain.specific.SpecificServiceCfg" parameterType="java.lang.Integer">
+  select <include refid="specificServiceCfgColumns" />
+  from specific_service_cfg s where s.spec_service_id = #{specServiceId}
+  </select>
+  
+  <!-- 查出所有符合条件的顶层数据 -->
+  
+    <select id="findTopPage" resultMap="CFGResultMap" parameterType="com.nis.domain.specific.SpecificServiceCfg">
+	SELECT * FROM specific_service_cfg s WHERE  s.is_valid=1
+	
+	<if test="specServiceId != null">
+	AND s.spec_service_id like '%${specServiceId}%'
+	</if>
+	<if test="specServiceName != null and specServiceName != '' ">
+	AND s.spec_service_name like '%${specServiceName}%'
+	</if>
+	<if test="specServiceDesc != null and specServiceDesc != '' ">
+	AND s.spec_service_desc like '%${specServiceDesc}%'
+	</if>
+	<if test="groupId != null and groupId != '' ">
+	AND group_id like '%${groupId}%'
+	</if>
+    <if test="beginDate != null" >
+    AND s.op_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
+    </if>
+    <if test="endDate != null" >
+    AND s.op_time &lt;= #{endDate,jdbcType=TIMESTAMP}
+    </if> 
+    AND s.parent_id not in (
+		     SELECT s2.spec_service_id FROM specific_service_cfg s2 WHERE  s2.is_valid=1
+		        <if test="specServiceId != null">
+				AND s2.spec_service_id like '%${specServiceId}%'
+				</if>
+			    <if test="specServiceName != null and specServiceName != '' ">
+				AND s2.spec_service_name like '%${specServiceName}%'
+				</if>
+				<if test="specServiceDesc != null and specServiceDesc != '' ">
+				AND s2.spec_service_desc like '%${specServiceDesc}%'
+				</if>
+				<if test="groupId != null and groupId != '' ">
+				AND group_id like '%${groupId}%'
+				</if>
+			    <if test="beginDate != null" >
+			    AND s2.op_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
+			    </if>
+			    <if test="endDate != null" >
+			    AND s2.op_time &lt;= #{endDate,jdbcType=TIMESTAMP}
+			    </if> 
+		    )
+    <choose>
+		<when test="page != null and page.orderBy != null and page.orderBy != ''">
+			ORDER BY s.${page.orderBy}
+		</when>
+		<otherwise>
+			ORDER BY s.op_time desc
+		</otherwise>
+	</choose>
+    
+  </select>
+  
+  <!-- 查询符合条件的所有数据 -->
+  <select id="findAllSpecificServiceCfg" resultMap="CFGResultMap" >
+  SELECT * from specific_service_cfg where is_valid = 1
+  <if test="specificServiceCfg.specServiceId != null">
+  AND spec_service_id like '%${specificServiceCfg.specServiceId}%'
+  </if>
+  <if test="specificServiceCfg.specServiceName != null and specificServiceCfg.specServiceName != '' ">
+  AND spec_service_name like '%${specificServiceCfg.specServiceName}%'
+  </if>
+  <if test="specificServiceCfg.specServiceDesc != null and specificServiceCfg.specServiceDesc != '' ">
+  AND spec_service_desc like '%${specificServiceCfg.specServiceDesc}%'
+  </if>
+  <if test="specificServiceCfg.groupId != null and specificServiceCfg.groupId != '' ">
+  AND group_id like '%${specificServiceCfg.groupId}%'
+  </if>
+  <if test="specificServiceCfg.beginDate != null">
+  AND op_time &gt; #{specificServiceCfg.beginDate}
+  </if>
+  <if test="specificServiceCfg.endDate != null" >
+  AND op_time &lt; #{specificServiceCfg.endDate}
+  </if>
+  <choose>
+	  <when test="orderBy != null and orderBy != '' ">
+	  ORDER BY ${orderBy}
+	  </when>
+	  <otherwise>
+	  ORDER BY op_time desc
+	  </otherwise>
+  </choose>
+  </select>
+  
+  <!-- 新增 -->
+ <insert id="insert" parameterType="com.nis.domain.specific.SpecificServiceCfg" useGeneratedKeys="true">
+ insert into specific_service_cfg (spec_service_id,spec_service_name,spec_service_desc,is_valid, op_time, parent_id,is_leaf,group_id)
+                            values(#{specServiceId},#{specServiceName},#{specServiceDesc},#{isValid},#{opTime},#{parent.specServiceId},#{isLeaf},#{groupId}) 
+ </insert>
+ 
+ <!-- 修改 -->
+ <update id="update" parameterType="com.nis.domain.specific.SpecificServiceCfg">
+		UPDATE specific_service_cfg s SET 
+		s.spec_service_id = #{specificServiceCfg.specServiceId},
+		s.spec_service_name = #{specificServiceCfg.specServiceName},
+		s.spec_service_desc = #{specificServiceCfg.specServiceDesc},
+		s.is_valid = #{specificServiceCfg.isValid},
+		s.op_time = #{specificServiceCfg.opTime},
+		s.parent_id = #{specificServiceCfg.parent.specServiceId},
+		s.is_leaf = #{specificServiceCfg.isLeaf},
+		s.group_id = #{specificServiceCfg.groupId}
+		WHERE s.spec_service_id = #{oldId}
+</update>
+	
+	<!-- 删除 -->
+	<update id="delete" parameterType="com.nis.domain.specific.SpecificServiceCfg">
+	UPDATE specific_service_cfg s set s.is_valid = #{isValid} where s.spec_service_id = #{specServiceId}
+	</update>
+	<!-- getChildrenById -->
+	<select id="getChildrenById" resultMap="CFGResultMap" parameterType="java.lang.Integer">
+	 SELECT * FROM specific_service_cfg s WHERE  s.is_valid = 1 and s.parent_id = #{specServiceId}
+	</select>
+</mapper>
\ No newline at end of file
diff --git a/src/main/java/com/nis/web/dao/specific/SpecificServiceHostCfgDao.java b/src/main/java/com/nis/web/dao/specific/SpecificServiceHostCfgDao.java
new file mode 100644
index 000000000..e8aa88702
--- /dev/null
+++ b/src/main/java/com/nis/web/dao/specific/SpecificServiceHostCfgDao.java
@@ -0,0 +1,48 @@
+package com.nis.web.dao.specific;
+
+import java.util.List;
+
+import com.nis.domain.specific.SpecificServiceHostCfg;
+import com.nis.web.dao.CrudDao;
+import com.nis.web.dao.MyBatisDao;
+
+
+@MyBatisDao
+public interface SpecificServiceHostCfgDao extends CrudDao<SpecificServiceHostCfg> {
+
+	/**
+	 * 根据主键查询数据对象
+	 * @param hostId
+	 * @return
+	 */
+	SpecificServiceHostCfg getByHostId(Integer hostId);
+
+	/**
+	 * 查询分页
+	 * @param specificServiceHostCfg
+	 * @return
+	 */
+	List<SpecificServiceHostCfg> findSpecHostList(SpecificServiceHostCfg specificServiceHostCfg);
+
+	/**
+	 * 查出所有
+	 * @return
+	 */
+	List<SpecificServiceHostCfg> getAll();
+
+	/**
+	 * 删除
+	 * @param hostId
+	 */
+	void delete(Integer hostId);
+
+	/**
+	 * 根据协议ID查询对象
+	 * @param specServiceId
+	 * @return
+	 */
+	SpecificServiceHostCfg getBySpecServiceId(Integer specServiceId);
+	
+	
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/nis/web/dao/specific/SpecificServiceHostCfgDao.xml b/src/main/java/com/nis/web/dao/specific/SpecificServiceHostCfgDao.xml
new file mode 100644
index 000000000..0cf4fd69a
--- /dev/null
+++ b/src/main/java/com/nis/web/dao/specific/SpecificServiceHostCfgDao.xml
@@ -0,0 +1,174 @@
+<?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.specific.SpecificServiceHostCfgDao">
+
+	<resultMap id="specificServiceHostCfgResultMap"
+		type="com.nis.domain.specific.SpecificServiceHostCfg">
+		<id column="host_id" property="hostId" jdbcType="INTEGER" />
+		<result column="spec_service_id" property="specServiceId" jdbcType="INTEGER" />
+		<result column="ip_type" property="ipType" jdbcType="INTEGER" />
+		<result column="src_ip" property="srcIp" jdbcType="VARCHAR" />
+		<result column="src_ip_mask" property="srcIpMask" jdbcType="VARCHAR" />
+		<result column="src_port" property="srcPort" jdbcType="VARCHAR" />
+		<result column="src_port_mask" property="srcPortMask" jdbcType="VARCHAR" />
+		<result column="dst_ip" property="dstIp" jdbcType="VARCHAR" />
+		<result column="dst_ip_mask" property="dstIpMask" jdbcType="VARCHAR" />
+		<result column="dst_port" property="dstPort" jdbcType="VARCHAR" />
+		<result column="dst_port_mask" property="dstPortMask" jdbcType="VARCHAR" />
+		<result column="direction" property="direction" jdbcType="INTEGER" />
+		<result column="protocol" property="protocol" jdbcType="INTEGER" />
+		<result column="is_valid" property="isValid" jdbcType="INTEGER" />
+		<result column="is_audit" property="isAudit" jdbcType="INTEGER" />
+		<result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+		<result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
+		<result column="audit_time" property="auditTime" jdbcType="TIMESTAMP" />
+		<!-- 创建人员 -->
+		<association property="creator" javaType="com.nis.domain.SysUser">
+			<id property="id" column="creator_id" />
+		</association>
+		<!-- 修改人员 -->
+		<association property="editor" javaType="com.nis.domain.SysUser">
+			<id property="id" column="editor_id" />
+		</association>
+		<!-- 审核人员 -->
+		<association property="auditor" javaType="com.nis.domain.SysUser">
+			<id property="id" column="auditor_id" />
+		</association>
+	</resultMap>
+
+	<sql id="specificServiceHostCfgColumns">
+		s.host_id AS hostId,
+		s.spec_service_id AS specServiceId,
+		s.ip_type AS ipType,
+		s.src_ip AS srcIp,
+		s.src_ip_mask AS srcIpMask,
+		s.src_port AS srcPort,
+		s.src_port_mask AS srcPortMask,
+		s.dst_ip AS dstIp,
+		s.dst_ip_mask AS dstIpMask,
+		s.dst_port AS dstPort,
+		s.dst_port_mask AS dstPortMask,
+		s.direction AS direction,
+		s.protocol AS protocol,
+		s.is_valid AS isValid,
+		s.is_audit AS isAudit,
+		s.creator_id AS "creator.id",
+		s.create_time AS createTime,
+		s.editor_id AS "editor.id",
+		s.edit_time AS editTime,
+		s.auditor_id AS "auditor.id",
+		s.audit_time AS auditTime
+	</sql>
+
+
+	<!-- 根据id查出对象 -->
+	<select id="getByHostId" resultType="com.nis.domain.specific.SpecificServiceHostCfg"
+		parameterType="java.lang.Integer">
+		select
+		<include refid="specificServiceHostCfgColumns" />
+		from specific_service_host_cfg s where s.host_id = #{hostId}
+	</select>
+
+<!-- 查询分页 -->
+<select id="findSpecHostList" resultMap="specificServiceHostCfgResultMap" parameterType="com.nis.domain.specific.SpecificServiceHostCfg">
+select * from specific_service_host_cfg where is_valid = 1
+    <if test="isAudit !=null" >
+      AND is_audit = #{isAudit}
+    </if>
+    <if test="specServiceId !=null" >
+      AND spec_service_id = #{specServiceId}
+    </if>
+    <if test="ipType !=null" >
+      AND ip_type = #{ipType}
+    </if>
+    <if test="srcIp !=null and srcIp !='' " >
+      AND src_ip = #{srcIp}
+    </if>
+    <if test="dstIp !=null and dstIp !='' " >
+      AND dst_ip = #{dstIp}
+    </if>
+    <if test="protocol !=null" >
+      AND protocol = #{protocol}
+    </if>
+    <if test="direction !=null" >
+      AND direction = #{direction}
+    </if>
+    <if test="beginDate !=null and beginDate !='' " >
+      AND create_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
+    </if>
+    <if test="endDate !=null and endDate !='' " >
+       AND create_time &lt;= #{endDate,jdbcType=TIMESTAMP}
+    </if> 
+     <if test="editBeginDate !=null and editBeginDate !='' " >
+      AND edit_time &gt;= #{editBeginDate,jdbcType=TIMESTAMP}
+    </if>
+    <if test="editEndDate !=null and editEndDate !='' " >
+       AND edit_time &lt;= #{editEndDate,jdbcType=TIMESTAMP}
+    </if> 
+    <if test="auditBeginDate !=null and auditBeginDate !='' " >
+      AND audit_time &gt;= #{auditBeginDate,jdbcType=TIMESTAMP}
+    </if>
+    <if test="auditEndDate !=null and auditEndDate !='' " >
+       AND audit_time &lt;= #{auditEndDate,jdbcType=TIMESTAMP}
+    </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="getAll" resultMap="specificServiceHostCfgResultMap">
+select * from specific_service_host_cfg 
+</select>
+<!-- 根据协议ID查询对象 -->
+<select id="getBySpecServiceId" resultType="com.nis.domain.specific.SpecificServiceHostCfg" parameterType="java.lang.Integer">
+select
+<include refid="specificServiceHostCfgColumns" />
+from specific_service_host_cfg s where s.spec_service_id = #{specServiceId}
+</select>
+
+	<!-- 新增 -->
+	<insert id="insert" parameterType="com.nis.domain.specific.SpecificServiceHostCfg">
+	insert into specific_service_host_cfg (spec_service_id,ip_type,src_ip,src_ip_mask,src_port,src_port_mask,dst_ip,dst_ip_mask,dst_port,dst_port_mask,direction,protocol,is_valid,is_audit,creator_id,create_time,editor_id,edit_time,auditor_id,audit_time)
+	values(#{specServiceId},#{ipType},#{srcIp},#{srcIpMask},#{srcPort},#{srcPortMask},#{dstIp},#{dstIpMask},#{dstPort},#{dstPortMask},#{direction},#{protocol},#{isValid},#{isAudit},#{creator.id},#{createTime},#{editor.id},#{editTime},#{auditor.id},#{auditTime})
+	</insert>
+	<!-- 修改 -->
+	<update id="update" parameterType="com.nis.domain.specific.SpecificServiceHostCfg">
+	update specific_service_host_cfg s set 
+		s.spec_service_id = #{specServiceId},
+		s.ip_type = #{ipType},
+		s.src_ip = #{srcIp},
+		s.src_ip_mask = #{srcIpMask},
+		s.src_port = #{srcPort},
+		s.src_port_mask = #{srcPortMask},
+		s.dst_ip = #{dstIp},
+		s.dst_ip_mask = #{dstIpMask},
+		s.dst_port = #{dstPort},
+		s.dst_port_mask = #{dstPortMask},
+		s.direction = #{direction},
+		s.protocol = #{protocol},
+		s.is_valid = #{isValid},
+		s.is_audit = #{isAudit},
+		s.creator_id = #{creator.id},
+		s.create_time = #{createTime},
+		s.editor_id = #{editor.id},
+		s.edit_time = #{editTime},
+		s.auditor_id = #{auditor.id},
+		s.audit_time = #{auditTime}
+		where s.host_id = #{hostId}
+	</update>
+	<!-- 删除 -->
+		<update id="delete" parameterType="java.lang.Integer">
+	update specific_service_host_cfg s set 
+		s.is_valid = 0
+		where s.host_id = #{hostId}
+	</update>
+	
+
+</mapper>
\ No newline at end of file
diff --git a/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java b/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java
index 33d873c28..075082734 100644
--- a/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java
+++ b/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java
@@ -25,7 +25,7 @@ public class ServiceDictInfoService extends BaseService{
      private ServiceDictInfoDao serviceDictInfoDao;
 	
 	/**
-	 * 查询业务字典分页(无条件查询)
+	 * 查询业务字典顶层分页
 	 * @param page
 	 * @param serviceDictInfo
 	 * @return
@@ -61,11 +61,67 @@ public class ServiceDictInfoService extends BaseService{
 	            }
 			
 		}
-		
-		
+		ServiceDictInfo sd = new ServiceDictInfo();
+		sd.setServiceDictId(0);
+		for(ServiceDictInfo se:parentList){
+			se.setParent(sd);
+		}
+		if(tempType!=0){
+			serviceDictInfo.setItemType(tempType);
+		}else{
+			serviceDictInfo.setItemType(null);
+		}
 		page.setList(parentList);
 		return page;
 	}
+	/**
+	 * 查询所有数据
+	 * @param serviceDictInfo
+	 * @param itType
+	 * @return
+	 */
+	public List<ServiceDictInfo> findAllServiceDictInfo(ServiceDictInfo serviceDictInfo,Integer[] itType,String orderBy){
+		List<ServiceDictInfo> list = Lists.newArrayList();
+		Integer tempType = 0;
+		if(serviceDictInfo.getItemType()!=null){
+			tempType = serviceDictInfo.getItemType();
+		}
+		if(itType.length==1){
+		    serviceDictInfo.setItemType(itType[0]);
+		    list = serviceDictInfoDao.findAllServiceDictInfo(serviceDictInfo,orderBy);
+		}
+		if(itType.length==2){
+			if(tempType!=0){
+				list = serviceDictInfoDao.findAllServiceDictInfo(serviceDictInfo,orderBy);
+			}else{
+			   List<Integer> tempIntegerList = Lists.newArrayList();
+			   tempIntegerList.add(1);tempIntegerList.add(2);tempIntegerList.add(3);
+			    //Map<String,String> map = DictUtils.getDictOption("SERVICE_DICT_ITM_TYPE");
+			   if(tempIntegerList.contains(itType[0])){
+				   tempIntegerList.remove(itType[0]);
+			    }
+			   if(tempIntegerList.contains(itType[1])){
+				   tempIntegerList.remove(itType[1]);
+			    }
+			       serviceDictInfo.setItemType(tempIntegerList.get(0));
+			       list = serviceDictInfoDao.findAllServiceDictInfoN(serviceDictInfo,orderBy);
+			    }
+		 }
+		if(tempType!=0){
+			serviceDictInfo.setItemType(tempType);
+		}else{
+			serviceDictInfo.setItemType(null);
+		}
+		return list;
+	}
+	
+	
+	
+	
+	
+	
+	
+	
 	/**
 	 * 查询所有有效字典配置
 	 * @return
@@ -91,178 +147,6 @@ public class ServiceDictInfoService extends BaseService{
 		}
 		return list;
 	}
-	/**
-	 * 查询条件查询顶层分页(含条件查询,考虑排序接入可行性)
-	 * @param page
-	 * @param serviceDictInfo
-	 * @param itType
-	 * @return
-	 */
-	public Page<ServiceDictInfo> findDictTopSearchList(Page<ServiceDictInfo> page, ServiceDictInfo serviceDictInfo, Integer[] itType) {
-		// 设置分页参数 
-				serviceDictInfo.setPage(page);
-		//根据条件查询符合数据
-				List<ServiceDictInfo> allList = Lists.newArrayList();
-				List<ServiceDictInfo> list = Lists.newArrayList();
-				Integer tempType = 0;
-				if(serviceDictInfo.getItemType()!=null){
-					tempType = serviceDictInfo.getItemType();
-				}
-				if(itType.length==1){
-				    serviceDictInfo.setItemType(itType[0]);
-				    allList = serviceDictInfoDao.findDictTopSearchList(serviceDictInfo);
-				}
-				if(itType.length==2){
-					if(tempType!=0){
-					  allList = serviceDictInfoDao.findDictTopSearchList(serviceDictInfo);
-					}else{
-					   List<Integer> tempIntegerList = Lists.newArrayList();
-					   tempIntegerList.add(1);tempIntegerList.add(2);tempIntegerList.add(3);
-					    //Map<String,String> map = DictUtils.getDictOption("SERVICE_DICT_ITM_TYPE");
-					   if(tempIntegerList.contains(itType[0])){
-						   tempIntegerList.remove(itType[0]);
-					    }
-					   if(tempIntegerList.contains(itType[1])){
-						   tempIntegerList.remove(itType[1]);
-					    }
-					       serviceDictInfo.setItemType(tempIntegerList.get(0));
-					       allList = serviceDictInfoDao.findDictTopSearchListN(serviceDictInfo);
-					    }
-							
-				 }
-				ServiceDictInfo tempSe = new ServiceDictInfo();
-				tempSe.setServiceDictId(0);
-				for(ServiceDictInfo se:allList){
-					se.setParent(tempSe);
-				}
-				page.setList(allList);
-		
-		
-		/*//根据条件查询符合数据
-		List<ServiceDictInfo> allList = Lists.newArrayList();
-		List<Integer> tempList = Lists.newArrayList();
-		List<ServiceDictInfo> list = Lists.newArrayList();
-		List<ServiceDictInfo> listChild = Lists.newArrayList();
-		List<ServiceDictInfo> listParent = Lists.newArrayList();
-		Integer tempType = 0;
-		Integer total = 0;
-		Integer pageCount = 0;
-		Integer lostCount = 0;
-		if(serviceDictInfo.getItemType()!=null){
-			tempType = serviceDictInfo.getItemType();
-		}
-		if(itType.length==1){
-		    serviceDictInfo.setItemType(itType[0]);
-		    allList = serviceDictInfoDao.findDictSearchList(serviceDictInfo);
-		}
-		if(itType.length==2){
-			if(tempType!=0){
-			  allList = serviceDictInfoDao.findDictSearchList(serviceDictInfo);
-			}else{
-			   List<Integer> tempIntegerList = Lists.newArrayList();
-			   tempIntegerList.add(1);tempIntegerList.add(2);tempIntegerList.add(3);
-			    //Map<String,String> map = DictUtils.getDictOption("SERVICE_DICT_ITM_TYPE");
-			   if(tempIntegerList.contains(itType[0])){
-				   tempIntegerList.remove(itType[0]);
-			    }
-			   if(tempIntegerList.contains(itType[1])){
-				   tempIntegerList.remove(itType[1]);
-			    }
-			       serviceDictInfo.setItemType(tempIntegerList.get(0));
-			       allList = serviceDictInfoDao.findDictSearchListN(serviceDictInfo);
-			    }
-					
-		 }
-		
-		//处理数据
-		 //page.list中有多少个不是page.list中的顶层(其上级在page.list)
-		ServiceDictInfo tempSe = new ServiceDictInfo();
-		tempSe.setServiceDictId(0);
-		//取出主键优化处理
-		for(ServiceDictInfo se:allList){
-			if(se!=null&&se.getServiceDictId()!=null){
-				tempList.add(se.getServiceDictId());
-			}
-		}
-		
-		for(ServiceDictInfo se:allList){
-			if(se!=null&&se.getParent()!=null&&se.getParent().getServiceDictId()!=null){
-				//ServiceDictInfo temp = serviceDictInfoDao.getDictById(se.getParent().getServiceDictId());
-				if(tempList.contains(se.getParent().getServiceDictId())){
-					listChild.add(se);
-					lostCount+=lostCount;
-				}else{
-					se.setParent(tempSe);
-					listParent.add(se);
-				}
-			}
-		}  
-		
-		//确定总页数
-		 total = allList.size() - lostCount;
-		 pageCount = total%page.getPageSize()==0?total%page.getPageSize():(total%page.getPageSize()+1);
-		 if(pageCount==0){
-			 pageCount=1;
-		 }
-		//取出所有的顶层
-		//获取分页 每页数量pageSize、、当前页数pageNo (排序，，，)  每页第一个(pageNo-1)*pageSize+1 最后一个pageNo*pageSize
-		 List<ServiceDictInfo> parentShow = Lists.newArrayList();
-		for(int i=0;i<listParent.size();i++){
-			if(i>=((page.getPageNo()-1)*page.getPageSize())&&i<page.getPageNo()*page.getPageSize()){
-				parentShow.add(listParent.get(i));
-			}
-		}
-		parentShow.addAll(listChild);
-		
-		ServiceDictInfo.sortList(list,parentShow,0,true);
-		
-		page.setList(list);*/
-		return page;
-	}
-	/**
-	 * 条件查询所有数据
-	 * @param serviceDictInfo
-	 * @param itType
-	 * @return
-	 */
-	public List<ServiceDictInfo> findAllDictSearchList(ServiceDictInfo serviceDictInfo,Integer[] itType){
-		List<ServiceDictInfo> list = Lists.newArrayList();
-		Integer tempType = 0;
-		if(serviceDictInfo.getItemType()!=null){
-			tempType = serviceDictInfo.getItemType();
-		}
-		if(itType.length==1){
-		    serviceDictInfo.setItemType(itType[0]);
-		    list = serviceDictInfoDao.findAllDictSearchList(serviceDictInfo);
-		}
-		if(itType.length==2){
-			if(tempType!=0){
-				list = serviceDictInfoDao.findAllDictSearchList(serviceDictInfo);
-			}else{
-			   List<Integer> tempIntegerList = Lists.newArrayList();
-			   tempIntegerList.add(1);tempIntegerList.add(2);tempIntegerList.add(3);
-			    //Map<String,String> map = DictUtils.getDictOption("SERVICE_DICT_ITM_TYPE");
-			   if(tempIntegerList.contains(itType[0])){
-				   tempIntegerList.remove(itType[0]);
-			    }
-			   if(tempIntegerList.contains(itType[1])){
-				   tempIntegerList.remove(itType[1]);
-			    }
-			       serviceDictInfo.setItemType(tempIntegerList.get(0));
-			       list = serviceDictInfoDao.findAllDictSearchListN(serviceDictInfo);
-			    }
-		 }
-		if(tempType!=0){
-			serviceDictInfo.setItemType(tempType);
-		}else{
-			serviceDictInfo.setItemType(null);
-		}
-		return list;
-	}
-	
-
-	
-
 	/**
 	 * 根据主键查询字典详细信息
 	 * @param serviceDictId
diff --git a/src/main/java/com/nis/web/service/basics/SysDictInfoService.java b/src/main/java/com/nis/web/service/basics/SysDictInfoService.java
index 5c26845a6..b62ef2c68 100644
--- a/src/main/java/com/nis/web/service/basics/SysDictInfoService.java
+++ b/src/main/java/com/nis/web/service/basics/SysDictInfoService.java
@@ -24,126 +24,32 @@ public class SysDictInfoService extends BaseService{
 	
 	
 	
-	
 	/**
-	 * 查询顶层分页(无条件查询)
+	 * 查询顶层分页(含条件查询,考虑排序接入可行性)
 	 * @param page
 	 * @param sysDictInfo
 	 * @param itType
 	 * @return
 	 */
 	public Page<SysDictInfo> findTopDictList(Page<SysDictInfo> page, SysDictInfo sysDictInfo, Integer[] itType) {
-		// 设置分页参数 
-		sysDictInfo.setPage(page);
-		List<SysDictInfo> parentList = Lists.newArrayList();
-		Integer tempType = 0;
-		//预留以后分开用
-		if(sysDictInfo.getItemType()!=null){
-			tempType = sysDictInfo.getItemType();
-		}
-		//查出顶层分页查询
-		if(itType.length==1){
-			sysDictInfo.setItemType(itType[0]);
-			parentList = sysDictInfoDao.findTopDictList(sysDictInfo);
-		}
-		if(itType.length==2){
-			 if(tempType!=0){
-				 parentList = sysDictInfoDao.findTopDictList(sysDictInfo);
-	            }else{
-	            	List<Integer> tempList = Lists.newArrayList();
-	    			tempList.add(1);tempList.add(2);tempList.add(3);
-	    			//Map<String,String> map = DictUtils.getDictOption("SERVICE_DICT_ITM_TYPE");
-	    			if(tempList.contains(itType[0])){
-	    				tempList.remove(itType[0]);
-	    			}
-	                if(tempList.contains(itType[1])){
-	                	tempList.remove(itType[1]);
-	    			}
-	                sysDictInfo.setItemType(tempList.get(0));
-	                parentList = sysDictInfoDao.findTopDictListN(sysDictInfo);
-	            }
-			
-		}
-		page.setList(parentList);
-		return page;
-	}
-	/**
-	 * 查询所有有效字典配置
-	 */
-	public List<SysDictInfo> findAllDictList() {
-		return sysDictInfoDao.findAllDictList(new SysDictInfo());
-
-	}
-	/**
-	 * 条件查询所有数据
-	 * @param page
-	 * @param sysDictInfo
-	 * @param intArr
-	 * @return
-	 */
-	public List<SysDictInfo> findAllDictSearchList(SysDictInfo sysDictInfo, Integer[] itType) {
-	
-				List<SysDictInfo> list = Lists.newArrayList();
-				Integer tempType = 0;
-				if(sysDictInfo.getItemType()!=null){
-					tempType = sysDictInfo.getItemType();
-				}
-				if(itType.length==1){
-				    sysDictInfo.setItemType(itType[0]);
-				    list = sysDictInfoDao.findAllDictSearchList(sysDictInfo);
-				}
-				if(itType.length==2){
-					if(tempType!=0){
-						list = sysDictInfoDao.findAllDictSearchList(sysDictInfo);
-					}else{
-					   List<Integer> tempIntegerList = Lists.newArrayList();
-					   tempIntegerList.add(1);tempIntegerList.add(2);tempIntegerList.add(3);
-					    //Map<String,String> map = DictUtils.getDictOption("SERVICE_DICT_ITM_TYPE");
-					   if(tempIntegerList.contains(itType[0])){
-						   tempIntegerList.remove(itType[0]);
-					    }
-					   if(tempIntegerList.contains(itType[1])){
-						   tempIntegerList.remove(itType[1]);
-					    }
-					       sysDictInfo.setItemType(tempIntegerList.get(0));
-					       list = sysDictInfoDao.findAllDictSearchListN(sysDictInfo);
-					    }
-				 }
-				if(tempType!=0){
-					sysDictInfo.setItemType(tempType);
-				}else{
-					sysDictInfo.setItemType(null);
-				}
-                return list;
-	}
-	/**
-	 * 查询条件查询顶层分页(含条件查询,考虑排序接入可行性)
-	 * @param page
-	 * @param sysDictInfo
-	 * @param itType
-	 * @return
-	 */
-	public Page<SysDictInfo> findDictTopSearchList(Page<SysDictInfo> page, SysDictInfo sysDictInfo, Integer[] itType) {
 		// 设置分页参数 
 		        sysDictInfo.setPage(page);
 		//根据条件查询符合数据
 				List<SysDictInfo> allList = Lists.newArrayList();
-				List<SysDictInfo> list = Lists.newArrayList();
 				Integer tempType = 0;
 				if(sysDictInfo.getItemType()!=null){
 					tempType = sysDictInfo.getItemType();
 				}
 				if(itType.length==1){
 					sysDictInfo.setItemType(itType[0]);
-				    allList = sysDictInfoDao.findDictTopSearchList(sysDictInfo);
+				    allList = sysDictInfoDao.findTopDictList(sysDictInfo);
 				}
 				if(itType.length==2){
 					if(tempType!=0){
-					  allList = sysDictInfoDao.findDictTopSearchList(sysDictInfo);
+					  allList = sysDictInfoDao.findTopDictList(sysDictInfo);
 					}else{
 					   List<Integer> tempIntegerList = Lists.newArrayList();
 					   tempIntegerList.add(1);tempIntegerList.add(2);tempIntegerList.add(3);
-					    //Map<String,String> map = DictUtils.getDictOption("SERVICE_DICT_ITM_TYPE");
 					   if(tempIntegerList.contains(itType[0])){
 						   tempIntegerList.remove(itType[0]);
 					    }
@@ -151,11 +57,16 @@ public class SysDictInfoService extends BaseService{
 						   tempIntegerList.remove(itType[1]);
 					    }
 					   sysDictInfo.setItemType(tempIntegerList.get(0));
-					       allList = sysDictInfoDao.findDictTopSearchListN(sysDictInfo);
+					       allList = sysDictInfoDao.findTopDictListN(sysDictInfo);
 					    }
 							
 				 }
-				allList = sysDictInfoDao.findDictTopSearchList(sysDictInfo);
+				//allList = sysDictInfoDao.findDictTopSearchList(sysDictInfo);
+				if(tempType!=0){
+					sysDictInfo.setItemType(tempType);
+				}else{
+					sysDictInfo.setItemType(null);
+				}
 				SysDictInfo tempSe = new SysDictInfo();
 				tempSe.setSysDictId(0);
 				for(SysDictInfo se:allList){
@@ -166,6 +77,60 @@ public class SysDictInfoService extends BaseService{
 				return page;
 	}
 
+	
+	/**
+	 * 查询所有数据
+	 * @param page
+	 * @param sysDictInfo
+	 * @param intArr
+	 * @return
+	 */
+	public List<SysDictInfo> findAllSysDictInfo(SysDictInfo sysDictInfo, Integer[] itType,String orderBy) {
+	
+				List<SysDictInfo> list = Lists.newArrayList();
+				Integer tempType = 0;
+				if(sysDictInfo.getItemType()!=null){
+					tempType = sysDictInfo.getItemType();
+				}
+				if(itType.length==1){
+				    sysDictInfo.setItemType(itType[0]);
+				    list = sysDictInfoDao.findAllSysDictInfo(sysDictInfo,orderBy);
+				}
+				if(itType.length==2){
+					if(tempType!=0){
+						list = sysDictInfoDao.findAllSysDictInfo(sysDictInfo,orderBy);
+					}else{
+					   List<Integer> tempIntegerList = Lists.newArrayList();
+					   tempIntegerList.add(1);tempIntegerList.add(2);tempIntegerList.add(3);
+					   if(tempIntegerList.contains(itType[0])){
+						   tempIntegerList.remove(itType[0]);
+					    }
+					   if(tempIntegerList.contains(itType[1])){
+						   tempIntegerList.remove(itType[1]);
+					    }
+					       sysDictInfo.setItemType(tempIntegerList.get(0));
+					       list = sysDictInfoDao.findAllSysDictInfoN(sysDictInfo,orderBy);
+					    }
+				 }
+				if(tempType!=0){
+					sysDictInfo.setItemType(tempType);
+				}else{
+					sysDictInfo.setItemType(null);
+				}
+                return list;
+	}
+	
+	
+	
+	/**
+	 * 查询所有有效字典配置
+	 */
+	public List<SysDictInfo> findAllDictList() {
+		return sysDictInfoDao.findAllDictList(new SysDictInfo());
+
+	}
+	
+	
 
 	/**
 	 * 根据主键查询生效范围字典详细信息
diff --git a/src/main/java/com/nis/web/service/basics/TaskInfoService.java b/src/main/java/com/nis/web/service/basics/TaskInfoService.java
index e4ebe5fb0..31e7b969b 100644
--- a/src/main/java/com/nis/web/service/basics/TaskInfoService.java
+++ b/src/main/java/com/nis/web/service/basics/TaskInfoService.java
@@ -36,12 +36,13 @@ public class TaskInfoService extends BaseService{
 	public void saveOrUpdate(TaskInfo taskInfo) {
 		if (StringUtil.isEmpty(taskInfo.getId())) {
 			//设置默认参数值
-			taskInfo.setIsValid(1);//有效
+			taskInfo.setIsValid(0);//无效
 			taskInfo.setIsAudit(0);//未审核
 			taskInfo.setCreatorId((UserUtils.getUser().getId()).intValue());//创建人员
 			taskInfo.setCreateTime(new Date());//创建时间
 			taskInfoDao.insert(taskInfo);
 		}else{
+			taskInfo.setIsAudit(0);//修改后状态为未审核
 			taskInfo.setEditorId((UserUtils.getUser().getId()).intValue());//修改人员
 			taskInfo.setEditTime(new Date());//修改时间
 			taskInfoDao.update(taskInfo);
@@ -63,6 +64,7 @@ public class TaskInfoService extends BaseService{
 		for (int i = 0; i < exId.length; i++) {
 			taskInfo.setId(Long.valueOf(exId[i]));
 			taskInfo.setIsAudit(1);//审核通过
+			taskInfo.setIsValid(1);//审核通过
 			taskInfo.setAuditTime(new Date());
 			taskInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员
 			taskInfoDao.update(taskInfo);
@@ -85,6 +87,7 @@ public class TaskInfoService extends BaseService{
 		for (int i = 0; i < cancelId.length; i++) {
 			taskInfo.setId(Long.valueOf(cancelId[i]));
 			taskInfo.setIsAudit(3);//取消审核通过
+			taskInfo.setIsValid(0);
 			taskInfo.setAuditTime(new Date());
 			taskInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员
 			taskInfoDao.update(taskInfo);
diff --git a/src/main/java/com/nis/web/service/configuration/RequestInfoService.java b/src/main/java/com/nis/web/service/configuration/RequestInfoService.java
index f74bc07c5..47c997552 100644
--- a/src/main/java/com/nis/web/service/configuration/RequestInfoService.java
+++ b/src/main/java/com/nis/web/service/configuration/RequestInfoService.java
@@ -40,12 +40,13 @@ public class RequestInfoService extends BaseService{
 	public void saveOrUpdate(RequestInfo requestInfo) {
 		if (StringUtil.isEmpty(requestInfo.getId())) {
 			//设置默认参数值
-			requestInfo.setIsValid(1);//有效
+			requestInfo.setIsValid(0);//无效
 			requestInfo.setIsAudit(0);//未审核
 			requestInfo.setCreatorId((UserUtils.getUser().getId()).intValue());//创建人员
 			requestInfo.setCreateTime(new Date());//创建时间
 			requestInfoDao.insert(requestInfo);
 		}else{
+			requestInfo.setIsAudit(0);//修改后状态为未审核
 			requestInfo.setEditorId((UserUtils.getUser().getId()).intValue());//修改人员
 			requestInfo.setEditTime(new Date());//修改时间
 			requestInfoDao.update(requestInfo);
@@ -67,6 +68,7 @@ public class RequestInfoService extends BaseService{
 		for (int i = 0; i < exId.length; i++) {
 			requestInfo.setId(Long.valueOf(exId[i]));
 			requestInfo.setIsAudit(1);//审核通过
+			requestInfo.setIsValid(1);//审核通过有效
 			requestInfo.setAuditTime(new Date());
 			requestInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员
 			requestInfoDao.update(requestInfo);
@@ -89,6 +91,7 @@ public class RequestInfoService extends BaseService{
 		for (int i = 0; i < cancelId.length; i++) {
 			requestInfo.setId(Long.valueOf(cancelId[i]));
 			requestInfo.setIsAudit(3);//取消审核通过
+			requestInfo.setIsValid(0);//取消审核通过无效
 			requestInfo.setAuditTime(new Date());
 			requestInfo.setAuditorId((UserUtils.getUser().getId()).intValue());//审核人员
 			requestInfoDao.update(requestInfo);
diff --git a/src/main/java/com/nis/web/service/specific/SpecificServiceCfgService.java b/src/main/java/com/nis/web/service/specific/SpecificServiceCfgService.java
new file mode 100644
index 000000000..ebdb221e2
--- /dev/null
+++ b/src/main/java/com/nis/web/service/specific/SpecificServiceCfgService.java
@@ -0,0 +1,122 @@
+package com.nis.web.service.specific;
+
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.beust.jcommander.internal.Lists;
+import com.nis.domain.Page;
+import com.nis.domain.specific.SpecificServiceCfg;
+import com.nis.util.StringUtil;
+import com.nis.web.dao.specific.SpecificServiceCfgDao;
+import com.nis.web.service.BaseService;
+
+@Service
+public class SpecificServiceCfgService extends BaseService{
+	
+	@Autowired
+     private SpecificServiceCfgDao specificServiceCfgDao;
+	
+	/**
+	 * 根据id查询对象
+	 * @param specServiceId
+	 * @return
+	 */
+	public SpecificServiceCfg getBySpecServiceId(Integer specServiceId) {
+		return specificServiceCfgDao.getBySpecServiceId(specServiceId);
+	}
+	/**
+	 * 查询所有符合条件的顶层分页
+	 * @param page
+	 * @param specificServiceCfg
+	 * @return
+	 */
+	public Page<SpecificServiceCfg> findTopPage(Page<SpecificServiceCfg> page, SpecificServiceCfg specificServiceCfg){
+		// 设置分页参数 
+		specificServiceCfg.setPage(page);
+		// 执行分页查询
+		List<SpecificServiceCfg> list = Lists.newArrayList();
+		list = specificServiceCfgDao.findTopPage(specificServiceCfg);
+		SpecificServiceCfg ss = new SpecificServiceCfg();
+		ss.setSpecServiceId(0);
+		for(SpecificServiceCfg ssc:list){
+			ssc.setParent(ss);
+		}
+		page.setList(list);
+		return page;
+	}
+	/**
+	 * 查询所有符合条件的数据
+	 * @param specificServiceCfg
+	 * @return
+	 */
+	public List<SpecificServiceCfg> findAllSpecificServiceCfg(SpecificServiceCfg specificServiceCfg, String orderBy) {
+		return specificServiceCfgDao.findAllSpecificServiceCfg(specificServiceCfg,orderBy);
+	}
+	/**
+	 * 保存或修改
+	 * @param specificServiceCfg
+	 */
+	public void saveOrUpdate(SpecificServiceCfg specificServiceCfg, Integer oldId) {
+		if(specificServiceCfg.getGroupId()==null){
+			specificServiceCfg.setGroupId(0);
+		}
+		if(oldId==null){//新增
+			specificServiceCfg.setIsValid(1);
+			specificServiceCfg.setOpTime(new Date());
+			specificServiceCfgDao.insert(specificServiceCfg);
+		}else{//修改
+			specificServiceCfg.setOpTime(new Date());
+			//修改id则将其子类的parent_id一并修改
+			if(oldId!=specificServiceCfg.getSpecServiceId()){
+				//找出所有子类
+				List<SpecificServiceCfg> list = specificServiceCfgDao.getChildrenById(oldId);
+				SpecificServiceCfg se =new SpecificServiceCfg();
+				se.setSpecServiceId(specificServiceCfg.getSpecServiceId());
+				for(SpecificServiceCfg ss:list){
+					if(ss!=null){
+						ss.setParent(se);
+						specificServiceCfgDao.update(ss,ss.getSpecServiceId());
+					}
+				}
+			}
+			specificServiceCfgDao.update(specificServiceCfg,oldId);
+		}
+	}
+	/**
+	 * 删除
+	 * @param specificServiceCfg
+	 */
+	public void delete(String mulitId) {
+		String[] ids = mulitId.split(",");
+		for(String id:ids){
+			if (!id.equals("")) {
+				SpecificServiceCfg specificServiceCfg = specificServiceCfgDao.getBySpecServiceId(Integer.valueOf(id));
+				List<SpecificServiceCfg> list = Lists.newArrayList();
+				//找出所有下级
+				if(specificServiceCfg!=null){
+					SpecificServiceCfg.sortList(list, specificServiceCfgDao.findAllSpecificServiceCfg(new SpecificServiceCfg(),""), specificServiceCfg.getSpecServiceId(), true);
+					list.add(specificServiceCfg);
+					for(SpecificServiceCfg ss:list){
+						ss.setIsValid(0);
+						specificServiceCfgDao.delete(ss);
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * 根据specServiceId查询所有下级
+	 * @param specServiceId
+	 * @return
+	 */
+	public List<SpecificServiceCfg> getChildrenById(Integer specServiceId) {
+		return specificServiceCfgDao.getChildrenById(specServiceId);
+	}
+	
+	
+
+}
diff --git a/src/main/java/com/nis/web/service/specific/SpecificServiceHostCfgService.java b/src/main/java/com/nis/web/service/specific/SpecificServiceHostCfgService.java
new file mode 100644
index 000000000..ce788064f
--- /dev/null
+++ b/src/main/java/com/nis/web/service/specific/SpecificServiceHostCfgService.java
@@ -0,0 +1,110 @@
+package com.nis.web.service.specific;
+
+import java.util.Date;
+import java.util.List;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.nis.domain.Page;
+import com.nis.domain.SysUser;
+import com.nis.domain.specific.SpecificServiceHostCfg;
+import com.nis.web.dao.specific.SpecificServiceHostCfgDao;
+import com.nis.web.security.UserUtils;
+import com.nis.web.service.BaseService;
+
+@Service
+public class SpecificServiceHostCfgService extends BaseService{
+	
+	@Autowired
+     private SpecificServiceHostCfgDao specificServiceHostCfgDao;
+
+	/**
+	 * 根据主键查询数据对象
+	 * @param hostId
+	 * @return
+	 */
+	public SpecificServiceHostCfg getDictByHostId(Integer hostId) {
+		return specificServiceHostCfgDao.getByHostId(hostId);
+	}
+
+	/**
+	 * 查出分页
+	 * @param page
+	 * @param specificServiceHostCfg
+	 * @return
+	 */
+	public Page<SpecificServiceHostCfg> findSpecHostList(Page<SpecificServiceHostCfg> page,
+			SpecificServiceHostCfg specificServiceHostCfg) {
+		specificServiceHostCfg.setPage(page);
+		page.setList(specificServiceHostCfgDao.findSpecHostList(specificServiceHostCfg));
+		return page;
+	}
+
+	/**
+	 * 新增或修改
+	 * @param specificServiceHostCfg
+	 */
+	public void saveOrUpdate(SpecificServiceHostCfg specificServiceHostCfg) {
+		SysUser user = UserUtils.getUser();
+		Date date = new Date();
+		if(specificServiceHostCfg.getHostId()==null){//新增
+			specificServiceHostCfg.setIsValid(1);
+			specificServiceHostCfg.setCreator(user);
+			specificServiceHostCfg.setCreateTime(date);
+			specificServiceHostCfg.setEditor(user);
+			specificServiceHostCfg.setEditTime(date);
+			specificServiceHostCfg.setAuditor(user);
+			specificServiceHostCfg.setAuditTime(date);
+			specificServiceHostCfgDao.insert(specificServiceHostCfg);
+		}else{//修改
+			//是否进行了审核操作
+			//SpecificServiceHostCfg ssh = specificServiceHostCfgDao.getByHostId(specificServiceHostCfg.getHostId());
+			/*if(ssh.getIsAudit()!=specificServiceHostCfg.getIsAudit()){
+				specificServiceHostCfg.setAuditor(user);
+				specificServiceHostCfg.setAuditTime(date);
+			}*/
+			specificServiceHostCfg.setEditor(user);
+			specificServiceHostCfg.setEditTime(date);
+			specificServiceHostCfg.setAuditor(user);
+			specificServiceHostCfg.setAuditTime(date);
+			specificServiceHostCfgDao.update(specificServiceHostCfg);
+		}
+	}
+
+	/**
+	 * 查出所有
+	 * @return
+	 */
+	public List<SpecificServiceHostCfg> getAll() {
+		
+		return specificServiceHostCfgDao.getAll();
+	}
+
+	/**
+	 * 删除
+	 * @param mulitId
+	 */
+	public void delete(String mulitId) {
+		String[] ids = mulitId.split(",");
+		for(String hostId:ids){
+			if (!StringUtils.isEmpty(hostId)) {
+				specificServiceHostCfgDao.delete(Integer.valueOf(hostId));
+			}
+		}
+	}
+
+	/**
+	 * 根据协议ID查询对象
+	 * @param specServiceId
+	 * @return
+	 */
+	public SpecificServiceHostCfg getBySpecServiceId(Integer specServiceId) {
+		
+		return specificServiceHostCfgDao.getBySpecServiceId(specServiceId);
+	}
+	
+	
+	
+}
diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 10baf8b7c..5c7b33fbe 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -11,7 +11,7 @@ officeManage=office management
 userManage=user management
 notify=my notify
 help=help
-home=home
+home=Home
 panel=my panel
 userInfo=personal information
 updatePwd=update password
@@ -95,6 +95,7 @@ log_search=log search
 sysService_manage=system service manage
 service_manage=service type manage
 system_service_manage=system service type manage
+specific_service_cfg=specific service cfg
 #============menu end======================
 
 #============yewu begin======================
@@ -172,6 +173,12 @@ has_approved=It has been approved and can not be operated on !
 hasnot_approved=It has not been approved and can not be operated on !
 check_one=choose one please !
 one_more=please choose at least one !
+custom_columns=custom columns
+maxlength_64=The maxlength is 64\uff01
+maxlength_128=The maxlength is 128\uff01
+maxlength_256=The maxlength is 256\uff01
+maxlength_512=The maxlength is 512\uff01
+maxlength_4000=The maxlength is 4000\uff01
 #==========message end=====================
 
 #==========yewuliexingguanli begin=====================
diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index 10baf8b7c..1d61153f8 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -11,7 +11,7 @@ officeManage=office management
 userManage=user management
 notify=my notify
 help=help
-home=home
+home=Home
 panel=my panel
 userInfo=personal information
 updatePwd=update password
@@ -95,6 +95,7 @@ log_search=log search
 sysService_manage=system service manage
 service_manage=service type manage
 system_service_manage=system service type manage
+specific_service_cfg=specific service cfg
 #============menu end======================
 
 #============yewu begin======================
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 7b93af1a8..a50c12ec3 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -11,7 +11,7 @@ officeManage=\u673a\u6784\u7ba1\u7406
 userManage=\u7528\u6237\u7ba1\u7406
 notify=\u6211\u7684\u540c\u5fd7
 help=\u5173\u4e8e\u5e2e\u52a9
-home=\u5b98\u65b9\u9996\u9875
+home=\u9996\u9875
 panel=\u6211\u7684\u9762\u677f
 userInfo=\u4e2a\u4eba\u4fe1\u606f
 updatePwd=\u4fee\u6539\u5bc6\u7801
@@ -95,6 +95,7 @@ text_monitor=\u6587\u672c\u5e38\u89c4\u76d1\u6d4b
 sysService_manage=\u7cfb\u7edf\u4e1a\u52a1\u7ba1\u7406
 service_manage=\u4e1a\u52a1\u7c7b\u578b\u7ba1\u7406
 system_service_manage=\u7cfb\u7edf\u4e1a\u52a1\u7c7b\u578b\u7ba1\u7406
+specific_service_cfg=\u7279\u5b9a\u670d\u52a1\u7ba1\u7406
 #==========menu end=====================
 
 #==========yewu zidian begin=====================
@@ -106,7 +107,7 @@ desc=\u63cf\u8ff0\u4fe1\u606f
 parent_id=\u7236ID
 is_leaf=\u662f\u5426\u53f6\u5b50\u8282\u70b9
 is_valid=\u6709\u6548\u6807\u5fd7
-create_time=\u914d\u7f6e\u65f6\u95f4
+create_time=\u521b\u5efa\u65f6\u95f4
 edit_time=\u4fee\u6539\u65f6\u95f4
 superior_config=\u4e0a\u7ea7\u914d\u7f6e
 config_content=\u914d\u7f6e\u5185\u5bb9
@@ -171,6 +172,12 @@ has_approved=\u5df2\u7ecf\u901a\u8fc7\u5ba1\u6838\uff0c\u65e0\u6cd5\u8fdb\u884c\
 hasnot_approved=\u672a\u901a\u8fc7\u5ba1\u6838\uff0c\u65e0\u6cd5\u8fdb\u884c\u8be5\u64cd\u4f5c\uff01
 check_one=\u8bf7\u9009\u62e9\u4e00\u6761\u6570\u636e\uff01
 one_more=\u8bf7\u81f3\u5c11\u9009\u62e9\u4e00\u6761\u6570\u636e!
+custom_columns=\u81ea\u5b9a\u4e49\u5217\u5b57\u6bb5
+maxlength_64=\u8bf7\u8f93\u5165\u4e00\u4e2a\u957f\u5ea6\u6700\u591a\u662f 64\u7684\u5b57\u7b26\u4e32\uff01
+maxlength_128=\u8bf7\u8f93\u5165\u4e00\u4e2a\u957f\u5ea6\u6700\u591a\u662f 128\u7684\u5b57\u7b26\u4e32\uff01
+maxlength_256=\u8bf7\u8f93\u5165\u4e00\u4e2a\u957f\u5ea6\u6700\u591a\u662f256\u7684\u5b57\u7b26\u4e32\uff01
+maxlength_512=\u8bf7\u8f93\u5165\u4e00\u4e2a\u957f\u5ea6\u6700\u591a\u662f512\u7684\u5b57\u7b26\u4e32\uff01
+maxlength_4000=\u8bf7\u8f93\u5165\u4e00\u4e2a\u957f\u5ea6\u6700\u591a\u662f4000\u7684\u5b57\u7b26\u4e32\uff01
 #==========message end=====================
 
 #==========yewuliexingguanli begin=====================
diff --git a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
index fe92d2b0f..c0c328a9a 100644
--- a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
@@ -11,7 +11,7 @@
             <div for="cfgDesc"></div>
         </div>
     </div>
-    
+    <%-- 
     <div class="col-md-6">
         <div class="form-group ">
             <label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_area"/></label>
@@ -20,10 +20,8 @@
             </div>
             <div for="district"></div>
         </div>
-    </div>
-</div>
-<div class="row">
-	<div class="col-md-6">
+    </div> --%>
+    <div class="col-md-6">
         <div class="form-group ">
             <label class="control-label col-md-3"><font color="red">*</font><spring:message code="key_word"/></label>
             <div class="col-md-6">
@@ -32,42 +30,6 @@
             <div for="keywords"></div>
         </div>
     </div>
-
-	<%-- <div class="col-md-6">
-	    <div class="form-group ">
-	            <label class="control-label col-md-3">管控类型</label>
-	            <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>
-            	 	<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="6" <c:if test="${_cfg.action==6}">selected</c:if><c:if test="${_cfg.action!=6}">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> >封堵监测都白名单</option>
-            	 	<option value="8" <c:if test="${_cfg.action==8}">selected</c:if><c:if test="${_cfg.action!=8}">disabled="disabled"</c:if> >灰名单</option>
-            	 </select>
-                 <input class="form-control" type="hidden" name="action" value="${_cfg.action}">
-            	</div>
-	    </div>
-    </div> --%>
-    <div class="col-md-6">
-        <div class="form-group">
-            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_area_block"/></label>
-            <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>
 <div class="row">
     <div class="col-md-6">
@@ -116,6 +78,27 @@
             </div>
         </div>
     </div>
+    <div class="col-md-6">
+        <div class="form-group">
+            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_area_block"/></label>
+            <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>
+<div class="row">
     <div class="col-md-6">
         <div class="form-group ">
             <label class="control-label col-md-3"><spring:message code="area_effect_id"></spring:message></label>
diff --git a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
index 7886da9a8..d7a425267 100644
--- a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp
@@ -105,89 +105,103 @@
         </div>
     </div>
 </div>
-<div class="row">
-    <div class="col-md-6">
-        <div class="form-group">
-            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="direction"/></label>
-            <div class="col-md-6">
-            	<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"><font color="red">*</font><spring:message code="protocol"/></label>
-            <div class="col-md-6">
-            	<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>><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>
-<%-- <div class="row">
-    <div class="col-md-6">
-        <div class="form-group">
-            <label class="control-label col-md-3">协议ID</label>
-            <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">管控类型</div>
-            <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>
-            	 	<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="6" <c:if test="${_cfg.action==6}">selected</c:if><c:if test="${_cfg.action!=6}">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> >封堵监测都白名单</option>
-            	 	<option value="8" <c:if test="${_cfg.action==8}">selected</c:if><c:if test="${_cfg.action!=8}">disabled="disabled"</c:if> >灰名单</option>
-            	 </select>
-                 <input class="form-control" type="hidden" name="action" value="${_cfg.action}">
-            </div>
-        </div>
-    </div>
-</div> --%>
-<div class="row">
-    <div class="col-md-6">
-        <div class="form-group">
-            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_area_block"/></label>
-            <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"><spring:message code="area_effect_id"/></label>
-            <div class="col-md-6">
-                 <input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
-            </div>
-            <div for="areaEffectiveIds"></div>
-        </div>
-    </div>
-</div>
+<c:choose>
+	<c:when test="${action==5}">
+		<input type="hidden" name="protocol" value="0">
+		<input type="hidden" name="direction" value="0">
+		<input type="hidden" name="isAreaEffective" value="0">
+	</c:when>
+	<c:when test="${action==8}">
+		<div class="row">
+		    <div class="col-md-6">
+		        <div class="form-group">
+		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="direction"/></label>
+		            <div class="col-md-6">
+		            	<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>><spring:message code="twoway"/></option>
+		                   <option value="1" <c:if test="${_cfg.direction==1}">selected</c:if>><spring:message code="oneway"/></option>
+		                 </select>
+		            </div>
+		            <div for="direction"></div>
+		        </div>
+		    </div>
+		    <div class="col-md-6">
+		        <div class="form-group ">
+		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label>
+		            <div class="col-md-6">
+		            	<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>><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>
+		<input type="hidden" name="isAreaEffective" value="0">
+		<input type="hidden" name="areaEffectiveIds" value="">
+	</c:when>
+	<c:otherwise>
+		<div class="row">
+		    <div class="col-md-6">
+		        <div class="form-group ">
+		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label>
+		            <div class="col-md-6">
+		            	<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>><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 class="col-md-6">
+		        <div class="form-group">
+		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="direction"/></label>
+		            <div class="col-md-6">
+		            	<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>><spring:message code="twoway"/></option>
+		                   <option value="1" <c:if test="${_cfg.direction==1}">selected</c:if>><spring:message code="oneway"/></option>
+		                 </select>
+		            </div>
+		            <div for="direction"></div>
+		        </div>
+		    </div>
+		</div>
+		<div class="row">
+		    <div class="col-md-6">
+		        <div class="form-group">
+		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_area_block"/></label>
+		            <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"><spring:message code="area_effect_id"/></label>
+		            <div class="col-md-6">
+		                 <input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
+		            </div>
+		            <div for="areaEffectiveIds"></div>
+		        </div>
+		    </div>
+		</div>
+	</c:otherwise>
+</c:choose>
 <!--/row-->
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
index 90684fdd8..ec8061d3b 100644
--- a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
@@ -21,101 +21,93 @@
         </div>
     </div>
 </div>
-<div class="row">
-	<div class="col-md-6">
-	    <div class="form-group ">
-	        <label class="control-label col-md-3"><font color="red">*</font><spring:message code="block_type"/></label>
-	        <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> ><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> ><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> ><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> ><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> ><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> ><spring:message code="grey_list"/></option>                   
-            	</select>
-                 <%-- <input class="form-control" type="hidden" name="action" value="${_cfg.action}"> --%>
-            </div>
-            <div for="action"></div>
-	    </div>
-    </div>
-    <div class="col-md-6">
-        <div class="form-group">
-            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_area_block"/></label>
-            <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>
-<div class="row">
-    <div class="col-md-6">
-        <div class="form-group">
-            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="expression_type"/></label>
-            <div class="col-md-6">
-            	<label class="radio-inline">
-            		<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 for="exprType"></div>
-        </div>
-    </div>
-    <div class="col-md-6">
-        <div class="form-group ">
-            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_method"/></label>
-            <div class="col-md-6">
-            	<select name="matchMethod" class="selectpicker select2 form-control" title="--请选择--" >
-					<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="right_match"></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="exactly_match"></spring:message></option>     
-				</select>
-            </div>
-            <div for="matchMethod"></div>
-        </div>
-    </div>
-</div>
-<div class="row">
-    <div class="col-md-6">
-        <div class="form-group">
-            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_hexbinary"/></label>
-            <div class="col-md-6">
-            	<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="case_insensitive_nohex"></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="case_sensitive_nohex"></spring:message></option>
-				</select>
-            </div>
-            <div for="isHexbin"></div>
-        </div>
-        
-    </div>
-    <div class="col-md-6">
-        <div class="form-group ">
-            <label class="control-label col-md-3"><spring:message code="area_effect_id"></spring:message></label>
-            <div class="col-md-6">
-                 <input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
-            </div>
-            <div for="areaEffectiveIds"></div>
-        </div>
-    </div>
-</div>
+<c:choose>
+	<c:when test="${action ==5}">
+		<input type="hidden" name="isAreaEffective" value="0">
+		<input type="hidden" name="exprType" value="0">
+		<input type="hidden" name="matchMethod" value="0">
+		<input type="hidden" name="isHexbin" value="0">
+	</c:when>
+	<c:otherwise>
+		<div class="row">
+		    <div class="col-md-6">
+		        <div class="form-group">
+		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="expression_type"/></label>
+		            <div class="col-md-6">
+		            	<label class="radio-inline">
+		            		<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 for="exprType"></div>
+		        </div>
+		    </div>
+		    <div class="col-md-6">
+		        <div class="form-group ">
+		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_method"/></label>
+		            <div class="col-md-6">
+		            	<select name="matchMethod" class="selectpicker select2 form-control" title="--请选择--" >
+							<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="right_match"></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="exactly_match"></spring:message></option>     
+						</select>
+		            </div>
+		            <div for="matchMethod"></div>
+		        </div>
+		    </div>
+		</div>
+		<div class="row">
+		    <div class="col-md-6">
+		        <div class="form-group">
+		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_hexbinary"/></label>
+		            <div class="col-md-6">
+		            	<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="case_insensitive_nohex"></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="case_sensitive_nohex"></spring:message></option>
+						</select>
+		            </div>
+		            <div for="isHexbin"></div>
+		        </div>
+		    </div>
+		    <div class="col-md-6">
+		        <div class="form-group">
+		            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_area_block"/></label>
+		            <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>
+		<div class="row">
+		    <div class="col-md-6">
+		        <div class="form-group ">
+		            <label class="control-label col-md-3"><spring:message code="area_effect_id"></spring:message></label>
+		            <div class="col-md-6">
+		                 <input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
+		            </div>
+		            <div for="areaEffectiveIds"></div>
+		        </div>
+		    </div>
+		</div>
+	</c:otherwise>
+</c:choose>
 <!--/row-->
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/include/header.jsp b/src/main/webapp/WEB-INF/include/header.jsp
index 44ba82c87..b4d8c9f50 100644
--- a/src/main/webapp/WEB-INF/include/header.jsp
+++ b/src/main/webapp/WEB-INF/include/header.jsp
@@ -1,3 +1,4 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta charset="utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@@ -47,6 +48,10 @@
 
 <script src="${pageContext.request.contextPath}/static/global/plugins/jquery-jbox/2.3/jquery.jBox-2.3.src.js" type="text/javascript"></script>
 <script src="${pageContext.request.contextPath}/static/global/plugins/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+
+<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-typeahead/bootstrap3-typeahead.min.js" type="text/javascript"></script>
+<script src="${pageContext.request.contextPath}/static/global/plugins/unicodes.js" type="text/javascript"></script>
+
 <!-- END CORE PLUGINS -->
 
 
@@ -62,4 +67,17 @@
 
 <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>
diff --git a/src/main/webapp/WEB-INF/include/left_menu.jsp b/src/main/webapp/WEB-INF/include/left_menu.jsp
index 071075475..682412d8e 100644
--- a/src/main/webapp/WEB-INF/include/left_menu.jsp
+++ b/src/main/webapp/WEB-INF/include/left_menu.jsp
@@ -7,16 +7,17 @@
 		<c:forEach items="${fns:getLeftMenuTreeList()}" var="menu" varStatus="idxStatus">
      		
 			<ul id="menu_${menu.id }" class="hide accordion page-sidebar-menu page-header-fixed page-sidebar-menu-light" 
-     			data-keep-expanded="false" data-auto-scroll="true" data-slide-speed="200">
+     			data-keep-expanded="false" data-auto-scroll="true" data-slide-speed="200"
+     			menu-id="${menu.id }" menu-name="<spring:message code="${menu.code}"></spring:message>" >
      			
      			<c:if test="${not empty menu.children }">
      				<c:forEach  items="${menu.children}" var="secondMenu" varStatus="secondStatus">
      					
-	     				<li class="nav-item <c:if test="${secondStatus.index==0 }"> active open</c:if>">
+	     				<li class="nav-item" id="menu_${secondMenu.id }" menu-id="${secondMenu.id }" menu-name="<spring:message code="${secondMenu.code}"></spring:message>" >
 		     				
 		     				<a class="nav-link nav-toggle"		     					
 		     					<c:if test="${secondMenu.href != null && secondMenu.href != ''}" var="secondHref">
-		     						 href="${ctx}/${secondMenu.href }" target="mainFrame" >
+		     						 href="javascript:;" onclick="page_turn('${secondMenu.id }','1','','${ctx}/${secondMenu.href }',this)" target="mainFrame" >
 		     					</c:if>
 		     					<c:if test="${!secondHref }">
 		     						 href="javascript:;" class="nav-link nav-toggle"> 
@@ -26,7 +27,7 @@
 								<span class="title"> 
 								<%-- ${secondMenu.name } --%> <spring:message code="${secondMenu.code}"></spring:message></span>
 								<c:if test="${not empty secondMenu.children }" var="secondClid">
-									<span class="arrow open"></span>
+									<span class="arrow "></span>
 								</c:if>
 							</a>
 							
@@ -37,11 +38,12 @@
 									<c:forEach  items="${secondMenu.children}" var="thirdMenu" varStatus="thirdStatus">
 									
 										
-										<li class="nav-item <c:if test="${not empty thirdMenu.children && thirdStatus.index==0}">active open</c:if>">
+										<li class="nav-item" id="menu_${thirdMenu.id }" menu-id="${thirdMenu.id }" menu-name="<spring:message code="${thirdMenu.code}"></spring:message>">
 							
 						     				<a class="nav-link nav-toggle"		     					
 						     					<c:if test="${thirdMenu.href != null && thirdMenu.href != ''}" var="thirdHref">
-						     						 href="${ctx}/${thirdMenu.href }" target="mainFrame" >
+						     						 href="javascript:;" onclick="page_turn('${thirdMenu.id }','2','','${ctx}/${thirdMenu.href }',this)" target="mainFrame" >
+						     						 
 						     					</c:if>
 						     					<c:if test="${!thirdHref }">
 						     						 href="javascript:;" class="nav-link nav-toggle"> 
@@ -50,15 +52,17 @@
 												<span class="title">
 												<%-- ${thirdMenu.name } --%><spring:message code="${thirdMenu.code}"></spring:message></span> 
 												<c:if test="${not empty thirdMenu.children }" var="thiredClid">
-													<span class="arrow open"></span>
+													<span class="arrow "></span>
 												</c:if>
 											</a>
 											
 											<c:if test="${thiredClid}">
 												<ul class="sub-menu">
 													<c:forEach  items="${thirdMenu.children}" var="fourthMenu">
-														<li class="nav-item">
-															<a href="${ctx}/${fourthMenu.href }" target="mainFrame" class="nav-link ">
+														<li class="nav-item" id="menu_${fourthMenu.id }" menu-id="${fourthMenu.id }" menu-name="<spring:message code="${fourthMenu.code}"></spring:message>"  >
+															<a href="javascript:;" 
+															onclick="page_turn('${fourthMenu.id }','3','','${ctx}/${fourthMenu.href }',this)" target="mainFrame" 
+															class="nav-link ">
 																<%-- ${fourthMenu.name } --%> <spring:message code="${fourthMenu.code}"></spring:message> 
 																<!-- <span class="badge badge-danger">1</span> -->
 															</a>
diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
index a0fbfd7e5..0989b9077 100644
--- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
@@ -5,9 +5,9 @@
 <%@ attribute name="label" type="java.lang.String" required="false"%>
 <c:choose>
 	<c:when test="${label eq 'delete'}">
-		<button class="btn btn-default" onclick="del('${url}')" data-toggle="tooltip" data-placement="top">
+		<a href="javascript:void(0);" class="btn btn-default" onclick="del('${url}')" data-toggle="tooltip" data-placement="top">
 			<i class="fa fa-trash"> <spring:message code="delete"/></i>
-		</button>
+		</a>
 	</c:when>
 
 	<c:when test="${label eq 'approved'}">
diff --git a/src/main/webapp/WEB-INF/tags/sys/tableSort.tag b/src/main/webapp/WEB-INF/tags/sys/tableSort.tag
index 06149217d..e3245d1a2 100644
--- a/src/main/webapp/WEB-INF/tags/sys/tableSort.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/tableSort.tag
@@ -10,10 +10,15 @@
 	$(document).ready(function() {
 		var orderBy = $("#${id}").val().split(" ");
 		$(".sort-column").each(function(){
+
 			if ($(this).hasClass(orderBy[0])){
 				orderBy[1] = orderBy[1]&&orderBy[1].toUpperCase()=="DESC"?"down":"up";
-				$(this).html($(this).html()+" <i class=\"icon icon-arrow-"+orderBy[1]+"\"></i>");
+				$(this).html($(this).html()+" <i class=\"sort-icon-"+orderBy[1]+"\"></i>");
+			}else {
+				$(this).html($(this).html()+" <i class=\"sort-icon\"></i>");
 			}
+			
+
 		});
 		$(".sort-column").click(function(){
 			var order = $(this).attr("class").split(" ");
@@ -23,10 +28,11 @@
 			}
 			if (order == sort[0]){
 				sort = (sort[1]&&sort[1].toUpperCase()=="DESC"?"ASC":"DESC");
-				$("#${id}").val(order+" DESC"!=order+" "+sort?"":order+" "+sort);
+				$("#${id}").val(order+" "+sort);
 			}else{
 				$("#${id}").val(order+" ASC");
 			}
+
 			${callback}
 		});
 	});
diff --git a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
index 2c39be7cb..ee9955d66 100644
--- a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
@@ -27,7 +27,7 @@
 <div class="input-append">
 	<input id="${id}Id" name="${name}" class="${cssClass} singleClass" type="hidden" value="${value}" />
 	<input id="${id}Name" name="${labelName}" ${allowInput?'':'readonly="readonly"'} type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}" placeholder="${value}"
-		class="${cssClass}" style="${cssStyle}"/><a id="${id}Button" href="javascript:" class="btn ${disabled} ${hideBtn ? 'hide' : ''}" style="${smallBtn?'padding:4px 2px;':''}">&nbsp;<i class="icon-search"></i>&nbsp;</a>&nbsp;&nbsp;
+		class="${cssClass}" style="${cssStyle} background-color:transparent"/><a id="${id}Button" href="javascript:" class="btn ${disabled} ${hideBtn ? 'hide' : ''}" style="${smallBtn?'padding:4px 2px;':''}">&nbsp;<i class="icon-search"></i>&nbsp;</a>&nbsp;&nbsp;
 </div>
 <script type="text/javascript">
 	$("#${id}Button, #${id}Name").click(function(){
diff --git a/src/main/webapp/WEB-INF/tlds/fns.tld b/src/main/webapp/WEB-INF/tlds/fns.tld
index be9bfd704..d94a1c3b6 100644
--- a/src/main/webapp/WEB-INF/tlds/fns.tld
+++ b/src/main/webapp/WEB-INF/tlds/fns.tld
@@ -311,6 +311,14 @@
     <example>${fns:getSysDictInfoById(id)}</example>  
   </function>
   
+   <function>
+    <description>根据id获取特定服务配置</description>
+    <name>getBySpecServiceId</name>
+    <function-class>com.nis.util.ConfigDictUtils</function-class>
+    <function-signature>java.lang.String getBySpecServiceId(java.lang.Integer)</function-signature>
+    <example>${fns:getBySpecServiceId(id)}</example>  
+  </function>
+  
   <!-- 计算序号 -->
      <function>
     <description>计算序号</description>
diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp
index bd60d355a..7e6c22db3 100644
--- a/src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp
@@ -11,6 +11,7 @@
 	function reset(){
  		$("#searchForm").reset();
  	}
+	
 	/** 
 	 处理全选、全取消
 	**/
@@ -68,6 +69,12 @@
 		return false;
 	}
 		$(document).ready(function() {
+			
+			//reset
+			$("#resetBtn").on("click",function(){
+				$(".Wdate").attr("value",'');
+				$("#searchForm")[0].reset();
+			});
 
 			//设定显示总条数
 			$("#showTotalCount").text('${showTotalCount}');
@@ -229,8 +236,8 @@
 								<div class="row">
 									
 									<div class="pull-left">
-										<button type="button" class="btn blue" onclick="page2()"> <i class="fa fa-search"></i> 搜索  </button>
-										<button type="button" class="btn btn-default" onclick="reset()"> <i class="fa fa-refresh"></i> 重置  </button>
+										<button type="button"  class="btn blue" onclick="page2()"> <i class="fa fa-search"></i> 搜索  </button>
+										<button type="button" id="resetBtn" class="btn btn-default" onclick="reset()"> <i class="fa fa-refresh"></i> 重置  </button>
 									</div>
 							
 								</div>
@@ -293,7 +300,7 @@
 														        <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)"><spring:message code="delete"/></a></li>
+													       	 	<li><a href="${ctx}/basics/serviceDictInfo/delete?mulitId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)"><spring:message code="delete"/></a></li>
 															 </shiro:hasPermission>
 													    
 													      </ul>
diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp
index 4c71d4a1a..7c3862c82 100644
--- a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp
@@ -58,14 +58,6 @@
 		$("#searchForm").attr("action","${ctx}/basics/serviceDictInfo/list?itType=${itType}");
 		$("#searchForm").submit();
 		return false;
-	}
-	function page2(n,s){
- 		$("#intype").attr("name",$("#seltype").val());
-		$("#pageNo").val(n);
-		$("#pageSize").val(s);
-		$("#searchForm").attr("action","${ctx}/basics/serviceDictInfo/searchList?itType=${itType}");
-		$("#searchForm").submit();
-		return false;
 	}
 		$(document).ready(function() {
 			
@@ -77,6 +69,11 @@
 				$("#intype").attr("name",$("#seltype").find("option:selected").val());
 				$("#intype").val('${searchContent}');
 			
+				//reset
+				$("#resetBtn").on("click",function(){
+					$(".Wdate").attr("value",'');
+					$("#searchForm")[0].reset();
+				});
 			
 			//筛选功能初始化
 	 		filterActionInit();
@@ -123,13 +120,13 @@
 				<div class="portlet-body">
 
 					<div class="row"  >
-						<form:form id="searchForm" modelAttribute="serviceDictInfo" action="${ctx}/basics/serviceDictInfo/searchList?itType=${itType}" method="post" class="form-search">
+						<form:form id="searchForm" modelAttribute="serviceDictInfo" action="${ctx}/basics/serviceDictInfo/list?itType=${itType}" method="post" class="form-search">
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${serviceDictInfo.isFilterAction}"/>
-							
+							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();"/>
 							<!-- 搜索内容与操作按钮栏 -->
 			 				<div class="col-md-12">
 									
@@ -160,7 +157,7 @@
                                             <input id="intype" class="form-control input-medium" placeholder="请输入配置编码" type="text">
                                             
                                             <div class="input-group-btn">
-                                              	 <button class="btn btn-default btn-search" type="button" onclick="page2()"><i class="fa fa-search"></i></button>
+                                              	 <button class="btn btn-default btn-search" type="button" onclick="page()"><i class="fa fa-search"></i></button>
                                             </div>
                                             
                                         </div>
@@ -229,8 +226,8 @@
 								<div class="row">
 									
 									<div class="pull-left">
-										<button type="button" class="btn blue" onclick="page2()"> <i class="fa fa-search"></i> 搜索  </button>
-										<button type="button" class="btn btn-default" onclick="reset()"> <i class="fa fa-refresh"></i> 重置  </button>
+										<button type="button" class="btn blue" onclick="page()"> <i class="fa fa-search"></i> 搜索  </button>
+										<button type="button" class="btn btn-default" onclick="reset()" id="resetBtn"> <i class="fa fa-refresh"></i> 重置  </button>
 									</div>
 							
 								</div>
@@ -247,9 +244,9 @@
 					
 					
 
-					<!-- <div class="table-responsive"> -->
+					<div class="table-responsive">
 					<sys:message content="${message}"/>
-						<table id="treeTable" class="table table-striped table-bordered table-condensed">
+						<table id="treeTable" class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
 								<tr>
 								   <th><input type="checkbox" class="ckboxs" id="selAll" onclick="selectAll()"></th>
@@ -260,9 +257,9 @@
 								   <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 class="sort-column create_time"><spring:message code="create_time"/>
 								   </th><th><spring:message code="editor"/></th>
-								   <th><spring:message code="edit_time"/></th>
+								   <th class="sort-column edit_time"><spring:message code="edit_time"/></th>
 								   <shiro:hasPermission name="sys:menu:edit"><th><spring:message code="operation"/></th></shiro:hasPermission>
 								</tr>
 							</thead>
@@ -293,7 +290,7 @@
 														        <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)"><spring:message code="delete"/></a></li>
+													       	 	<li><a href="${ctx}/basics/serviceDictInfo/delete?mulitId=${serviceDictInfo.serviceDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)"><spring:message code="delete"/></a></li>
 															 </shiro:hasPermission>
 													    
 													      </ul>
@@ -305,6 +302,7 @@
 						</table>
 						<div class="page">${page}</div>	
 					</div>
+				</div>
 			</div>
 		</div>
 	</div>
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp
index 1ebeb0a8e..ebfd50c06 100644
--- a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp
@@ -235,15 +235,19 @@
 									<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><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">
-					                  <form:options items="${fns:getDictList('SYS_YES_NO')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false"/>
-				                    </form:select>
+							<c:if test="${specType != null and specType==3 }">
+							    <form:hidden path="isLeaf" value="0"/>
+							</c:if>
+							<c:if test="${specType != null and specType!=3 }">
+								<div class="form-group">
+									<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="is_leaf"/>:</label>
+									<div class="col-md-4">
+											<form:select path="isLeaf"  class="form-control">
+							                  <form:options items="${fns:getDictList('SYS_YES_NO')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false"/>
+						                    </form:select>
+									</div>
 								</div>
-							</div>
+							</c:if>
 							<div class="form-group">
 								<label class="col-md-3 control-label"><spring:message code="desc"/>:</label>
 								<div class="col-md-4">
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp
index 3ed54ae81..e0aa9b040 100644
--- a/src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp
@@ -77,7 +77,12 @@
 				$("#intype").attr("name",$("#seltype").find("option:selected").val());
 				$("#intype").val('${searchContent}');
 			
-			
+				//reset
+				$("#resetBtn").on("click",function(){
+					$(".Wdate").attr("value",'');
+					$("#searchForm")[0].reset();
+				});
+				
 			//筛选功能初始化
 	 		filterActionInit();
 	 		
@@ -228,7 +233,7 @@
 									
 									<div class="pull-left">
 										<button type="button" class="btn blue" onclick="page2()"> <i class="fa fa-search"></i> 搜索  </button>
-										<button type="button" class="btn btn-default" onclick="reset()"> <i class="fa fa-refresh"></i> 重置  </button>
+										<button type="button" id="resetBtn" class="btn btn-default" onclick="reset()"> <i class="fa fa-refresh"></i> 重置  </button>
 									</div>
 							
 								</div>
@@ -291,7 +296,7 @@
 														        <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)"><spring:message code="delete"/></a></li>
+													       	 	<li><a href="${ctx}/basics/sysDictInfo/delete?mulitId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)"><spring:message code="delete"/></a></li>
 															 </shiro:hasPermission>
 													    
 													      </ul>
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
index 4b852b0a8..add84e0b9 100644
--- a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
@@ -64,14 +64,6 @@
     		$("#searchForm").submit();
     		return false;
     	}
-    	function page2(n,s){
-     		$("#intype").attr("name",$("#seltype").val());
-    		$("#pageNo").val(n);
-    		$("#pageSize").val(s);
-    		$("#searchForm").attr("action","${ctx}/basics/sysDictInfo/searchList?itType=${itType}");
-    		$("#searchForm").submit();
-    		return false;
-    	}
     	$(document).ready(function() {
     		//设定显示总条数
 			$("#showTotalCount").text('${showTotalCount}');
@@ -79,8 +71,13 @@
 			
 				$("#seltype").find("option[value='${searchType==null?11:searchType}']").attr("selected",true);
 				$("#intype").attr("name",$("#seltype").find("option:selected").val());
-				$("#intype").val('${sysDictInfo.itemValue}');
-			
+				$("#intype").val('${searchContent}');
+
+				//reset
+				$("#resetBtn").on("click",function(){
+					$(".Wdate").attr("value",'');
+					$("#searchForm")[0].reset();
+				});
 			
 			//筛选功能初始化
 	 		filterActionInit();
@@ -126,13 +123,13 @@
 				<div class="portlet-body">
 
 					<div class="row"  >
-						<form:form id="searchForm" modelAttribute="sysDictInfo" action="${ctx}/basics/sysDictInfo/searchList?itType=${itType}" method="post" class="form-search">
+						<form:form id="searchForm" modelAttribute="sysDictInfo" action="${ctx}/basics/sysDictInfo/list?itType=${itType}" method="post" class="form-search">
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${sysDictInfo.isFilterAction}"/>
-							
+							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();"/>
 							<!-- 搜索内容与操作按钮栏 -->
 			 				<div class="col-md-12">
 									
@@ -163,7 +160,7 @@
                                             <input id="intype" class="form-control input-medium" placeholder="请输入配置编码" type="text">
                                             
                                             <div class="input-group-btn">
-                                              	 <button class="btn btn-default btn-search" type="button" onclick="page2()"><i class="fa fa-search"></i></button>
+                                              	 <button class="btn btn-default btn-search" type="button" onclick="page()"><i class="fa fa-search"></i></button>
                                             </div>
                                             
                                         </div>
@@ -232,8 +229,8 @@
 								<div class="row">
 									
 									<div class="pull-left">
-										<button type="button" class="btn blue" onclick="page2()"> <i class="fa fa-search"></i> 搜索  </button>
-										<button type="button" class="btn btn-default" onclick="reset()"> <i class="fa fa-refresh"></i> 重置  </button>
+										<button type="button" class="btn blue" onclick="page()"> <i class="fa fa-search"></i> 搜索  </button>
+										<button type="button" class="btn btn-default" onclick="reset()" id="resetBtn"> <i class="fa fa-refresh"></i> 重置  </button>
 									</div>
 							
 								</div>
@@ -250,9 +247,9 @@
 					
 					
 
-					<!-- <div class="table-responsive"> -->
+					<div class="table-responsive">
 					<sys:message content="${message}"/>
-						<table id="treeTable" class="table table-striped table-bordered table-condensed">
+						<table id="treeTable" class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
 								<tr>
 								   <th><input type="checkbox" id="selAll" class="ckboxs" onclick="selectAll()"></th>
@@ -261,11 +258,13 @@
 								   <th><spring:message code="config_content"/></th>
 								   <th><spring:message code="desc"/></th>
 								   <th><spring:message code="item_type"/></th>
+								   <c:if test="${specType != null and specType!=3 }">
 								   <th><spring:message code="is_leaf"/></th>
+								   </c:if>
 								   <th><spring:message code="creator"/></th>
-								   <th><spring:message code="create_time"/>
+								   <th class="sort-column create_time"><spring:message code="create_time"/>
 								   </th><th><spring:message code="editor"/></th>
-								   <th><spring:message code="edit_time"/></th>
+								   <th class="sort-column edit_time"><spring:message code="edit_time"/></th>
 								   <shiro:hasPermission name="sys:menu:edit"><th><spring:message code="operation"/></th></shiro:hasPermission>
 								</tr>
 							</thead>
@@ -278,7 +277,9 @@
 												<td>${sysDictInfo.itemValue}</td>
 												<td title="${sysDictInfo.itemDesc}">${fns:abbr(sysDictInfo.itemDesc,15)}</td>
 												<td>${fns:getDictLabel("SYS_DICT_ITM_TYPE",sysDictInfo.itemType,"0")}</td>
+												<c:if test="${specType != null and specType!=3 }">
 												<td>${fns:getDictLabel("SYS_YES_NO",sysDictInfo.isLeaf,"0")}</td>
+												</c:if>
 												<td><c:if test="${sysDictInfo.sysDictCreator != null}">
 												    ${fns:getUserById(sysDictInfo.sysDictCreator.id).name}
 												    </c:if></td>
@@ -296,7 +297,7 @@
 														        <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)"><spring:message code="delete"/></a></li>
+													       	 	<li><a href="${ctx}/basics/sysDictInfo/delete?mulitId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)"><spring:message code="delete"/></a></li>
 															 </shiro:hasPermission>
 													    
 													      </ul>
@@ -308,6 +309,7 @@
 						</table>
 						<div class="page">${page}</div>	
 					</div>
+				</div>
 			</div>
 		</div>
 	</div>
diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp
index 800670b2d..0a014dcd4 100644
--- a/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/taskInfoForm.jsp
@@ -9,6 +9,13 @@
 
 <div class="page-content">
 	<div class="row">
+	
+	<div class="theme-panel hidden-xs hidden-sm">
+		<button type="button" class="btn btn-default" onclick="history.go(-1)"><spring:message code="back"/></button>
+	</div>
+	<h3 class="page-title">
+		<spring:message code="special_task"/>
+	</h3>
 		<div class="col-md-12">
 			<div class="portlet box blue">
 				<div class="portlet-title">
@@ -81,25 +88,35 @@
 				rules: {
 					taskName: {
 						required: true,
+						maxlength:64,
 					},
 					taskOrg: {
 						required: true,
+						maxlength:128,
 					},
 					taskTime: {
 						required: true,
 					},
+					taskDesc: {
+						maxlength:512,
+					},
 					
 				},
 				messages: {
 					taskName: {
 						required: '<spring:message code="required"/>',
+						maxlength: '<spring:message code="maxlength_64"/>',
 					},
 					taskOrg: {
 						required: '<spring:message code="required"/>',
+						maxlength: '<spring:message code="maxlength_128"/>',
 					},
 					taskTime: {
 						required: '<spring:message code="required"/>',
 					},
+					taskDesc: {
+						maxlength: '<spring:message code="maxlength_512"/>',
+					},
 				},
 				submitHandler: function(form){
 					//loading('onloading...');
diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
index df9a34953..4b4efbf58 100644
--- a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
@@ -9,13 +9,15 @@
 <body>
 
 <div class="page-content">
+	<shiro:hasPermission name="basics:taskInfo:edit">
 	<div class="theme-panel hidden-xs hidden-sm">
+	<button type="button" class="btn btn-default" onclick="javascript:window.location='${ctx}/basics/taskInfo/list'"><spring:message code="refresh"></spring:message></button>
 		<button type="button" class="btn btn-primary"
 			onClick="javascript:window.location='${ctx}/basics/taskInfo/form'">
 			<i class="fa fa-plus"></i>
 			<spring:message code="add"/></button>
 	</div>
-	
+	</shiro:hasPermission>
 	<h3 class="page-title">
 		<spring:message code="special_task"></spring:message>
 		<small><spring:message code="date_list"/></small>
@@ -35,7 +37,7 @@
 							
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${taskInfo.isFilterAction }"/>
-							
+							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();"/>
 							<!-- 搜索内容与操作按钮栏 -->
 							<div class="col-md-12">
 									
@@ -50,7 +52,7 @@
 									<div class="pull-left">	
 										<div class="input-group">
                                             <div class="input-group-btn">
-												<input id="taskName" name="taskName" class="form-control input-medium" placeholder=<spring:message code="input_title"/> type="text" value="${taskInfo.taskName }">
+												<input id="taskName" name="taskName" class="form-control input-medium" type="text" value="${taskInfo.taskName }">
                                             </div>
                                             
                                             <div class="input-group-btn">
@@ -65,7 +67,7 @@
 									</div>
 
 									<div class="pull-right">
-									
+									<shiro:hasPermission name="basics:taskInfo:edit"> 
                                         <button type="button" class="btn btn-default" onclick="edit()">
                                             <i class="fa fa-edit"></i> <spring:message code="edit"></spring:message></button>
                                             <sys:delRow url="${ctx}/basics/taskInfo/delete" id="contentTable" label="delete"></sys:delRow>
@@ -82,6 +84,11 @@
 												<li><sys:delRow url="${ctx}/basics/taskInfo/taskCancelExamine" id="contentTable" label="cancelPass"></sys:delRow></li>            
                                             </ul>
                                         </div>
+                                        </shiro:hasPermission>
+                                        <a class="btn  btn-icon-only btn-default setfields tooltips" 
+                                      		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
+                                             <i class="icon-wrench"></i>
+                                         </a>
                                     </div>
 							
 								
@@ -112,7 +119,7 @@
 							
 									<div class="col-md-6">
 										<div class="pull-left">
-											<label><spring:message code="operate_time"/>：</label>
+											<label><spring:message code="edit_time"/>：</label>
 										</div>
 										<div class="pull-left">
 											<input id="dobeginDate" name="dobeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
@@ -145,9 +152,9 @@
 
 					</div>
 
-					<!-- <div class="table-responsive"> -->
+					<div class="table-responsive">
 					<sys:message content="${message}"/>
-						<table id="contentTable" class="table table-striped table-bordered table-condensed">
+						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
@@ -156,8 +163,13 @@
 									<th><spring:message code="task_org"></spring:message></th>
 									<th><spring:message code="task_time"></spring:message></th>
 									<th><spring:message code="state"></spring:message></th>
-									<th><spring:message code="operator"></spring:message></th>
-									<th><spring:message code="operate_time"></spring:message></th>
+									<th><spring:message code="desc"></spring:message></th>
+									<th><spring:message code="creator"></spring:message></th>
+									<th class="sort-column createTime"><spring:message code="create_time"/></th>
+									<th><spring:message code="editor"/></th>
+									<th class="sort-column editTime"><spring:message code="edit_time"/></th>
+									<th><spring:message code="auditor"></spring:message></th>
+									<th class="sort-column auditTime"><spring:message code="audit_time"></spring:message></th>
 								</tr>
 							</thead>
 							<tbody>
@@ -175,18 +187,13 @@
 											<c:when test="${taskInfo.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
+									<td>${taskInfo.taskDesc }</td>
 									<td>${taskInfo.creatorName }</td>
-									<td>
-									<!-- 编辑时间为空则显示创建时间 -->
-									<c:choose>
-										<c:when test="${empty taskInfo.editTime}">
-											<fmt:formatDate value="${taskInfo.createTime }" pattern="yyyy-MM-dd"/>
-										</c:when>
-										<c:otherwise>
-											<fmt:formatDate value="${taskInfo.editTime }" pattern="yyyy-MM-dd"/>
-										</c:otherwise>
-									</c:choose>
-									</td>
+									<td><fmt:formatDate value="${taskInfo.createTime }" pattern="yyyy-MM-dd"/></td>
+									<td>${taskInfo.editorName }</td>
+									<td><fmt:formatDate value="${taskInfo.editTime }" pattern="yyyy-MM-dd"/></td>
+									<td>${taskInfo.auditorName }</td>
+									<td><fmt:formatDate value="${taskInfo.auditTime }" pattern="yyyy-MM-dd"/></td>
 								</tr>
 							</c:forEach>
 					
@@ -194,6 +201,7 @@
 						</table>
 						<div class="page">${page}</div>	
 					</div>
+					</div>
 			</div>
 		</div>
 	</div>
@@ -228,12 +236,13 @@
  	
  	
  	function resetx(){
-//  		$("#searchForm").reset();
- 		$(':input','#searchForm')
- 		.not(':button,:submit,:reset,:hidden')
- 		.val('')
- 		.removeAttr('checked')
- 		.removeAttr('selected');
+ 		$("select.selectpicker").each(function(){
+			$(this).selectpicker('val',$(this).find('option:first').val());
+			$(this).find("option").attr("selected",false);
+			$(this).find("option:first").attr("selected",true);
+		});
+		$(".Wdate").attr("value",'');
+		$("#searchForm")[0].reset();
  	}
  	
  	
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
index d10240500..1bd111e9e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
@@ -3,22 +3,6 @@
 <html>
 <head>
 <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(){
@@ -36,9 +20,6 @@ $(function(){
 			'keywords':{
 				required:true
 			},
-			'district':{
-				required:true
-			},
 			'isAreaEffective':{
 				required:true
 			},
@@ -59,9 +40,6 @@ $(function(){
 			'keywords':{
 				required:'<spring:message code="required"/>'
 			},
-			'district':{
-				required:'<spring:message code="required"/>'
-			},
 			'isAreaEffective':{
 				required:'<spring:message code="required"/>'
 			},
@@ -123,10 +101,16 @@ $(function(){
                             <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}">  
-                              <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
-                              
-                            
+                            <input type="hidden" name="action" value="${action}">  
+                            <input type="hidden" name="district" value="${_cfg.district}"> 
+                            <c:choose>
+                            	<c:when test="${action!=5 and action!=8}">
+                            		<%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
+                            	</c:when>
+                            	<c:otherwise>
+                            		<input type="hidden" name=requestId value="0">
+                            	</c:otherwise>
+                            </c:choose>
                           </div>
                           <div class="form-actions">
                               <div class="row">
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
index 8cefa23f6..f9a570046 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
@@ -3,22 +3,6 @@
 <html>
 <head>
 <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() {
  		//筛选功能初始化
@@ -140,6 +124,10 @@
 								</div>
 								 <div class="pull-right">
                                     <button class="btn btn-default btn-search" type="button" onclick="return page()"><i class="fa fa-search"></i></button>
+                                 	<a class="btn  btn-icon-only btn-default setfields tooltips" 
+                                      		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
+                                             <i class="icon-wrench"></i>
+                                     </a>
                                  </div>
 							</div>
 							<!-- 搜索内容与操作按钮栏 -->
@@ -222,22 +210,18 @@
 						</form:form>
 					</div>
 					<div class="table-responsive">
-						<table class="table table-striped table-bordered table-condensed text-nowrap">
+						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
 								<tr>
 									<th><spring:message code="seq"/></th>
 									<th><spring:message code="config_describe"/></th>
-									<th><spring:message code="match_area"/></th>
 									<th><spring:message code="key_word"/></th>
 									<th><spring:message code="block_type"/></th>
-									<!-- <th>业务id</th> -->
-									<th><spring:message code="letter"/></th>
-									<!-- <th>编译id</th> -->
 									<th><spring:message code="whether_area_block"/></th>
+									<th><spring:message code="letter"/></th>
 									<th><spring:message code="type"/></th>
 									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<!-- <th>区域生效id</th> -->
 									<th><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="creator"/></th>
@@ -254,7 +238,7 @@
 									<tr>
 									<td>${status.index+1 }</td>
 									<td>${cfg.cfgDesc }</td>
-									<td>${cfg.district }</td>
+									<%-- <td>${cfg.district }</td> --%>
 									<td>${cfg.keywords }</td>
 									<td>
 										<c:if test="${1 eq cfg.action }"><spring:message code="block"/></c:if>
@@ -264,13 +248,11 @@
 										<c:if test="${7 eq cfg.action }"><spring:message code="block_monitor_white_list"/></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}"><spring:message code="no"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
 									</td>
+									<td>${cfg.requestName }</td>
 									<td>
 									<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId">
 										<c:forEach items="${fls}" var="fl">
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
index ef4983298..121e8a4db 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
@@ -4,21 +4,6 @@
 <head>
 <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(){
@@ -222,12 +207,6 @@ $(function(){
                         <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">
-                          <a href="javascript:;" class="collapse" data-original-title="" title=""> </a>
-                          <a href="#portlet-config" data-toggle="modal" class="config" data-original-title="" title=""> </a>
-                          <a href="javascript:;" class="reload" data-original-title="" title=""> </a>
-                          <a href="javascript:;" class="remove" data-original-title="" title=""> </a>
-                      </div> -->
                   </div>
                   <div class="portlet-body form">
                       <!-- BEGIN FORM-->
@@ -242,26 +221,14 @@ $(function(){
                             <input type="hidden" name="cfgName" value="${cfgName}">  
                             <input type="hidden" name="action" value="${action}">
                             <input type="hidden" name="protocolId" value="${_cfg.protocolId}">
-                            <!--  <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" %>
+                             <c:choose>
+                            	<c:when test="${action!=5 and action!=8}">
+                            		<%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
+                            	</c:when>
+                            	<c:otherwise>
+                            		<input type="hidden" name=requestId value="0">
+                            	</c:otherwise>
+                            </c:choose>
                               
                             
                           </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
index fff8f1377..94ce304cb 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
@@ -3,24 +3,11 @@
 <html>
 <head>
 <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() {
+		$("seltype").on("click",function(){
+			alert(2333)
+		});
 		//筛选功能初始化
 		filterActionInit();
 		$("#isAudit").change(function(){
@@ -55,9 +42,7 @@
 			<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">
 		<spring:message code="${cfgName}"></spring:message>
 		<small><spring:message code="date_list"/></small>
@@ -89,38 +74,24 @@
 										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
-								<div class="pull-left">
-									<c:set var="request_number"><spring:message code='request_number'/></c:set>
-									<form:select path="requestId" class="selectpicker select2 input-small" title="${request_number}" data-live-search="true" data-live-search-placeholder="search">
-										<c:forEach items="${requestInfos}" var="requestInfo" >
-											<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
-										</c:forEach>
-									</form:select>
-								</div>
-								<div class="pull-left">
-									<c:set var="flI18n"><spring:message code='type'/></c:set>
-									<form:select path="classify" class="selectpicker select2 input-small" title="${flI18n}" data-live-search="true" data-live-search-placeholder="search">
-										<c:forEach items="${fls}" var="fl" >
-											<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
-										</c:forEach>
-									</form:select>
-								</div>
-								<div class="pull-left">
-									<c:set var="attributeI18n"><spring:message code='attribute'/></c:set>
-									<form:select path="attribute" class="selectpicker select2 input-small" title="${attributeI18n}" data-live-search="true" data-live-search-placeholder="search">
-										<c:forEach items="${xzs}" var="xz" >
-											<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
-										</c:forEach>
-									</form:select>
-								</div>
-								<div class="pull-left">
-									<c:set var="labelI18n"><spring:message code='label'/></c:set>
-									<form:select path="lable" class="selectpicker select2 input-small" title="${labelI18n}" data-live-search="true" data-live-search-placeholder="search">
-										<c:forEach items="${lables}" var="lable" >
-											<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
-										</c:forEach>
-									</form:select>
-								</div>
+								<div class="pull-left">	
+										<%-- <div class="input-group">
+                                            <div class="input-group-btn">
+                                                <form:select path="seltype" class="selectpicker select2 input-small" >
+													<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
+													<form:option value="srcIp"><spring:message code="client_ip"></spring:message></form:option>
+													<form:option value="dstIp"><spring:message code="server_ip"></spring:message></form:option>
+												</form:select>
+                                            </div>
+                                            
+                                            <input id="intype" class="form-control input-medium" type="text" value="">
+                                            
+                                            <div class="input-group-btn">
+                                              	 <button class="btn btn-default btn-search" type="button" onclick="page()"><i class="fa fa-search"></i></button>
+                                            </div>
+                                            
+                                        </div> --%>
+	                               </div>
 								<!-- <div class="pull-right">
                                         <button type="button" class="btn btn-default">
                                             <i class="fa fa-edit"></i> 编辑</button>
@@ -164,6 +135,10 @@
 								</div>
 								 <div class="pull-right">
                                     <button class="btn btn-default btn-search" type="button" onclick="return page()"><i class="fa fa-search"></i></button>
+                                 	<a class="btn  btn-icon-only btn-default setfields tooltips" 
+                                      		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
+                                             <i class="icon-wrench"></i>
+                                     </a>
                                  </div>
 							</div>
 							<!-- 搜索内容与操作按钮栏 -->
@@ -171,23 +146,63 @@
 							<!-- 筛选搜索内容栏默认隐藏-->
 							<div class="col-md-12 filter-action-select-panle hide" >
 								<div class="row">
-								
+									<c:choose>
+										<c:when test="${action==5}">
+										</c:when>
+										<c:when test="${action==8}">
+										</c:when>
+										<c:otherwise>
+											<div class="pull-left">
+												<c:set var="request_number"><spring:message code='request_number'/></c:set>
+												<form:select path="requestId" class="selectpicker select2 input-small" title="${request_number}" data-live-search="true" data-live-search-placeholder="search">
+													<c:forEach items="${requestInfos}" var="requestInfo" >
+														<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+											<div class="pull-left">
+												<c:set var="flI18n"><spring:message code='type'/></c:set>
+												<form:select path="classify" class="selectpicker select2 input-small" title="${flI18n}" data-live-search="true" data-live-search-placeholder="search">
+													<c:forEach items="${fls}" var="fl" >
+														<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+											<div class="pull-left">
+												<c:set var="attributeI18n"><spring:message code='attribute'/></c:set>
+												<form:select path="attribute" class="selectpicker select2 input-small" title="${attributeI18n}" data-live-search="true" data-live-search-placeholder="search">
+													<c:forEach items="${xzs}" var="xz" >
+														<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+											<div class="pull-left">
+												<c:set var="labelI18n"><spring:message code='label'/></c:set>
+												<form:select path="lable" class="selectpicker select2 input-small" title="${labelI18n}" data-live-search="true" data-live-search-placeholder="search">
+													<c:forEach items="${lables}" var="lable" >
+														<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+										</c:otherwise>
+									</c:choose>
+								</div>
+								<div class="row">
 									<div class="col-md-6">
-											<div class="pull-left">
-												<label><spring:message code="config_time"/>：</label>
-											</div>
-											<div class="pull-left">
-												<input name="search_create_time_start" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-												value="<fmt:formatDate value='${ipCfg.search_create_time_start}' pattern='yyyy-MM-dd HH:mm:ss'/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-											</div>
-											<div class="pull-left">
-												<label>到</label>
-											</div>
-											<div class="pull-left">
-												<input name="search_create_time_end" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-												value="<fmt:formatDate value="${ipCfg.search_create_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-											</div>
-											
+										<div class="pull-left">
+											<label><spring:message code="config_time"/>：</label>
+										</div>
+										<div class="pull-left">
+											<input name="search_create_time_start" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+											value="<fmt:formatDate value='${ipCfg.search_create_time_start}' pattern='yyyy-MM-dd HH:mm:ss'/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+										<div class="pull-left">
+											<label>到</label>
+										</div>
+										<div class="pull-left">
+											<input name="search_create_time_end" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+											value="<fmt:formatDate value="${ipCfg.search_create_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
 									</div>
 							
 									<div class="col-md-6">
@@ -240,7 +255,7 @@
 						</form:form>
 					</div>
 					<div class="table-responsive">
-						<table class="table table-striped table-bordered table-condensed text-nowrap">
+						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
 								<tr>
 									<th><spring:message code="seq"/></th>
@@ -254,18 +269,24 @@
 									<th><spring:message code="server_address_mask"/></th>
 									<th><spring:message code="server_port"/></th>
 									<th><spring:message code="server_port_mask"/></th>
-									<th><spring:message code="direction"/></th>
-									<th><spring:message code="protocol"/></th>
-									<!-- <th>协议ID</th> -->
 									<th><spring:message code="block_type"/></th>
-									<!-- <th>业务id</th> -->
-									<th><spring:message code="letter"/></th>
-									<!-- <th>编译id</th> -->
-									<th><spring:message code="whether_area_block"/></th>
-									<th><spring:message code="type"/></th>
-									<th><spring:message code="attribute"/></th>
-									<th><spring:message code="label"/></th>
-									<!-- <th>区域生效id</th> -->
+									<c:choose>
+										<c:when test="${action==5}">
+										</c:when>
+										<c:when test="${action==8}">
+											<th><spring:message code="direction"/></th>
+											<th><spring:message code="protocol"/></th>
+										</c:when>
+										<c:otherwise>
+											<th><spring:message code="direction"/></th>
+											<th><spring:message code="protocol"/></th>
+											<th><spring:message code="whether_area_block"/></th>
+											<th><spring:message code="letter"/></th>
+											<th><spring:message code="type"/></th>
+											<th><spring:message code="attribute"/></th>
+											<th><spring:message code="label"/></th>
+										</c:otherwise>
+									</c:choose>
 									<th><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="creator"/></th>
@@ -291,16 +312,6 @@
 									<td>${ipCfg.dstIpMask }</td>
 									<td>${ipCfg.dstPort }</td>
 									<td>${ipCfg.dstPortMask }</td>
-									<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 }"><spring:message code="block"/></c:if>                   
 										<c:if test="${2 eq ipCfg.action }"><spring:message code="monitor"/></c:if>                 
@@ -309,37 +320,61 @@
 										<c:if test="${7 eq ipCfg.action }"><spring:message code="block_monitor_white_list"/></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}"><spring:message code="no"/></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">
-										<c:forEach items="${fls}" var="fl">
-											<c:if test="${fn:trim(fl.serviceDictId) eq classifyId}">
-											${fl.itemValue},
-											</c:if>
-										</c:forEach>
-									</c:forEach>
-									${classifyName[status]}
-									</td>
-									<td>
-									<c:forEach items="${fn:split(ipCfg.attribute,',')}" var="attributeId">
-										<c:forEach items="${xzs}" var="xz">
-											<c:if test="${fn:trim(xz.serviceDictId) eq attributeId}">${xz.itemValue},</c:if>
-										</c:forEach>
-									</c:forEach>
-									</td>
-									<td>
-									<c:forEach items="${fn:split(ipCfg.lable,',')}" var="lableId">
-										<c:forEach items="${lables}" var="lable">
-											<c:if test="${fn:trim(lable.serviceDictId) eq lableId}">${lable.itemValue},</c:if>
-										</c:forEach>
-									</c:forEach>
-									</td>
+									<c:choose>
+										<c:when test="${action==5}">
+										</c:when>
+										<c:when test="${action==8}">
+											<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>
+										</c:when>
+										<c:otherwise>
+											<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>
+												<c:if test="${ipCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+												<c:if test="${ipCfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
+											</td>
+											<td>${ipCfg.requestName }</td>
+											<td>
+											<c:forEach items="${fn:split(ipCfg.classify,',')}" var="classifyId">
+												<c:forEach items="${fls}" var="fl">
+													<c:if test="${fn:trim(fl.serviceDictId) eq classifyId}">
+													${fl.itemValue},
+													</c:if>
+												</c:forEach>
+											</c:forEach>
+											${classifyName[status]}
+											</td>
+											<td>
+											<c:forEach items="${fn:split(ipCfg.attribute,',')}" var="attributeId">
+												<c:forEach items="${xzs}" var="xz">
+													<c:if test="${fn:trim(xz.serviceDictId) eq attributeId}">${xz.itemValue},</c:if>
+												</c:forEach>
+											</c:forEach>
+											</td>
+											<td>
+											<c:forEach items="${fn:split(ipCfg.lable,',')}" var="lableId">
+												<c:forEach items="${lables}" var="lable">
+													<c:if test="${fn:trim(lable.serviceDictId) eq lableId}">${lable.itemValue},</c:if>
+												</c:forEach>
+											</c:forEach>
+											</td>
+										</c:otherwise>
+									</c:choose>
 									<%-- <td>${ipCfg.areaEffectiveIds }</td> --%>
 									<td>
 										<c:if test="${ipCfg.isValid==0}"><spring:message code="no"/></c:if>
diff --git a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp
index e256c9d34..e90a620b4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp
@@ -81,16 +81,6 @@
 		</div>
 	</div>
 </div>
-<style>
-	.input-medium {
-    width: 200px !important;
-}
-	.Wdate {
-	border: #c2cad8 1px solid;
-    height: 34px;
-}
-	
-</style>
 <script type="text/javascript">
 		 $(document).ready(function() {
 	 		
@@ -98,15 +88,21 @@
 				rules: {
 					requestNumber: {
 						required: true,
+						maxlength:64,
 					},
 					requestOrg: {
 						required: true,
+						maxlength:128,
 					},
 					requestTime: {
 						required: true,
 					},
+					requestTitle: {
+						maxlength:512,
+					},
 					requestContent: {
 						required: true,
+						maxlength:4000,
 					},
 					
 					
@@ -114,15 +110,21 @@
 				messages: {
 					requestNumber: {
 						required: '<spring:message code="required"/>',
+						maxlength:'<spring:message code="maxlength_64"/>',
 					},
 					requestOrg: {
 						required: '<spring:message code="required"/>',
+						maxlength:'<spring:message code="maxlength_128"/>',
 					},
 					requestTime: {
 						required: '<spring:message code="required"/>',
 					},
+					requestTitle: {
+						maxlength:'<spring:message code="maxlength_512"/>',
+					},
 					requestContent: {
 						required: '<spring:message code="required"/>',
+						maxlength:'<spring:message code="maxlength_4000"/>',
 					},
 				},
 				submitHandler: function(form){
diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
index 4e40a5256..79d040c02 100644
--- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
@@ -9,13 +9,14 @@
 <body>
 
 <div class="page-content">
+	<shiro:hasPermission name="cfg:requestInfo:edit">
 	<div class="theme-panel hidden-xs hidden-sm">
 		<button type="button" class="btn btn-primary"
 			onClick="javascript:window.location='${ctx}/cfg/request/form'">
 			<i class="fa fa-plus"></i>
 			<spring:message code="add"/></button>
 	</div>
-	
+	</shiro:hasPermission>
 	<h3 class="page-title">
 		<spring:message code="requestInfo"></spring:message>
 		<small><spring:message code="date_list"/></small>
@@ -36,6 +37,8 @@
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${requestInfo.isFilterAction }"/>
 							
+							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();"/>
+							
 							<!-- 搜索内容与操作按钮栏 -->
 							<div class="col-md-12">
 									
@@ -71,7 +74,7 @@
 									</div>
 
 									<div class="pull-right">
-									
+									<shiro:hasPermission name="cfg:requestInfo:edit">
                                         <button type="button" class="btn btn-default" onclick="edit()">
                                             <i class="fa fa-edit"></i> <spring:message code="edit"></spring:message></button>
                                             <sys:delRow url="${ctx}/cfg/request/delete" id="contentTable" label="delete"></sys:delRow>
@@ -88,9 +91,9 @@
 												<li><sys:delRow url="${ctx}/cfg/request/requestCancelExamine" id="contentTable" label="cancelPass"></sys:delRow></li>            
                                             </ul>
                                         </div>
-                        
+                        			</shiro:hasPermission>
                                         <a class="btn  btn-icon-only btn-default setfields tooltips" 
-                                      		  data-container="body" data-placement="top" data-original-title="自定义列字段" href="javascript:;">
+                                      		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
                                              <i class="icon-wrench"></i>
                                          </a>
                                     </div>
@@ -126,7 +129,7 @@
 							
 									<div class="col-md-6">
 										<div class="pull-left">
-											<label><spring:message code="operate_time"/>：</label>
+											<label><spring:message code="edit_time"/>：</label>
 										</div>
 										<div class="pull-left">
 											<input id="dobeginDate" name="dobeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
@@ -164,9 +167,9 @@
 					
 					
 
-					<!-- <div class="table-responsive"> -->
+					<div class="table-responsive">
 					<sys:message content="${message}"/>
-						<table id="contentTable" class="table table-striped table-bordered table-condensed">
+						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
@@ -175,12 +178,16 @@
 									<th><spring:message code="request_organization"></spring:message></th>
 									<th><spring:message code="request_time"></spring:message></th>
 									<th><spring:message code="state"></spring:message></th>
-									<th><spring:message code="operator"></spring:message></th>
-									<th><spring:message code="operate_time"></spring:message></th>
 									<th><spring:message code="title"></spring:message></th>
 									<th><spring:message code="content"></spring:message></th>
 									<th><spring:message code="special_task"></spring:message></th>
-<%-- 									<th><spring:message code="operation"></spring:message></th> --%>
+									<th><spring:message code="creator"/></th>
+									<th class="sort-column createTime"><spring:message code="create_time"/></th>
+									<th><spring:message code="editor"/></th>
+									<th class="sort-column editTime"><spring:message code="edit_time"/></th>
+									<th><spring:message code="auditor"></spring:message></th>
+									<th class="sort-column auditTime"><spring:message code="audit_time"></spring:message></th>
+						
 								</tr>
 							</thead>
 							<tbody>
@@ -198,21 +205,15 @@
 											<c:when test="${requestInfo.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td>${requestInfo.creatorName }</td>
-									<td>
-									<!-- 编辑时间为空则显示创建时间 -->
-									<c:choose>
-										<c:when test="${empty requestInfo.editTime}">
-											<fmt:formatDate value="${requestInfo.createTime }" pattern="yyyy-MM-dd"/>
-										</c:when>
-										<c:otherwise>
-											<fmt:formatDate value="${requestInfo.editTime }" pattern="yyyy-MM-dd"/>
-										</c:otherwise>
-									</c:choose>
-									</td>
 									<td>${requestInfo.requestTitle }</td>
 									<td>${requestInfo.requestContent }</td>
 									<td>${requestInfo.taskName }</td>
+									<td>${requestInfo.creatorName }</td>
+									<td><fmt:formatDate value="${requestInfo.createTime }" pattern="yyyy-MM-dd"/></td>
+									<td>${requestInfo.editorName }</td>
+									<td><fmt:formatDate value="${requestInfo.editTime }" pattern="yyyy-MM-dd"/></td>
+									<td>${requestInfo.auditorName }</td>
+									<td><fmt:formatDate value="${requestInfo.auditTime }" pattern="yyyy-MM-dd"/></td>
 								</tr>
 							</c:forEach>
 					
@@ -224,6 +225,7 @@
 		</div>
 	</div>
 	</div>
+	</div>
 
 <script>
  	$(document).ready(function() {
@@ -265,11 +267,20 @@
  	
  	function resetx(){
 //  		$("#searchForm").reset();
- 		$(':input','#searchForm')
- 		.not(':button,:submit,:reset,:hidden')
- 		.val('')
- 		.removeAttr('checked')
- 		.removeAttr('selected');
+//  		$(':input','#searchForm')
+//  		.not(':button,:submit,:reset,:hidden')
+//  		.val('')
+//  		.removeAttr('checked')
+//  		.removeAttr('selected');
+			$("select.selectpicker").each(function(){
+				$(this).selectpicker('val',$(this).find('option:first').val());
+				$(this).find("option").attr("selected",false);
+				$(this).find("option:first").attr("selected",true);
+			});
+			$(".Wdate").attr("value",'');
+			$("#searchForm")[0].reset();
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+"<spring:message code='title'/>");
+ 		
  	}
  	
  	
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
index 8b7fa64ce..aa68243c1 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
@@ -3,22 +3,6 @@
 <html>
 <head>
 <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(){
 	$("#cfgFrom").validate({
@@ -123,31 +107,18 @@ $(function(){
                             	<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
                             </c:if>
                             <input id="audit" name="audit" type="hidden" value="${audit}"/>
+                            <input id="action" name="action" type="hidden" value="${action}"/>
                             <input type="hidden" name="tableName" value="${_cfg.tableName}">  
                             <input type="hidden" name="serviceId" value="${_cfg.serviceId}">  
                             <input type="hidden" name="cfgName" value="${cfgName}">  
-                            <!--  <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" %>
-                              
-                            
+                            <c:choose>
+                            	<c:when test="${action!=5 and action!=8}">
+                            		<%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
+                            	</c:when>
+                            	<c:otherwise>
+                            		<input type="hidden" name=requestId value="0">
+                            	</c:otherwise>
+                            </c:choose>
                           </div>
                           <div class="form-actions">
                               <div class="row">
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
index 287103211..4004f2f9b 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
@@ -3,22 +3,6 @@
 <html>
 <head>
 <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() {
  		//筛选功能初始化
@@ -89,38 +73,44 @@
 										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
 									</form:select>
 								</div>
-								<div class="pull-left">
-									<c:set var="request_number"><spring:message code='request_number'/></c:set>
-									<form:select path="requestId" class="selectpicker select2 input-small" title="${request_number}" data-live-search="true" data-live-search-placeholder="search">
-										<c:forEach items="${requestInfos}" var="requestInfo" >
-											<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
-										</c:forEach>
-									</form:select>
-								</div>
-								<div class="pull-left">
-									<c:set var="flI18n"><spring:message code='type'/></c:set>
-									<form:select path="classify" class="selectpicker select2 input-small" title="${flI18n}" data-live-search="true" data-live-search-placeholder="search">
-										<c:forEach items="${fls}" var="fl" >
-											<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
-										</c:forEach>
-									</form:select>
-								</div>
-								<div class="pull-left">
-									<c:set var="attributeI18n"><spring:message code='attribute'/></c:set>
-									<form:select path="attribute" class="selectpicker select2 input-small" title="${attributeI18n}" data-live-search="true" data-live-search-placeholder="search">
-										<c:forEach items="${xzs}" var="xz" >
-											<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
-										</c:forEach>
-									</form:select>
-								</div>
-								<div class="pull-left">
-									<c:set var="labelI18n"><spring:message code='label'/></c:set>
-									<form:select path="lable" class="selectpicker select2 input-small" title="${labelI18n}" data-live-search="true" data-live-search-placeholder="search">
-										<c:forEach items="${lables}" var="lable" >
-											<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
-										</c:forEach>
-									</form:select>
-								</div>
+								<c:choose>
+									<c:when test="${action==5}">
+									</c:when>
+									<c:otherwise>
+										<div class="pull-left">
+											<c:set var="request_number"><spring:message code='request_number'/></c:set>
+											<form:select path="requestId" class="selectpicker select2 input-small" title="${request_number}" data-live-search="true" data-live-search-placeholder="search">
+												<c:forEach items="${requestInfos}" var="requestInfo" >
+													<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
+												</c:forEach>
+											</form:select>
+										</div>
+										<div class="pull-left">
+											<c:set var="flI18n"><spring:message code='type'/></c:set>
+											<form:select path="classify" class="selectpicker select2 input-small" title="${flI18n}" data-live-search="true" data-live-search-placeholder="search">
+												<c:forEach items="${fls}" var="fl" >
+													<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
+												</c:forEach>
+											</form:select>
+										</div>
+										<div class="pull-left">
+											<c:set var="attributeI18n"><spring:message code='attribute'/></c:set>
+											<form:select path="attribute" class="selectpicker select2 input-small" title="${attributeI18n}" data-live-search="true" data-live-search-placeholder="search">
+												<c:forEach items="${xzs}" var="xz" >
+													<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
+												</c:forEach>
+											</form:select>
+										</div>
+										<div class="pull-left">
+											<c:set var="labelI18n"><spring:message code='label'/></c:set>
+											<form:select path="lable" class="selectpicker select2 input-small" title="${labelI18n}" data-live-search="true" data-live-search-placeholder="search">
+												<c:forEach items="${lables}" var="lable" >
+													<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
+												</c:forEach>
+											</form:select>
+										</div>
+									</c:otherwise>
+								</c:choose>
 								<%-- <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> --%>
@@ -140,6 +130,10 @@
 								</div>
 								 <div class="pull-right">
                                     <button class="btn btn-default btn-search" type="button" onclick="return page()"><i class="fa fa-search"></i></button>
+                                 	<a class="btn  btn-icon-only btn-default setfields tooltips" 
+                                      		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
+                                             <i class="icon-wrench"></i>
+                                     </a>
                                  </div>
 							</div>
 							<!-- 搜索内容与操作按钮栏 -->
@@ -222,21 +216,24 @@
 						</form:form>
 					</div>
 					<div class="table-responsive">
-						<table class="table table-striped table-bordered table-condensed text-nowrap">
+						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
 								<tr>
 									<th><spring:message code="seq"/></th>
 									<th><spring:message code="config_describe"/></th>
 									<th><spring:message code="key_word"/></th>
 									<th><spring:message code="block_type"/></th>
-									<!-- <th>业务id</th> -->
-									<th><spring:message code="letter"/></th>
-									<!-- <th>编译id</th> -->
-									<th><spring:message code="whether_area_block"/></th>
-									<th><spring:message code="type"/></th>
-									<th><spring:message code="attribute"/></th>
-									<th><spring:message code="label"/></th>
-									<!-- <th>区域生效id</th> -->
+									<c:choose>
+										<c:when test="${action==5}">
+										</c:when>
+										<c:otherwise>
+											<th><spring:message code="whether_area_block"/></th>
+											<th><spring:message code="letter"/></th>
+											<th><spring:message code="type"/></th>
+											<th><spring:message code="attribute"/></th>
+											<th><spring:message code="label"/></th>
+										</c:otherwise>
+									</c:choose>
 									<th><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="creator"/></th>
@@ -262,38 +259,41 @@
 										<c:if test="${7 eq cfg.action }"><spring:message code="block_monitor_white_list"/></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}"><spring:message code="no"/></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">
-										<c:forEach items="${fls}" var="fl">
-											<c:if test="${classifyId eq fn:trim(fl.serviceDictId)}">
-											${fl.itemValue},
-											</c:if>
-										</c:forEach>
-									</c:forEach>
-									${classifyName[status]}
-									</td>
-									<td>
-									<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId">
-										<c:forEach items="${xzs}" var="xz">
-											<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">${xz.itemValue},</c:if>
-										</c:forEach>
-									</c:forEach>
-									</td>
-									<td>
-									<c:forEach items="${fn:split(cfg.lable,',')}" var="lableId">
-										<c:forEach items="${lables}" var="lable">
-											<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">${lable.itemValue},</c:if>
-										</c:forEach>
-									</c:forEach>
-									</td>
-									<%-- <td>${cfg.areaEffectiveIds }</td> --%>
+									<c:choose>
+										<c:when test="${action==5}">
+										</c:when>
+										<c:otherwise>
+											<td>
+												<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+												<c:if test="${cfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
+											</td>
+											<td>${cfg.requestName }</td>
+											<td>
+											<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId">
+												<c:forEach items="${fls}" var="fl">
+													<c:if test="${classifyId eq fn:trim(fl.serviceDictId)}">
+													${fl.itemValue},
+													</c:if>
+												</c:forEach>
+											</c:forEach>
+											${classifyName[status]}
+											</td>
+											<td>
+											<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId">
+												<c:forEach items="${xzs}" var="xz">
+													<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">${xz.itemValue},</c:if>
+												</c:forEach>
+											</c:forEach>
+											</td>
+											<td>
+											<c:forEach items="${fn:split(cfg.lable,',')}" var="lableId">
+												<c:forEach items="${lables}" var="lable">
+													<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">${lable.itemValue},</c:if>
+												</c:forEach>
+											</c:forEach>
+											</td>
+										</c:otherwise>
+									</c:choose>
 									<td>
 										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
 										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
diff --git a/src/main/webapp/WEB-INF/views/home.jsp b/src/main/webapp/WEB-INF/views/home.jsp
index d4bc39566..a0d9d5597 100644
--- a/src/main/webapp/WEB-INF/views/home.jsp
+++ b/src/main/webapp/WEB-INF/views/home.jsp
@@ -11,6 +11,7 @@
 
 <script src="${pageContext.request.contextPath}/static/pages/scripts/home.js" type="text/javascript"></script>
 
+
 <script type="text/javascript">
 	$(document).ready(function() {
 		
@@ -28,9 +29,43 @@
 		$obj.parent("li").addClass("hide");
 		
 		
+	
+		
+		// === Search input typeahead === //
+		$('#searchText').typeahead({
+			source: function(query,process) {
+				
+				var sourceArray = new Array();
+				$(".accordion:visible a[target='mainFrame']").each(function(){
+					
+					sourceArray.push($(this).parents("li").attr("menu-name")+"_"+$(this).parents("li").attr("menu-id"));
+				})
+
+				return process(sourceArray)
+			},
+			setValue:function(item){
+			},
+			items: 8,
+			matcher:function(term){
+				var mod1 = pinyin.getPY_Header(term);
+				var mod2 = pinyin.getPY_All(term);
+				var mod3 = term;
+				var s1 = mod1.toUpperCase().indexOf(this.query.toUpperCase())!=-1;
+				var s2 = mod2.toUpperCase().indexOf(this.query.toUpperCase())!=-1;
+				var s3 = mod3.toUpperCase().indexOf(this.query.toUpperCase())!=-1;
+				
+				return (s1||s2||s3);
+			}
+		});
+		
+		
+		$("#searchText").click(function(){
+			$(this).val("");
+		});
+		
 	});
 	//面包屑导航
-	$(function(){
+/* 	$(function(){
 	
 		$("div ul li a").click(function(){
 			if(typeof $(this).attr("id") !='undefined'){
@@ -43,7 +78,61 @@
 // 			var ur="${ctx}"+urlto.split("nis")[1];
 // 			$("#menutwo").attr("href",ur);
 			})
-})
+}) */
+	
+//页面跳转函数 level:级别，1顶级，2有子级。name:菜单名称，有多级#间隔。url：访问路径。object：点击元素对象。
+function page_turn(id, level, name, url,obj){
+	var $object = $("#menu_"+id);//点击当前级别
+	$(".page-sidebar li").filter(".active,.open").removeClass("active open");//删除选中样式
+	
+	var $header = $(".page-breadcrumb");//添加头部信息
+	$(".page-breadcrumb").empty();
+
+	
+	var parent_li = $object.parents("li");
+	var parent_parent_li = $object.parents("li").parents("li");
+						 
+	var breadcrumb = $(".accordion:visible").attr("menu-name");
+	if(level==1){//一级菜单
+		breadcrumb += "#"+$object.attr("menu-name");
+	}else if(level==2){//二级菜单
+		parent_li.addClass("active open");
+		breadcrumb += "#"+parent_li.attr("menu-name")+"#"+$object.attr("menu-name");
+	}else if(level==3){//三级
+		parent_li.addClass("active open");
+		parent_parent_li.addClass("active open");
+		breadcrumb += "#"+parent_parent_li.attr("menu-name")+"#"+parent_li.attr("menu-name")+"#"+$object.attr("menu-name");
+	}
+	$object.addClass("active");	
+	
+	
+	
+	$header.append("<li><a href='index.html'><spring:message code='home'></spring:message></a> <i class='fa fa-circle'></i></li>");
+	var breadcrumbs = breadcrumb.split("#");
+	for(var i=0;i<breadcrumbs.length;i++) {
+		var circle="";
+		if(i!=breadcrumbs.length-1) {
+			circle = " <i class='fa fa-circle'></i>";
+		}
+		$header.append("<li><a href='javascript:void(0);'>"+breadcrumbs[i]+"</a>"+circle+"</li>");
+	}
+	
+	//调入页面
+	window.frames['mainFrame'].location=url;
+
+	App.scrollTo()
+	
+}
+	
+function searchMenu() {
+	var search_txt = $("#searchText").val();
+	if(search_txt.indexOf('_')!=-1){
+		search_txt = search_txt.substring(search_txt.lastIndexOf('_'));
+		$("#menu"+search_txt+" >a").trigger('click');
+	}else {
+		alert('未找到该菜单！');
+	}
+}
 
 </script>
 </head>
@@ -193,14 +282,13 @@
 					</li>
 
 					<li class="sidebar-search-wrapper">
-						<form class="sidebar-search  " action="page_general_search_3.html"
-							method="POST">
+						<form class="sidebar-search">
 							<a href="javascript:;" class="remove"> <i class="icon-close"></i>
 							</a>
 							<div class="input-group">
-								<input class="form-control" placeholder="Search..." type="text">
+								<input class="form-control" autocomplete="off"  spellcheck="false" placeholder="Search..." type="text" id="searchText">
 								<span class="input-group-btn"> <a href="javascript:;"
-									class="btn submit"> <i class="icon-magnifier"></i>
+									class="btn" onclick="searchMenu();"> <i class="icon-magnifier"></i>
 								</a>
 								</span>
 							</div>
@@ -225,10 +313,7 @@
 	
 				<div class="page-bar">
 					<ul class="page-breadcrumb">
-						<li><a href="index.html">Home</a> <i class="fa fa-circle"></i>
-						</li>
-						<li><a href="#" id="menutwo"  target="mainFrame">Tables</a> <i class="fa fa-circle"></i></li>
-						<li><span id="menuthree">Datatables</span></li>
+						<li><a href="index.html"><spring:message code="home"></spring:message></a> <i class="fa fa-circle"></i></li>
 					</ul>
 				</div>
 				
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
new file mode 100644
index 000000000..c434d1a18
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
@@ -0,0 +1,205 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<link rel="stylesheet" type="text/css" href="${ctxStatic}/pages/css/dictInfo.css" />
+<script type="text/javascript" src="${ctxStatic}/pages/scripts/specificServiceForm/specificServiceFormCfg.js"></script>
+	<title></title>
+	<script type="text/javascript">
+	 	$(document).ready(function() {
+	 		jQuery.validator.addMethod("maxValue", function(value, element) {    
+			      return value >=0&&value<210000000;    
+			    }, "请填写正确的协议id");
+	  		//校验叶子节点无上级不得选为叶子节点
+			jQuery.validator.addMethod("leafHasTree",function(value,element){
+				var flagLeafHasTree=false;
+				$.ajax({
+					type:'post',
+					async:false,
+					url:'${ctx}/specific/specificServiceCfg/ajaxLeafHasTree',
+					data:{parentId:$("#specificServiceCfgId").val(),newIsLeaf:$("#isLeaf option:selected").val()},
+					success:function(data){
+						flagLeafHasTree=data;
+					}
+				});
+				return flagLeafHasTree;
+			},"该配置上级为根节点，不得设为叶子节点");
+			
+			//校验叶子节点有下级不得更改为叶子节点
+			 jQuery.validator.addMethod("leafChange",function(value,element){
+				var flagLeafChange=false;
+				$.ajax({
+					type:'post',
+					async:false,
+					url:'${ctx}/specific/specificServiceCfg/ajaxLeafChange',
+					data:{parent:"${specificServiceCfg.specServiceId}",newIsLeaf:$("#isLeaf option:selected").val()},
+					success:function(data){
+						flagLeafChange=data;
+					}
+				});
+				return flagLeafChange;
+			},"该配置包含下级配置，不得改为叶子节点"); 
+			 
+			$("#name").focus();
+			$("#inputForm").validate({
+				rules:{
+				 	specServiceId:{
+						required:true,
+						digits:true,
+						maxValue: true,
+						remote:'${ctx}/specific/specificServiceCfg/isIdRepeat?oldId=${specificServiceCfg.specServiceId}'
+					},
+					specServiceName:{
+						required:true
+					},
+					groupId:{
+						digits:true,
+						maxValue:true
+						},
+					isLeaf:{
+						leafHasTree:true,
+						leafChange:true 
+					}
+				},
+				messages: {
+					 specServiceId:{
+						required:'请填写协议ID',
+						digits:"请填写整数数字",
+						maxValue: "请填写正确的协议ID(0~210000000)",
+						remote:'该协议ID已存在'
+					},
+					specServiceName:{
+						required:'请填写协议名称'
+					},
+					groupId:{
+						digits:'请填写整数数值',
+						maxValue:'请填写正确的分组Id(0~210000000)'
+						},
+					isLeaf:{
+						leafHasTree:'该配置上级为根节点，不得设为叶子节点',
+						leafChange:'该配置包含下级配置，不得改为叶子节点'
+					}
+				},
+				
+				submitHandler: function(form){
+					if(!validateItem()) {
+						return false;
+					}
+					loading('正在提交，请稍等...');
+					form.submit();
+				},
+				errorContainer: "#messageBox",
+				errorPlacement: function(error, element) {
+					$("#messageBox").text("输入有误，请先更正。");
+					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+						error.appendTo(element.parent().parent());
+					} else {
+						error.insertAfter(element);
+					}
+				}
+			});
+		});
+	</script>
+</head>
+<body>
+
+
+<div class="page-content">
+
+	<div class="theme-panel hidden-xs hidden-sm">
+		
+		<button type="button" class="btn btn-default" onclick="history.go(-1)"><spring:message code="back"/></button>
+
+	</div>
+		
+		
+	<h3 class="page-title">
+		<spring:message code="specific_service_cfg"/>
+	</h3>
+
+	<div class="row">
+		<div class="col-md-12">
+			<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 specificServiceCfg.specServiceId?'修改':'添加'}</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>
+						<a href="javascript:;" class="reload"> </a>
+						<a href="javascript:;" class="remove"> </a> -->
+					</div>
+				</div>
+				
+				<div class="portlet-body form">
+					
+				
+					<div class="form-body">
+
+						<!-- BEGIN FORM-->	
+						<form:form id="inputForm" modelAttribute="specificServiceCfg" action="${ctx}/specific/specificServiceCfg/saveOrUpdate" method="post" class="form-horizontal">
+							<input name="oldId" type="hidden" value="${specificServiceCfg.specServiceId}"/>
+							<form:hidden path="isValid"  class="form-control"/>
+							<sys:message content="${message}"/>
+							<div class="form-group">
+								<label class="col-md-3 control-label"><spring:message code="superior_config"/>:</label>
+								<div class="col-md-4">
+					                <sys:treeselect id="specificServiceCfg" name="parent.specServiceId" value="${specificServiceCfg.parent.specServiceId}" labelName="parent.specServiceName" labelValue="${specificServiceCfg.parent.specServiceName eq '根节点'?'根节点':fns:getBySpecServiceId(specificServiceCfg.parent.specServiceId).specServiceName}"
+										title="菜单" url="/specific/specificServiceCfg/treeData" extId="${specificServiceCfg.specServiceId}" cssClass="required form-control"/>	
+								</div>
+							</div>
+						    <div class="form-group">
+								<label class="col-md-3 control-label"><font color="red">*</font>协议ID:</label>
+								<div class="col-md-4">
+									<input id="specServiceId" name="specServiceId" maxlength="50" class="form-control" value="${specificServiceCfg.specServiceId}"/>
+								</div>
+							</div>  
+							<div class="form-group">
+								<label class="col-md-3 control-label"><font color="red">*</font>协议名称:</label>
+								<div class="col-md-4">
+									<form:input path="specServiceName" htmlEscape="false" maxlength="50" class="form-control"/>
+								</div>
+							</div> 
+						 	<div class="form-group">
+								<label class="col-md-3 control-label">maat端配置分组id:</label>
+								<div class="col-md-4">
+									<form:input path="groupId" htmlEscape="false" maxlength="50" class="form-control" placeholder="0"/>
+								</div>
+							</div> 
+							<div class="form-group">
+								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="is_leaf"/>:</label>
+								<div class="col-md-4">
+									<form:select path="isLeaf"  class="form-control">
+					                  <form:options items="${fns:getDictList('SYS_YES_NO')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false"/>
+				                    </form:select>
+								</div>
+							</div> 
+							 <div class="form-group">
+								<label class="col-md-3 control-label">协议描述:</label>
+								<div class="col-md-4">
+									<form:textarea path="specServiceDesc" htmlEscape="false" maxlength="2000" class="form-control"/>
+								</div>
+							</div>
+							<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"><spring:message code="submit"/></button></shiro:hasPermission>
+										<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)"><spring:message code="cancel"/></button>
+									</div>
+								</div>
+							</div>
+						</form:form>
+						<!-- END FORM-->
+					</div>
+					
+				</div>
+				
+			</div>
+		</div>
+	</div>
+</div>
+
+
+	
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgInfo.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgInfo.jsp
new file mode 100644
index 000000000..b2b16ab77
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgInfo.jsp
@@ -0,0 +1,97 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<link rel="stylesheet" type="text/css" href="${ctxStatic}/pages/css/dictInfo.css" />
+<script type="text/javascript" src="${ctxStatic}/pages/scripts/dict.js"></script>
+	
+</head>
+<body>
+
+
+<div class="page-content">
+
+	<div class="theme-panel hidden-xs hidden-sm">
+		
+		<button type="button" class="btn btn-default" onclick="history.go(-1)"><spring:message code="back"/></button>
+
+	</div>
+		
+		
+	<h3 class="page-title">
+		<spring:message code="specific_service_cfg"/>
+	</h3>
+
+	<div class="row">
+		<div class="col-md-12">
+			<div class="portlet box blue">
+				<div class="portlet-title">
+					<div class="caption">
+						<i class="fa fa-gift"></i><spring:message code="show"/></div>
+					<div class="tools">
+					</div>
+				</div>
+				
+				<div class="portlet-body form">
+					
+				
+					<div class="form-body">
+						<!-- BEGIN FORM-->	
+						<form:form id="inputForm" modelAttribute="specificServiceCfg"  class="form-horizontal">
+							<div class="form-group">
+								<label class="col-md-3 control-label"><spring:message code="superior_config"/>:</label>
+								<div class="col-md-4">
+								 <input value="${specificServiceCfg.parent.specServiceId == 0?'根节点':fns:getBySpecServiceId(specificServiceCfg.parent.specServiceId).specServiceName}" maxlength="50" class="form-control" readonly="readonly"/>
+					             </div>
+							</div>
+						    <div class="form-group">
+								<label class="col-md-3 control-label"><font color="red">*</font>协议ID:</label>
+								<div class="col-md-4">
+									<input id="specServiceId" name="specServiceId" maxlength="50" class="form-control" value="${specificServiceCfg.specServiceId}" readonly="readonly"/>
+								</div>
+							</div>  
+							<div class="form-group">
+								<label class="col-md-3 control-label"><font color="red">*</font>协议名称:</label>
+								<div class="col-md-4">
+									<form:input path="specServiceName" htmlEscape="false" maxlength="50" class="form-control" readonly="readonly"/>
+								</div>
+							</div> 
+						 	<div class="form-group">
+								<label class="col-md-3 control-label"><font color="red">*</font>maat端配置分组id:</label>
+								<div class="col-md-4">
+									<form:input path="groupId" htmlEscape="false" maxlength="50" class="form-control" readonly="readonly"/>
+								</div>
+							</div> 
+							<div class="form-group">
+								<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',specificServiceCfg.isLeaf,'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><spring:message code="is_leaf"/>:</label>
+								<div class="col-md-4">
+                                  <input value="<fmt:formatDate value='${specificServiceCfg.opTime}' pattern='yyyy-MM-dd HH:mm:ss'/>" maxlength="50" class="form-control" readonly="readonly" />
+								</div>
+							</div> 
+							 <div class="form-group">
+								<label class="col-md-3 control-label">协议描述:</label>
+								<div class="col-md-4">
+									<form:textarea path="specServiceDesc" htmlEscape="false" maxlength="2000" class="form-control" readonly="readonly"/>
+								</div>
+							</div>
+						</form:form>
+						<!-- END FORM-->
+					</div>
+					
+				</div>
+				
+			</div>
+		</div>
+	</div>
+</div>
+
+
+	
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
new file mode 100644
index 000000000..65c5597d9
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
@@ -0,0 +1,286 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title></title>
+<link href="${ctxStatic}/global/plugins/treeTable/themes/vsStyle/treeTable.min.css" rel="stylesheet" type="text/css" />
+	<script src="${ctxStatic}/global/plugins/treeTable/jquery.treeTable.min.js" type="text/javascript"></script>
+	<script src="${ctxStatic}/pages/scripts/dict.js" type="text/javascript"></script>
+	<style type="text/css">
+	</style>
+	<script type="text/javascript">
+	function reset(){
+ 		$("#searchForm").reset();
+ 	}
+	
+	/** 
+	 处理全选、全取消
+	**/
+	 function selectAll(){
+		//alert($("#selAll").prop("checked"));
+	  	 if($("#selAll").prop("checked")){
+			//$("#treeTable").find(":checkbox[name='check']").attr("checked","checked");
+				//$("#treeTable").find(":checkbox[name='check']").each(function(){
+                $("input[name='check']:checkbox").each(function(){
+                $(this).prop("checked",true);
+					});
+
+			
+		}else{
+		    //$("#treeTable").find(":checkbox[name='check']").attr("checked",false);	
+			//$("#treeTable").find(":checkbox[name='check']").each(function(){
+               $("input[name='check']:checkbox").each(function(){
+                //$(this).attr("checked",false);
+              	 $(this).removeProp("checked");
+					});
+		} 
+	} 
+	/*
+	系统通用方法，根据参数来决定处理的url和参数
+	*/
+	function cmd(){
+		var url=arguments[0];
+		var mulitId="";
+		jQuery("#treeTable").find(":checkbox:checked[name='check']").each(function(){
+		  if(jQuery(this).val()!=""){
+		    mulitId+=jQuery(this).val()+",";
+		  }
+		});
+		if(mulitId!=""){
+			confirmx('您确认要执行该操作？', url+"?mulitId="+mulitId);
+		}else{
+	       alert("至少选择一条数据记录");
+		}
+	}
+	function casec(){
+		if($("#intype").attr("name")=="specServiceId"||$("#intype").attr("name")=="groupId"){
+			 if(isNaN($("#intype").val())){
+				 $("#showError").show();
+				 return false;
+				 }else{
+						$("#showError").hide();
+						//alert(11);
+						 return true;
+						}
+			}else{
+				$("#showError").hide();
+				 return true;
+				}
+		}
+	
+	//查询
+ 	function page(n,s){
+ 		//$("#intype").attr("name",$("#seltype").val());
+		$("#pageNo").val(n);
+		$("#pageSize").val(s);
+		$("#searchForm").attr("action","${ctx}/specific/specificServiceCfg/list");
+		if(!casec()){
+			return false;
+			}
+		$("#searchForm").submit();
+		return false;
+	}
+		$(document).ready(function() {
+			
+			//reset
+			$("#resetBtn").on("click",function(){
+				$(".Wdate").attr("value",'');
+				$("#searchForm")[0].reset();
+			});
+
+			//设定显示总条数
+			$("#showTotalCount").text('${showTotalCount}');
+			//条件回传
+			$("#seltype").find("option[value=${searchType==null?11:searchType}]").attr("selected",true);
+			$("#intype").attr("name",$("#seltype").find("option:selected").val());
+			$("#intype").val('${searchContent}');
+			//筛选功能初始化
+	 		filterActionInit();
+	 		$("#seltype").change(function(){
+				$("#intype").val("");
+				$("#intype").attr("placeholder","请输入"+$(this).find("option:selected").text());
+				$("#intype").attr("name",$(this).find("option:selected").val());
+				$("#showError").hide();
+			});
+			$("#treeTable").treeTable({expandLevel : 3}).show();	
+		});
+		
+	</script>
+	<style type="text/css">
+	.dropdown-menu {
+    min-width: 70px;
+}
+	</style>
+</head>
+<body>
+<div class="page-content">
+	<div class="theme-panel hidden-xs hidden-sm">
+		<button type="button" class="btn btn-primary"
+			onClick="javascript:window.location='${ctx}/specific/specificServiceCfg/form'">
+			<i class="fa fa-plus"></i>
+			<spring:message code="add"></spring:message>配置</button>
+	</div>
+	
+	<h3 class="page-title">
+		<spring:message code="specific_service_cfg"/>
+		<small><spring:message code="date_list"/></small>
+	</h3>
+	
+	<h5 class="page-header"></h5>
+	<div class="row">
+		<div class="col-md-12">
+			<div class="portlet">
+	
+				<div class="portlet-body">
+
+					<div class="row"  >
+						<form:form id="searchForm" modelAttribute="specificServiceCfg" action="${ctx}/specific/specificServiceCfg/list" method="post" class="form-search">
+							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+							
+							<!-- 筛选按钮展开状态-->
+							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${specificServiceCfg.isFilterAction}"/>
+							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();"/>
+							
+							<!-- 搜索内容与操作按钮栏 -->
+			 				<div class="col-md-12">
+									<div class="pull-left">	
+										<div class="input-group">
+                                           <div class="input-group-btn">
+                                                <select id="seltype"  class="selectpicker select2 input-middle" >
+													<option value="specServiceId">协议ID</option>
+													<option value="specServiceName">协议名称</option>
+													<option value="groupId">maat端配置分组ID</option>
+												</select>
+                                            </div>
+                                            <input id="intype" class="form-control input-medium" placeholder="请输入协议ID" type="text" onchange="casec()">
+                                            <div class="input-group-btn">
+                                              	 <button class="btn btn-default btn-search" type="button" onclick="page()"><i class="fa fa-search"></i></button>
+                                            </div>
+                                            
+                                        </div>
+	                               </div>
+	                               <div class="pull-left" style="margin-top:10px;display:none" id="showError">
+									<label class="error">请填写整数</label>
+									</div>
+	                               <div class="pull-left">
+	                                     <button type="button" class="btn btn-default" id="filter-btn"> 筛选  <i class="fa fa-angle-double-down"></i></button>
+									</div>
+									
+
+									<div class="pull-right">
+									
+                                        <button type="button" class="btn btn-default" onclick="cmd('${ctx}/specific/specificServiceCfg/form')">
+                                            <i class="fa fa-edit"></i> 编辑</button>
+                                        <button type="button" class="btn btn-default" onclick="cmd('${ctx}/specific/specificServiceCfg/delete')">
+                                            <i class="fa fa-trash"></i> 删除</button>
+                                        <a class="btn  btn-icon-only btn-default setfields tooltips" 
+                                      		  data-container="body" data-placement="top" data-original-title="自定义列字段" href="javascript:;">
+                                             <i class="icon-wrench"></i>
+                                         </a>
+                                    </div>
+							</div> 
+							<!-- /搜索内容与操作按钮栏-->
+							
+							
+							
+							
+							<!-- 筛选搜索内容栏默认隐藏-->
+							<div class="col-md-12 filter-action-select-panle hide" >
+								<div class="row">
+								
+									<div class="col-md-6">
+											<div class="pull-left">
+												<label>操作时间：</label>
+											</div>
+											<div class="pull-left">
+												<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+												value="<fmt:formatDate value="${specificServiceCfg.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+											</div>
+											<div class="pull-left">
+												<label>到</label>
+											</div>
+											<div class="pull-left">
+												<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+												value="<fmt:formatDate value="${specificServiceCfg.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+											</div>
+									</div>
+								</div>
+								
+								<h5 class="page-header"></h5>
+								<div class="row">
+									
+									<div class="pull-left">
+										<button type="button"  class="btn blue" onclick="page()"> <i class="fa fa-search"></i> 搜索  </button>
+										<button type="button" id="resetBtn" class="btn btn-default" onclick="reset()"> <i class="fa fa-refresh"></i> 重置  </button>
+									</div>
+							
+								</div>
+							</div>
+							
+							<!-- /筛选搜索内容栏    结束-->
+						
+						</form:form>
+
+					</div>
+					
+					
+				
+					
+					
+
+					 <div class="table-responsive"> 
+					<sys:message content="${message}"/>
+						<table id="treeTable" class="table table-striped table-bordered table-condensed text-nowrap">
+							<thead>
+								<tr>
+								   <th><input type="checkbox" class="ckboxs" id="selAll" onclick="selectAll()"></th>
+								   <th>序号</th>
+								   <th>协议ID</th>
+								   <th>协议名称</th>
+								   <th>协议描述</th>
+								   <th>maat端配置分组id</th>
+								   <th><spring:message code="is_leaf"/></th>
+								   <th class="sort-column op_time">操作时间</th>
+<%-- 								   <shiro:hasPermission name="sys:menu:edit"><th><spring:message code="operation"/></th></shiro:hasPermission>
+ --%>								</tr>
+							</thead>
+							<tbody>
+							<c:forEach items="${list}" var="specificServiceCfg" varStatus="ss">
+											<tr id="${specificServiceCfg.specServiceId}" pId="${specificServiceCfg.parent.specServiceId ne 0?specificServiceCfg.parent.specServiceId:0}">
+												<td><input type="checkbox" class="ckbox" name="check" value="${specificServiceCfg.specServiceId}"></td>
+												<td>${specificServiceCfg.showSequence}</td>
+												<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/specific/specificServiceCfg/form?specServiceId=${specificServiceCfg.specServiceId}&doAction=0">${specificServiceCfg.specServiceId}</a></td>
+												<td title="${specificServiceCfg.specServiceName}">${specificServiceCfg.specServiceName}</td>
+												<td title="${specificServiceCfg.specServiceDesc}">${fns:abbr(specificServiceCfg.specServiceDesc,15)}</td>
+												<td>${specificServiceCfg.groupId }</td>
+												<td>${fns:getDictLabel("SYS_YES_NO",specificServiceCfg.isLeaf,"0")}</td>
+												<td><fmt:formatDate value="${specificServiceCfg.opTime}" 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="#"><spring:message code="operation"/><span class="caret"></span></a>
+													      <ul class="dropdown-menu btn-xs">
+													         <li><a href="${ctx}/specific/specificServiceCfg/form?mulitId=${specificServiceCfg.specServiceId}&doAction=0"><spring:message code="show"/></a></li>
+													         <shiro:hasPermission name="sys:dict:edit">
+														        <li><a href="${ctx}/specific/specificServiceCfg/form?mulitId=${specificServiceCfg.specServiceId}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)"><spring:message code="edit"/></a></li>
+													         </shiro:hasPermission>
+													         <shiro:hasPermission name="sys:dict:edit">
+													       	 	<li><a href="${ctx}/specific/specificServiceCfg/delete?mulitId=${specificServiceCfg.specServiceId}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)"><spring:message code="delete"/></a></li>
+															 </shiro:hasPermission>
+													    
+													      </ul>
+													    </div>
+													</td> --%>
+											</tr>
+										</c:forEach>
+							</tbody>
+						</table>
+						<div class="page">${page}</div>	
+					</div>
+					</div>
+			</div>
+		</div>
+	</div>
+	</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp
new file mode 100644
index 000000000..6c04c00bf
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp
@@ -0,0 +1,436 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<link rel="stylesheet" type="text/css"
+	href="${ctxStatic}/pages/css/dictInfo.css" />
+<script type="text/javascript" src="${ctxStatic}/pages/scripts/dict.js"></script>
+<title></title>
+<script type="text/javascript">
+	$(document).ready(function() {
+		$("[data-toogle='tooltip']").tooltip();
+		$("select[name='ipType']").on("change",function(){
+			var type=$(this).val();
+			if(4==type){
+				$("input[name='srcIpMask']").attr("placeholder","任意掩码请填0.0.0.0,无掩码请填255.255.255.255");
+				$("input[name='dstIpMask']").attr("placeholder","任意掩码请填0.0.0.0,无掩码请填255.255.255.255");
+				$("input[name='srcIp']").attr("placeholder","任意ip请填0.0.0.0");
+				$("input[name='dstIp']").attr("placeholder","任意ip请填0.0.0.0");
+				$("input[name='srcIpMask']").attr("title","任意掩码请填0.0.0.0,无掩码请填255.255.255.255");
+				$("input[name='dstIpMask']").attr("title","任意掩码请填0.0.0.0,无掩码请填255.255.255.255");
+				$("input[name='srcIp']").attr("title","任意ip请填0.0.0.0");
+				$("input[name='dstIp']").attr("title","任意ip请填0.0.0.0");
+			}
+			if(6==type){
+				$("input[name='srcIpMask']").attr("placeholder","若无请填FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF,任意请填 ::");
+				$("input[name='dstIpMask']").attr("placeholder","若无请填FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF,任意请填 ::");
+				$("input[name='srcIp']").attr("placeholder","任意ip请填  ::");
+				$("input[name='dstIp']").attr("placeholder","任意ip请填  ::");
+				$("input[name='srcIpMask']").attr("title","若无请填FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF,任意请填 ::");
+				$("input[name='dstIpMask']").attr("title","若无请填FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF,任意请填 ::");
+				$("input[name='srcIp']").attr("title","任意ip请填  ::");
+				$("input[name='dstIp']").attr("title","任意ip请填  ::");
+			}
+		});
+				jQuery.validator.addMethod("maxValue",
+						function(value, element) {
+							return value >= 0 && value < 210000000;
+						}, "请填写正确的协议id");
+				//ip地址校验
+				jQuery.validator.addMethod("ip",function(value, element) {
+					var typeInt=$("select[name='ipType']").val();
+					if(typeInt==4){
+						return this.optional(element)||(/^(\d+)\.(\d+)\.(\d+)\.(\d+)$/.test(value) && (RegExp.$1 <256 && RegExp.$2<256 && RegExp.$3<256 && RegExp.$4<256));
+					}else if(typeInt==6){
+						return this.optional(element)||/^\s*((([0-9A-Fa-f]{1,4}:){7}(([0-9A-Fa-f]{1,4})|:))|(([0-9A-Fa-f]{1,4}:){6}(:|((25[0-5]|2[0-4]\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})|(:[0-9A-Fa-f]{1,4})))|(([0-9A-Fa-f]{1,4}:){5}((:((25[0-5]|2[0-4]\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}((:((25[0-5]|2[0-4]\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}((:((25[0-5]|2[0-4]\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}((:((25[0-5]|2[0-4]\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}:)(:[0-9A-Fa-f]{1,4}){0,4}((:((25[0-5]|2[0-4]\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(:(:[0-9A-Fa-f]{1,4}){0,5}((:((25[0-5]|2[0-4]\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(((25[0-5]|2[0-4]\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})))(%.+)?\s*$/.test(value);
+						}}, "请填写正确的IP地址");
+				//ip地址掩码校验
+				jQuery.validator.addMethod("ipMask",function(value, element) {
+					obj=value; 
+					var typeInt=$("select[name='ipType']").val();
+					if(typeInt==4){
+						if(obj=="255.255.255.255"){
+							return true;
+						}else{
+							var exp=/^(254|252|248|240|224|192|128|0)\.0\.0\.0|255\.(254|252|248|240|224|192|128|0)\.0\.0|255\.255\.(254|252|248|240|224|192|128|0)\.0|255\.255\.255\.(254|252|248|240|224|192|128|0)$/; 
+							var reg = obj.match(exp); 
+							if(reg==null){return false;}else{return true} 
+						}
+					}else if(typeInt==6){
+						if(obj=="FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"||obj==0||obj=="::"){
+							return true;
+						}else{return (obj > 0) && ((obj & (obj - 1)) == 0)};
+					}
+						}, "请填写正确的IP地址掩码");
+				$("#name").focus();
+				$("#inputForm")
+						.validate(
+								{
+									rules : {
+										specServiceId:{
+											required:true,
+											digits:true,
+											maxValue:true 
+											},
+										srcIp:{
+											required:true,
+											ip:true
+										    },
+										dstIp:{
+											required:true,
+											ip:true
+										    },
+										srcIpMask:{
+											required:true,
+											ipMask:true
+										    },
+										dstIpMask:{
+											required:true,
+											ipMask:true
+										    },
+										srcPort:{
+											required:true,
+											digits:true,
+											max: 65535,
+											min: 0
+									        },
+										dstPort:{
+											required:true,
+											digits:true,
+											max: 65535,
+											min: 0
+										    },
+										srcPortMask:{
+											required:true,
+											digits:true,
+											max: 65535,
+											min: 0
+										    },
+										dstPortMask:{
+											required:true,
+											digits:true,
+											max: 65535,
+											min: 0
+										    }
+										},
+									messages : {
+										specServiceId:{
+											required:'<spring:message code="required"/>',
+										    digits:'请填写整数数值',
+											maxValue:'请填写合适的值（0~210000000）'
+											},
+										srcIp:{
+											required:'<spring:message code="required"/>',
+											ip:'请填写正确的ip'
+										    },
+										dstIp:{
+											required:'<spring:message code="required"/>',
+											ip:'请填写正确的ip'
+										    },
+										srcIpMask:{
+											required:'<spring:message code="required"/>'
+										    },
+										dstIpMask:{
+											required:'<spring:message code="required"/>'
+										    },
+										srcPort:{
+											required:'<spring:message code="required"/>',
+											digits:'请填写整数',
+											max: '数值不得大于65535',
+											min: '数值不得小于0'
+									        },
+										dstPort:{
+											required:'<spring:message code="required"/>',
+											digits:'请填写整数',
+											max: '数值不得大于65535',
+											min: '数值不得小于0'
+										    },
+										srcPortMask:{
+											required:'<spring:message code="required"/>',
+											digits:'请填写整数',
+											max: '数值不得大于65535',
+											min: '数值不得小于0'
+										    },
+										dstPortMask:{
+											required:'<spring:message code="required"/>',
+											digits:'请填写整数',
+											max: '数值不得大于65535',
+											min: '数值不得小于0'
+										    }
+										},
+
+									submitHandler : function(form) {
+										if (!validateItem()) {
+											return false;
+										}
+										loading('正在提交，请稍等...');
+										form.submit();
+									},
+									errorContainer : "#messageBox",
+									errorPlacement : function(error, element) {
+										$("#messageBox").text("输入有误，请先更正。");
+										if (element.is(":checkbox")
+												|| element.is(":radio")
+												|| element.parent().is(
+														".input-append")) {
+											error.appendTo(element.parent()
+													.parent());
+										} else {
+											error.insertAfter(element);
+										}
+									}
+								});
+			});
+</script>
+</head>
+<body>
+
+
+	<div class="page-content">
+
+		<div class="theme-panel hidden-xs hidden-sm">
+
+			<button type="button" class="btn btn-default"
+				onclick="history.go(-1)">
+				<spring:message code="back" />
+			</button>
+
+		</div>
+
+
+		<h3 class="page-title">
+			<spring:message code="agreement_ip_configuration" />
+		</h3>
+
+		<div class="row">
+			<div class="col-md-12">
+				<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 specificServiceHostCfg.hostId?'修改':'添加'}</shiro:hasPermission>
+							<shiro:lacksPermission name="sys:menu:edit">
+								<spring:message code="show" />
+							</shiro:lacksPermission>
+						</div>
+						<div class="tools"></div>
+					</div>
+
+					<div class="portlet-body form">
+
+						<div class="form-body">
+
+							<!-- BEGIN FORM-->
+							<form:form id="inputForm" modelAttribute="specificServiceHostCfg" action="${ctx}/specific/specificServiceHostCfg/saveOrUpdate" method="post" class="form-horizontal" >
+								<form:hidden path="hostId" class="form-control" />
+								<sys:message content="${message}" />
+								<div class="row">
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="col-md-3 control-label"><font color="red">*</font>协议ID:</label>
+											<div class="col-md-6">
+												<form:input path="specServiceId" htmlEscape="false" maxlength="50" class="form-control" />
+											</div>
+										</div>
+									</div>
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="col-md-3 control-label"><font color="red">*</font>方向:</label>
+											<div class="col-md-6">
+												<form:select path="direction" class="selectpicker select2 form-control" >
+													<c:forEach items="${fns:getDictList('SPEC_DIRECTION')}" var="dict">
+									                   <form:option value="${dict.itemCode}">${dict.itemValue}</form:option>
+									                </c:forEach>
+												</form:select>
+											</div>
+										</div>
+									</div>
+								</div>
+
+								<div class="row">
+								   <div class="col-md-6">
+										<div class="form-group">
+											<label class="col-md-3 control-label"><font color="red">*</font>协议:</label>
+											<div class="col-md-6">
+												<form:select path="protocol" class="selectpicker select2 form-control" >
+													<c:forEach items="${fns:getDictList('SPEC_PROTOCOL')}" var="dict">
+									                   <form:option value="${dict.itemCode}">${dict.itemValue}</form:option>
+									                </c:forEach>
+												</form:select>
+											</div>
+										</div>
+									</div>
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="col-md-3 control-label"><font color="red">*</font>ip类型:</label>
+										    <div class="col-md-6">
+												   <form:select path="ipType" class="selectpicker select2 form-control" >	
+	                                                	<c:forEach items="${fns:getDictList('SPEC_IP_TYPE')}" var="dict">
+										                   <form:option value="${dict.itemCode}">${dict.itemValue}</form:option>
+										                </c:forEach>
+										           </form:select>
+									        </div>
+											<div class="col-md-6" style="display:none;">
+											    <input name="isAudit" value="1"/>
+											</div>
+										</div>
+									</div>
+								</div>
+
+								<div class="row">
+									<div class="col-md-6">
+										<div class="form-group">
+												<label class="col-md-3 control-label"><font color="red">*</font>源IP地址:</label>
+												<div class="col-md-6">
+													<form:input path="srcIp" htmlEscape="false" maxlength="50" class="form-control" data-toggle="tooltip" data-placement="top" title="任意ip请填0.0.0.0"  placeholder="任意ip请填0.0.0.0"/>
+											    </div>
+										</div>
+									</div>
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="col-md-3 control-label"><font color="red">*</font>目的IP地址:</label>
+											<div class="col-md-6">
+												<form:input path="dstIp" htmlEscape="false" maxlength="50" class="form-control" data-toggle="tooltip" data-placement="top" title="任意ip请填0.0.0.0" placeholder="任意ip请填0.0.0.0"/>
+											</div>
+										</div>
+									</div>
+								</div>
+
+								<div class="row">
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="col-md-3 control-label"><font color="red">*</font>源地址掩码:</label>
+											<div class="col-md-6">
+												<form:input path="srcIpMask" htmlEscape="false" maxlength="50" class="form-control" data-toggle="tooltip" title="任意掩码请填0.0.0.0,无掩码请填255.255.255.255" data-placement="top" placeholder="任意掩码请填0.0.0.0,无掩码请填255.255.255.255"/>
+											</div>
+										</div>
+									</div>
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="col-md-3 control-label"><font color="red">*</font>目的地址掩码:</label>
+											<div class="col-md-6">
+												<form:input path="dstIpMask" htmlEscape="false" maxlength="50" class="form-control" data-toggle="tooltip" data-placement="top" title="任意掩码请填0.0.0.0,无掩码请填255.255.255.255" placeholder="任意掩码请填0.0.0.0,无掩码请填255.255.255.255"/>
+											</div>
+										</div>
+									</div>
+								</div>
+
+								<div class="row">
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="col-md-3 control-label"><font color="red">*</font>源端口:</label>
+											<div class="col-md-6">
+												<form:input path="srcPort" htmlEscape="false" maxlength="50" class="form-control" data-toggle="tooltip" data-placement="top" title="任意端口请填0" placeholder="任意端口请填0"/>
+											</div>
+										</div>
+									</div>
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="col-md-3 control-label"><font color="red">*</font>目的端口:</label>
+											<div class="col-md-6">
+												<form:input path="dstPort" htmlEscape="false" maxlength="50" class="form-control" data-toggle="tooltip" data-placement="top" title="任意端口请填0" placeholder="任意端口请填0"/>
+											</div>
+										</div>
+									</div>
+                                 </div>
+								<div class="row">
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="col-md-3 control-label"><font color="red">*</font>源端口掩码:</label>
+											<div class="col-md-6">
+												<form:input path="srcPortMask" htmlEscape="false" maxlength="50" class="form-control" data-toggle="tooltip" data-placement="top" title="任意掩码请填0,无掩码请填65535" placeholder="任意掩码请填0,无掩码请填65535"/>
+											</div>
+										</div>
+									</div>
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="col-md-3 control-label"><font color="red">*</font>目的端口掩码:</label>
+											<div class="col-md-6">
+												<form:input path="dstPortMask" htmlEscape="false" maxlength="50" class="form-control" data-toggle="tooltip" data-placement="top" title="任意掩码请填0,无掩码请填65535" placeholder="任意掩码请填0,无掩码请填65535"/>
+											</div>
+										</div>
+									</div>
+								</div>
+
+								<%-- <div class="row">
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="col-md-3 control-label"><font color="red">*</font>创建人员:</label>
+											<div class="col-md-6">
+												<form:input path="creator.id" htmlEscape="false" maxlength="50" class="form-control" />
+											</div>
+										</div>
+									</div>
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="col-md-3 control-label"><font color="red">*</font>配置时间:</label>
+											<div class="col-md-6">
+												<form:input path="createTime" htmlEscape="false" maxlength="50" class="form-control" />
+											</div>
+										</div>
+									</div>
+								</div>
+
+								<div class="row">
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="col-md-3 control-label"><font color="red">*</font>修改人员:</label>
+											<div class="col-md-6">
+												<form:input path="editor.id" htmlEscape="false" maxlength="50" class="form-control" />
+											</div>
+										</div>
+									</div>
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="col-md-3 control-label"><font color="red">*</font>修改时间:</label>
+											<div class="col-md-6">
+												<form:input path="editTime" htmlEscape="false" maxlength="50" class="form-control" />
+											</div>
+										</div>
+									</div>
+								</div>
+
+								<div class="row">
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="col-md-3 control-label"><font color="red">*</font>审核人员:</label>
+											<div class="col-md-6">
+												<form:input path="auditor.id" htmlEscape="false" maxlength="50" class="form-control" />
+											</div>
+										</div>
+									</div>
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="col-md-3 control-label"><font color="red">*</font>审核时间:</label>
+											<div class="col-md-6">
+												<form:input path="auditTime" htmlEscape="false" maxlength="50" class="form-control" />
+											</div>
+										</div>
+									</div>
+								</div> --%>
+
+
+
+
+
+								<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"><spring:message code="submit" /></button></shiro:hasPermission>
+											<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)"> <spring:message code="cancel" /></button>
+										</div>
+									</div>
+								</div>
+							</form:form>
+							<!-- END FORM-->
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp
new file mode 100644
index 000000000..708d44e8f
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp
@@ -0,0 +1,353 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title><spring:message code="agreement_ip_configuration" /></title>
+<script>
+ 	$(document).ready(function() {
+ 		//筛选功能初始化
+ 		filterActionInit();
+ 		
+		$("#isAudit").change(function(){
+			page();
+		});
+		$("#direction").change(function(){
+			page();
+		});
+		$("#protocol").change(function(){
+			page();
+		});
+		$("#ipType").change(function(){
+			page();
+		});
+		//全选及取消
+		$("#checkAll").change(function(){
+			if($("#checkAll").prop("checked")){
+				$("input.i-checks").prop("checked",true);
+			}else{
+				$("input.i-checks").prop("checked",false);
+			}
+		});
+ 	});
+ 	function resetx(){
+ 		$(':input','#searchForm')
+ 		.not(':button,:submit,:reset,:hidden')
+ 		.val('')
+ 		.removeAttr('checked')
+ 		.removeAttr('selected');
+ 		$("select.selectpicker").each(function(){
+			$(this).selectpicker('val',$(this).find('option:first').val());
+			$(this).find("option").attr("selected",false);
+			$(this).find("option:first").attr("selected",true);
+		});
+ 		$("#specServiceId").attr("value","");
+ 		$("#srcIp").attr("value","");
+ 		$("#dstIp").attr("value","");
+ 		
+ 	}
+	//编辑
+	function edit(){
+		var mulitId="";
+		jQuery("#contentTable").find(":checkbox:checked[name='check']").each(function(){
+			  if(jQuery(this).val()!=""){
+			    mulitId+=jQuery(this).val()+",";
+			  }
+			});
+			if(mulitId!=""){
+				confirmx('您确认要执行该操作？', '${ctx}/specific/specificServiceHostCfg/form?hostId='+mulitId.split(",", 1)[0]);
+			}else{
+		       alert("至少选择一条数据记录");
+			}
+	}
+	//删除
+	function delAll(){
+		var mulitId="";
+		jQuery("#contentTable").find(":checkbox:checked[name='check']").each(function(){
+			  if(jQuery(this).val()!=""){
+			    mulitId+=jQuery(this).val()+",";
+			  }
+			});
+			if(mulitId!=""){
+				confirmx('您确认要执行该操作？', '${ctx}/specific/specificServiceHostCfg/delete?mulitId='+mulitId);
+			}else{
+		       alert("至少选择一条数据记录");
+			}
+	}
+	//查询
+ 	function page(n,s){
+		$("#pageNo").val(n);
+		$("#pageSize").val(s);
+		$("#searchForm").attr("action","${ctx}/specific/specificServiceHostCfg/list");
+		$("#searchForm").submit();
+		return false;
+	}
+</script>
+</head>
+
+<body>
+
+<div class="page-content">
+	<div class="theme-panel hidden-xs hidden-sm">
+		<button type="button" class="btn btn-primary"
+			onClick="javascript:window.location='${ctx}/specific/specificServiceHostCfg/form'">
+			<i class="fa fa-plus"></i>
+			<spring:message code="add"/></button>
+	</div>
+	
+	<h3 class="page-title">
+		<spring:message code="agreement_ip_configuration" />
+		<small><spring:message code="date_list"/></small>
+	</h3>
+	
+	<h5 class="page-header"></h5>
+	<div class="row">
+		<div class="col-md-12">
+			<div class="portlet">
+	
+				<div class="portlet-body">
+
+					<div class="row"  >
+						<form:form id="searchForm" modelAttribute="specificServiceHostCfg" action="${ctx}/specific/specificServiceHostCfg/list" method="post" class="form-search">
+							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+							
+							<!-- 筛选按钮展开状态-->
+							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${specificServiceHostCfg.isFilterAction }"/>
+							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();"/>
+							
+							<!-- 搜索内容与操作按钮栏 -->
+							<div class="col-md-12">
+									<%-- <div class="pull-left">
+										<form:select path="isAudit" class="selectpicker select2 input-small" >
+											<form:option value=""><spring:message code="all_states"/></form:option>
+											   <c:forEach items="${fns:getDictList('SPEC_AUDIT')}" var="dict">
+											      <form:option value="${dict.itemCode}">${dict.itemValue}</form:option>
+											   </c:forEach>
+										</form:select>
+								   </div> --%>
+								   <div class="pull-left">
+									<c:set var="spec_service_id">协议ID</c:set>
+									<form:select path="specServiceId" class="selectpicker select2 input-small" title="${spec_service_id}" data-live-search="true" data-live-search-placeholder="search">
+										<c:forEach items="${listSpecServiceId}" var="specServiceId" >
+											<form:option value="${specServiceId}">${specServiceId}</form:option>
+										</c:forEach>
+									</form:select>
+								   </div>
+								    <div class="pull-left" style="margin-right:0px;">
+										<form:select path="ipType" class="selectpicker select2 input-small" >
+											<form:option value="">-请选择ip类型-</form:option>
+											   <c:forEach items="${fns:getDictList('SPEC_IP_TYPE')}" var="dict">
+											      <form:option value="${dict.itemCode}">${dict.itemValue}</form:option>
+											   </c:forEach>
+										</form:select>
+								   </div>
+								   <div class="pull-left">
+									<c:set var="src_ip">源Ip地址</c:set>
+									<form:select path="srcIp" class="selectpicker select2 input-small" title="${src_ip}" data-live-search="true" data-live-search-placeholder="search">
+										<c:forEach items="${listSrcIp}" var="srcIp" >
+											<form:option value="${srcIp}">${srcIp}</form:option>
+										</c:forEach>
+									</form:select>
+								   </div>
+								   <div class="pull-left">
+									<c:set var="dst_ip">目的Ip地址</c:set>
+									<form:select path="dstIp" class="selectpicker select2 input-small" title="${dst_ip}" data-live-search="true" data-live-search-placeholder="search">
+										<c:forEach items="${listDstIp}" var="dstIp" >
+											<form:option value="${dstIp}">${dstIp}</form:option>
+										</c:forEach>
+									</form:select>
+								   </div>
+								    <div class="pull-left">
+										<form:select path="direction" class="selectpicker select2 input-small" >
+											<form:option value="">-请选择方向-</form:option>
+											   <c:forEach items="${fns:getDictList('SPEC_DIRECTION')}" var="dict">
+											      <form:option value="${dict.itemCode}">${dict.itemValue}</form:option>
+											   </c:forEach>
+										</form:select>
+								   </div>
+								   <div class="pull-left" style="margin-right:0px;">
+										<form:select path="protocol" class="selectpicker select2 input-small" >
+											<form:option value="">-请选择协议-</form:option>
+											   <c:forEach items="${fns:getDictList('SPEC_PROTOCOL')}" var="dict">
+											      <form:option value="${dict.itemCode}">${dict.itemValue}</form:option>
+											   </c:forEach>
+										</form:select>
+								   </div>
+								   <div class="pull-left">
+                                    <button class="btn btn-default btn-search" type="button" onclick="return page()"><i class="fa fa-search"></i></button>
+                                 </div>
+								<div class="pull-left">
+	                                     <button type="button" class="btn btn-default" id="filter-btn"> 筛选  <i class="fa fa-angle-double-down"></i></button>
+								</div>
+								 
+									
+
+									<div class="pull-right">
+									<button type="button" class="btn btn-default" onclick="edit()">
+                                            <i class="fa fa-edit"></i> <spring:message code="edit"></spring:message></button>
+                                             <button type="button" class="btn btn-default" onclick="delAll()">
+                                            <i class="fa fa-trash"></i> 删除</button>
+                                      <%--   <div class="btn-group" >
+                                            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                                                <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
+                                                <i class="fa fa-angle-down"></i>
+                                            </button>
+                                            <ul class="dropdown-menu pull-right">
+                                                <li><sys:delRow url="" id="contentTable" label="approved"></sys:delRow></li>
+												<li><sys:delRow url="" id="contentTable" label="unapproved"></sys:delRow></li>
+												<li><sys:delRow url="" id="contentTable" label="cancelPass"></sys:delRow></li>            
+                                            </ul>
+                                        </div> --%>
+                                        <a class="btn  btn-icon-only btn-default setfields tooltips" 
+                                      		  data-container="body" data-placement="top" data-original-title="自定义列字段" href="javascript:;">
+                                             <i class="icon-wrench"></i>
+                                         </a>
+                                    </div>
+							
+								
+							</div>
+							<!-- /搜索内容与操作按钮栏-->
+							
+							
+							
+							
+							<!-- 筛选搜索内容栏默认隐藏-->
+							<div class="col-md-12 filter-action-select-panle hide" >
+								<div class="row">
+								
+									<div class="col-md-6">
+											<div class="pull-left">
+												<label>配置时间：</label>
+											</div>
+											<div class="pull-left">
+												<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate" data-options="buttons:buttons"
+												value="<fmt:formatDate value="${specificServiceHostCfg.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+											</div>
+											<div class="pull-left">
+												<label><spring:message code="to"/></label>
+											</div>
+											<div class="pull-left">
+												<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+												value="<fmt:formatDate value="${specificServiceHostCfg.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+											</div>
+											
+									</div>
+							
+									<div class="col-md-6">
+										<div class="pull-left">
+											<label>修改时间：</label>
+										</div>
+										<div class="pull-left">
+											<input id="editBeginDate" name="editBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+											value="<fmt:formatDate value="${specificServiceHostCfg.editBeginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+										<div class="pull-left">
+											<label><spring:message code="to"/></label>
+										</div>
+										<div class="pull-left">
+											<input id="editEndDate" name="editEndDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+											value="<fmt:formatDate value="${specificServiceHostCfg.editEndDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+									</div>
+									
+										<div class="col-md-6">
+										<div class="pull-left">
+											<label>审核时间：</label>
+										</div>
+										<div class="pull-left">
+											<input id="auditBeginDate" name="auditBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+											value="<fmt:formatDate value="${specificServiceHostCfg.auditBeginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+										<div class="pull-left">
+											<label><spring:message code="to"/></label>
+										</div>
+										<div class="pull-left">
+											<input id="auditEndDate" name="auditEndDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+											value="<fmt:formatDate value="${specificServiceHostCfg.auditEndDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+									</div> 
+								</div>
+								
+								<h5 class="page-header"></h5>
+								<div class="row">
+									
+									<div class="pull-left">
+										<button type="button" class="btn blue" onclick="page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
+										<button type="button" class="btn btn-default" onclick="resetx()"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+									</div>
+							
+								</div>
+							</div>
+							
+							<!-- /筛选搜索内容栏    结束-->
+						
+						</form:form>
+
+					</div>
+					
+					
+				
+					
+					
+
+					<div class="table-responsive">
+					<sys:message content="${message}"/>
+						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
+							<thead>
+								<tr>
+									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
+									<th>协议id</th>
+									<th>源IP地址</th>
+									<th>源地址掩码</th>
+									<th>源端口</th>
+									<th>源端口掩码</th>
+									<th>目的IP地址</th>
+									<th>目的地址掩码</th>
+									<th>目的端口</th>
+									<th>目的端口掩码</th>
+									<th>方向</th>
+									<th>协议</th>
+									<th>是否审核</th>
+									<th>创建人员</th>
+									<th class="sort-column create_time">配置时间</th>
+									<th>修改人员</th>
+									<th class="sort-column edit_time">修改时间</th>
+									<th isVisible="false">审核人员</th>
+									<th isVisible="false" class="sort-column audit_time">审核时间</th>
+								</tr>
+							</thead>
+							<tbody>
+							<c:forEach items="${page.list}" var="specificServiceHostCfg">
+								<tr>
+									<td><input type="checkbox" class="i-checks" name="check" id="${specificServiceHostCfg.hostId}" value="${specificServiceHostCfg.hostId}"></td>
+									<td>${specificServiceHostCfg.specServiceId }</td>
+									<td title="${specificServiceHostCfg.srcIp}">${fns:abbr(specificServiceHostCfg.srcIp,15)}</td>
+									<td title="${specificServiceHostCfg.srcIpMask}">${fns:abbr(specificServiceHostCfg.srcIpMask,15) }</td>
+									<td>${specificServiceHostCfg.srcPort}</td>
+									<td>${specificServiceHostCfg.srcPortMask}</td>
+									<td title="${specificServiceHostCfg.dstIp}">${fns:abbr(specificServiceHostCfg.dstIp,15) }</td>
+									<td title="${specificServiceHostCfg.dstIpMask}">${fns:abbr(specificServiceHostCfg.dstIpMask,15) }</td>
+									<td>${specificServiceHostCfg.dstPort }</td>
+									<td>${specificServiceHostCfg.dstPortMask }</td>
+									<td>${fns:getDictLabel("SPEC_DIRECTION",specificServiceHostCfg.direction,"0")}</td>
+									<td>${fns:getDictLabel("SPEC_PROTOCOL",specificServiceHostCfg.protocol,"0")}</td>
+									<td>${fns:getDictLabel("SPEC_AUDIT",specificServiceHostCfg.isAudit,"0")}</td>
+									<td>${fns:getUserById(specificServiceHostCfg.creator.id).name}</td>
+									<td><fmt:formatDate value="${specificServiceHostCfg.createTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+									<td>${fns:getUserById(specificServiceHostCfg.editor.id).name}</td>
+									<td><fmt:formatDate value="${specificServiceHostCfg.editTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+									<td>${fns:getUserById(specificServiceHostCfg.auditor.id==null?0:specificServiceHostCfg.auditor.id).name}</td>
+									<td><fmt:formatDate value="${specificServiceHostCfg.auditTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+								</tr>
+							</c:forEach>
+							</tbody>
+						</table>
+						<div class="page">${page}</div>	
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	</div>
+</body>
+</html>
diff --git a/src/main/webapp/WEB-INF/views/sys/userForm.jsp b/src/main/webapp/WEB-INF/views/sys/userForm.jsp
index ccb08e3d8..e4482a8e3 100644
--- a/src/main/webapp/WEB-INF/views/sys/userForm.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/userForm.jsp
@@ -68,131 +68,158 @@
 	</script>
 </head>
 <body>
-	<ul class="nav nav-tabs">
-		<li><a href="${ctx}/sys/user/list">用户列表</a></li>
-		<li class="active"><a href="${ctx}/sys/user/form?id=${user.id}">用户
-			<shiro:hasPermission name="sys:user:edit"></shiro:hasPermission>${not empty user.id?'修改':'添加'}
-			<shiro:lacksPermission name="sys:user:edit">查看</shiro:lacksPermission>
-		</a></li>
-	</ul><br/>
+<div class="page-content">
+
+<div class="row">
+<!-- 	<ul class="nav nav-tabs"> -->
+<%-- 		<li><a href="${ctx}/sys/user/list">用户列表</a></li> --%>
+<%-- 		<li class="active"><a href="${ctx}/sys/user/form?id=${user.id}">用户 --%>
+<%-- 			<shiro:hasPermission name="sys:user:edit"></shiro:hasPermission>${not empty user.id?'修改':'添加'} --%>
+<%-- 			<shiro:lacksPermission name="sys:user:edit">查看</shiro:lacksPermission> --%>
+<!-- 		</a></li> -->
+<!-- 	</ul><br/> -->
+	<div class="theme-panel hidden-xs hidden-sm">
+		<button type="button" class="btn btn-default" onclick="history.go(-1)"><spring:message code="back"/></button>
+	</div>
+	<h3 class="page-title">
+		<spring:message code="userManage"/>
+	</h3>
+	
+	<div class="col-md-12">
+	<div class="portlet box blue">
+		<div class="portlet-title">
+					<div class="caption">
+						<i class="fa fa-gift"></i><c:if test="${not empty user.id}"><spring:message code="edit"/></c:if><c:if test="${empty user.id}"><spring:message code="add"/></c:if></div>
+		</div>
+	
+	<div class="portlet-body form">
 	<form:form id="inputForm" modelAttribute="sysUser" action="${ctx}/sys/user/saveOrUpdate" method="post" class="form-horizontal">
 		<form:hidden path="id"/>
 		<sys:message content="${message}"/>
-		
-		<div class="control-group">
-			<label class="control-label">头像:</label>
-			<div class="controls">
+		<div class="form-body">
+		<div class="form-group">
+			<label class="col-md-3 control-label">头像:</label>
+			<div class="col-md-4">
 				<form:hidden id="nameImage" path="photo" htmlEscape="false" maxlength="255" class="input-xlarge"/>
 				<sys:ckfinder input="nameImage" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
 			</div>
 		</div>
 		
-		<div class="control-group">
-			<label class="control-label">登录名:</label>
-			<div class="controls">
+		<div class="form-group">
+			<label class="col-md-3 control-label">登录名:</label>
+			<div class="col-md-4">
 				<input id="oldLoginId" name="oldLoginId" type="hidden" value="${user.loginId}">
 				<c:if test="${not empty user.id}" var="exisitUser">
-					<form:input path="loginId" htmlEscape="false" maxlength="50" readonly="true" class="required userName"/>
+					<form:input path="loginId" htmlEscape="false" maxlength="50" readonly="true" class="required userName form-control"/>
 				</c:if>
 				
 				<c:if test="${!exisitUser}">
-					<form:input path="loginId" htmlEscape="false" maxlength="50" class="required userName"/>
+					<form:input path="loginId" htmlEscape="false" maxlength="50" class="required userName form-control"/>
 				</c:if>
-				
-				
-				
-				<span class="help-inline"><font color="red">*</font> </span>
 			</div>
+				<span class="help-inline"><font color="red">*</font> </span>
 		</div>
-		<div class="control-group">
-			<label class="control-label">归属公司:</label>
-			<div class="controls">
+		<div class="form-group">
+			<label class="col-md-3 control-label">归属公司:</label>
+			<div class="col-md-4">
                 <sys:treeselect id="company" name="company.id" value="${user.company.id}" labelName="company.name" labelValue="${user.company.name}"
-					title="公司" url="/sys/office/treeData?type=1" cssClass="required" notAllowSelectRoot="true"/>
+					title="公司" url="/sys/office/treeData?type=1" cssClass="required  form-control" notAllowSelectRoot="true"/>
 			</div>
 		</div>
 		
-		<div class="control-group">
-			<label class="control-label">归属单位:</label>
-			<div class="controls">
+		<div class="form-group">
+			<label class="col-md-3 control-label">归属单位:</label>
+			<div class="col-md-4">
                 <sys:treeselect id="entity" name="entity.id" value="${user.entity.id}" labelName="entity.name" labelValue="${user.entity.name}"
-					title="单位" url="/sys/office/treeData?type=2" cssClass="required" notAllowSelectRoot="true"/>
+					title="单位" url="/sys/office/treeData?type=2" cssClass="required form-control" notAllowSelectRoot="true"/>
 			</div>
 		</div>
 		
-		<div class="control-group">
-			<label class="control-label">归属部门:</label>
-			<div class="controls">
+		<div class="form-group">
+			<label class="col-md-3 control-label">归属部门:</label>
+			<div class="col-md-4">
                 <sys:treeselect id="office" name="office.id" value="${user.office.id}" labelName="office.name" labelValue="${user.office.name}"
-					title="部门" url="/sys/office/treeData?type=3" cssClass="required" notAllowSelectRoot="true"/>
+					title="部门" url="/sys/office/treeData?type=3" cssClass="required form-control" notAllowSelectRoot="true"/>
 			</div>
 		</div>
 		
-		<div class="control-group">
-			<label class="control-label">姓名:</label>
-			<div class="controls">
-				<form:input path="name" htmlEscape="false" maxlength="50" class="required"/>
-				<span class="help-inline"><font color="red">*</font> </span>
+		<div class="form-group">
+			<label class="col-md-3 control-label">姓名:</label>
+			<div class="col-md-4">
+				<form:input path="name" htmlEscape="false" maxlength="50" class="required form-control"/>
 			</div>
+			<span class="help-inline"><font color="red">*</font> </span>
 		</div>
 		
-		<div class="control-group">
-			<label class="control-label">密码:</label>
-			<div class="controls">
-				<input id="newPassword" name="newPassword" type="password" value="" maxlength="50" minlength="3" class="${empty user.id?'required':''}"/>
+		<div class="form-group">
+			<label class="col-md-3 control-label">密码:</label>
+			<div class="col-md-4">
+				<input id="newPassword" name="newPassword" type="password" value="" maxlength="50" minlength="3" class="${empty user.id?'required':''} form-control"/>
+			</div>
 				<c:if test="${empty user.id}"><span class="help-inline"><font color="red">*</font> </span></c:if>
 				<c:if test="${not empty user.id}"><span class="help-inline">若不修改密码，请留空。</span></c:if>
-			</div>
 		</div>
-		<div class="control-group">
-			<label class="control-label">确认密码:</label>
-			<div class="controls">
-				<input id="confirmNewPassword" name="confirmNewPassword" type="password" value="" maxlength="50" minlength="3" equalTo="#newPassword"/>
-				<c:if test="${empty user.id}"><span class="help-inline"><font color="red">*</font> </span></c:if>
+		<div class="form-group">
+			<label class="col-md-3 control-label">确认密码:</label>
+			<div class="col-md-4">
+				<input id="confirmNewPassword" name="confirmNewPassword" type="password" value="" maxlength="50" minlength="3" equalTo="#newPassword" class="form-control"/>
+				<c:if test="${empty user.id}"></c:if>
 			</div>
+			<span class="help-inline"><font color="red">*</font> </span>
 		</div>
 		
-		<div class="control-group">
-			<label class="control-label">身份标识:</label>
-			<div class="controls">
-				<form:select path="identity" class="input-medium">
+		<div class="form-group">
+			<label class="col-md-3 control-label">身份标识:</label>
+			<div class="col-md-4 ">
+				<form:select path="identity" class="selectpicker select2 form-control">
 					<form:option value="0">普通人员</form:option>
 					<form:option value="1">管理人员</form:option>
 				</form:select>
-				<span class="help-inline">管理人员需指定身份标识为“管理人员”，否则影响信访审核流程！</span>
 			</div>
+				<span class="help-inline"><font>管理人员需指定身份标识为“管理人员”，否则影响审核流程！</font></span>
 		</div>
 		
-		<div class="control-group">
-			<label class="control-label">邮箱:</label>
-			<div class="controls">
-				<form:input path="email" htmlEscape="false" maxlength="100" class="required email"/><span class="help-inline"><font color="red">*</font> </span>
+		<div class="form-group">
+			<label class="col-md-3 control-label">邮箱:</label>
+			<div class="col-md-4">
+				<form:input path="email" htmlEscape="false" maxlength="100" class="required email form-control"/>
 			</div>
+			<span class="help-inline"><font color="red">*</font> </span>
 		</div>
 		
 		
-		<div class="control-group">
-			<label class="control-label">用户角色:</label>
-			<div class="controls">
-				<form:checkboxes path="roleIdList" items="${allRoles}" itemLabel="name" itemValue="id" htmlEscape="false" class="required"/>
-				<span class="help-inline"><font color="red">*</font> </span>
+		<div class="form-group">
+			<label class="col-md-3 control-label">用户角色:</label>
+			<div class="col-md-8">
+				<form:checkboxes path="roleIdList" items="${allRoles}" itemLabel="name" itemValue="id" htmlEscape="false" class="required" style="vertical-align:middle;display:inline-block;margin-bottom:4px"/>
+				<span class="help-inline "><font color="red">*</font> </span>
 			</div>
 		</div>
 		
 		<c:if test="${not empty user.id}">
-			<div class="control-group">
-				<label class="control-label">创建时间:</label>
-				<div class="controls">
-					<label class="lbl"><fmt:formatDate value="${user.createTime}" type="both" dateStyle="full"/></label>
+			<div class="form-group">
+				<label class="col-md-3 control-label">创建时间:</label>
+				<div class="col-md-4">
+					<label class="lbl form-control"><fmt:formatDate value="${user.createTime}" type="both" dateStyle="full"/></label>
 				</div>
 			</div>
 			
 		</c:if>
+		</div>
 		<div class="form-actions">
+		<div class="row">
+		<div class="col-md-offset-3 col-md-9">
 			<shiro:hasPermission name="sys:user:edit"></shiro:hasPermission>
-			<input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;
-			<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
+			<button type="submit" class="btn btn-circle green"><spring:message code="submit"></spring:message></button>
+			<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)"><spring:message code="cancel"></spring:message></button>
+		</div>
+		</div>
 		</div>
 	</form:form>
+</div>
+</div>
+</div>
+</div>
+</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/sys/userInfo.jsp b/src/main/webapp/WEB-INF/views/sys/userInfo.jsp
index 11299b40e..b0e8fc2e6 100644
--- a/src/main/webapp/WEB-INF/views/sys/userInfo.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/userInfo.jsp
@@ -1,75 +1,114 @@
-<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ page contentType="text/html;charset=UTF-8"%>
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
 <html>
 <head>
-	<title>个人信息</title>
-	<script type="text/javascript">
-		$(document).ready(function() {
-			$("#inputForm").validate({
-				submitHandler: function(form){
-					loading('正在提交，请稍等...');
-					form.submit();
-				},
-				errorContainer: "#messageBox",
-				errorPlacement: function(error, element) {
-					$("#messageBox").text("输入有误，请先更正。");
-					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
-						error.appendTo(element.parent().parent());
-					} else {
-						error.insertAfter(element);
-					}
-				}
+<title>个人信息</title>
+<script type="text/javascript">
+	$(document).ready(
+			function() {
+				$("#inputForm")
+						.validate(
+								{
+									submitHandler : function(form) {
+										loading('正在提交，请稍等...');
+										form.submit();
+									},
+									errorContainer : "#messageBox",
+									errorPlacement : function(error, element) {
+										$("#messageBox").text("输入有误，请先更正。");
+										if (element.is(":checkbox")
+												|| element.is(":radio")
+												|| element.parent().is(
+														".input-append")) {
+											error.appendTo(element.parent()
+													.parent());
+										} else {
+											error.insertAfter(element);
+										}
+									}
+								});
 			});
-		});
-	</script>
+</script>
 </head>
 <body>
-	<ul class="nav nav-tabs">
-		<li class="active"><a href="${ctx}/sys/user/info">个人信息</a></li>
-		<li><a href="${ctx}/sys/user/modifyPwd">修改密码</a></li>
-	</ul><br/>
-	<form:form id="inputForm" modelAttribute="user" action="${ctx}/sys/user/info" method="post" class="form-horizontal">
-		<sys:message content="${message}"/>
-		
-		<div class="control-group">
-			<label class="control-label">头像:</label>
-			<div class="controls">
-				<form:hidden id="nameImage" path="photo" htmlEscape="false" maxlength="255" class="input-xlarge"/>
-				<sys:ckfinder input="nameImage" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+	<div class="page-content">
+		<div class="row">
+			<ul class="nav nav-tabs">
+				<li class="active"><a href="${ctx}/sys/user/info">个人信息</a></li>
+				<li><a href="${ctx}/sys/user/modifyPwd">修改密码</a></li>
+			</ul>
+			<br />
+			<div class="col-md-12">
+				<div class="portlet box blue">
+
+					<div class="portlet-title">
+						<div class="caption">
+							<i class="fa fa-gift"></i>
+							<spring:message code="userInfo" />
+						</div>
+					</div>
+					<div class="portlet-body form">
+						<form:form id="inputForm" modelAttribute="user"
+							action="${ctx}/sys/user/info" method="post"
+							class="form-horizontal form-striped">
+							<sys:message content="${message}" />
+							<div class="form-body">
+								<div class="form-group">
+									<label class="col-md-3 control-label">头像:</label>
+									<div class="col-md-4">
+										<form:hidden id="nameImage" path="photo" htmlEscape="false"
+											maxlength="255" class="input-xlarge" />
+										<sys:ckfinder input="nameImage" type="images"
+											uploadPath="/photo" selectMultiple="false" maxWidth="100"
+											maxHeight="100" />
+									</div>
+								</div>
+
+								<div class="form-group">
+									<label class="col-md-3 control-label">姓名:</label>
+									<div class="col-md-4">
+										<form:input path="name" htmlEscape="false" maxlength="50"
+											class="required form-control" readonly="true" />
+									</div>
+								</div>
+								<div class="form-group">
+									<label class="col-md-3 control-label">邮箱:</label>
+									<div class="col-md-4">
+										<form:input path="email" htmlEscape="false" maxlength="50"
+											class="email form-control" />
+									</div>
+								</div>
+
+								<div class="form-group">
+									<label class="col-md-3 control-label">用户部门:</label>
+									<div class="col-md-4">
+										<label class="lbl control-label">${user.office.name}</label>
+									</div>
+								</div>
+
+
+								<div class="form-group">
+									<label class="col-md-3 control-label">用户角色:</label>
+									<div class="col-md-4">
+										<label class="lbl control-label">${user.roleNames}</label>
+									</div>
+								</div>
+							</div>
+
+							<div class="form-actions">
+								<div class="row">
+									<div class="col-md-offset-3 col-md-9">
+										<button id="btnSubmit" type="submit" class="btn btn-primary">
+											<spring:message code="submit"></spring:message>
+										</button>
+									</div>
+								</div>
+							</div>
+						</form:form>
+					</div>
+				</div>
 			</div>
 		</div>
-		
-		<div class="control-group">
-			<label class="control-label">姓名:</label>
-			<div class="controls">
-				<form:input path="name" htmlEscape="false" maxlength="50" class="required" readonly="true"/>
-			</div>
-		</div>
-		<div class="control-group">
-			<label class="control-label">邮箱:</label>
-			<div class="controls">
-				<form:input path="email" htmlEscape="false" maxlength="50" class="email"/>
-			</div>
-		</div>
-		
-		<div class="control-group">
-			<label class="control-label">用户部门:</label>
-			<div class="controls">
-				<label class="lbl">${user.office.name}</label>
-			</div>
-		</div>
-		
-		
-		<div class="control-group">
-			<label class="control-label">用户角色:</label>
-			<div class="controls">
-				<label class="lbl">${user.roleNames}</label>
-			</div>
-		</div>
-		
-		<div class="form-actions">
-			<input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>
-		</div>
-	</form:form>
+	</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/sys/userList.jsp b/src/main/webapp/WEB-INF/views/sys/userList.jsp
index d947c5115..d5770c07e 100644
--- a/src/main/webapp/WEB-INF/views/sys/userList.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/userList.jsp
@@ -5,95 +5,199 @@
 <title>用户管理</title>
 <script type="text/javascript">
 	$(document).ready(function() {
-		$("#btnExport").click(function(){
-			top.$.jBox.confirm("确认要导出用户数据吗？","系统提示",function(v,h,f){
-				if(v=="ok"){
-					$("#searchForm").attr("action","${ctx}/sys/user/export");
+		$("#btnExport").click(function() {
+			top.$.jBox.confirm("确认要导出用户数据吗？", "系统提示", function(v, h, f) {
+				if (v == "ok") {
+					$("#searchForm").attr("action", "${ctx}/sys/user/export");
 					$("#searchForm").submit();
 				}
-			},{buttonsFocus:1});
-			top.$('.jbox-body .jbox-icon').css('top','55px');
+			}, {
+				buttonsFocus : 1
+			});
+			top.$('.jbox-body .jbox-icon').css('top', '55px');
 		});
-		$("#btnImport").click(function(){
-			$.jBox($("#importBox").html(), {title:"导入数据", buttons:{"关闭":true}, 
-				bottomText:"导入文件不能超过5M，仅允许导入“xls”或“xlsx”格式文件！"});
+		$("#btnImport").click(function() {
+			$.jBox($("#importBox").html(), {
+				title : "导入数据",
+				buttons : {
+					"关闭" : true
+				},
+				bottomText : "导入文件不能超过5M，仅允许导入“xls”或“xlsx”格式文件！"
+			});
 		});
-		
-	
+
 	});
-	
-	function page(n,s){
-		if(n) $("#pageNo").val(n);
-		if(s) $("#pageSize").val(s);
-		$("#searchForm").attr("action","${ctx}/sys/user/list");
+
+	function page(n, s) {
+		if (n)
+			$("#pageNo").val(n);
+		if (s)
+			$("#pageSize").val(s);
+		$("#searchForm").attr("action", "${ctx}/sys/user/list");
 		$("#searchForm").submit();
-    	return false;
-    }
+		return false;
+	}
 </script>
 </head>
 <body>
-	<div id="importBox" class="hide">
-		<form id="importForm" action="${ctx}/sys/user/import" method="post" enctype="multipart/form-data"
-			class="form-search" style="padding-left:20px;text-align:center;" onsubmit="loading('正在导入，请稍等...');"><br/>
-			<input id="uploadFile" name="file" type="file" style="width:330px"/><br/><br/>　　
-			<input id="btnImportSubmit" class="btn btn-primary" type="submit" value="   导    入   "/>
-			<a href="${ctx}/sys/user/import/template">下载模板</a>
-		</form>
-	</div>
-	<ul class="nav nav-tabs">
-		<li class="active"><a href="${ctx}/sys/user/list">用户列表</a></li>
-			<shiro:hasPermission name="sys:user:edit"></shiro:hasPermission>
-			<li><a href="${ctx}/sys/user/form">用户添加</a></li>
-	</ul>
-	
-	
-	
-	
-	<form:form id="searchForm" modelAttribute="sysUser" action="${ctx}/sys/user/list" method="post" class="breadcrumb form-search ">
-		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
-		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
-		<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();"/>
-		<ul class="ul-form">
-			<li><label>归属公司：</label><sys:treeselect id="company" name="company.id" value="${user.company.id}" labelName="company.name" labelValue="${user.company.name}" 
-				title="公司" url="/sys/office/treeData?type=1" cssClass="input-small" allowClear="true"/></li>
-			<li><label>登录名：</label><form:input path="loginId" htmlEscape="false" maxlength="50" class="input-medium"/></li>
-			<li><label>姓&nbsp;&nbsp;&nbsp;名：</label><form:input path="name" htmlEscape="false" maxlength="50" class="input-medium"/></li>
-			<li class="clearfix"></li>
-			<li><label>归属部门：</label><sys:treeselect id="office" name="office.id" value="${user.office.id}" labelName="office.name" labelValue="${user.office.name}" 
-				title="部门" url="/sys/office/treeData?type=3" cssClass="input-small" allowClear="true" notAllowSelectParent="true"/></li>
-			
-			<li class="btns"><input id="btnSubmit" class="btn btn-primary" type="submit" value="查询" onclick="return page();"/>
-				<input id="btnImport" class="btn btn-success" type="button" value="导入"/>
-				<input id="btnExport" class="btn btn btn-inverse" type="button" value="导出"/>
+	<div class="page-content">
+		<div id="importBox" class="hide">
+			<form id="importForm" action="${ctx}/sys/user/import" method="post"
+				enctype="multipart/form-data" class="form-search"
+				style="padding-left: 20px; text-align: center;"
+				onsubmit="loading('正在导入，请稍等...');">
+				<br /> <input id="uploadFile" name="file" type="file"
+					style="width: 330px" /><br />
+				<br /> <input id="btnImportSubmit" class="btn btn-primary"
+					type="submit" value="   导    入   " /> <a
+					href="${ctx}/sys/user/import/template">下载模板</a>
+			</form>
+		</div>
+
+
+		<!-- 	<ul class="nav nav-tabs"> -->
+		<%-- 		<li class="active"><a href="${ctx}/sys/user/list">用户列表</a></li> --%>
+		<%-- 			<shiro:hasPermission name="sys:user:edit"></shiro:hasPermission> --%>
+		<%-- 			<li><a href="${ctx}/sys/user/form">用户添加</a></li> --%>
+		<!-- 	</ul> -->
+
+
+
+		<shiro:hasPermission name="sys:user:edit">
+			<div class="theme-panel hidden-xs hidden-sm">
+			<button type="button" class="btn btn-default" onclick="javascript:window.location='${ctx}/sys/user/list'"><spring:message code="refresh"></spring:message></button>
+				<button type="button" class="btn btn-primary"
+					onClick="javascript:window.location='${ctx}/sys/user/form'">
+					<i class="fa fa-plus"></i>
+					<spring:message code="add" />
+				</button>
+			</div>
+		</shiro:hasPermission>
+
+		<h3 class="page-title">
+			<spring:message code="userManage"></spring:message>
+			<small><spring:message code="date_list" /></small>
+		</h3>
+
+		<h5 class="page-header"></h5>
+
+		<!-- 筛选搜索内容栏默认隐藏-->
+		<div class="row">
+			<div class="col-md-12">
+				<form:form id="searchForm" modelAttribute="sysUser"
+					action="${ctx}/sys/user/list" method="post" class="form-search ">
+					<input id="pageNo" name="pageNo" type="hidden"
+						value="${page.pageNo}" />
+					<input id="pageSize" name="pageSize" type="hidden"
+						value="${page.pageSize}" />
+					<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}"
+						callback="page();" />
+
+					<div class="col-md-12 filter-action-select-panle"
+						style="background-color: transparent">
+						<div class="row">
+							<div class="col-md-3">
+								<div class="pull-left">
+									<label>归属公司：</label>
+								</div>
+								<div class="pull-left">
+									<sys:treeselect id="company" name="company.id"
+										value="${user.company.id}" labelName="company.name"
+										labelValue="${user.company.name}" title="公司"
+										url="/sys/office/treeData?type=1" cssClass="form-control"
+										allowClear="true"/>
+								</div>
+								</div>
+								<div class="col-md-3">
+								<div class="pull-left">
+									<label>登录名：</label>
+								</div>
+								<div class="pull-left">
+									<form:input path="loginId" htmlEscape="false" maxlength="50"
+										class="form-control" />
+								</div>
+							 </div>
+							
+							<div class="col-md-3">
+								<div class="pull-left">
+									<label>姓名：</label>
+								</div>
+								<div class="pull-left">
+									<form:input path="name" htmlEscape="false" maxlength="50"
+										class="form-control" />
+								</div>
+								</div>
+								<div class="col-md-3">
+								<div class="pull-left">
+									<label>归属部门：</label>
+								</div>
+								<div class="pull-left">
+									<sys:treeselect id="office" name="office.id" value="${user.office.id}" labelName="office.name"
+										labelValue="${user.office.name}" title="部门"
+										url="/sys/office/treeData?type=3" cssClass="form-control" allowClear="true"
+										notAllowSelectParent="true"/>
+								</div>
+								</div>
+							</div>
+						<div class="row">
+							<div class="pull-left">
+								<button type="submit" class="btn blue" onclick="return page();">
+									<i class="fa fa-search"></i>
+									<spring:message code="search" />
+								</button>
+								<button type="reset" class="btn btn-default">
+									<i class="fa fa-refresh"></i>
+									<spring:message code="reset" />
+								</button>
+							</div>
+						</div>
+
+					</div>
+
+				</form:form>
+
+
+			</div>
+		</div>
+		<sys:message content="${message}" />
+		<table id="contentTable"
+			class="table table-striped table-bordered table-condensed">
+			<thead>
+				<tr>
+					<th>所属公司</th>
+					<th>所属部门</th>
+					<th class="sort-column login_id">登录名</th>
+					<th class="sort-column name">姓名</th>
+					<th>身份标识</th>
+					<th>邮箱</th>
+					<th>创建时间</th>
+					<%--<th>角色</th> --%>
+					<shiro:hasPermission name="sys:user:edit">
+						<th>操作</th>
+					</shiro:hasPermission>
+				</tr>
+			</thead>
+			<tbody>
+				<c:forEach items="${page.list}" var="user">
+					<tr>
+						<td>${user.company.name}</td>
+						<td>${fns:getOfficeDesc(user.office.id)}</td>
+						<td><a href="${ctx}/sys/user/form?id=${user.id}">${user.loginId}</a></td>
+						<td>${user.name}</td>
+						<td>${user.identity eq 1 ?'信访办':'办理人员'}</td>
+						<td>${user.email}</td>
+						<td><fmt:formatDate value="${user.createTime}"
+								pattern="yyyy-MM-dd HH:mm:ss" /></td>
+						<shiro:hasPermission name="sys:user:edit"></shiro:hasPermission>
+						<td><a href="${ctx}/sys/user/form?id=${user.id}">修改</a> <a
+							href="${ctx}/sys/user/delete?id=${user.id}"
+							onclick="return confirmx('确认要删除该用户吗？', this.href)">删除</a></td>
+					</tr>
+				</c:forEach>
+			</tbody>
+		</table>
+		<div class="page">${page}</div>
+	</div>
 
-			</li>
-				
-			<li class="clearfix"></li>
-			
-		</ul>
-	</form:form>
-	<sys:message content="${message}"/>
-	<table id="contentTable" class="table table-striped table-bordered table-condensed">
-		<thead><tr><th>所属公司</th><th>所属部门</th><th class="sort-column login_id">登录名</th><th class="sort-column name">姓名</th><th>身份标识</th><th>邮箱</th><th>创建时间</th><%--<th>角色</th> --%><shiro:hasPermission name="sys:user:edit"><th>操作</th></shiro:hasPermission></tr></thead>
-		<tbody>
-		<c:forEach items="${page.list}" var="user">
-			<tr>
-				<td>${user.company.name}</td>
-				<td>${fns:getOfficeDesc(user.office.id)}</td>
-				<td><a href="${ctx}/sys/user/form?id=${user.id}">${user.loginId}</a></td>
-				<td>${user.name}</td>
-				<td>${user.identity eq 1 ?'信访办':'办理人员'}</td>
-				<td>${user.email}</td>
-				<td><fmt:formatDate value="${user.createTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
-				<shiro:hasPermission name="sys:user:edit"></shiro:hasPermission>
-					<td>
-	    				<a href="${ctx}/sys/user/form?id=${user.id}">修改</a>
-						<a href="${ctx}/sys/user/delete?id=${user.id}" onclick="return confirmx('确认要删除该用户吗？', this.href)">删除</a>
-					</td>
-			</tr>
-		</c:forEach>
-		</tbody>
-	</table>
-	<div class="pagination">${page}</div>	
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/sys/userModifyPwd.jsp b/src/main/webapp/WEB-INF/views/sys/userModifyPwd.jsp
index 77070e9a6..d7c63a985 100644
--- a/src/main/webapp/WEB-INF/views/sys/userModifyPwd.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/userModifyPwd.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
 	<title>修改密码</title>
-	<script type="text/javascript">
+<script type="text/javascript">
 		$(document).ready(function() {
 			$("#oldPassword").focus();
 			$("#inputForm").validate({
@@ -30,37 +30,61 @@
 	</script>
 </head>
 <body>
+<div class="page-content">
+		<div class="row">
 	<ul class="nav nav-tabs">
 		<li><a href="${ctx}/sys/user/info">个人信息</a></li>
 		<li class="active"><a href="${ctx}/sys/user/modifyPwd">修改密码</a></li>
 	</ul><br/>
+	<div class="col-md-12">
+		<div class="portlet box blue">
+				<div class="portlet-title">
+					<div class="caption">
+							<i class="fa fa-gift"></i>
+					<spring:message code="updatePwd" />
+				</div>
+		</div>
+	<div class="portlet-body form">	
 	<form:form id="inputForm" modelAttribute="user" action="${ctx}/sys/user/modifyPwd" method="post" class="form-horizontal">
 		<form:hidden path="id"/>
 		<sys:message content="${message}"/>
-		<div class="control-group">
-			<label class="control-label">旧密码:</label>
-			<div class="controls">
-				<input id="oldPassword" name="oldPassword" type="password" value="" maxlength="50" minlength="3" class="required"/>
-				<span class="help-inline"><font color="red">*</font> </span>
+		<div class="form-body">
+		<div class="form-group">
+			<label class="col-md-3 control-label">旧密码:</label>
+			<div class="col-md-4">
+				<input id="oldPassword" name="oldPassword" type="password" value="" maxlength="50" minlength="3" class="required form-control"/>
 			</div>
+				<span class="help-inline"><font color="red">*</font> </span>
 		</div>
-		<div class="control-group">
-			<label class="control-label">新密码:</label>
-			<div class="controls">
-				<input id="newPassword" name="newPassword" type="password" value="" maxlength="50" minlength="3" class="required"/>
-				<span class="help-inline"><font color="red">*</font> </span>
+		<div class="form-group">
+			<label class="col-md-3 control-label">新密码:</label>
+			<div class="col-md-4">
+				<input id="newPassword" name="newPassword" type="password" value="" maxlength="50" minlength="3" class="required form-control"/>
 			</div>
+				<span class="help-inline"><font color="red">*</font> </span>
 		</div>
-		<div class="control-group">
-			<label class="control-label">确认新密码:</label>
-			<div class="controls">
-				<input id="confirmNewPassword" name="confirmNewPassword" type="password" value="" maxlength="50" minlength="3" class="required" equalTo="#newPassword"/>
-				<span class="help-inline"><font color="red">*</font> </span>
+		<div class="form-group">
+			<label class="col-md-3 control-label">确认新密码:</label>
+			<div class="col-md-4">
+				<input id="confirmNewPassword" name="confirmNewPassword" type="password" value="" maxlength="50" minlength="3" class="required form-control" equalTo="#newPassword"/>
 			</div>
+				<span class="help-inline"><font color="red">*</font> </span>
 		</div>
 		<div class="form-actions">
-			<input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>
+		<div class="row">
+				<div class="col-md-offset-3 col-md-9">
+			<button id="btnSubmit" type="submit" class="btn btn-primary">
+				<spring:message code="submit"></spring:message>
+			</button>
+		</div>
+		</div>
+		</div>
 		</div>
 	</form:form>
+	</div>
+	</div>
+	</div>
+	</div>
+</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/static/global/css/components.css b/src/main/webapp/static/global/css/components.css
index 09f9957c5..fa69f2746 100644
--- a/src/main/webapp/static/global/css/components.css
+++ b/src/main/webapp/static/global/css/components.css
@@ -21574,5 +21574,39 @@ Color library demo
 	margin-right: 3px;
 }     
 
+
+/*������ʽ*/
+.sort-column {
+	cursor: pointer;
+}
+.sort-column i {
+	top: 2px;
+	position: relative;
+	display: inline-table;
+}
+.sort-icon {
+    width: 9px;
+	height: 13px;
+	background-image: url('../img/bee.png');
+	background-position: -232px -59px;
+	
+}
+
+
+.sort-icon-down {
+    width: 9px;
+	height: 12px;
+    background-image: url('../img/bee.png');
+    background-position: -232px -73px;
+}
+
+.sort-icon-up {
+    width: 9px;
+	height: 13px;
+    background-image: url('../img/bee.png');
+    background-position: -232px -86px;
+}
+
+
  
  
diff --git a/src/main/webapp/static/global/img/bee.png b/src/main/webapp/static/global/img/bee.png
new file mode 100644
index 000000000..709e6d236
Binary files /dev/null and b/src/main/webapp/static/global/img/bee.png differ
diff --git a/src/main/webapp/static/global/plugins/bootstrap-typeahead/README.md b/src/main/webapp/static/global/plugins/bootstrap-typeahead/README.md
new file mode 100644
index 000000000..62d511dc0
--- /dev/null
+++ b/src/main/webapp/static/global/plugins/bootstrap-typeahead/README.md
@@ -0,0 +1,254 @@
+Bootstrap 3 Typeahead
+=====================
+
+For simple autocomplete use cases there seems to be nothing wrong with the dropped typeahead plugin. Here you will find the typeahead autocomplete plugin for Twitter's Bootstrap 2 ready to use with Twitter's Bootstrap 3. The original code is written by [@mdo](http://twitter.com/mdo) and [@fat](http://twitter.com/fat).
+
+Users who migrate their website or app from Twitter's Bootstrap 2 to Bootstrap 3 can also use this plugin to keep their current autocomplete functions. See for a complete list of migrations steps: [Migrate your templates from Twitter Bootstrap 2.x to Twitter Bootstrap 3](http://bassjobsen.weblogs.fm/migrate-your-templates-from-twitter-bootstrap-2-x-to-twitter-bootstrap-3/)
+
+With Twitter Bootstrap 3 the typeahead plugin had been dropped. [@mdo](http://twitter.com/mdo) says: "in favor of folks using [Twitter's typeahead](https://github.com/twitter/typeahead.js). Twitter's typeahead has more features than the old bootstrap-typeahead.js and less bugs." Twitter's typeahead don't work direct with Bootstrap 3. The DOM structure of the dropdown menu used by `typeahead.js` differs from the DOM structure of the Bootstrap dropdown menu. You'll need to load some additional CSS in order to get the `typeahead.js` dropdown menu to fit the default Bootstrap theme. Try [extended Bootstrap LESS](https://github.com/bassjobsen/typeahead.js-bootstrap-css) or if your are looking for a more extended version try: [typeahead.js-bootstrap3.less](https://github.com/hyspace/typeahead.js-bootstrap3.less/blob/master/typeahead.less).
+
+~~`Typeahead.js` doesn't seem ready for the new Twitter Bootstrap 3 at the moment. Code is not up to date and fixes are needed. See also:
+[Typeahead problems with Bootstrap 3.0 RC1](http://stackoverflow.com/questions/18167246/typeahead-problems-with-bootstrap-3-0-rc1).~~
+
+Download
+========
+
+ - Download the latest [bootstrap3-typeahead.js](https://github.com/bassjobsen/Bootstrap-3-Typeahead/blob/master/bootstrap3-typeahead.js) or [bootstrap3-typeahead.min.js](https://github.com/bassjobsen/Bootstrap-3-Typeahead/blob/master/bootstrap3-typeahead.min.js).
+
+ - Include it in your source after jQuery and Bootstrap's JavaScript.
+ 
+Full integration with Bootstrap 3 Typeahead
+-------------------------------------------
+Download the latest version of Boostrap from [Bootstrap](https://github.com/twbs/bootstrap/archive/master.zip). Copy `bootstrap3-typeahead.js` to the js/ folder. Edit `gruntfile.js` and add `bootstrap3-typeahead.js` to the plugins list.
+Build your own version with typeahead with `grunt dist`.
+
+CSS
+===
+There is no additional CSS required to use the plugin. Bootstrap's CSS contains all required styles in the `.dropdown-menu` class. The original CSS adds a `z-index` of 1051 to the dropdownmenu via the typeahead class. You could add this if you need it.
+`.typeahead { z-index: 1051; }` (less or css).
+
+Usage
+=====
+
+	<input type="text" data-provide="typeahead">
+
+You'll want to set `autocomplete="off"` to prevent default browser menus from appearing over the Bootstrap typeahead dropdown.
+
+Via data attributes
+-------------------
+Add data attributes to register an element with typeahead functionality as shown in the example above.
+
+Via JavaScript
+--------------
+
+Call the typeahead manually with:
+
+	$('.typeahead').typeahead()
+
+Destroys previously initialized typeaheads. This entails reverting DOM modifications and removing event handlers:	
+	
+	$('.typeahead').typeahead('destroy')
+
+Javascript Example
+=============
+
+Loading a collection
+--------------------
+
+	$.get('example_collection.json', function(data){
+		$("#name").typeahead({ source:data });
+	},'json');
+	//example_collection.json
+	// ["item1","item2","item3"]
+	
+Using JSON objects instead of simple strings
+--------------------------------------------
+
+You can add all the properties you wish on your objects, as long as you provide a "name" attribute OR you provide your own displayText method. The other values allow you to match the selected item with something in your model.
+	
+	var $input = $('.typeahead');
+	$input.typeahead({source:[{id: "someId1", name: "Display name 1"}, 
+				{id: "someId2", name: "Display name 2"}], 
+				autoSelect: true}); 
+	$input.change(function() {
+		var current = $input.typeahead("getActive");
+		if (current) {
+			// Some item from your model is active!
+			if (current.name == $input.val()) {
+				// This means the exact match is found. Use toLowerCase() if you want case insensitive match.
+			} else {
+				// This means it is only a partial match, you can either add a new item 
+				// or take the active if you don't want new items
+			}
+		} else {
+			// Nothing is active so it is a new value (or maybe empty value)
+		}
+	});
+	
+	
+Options
+=======
+
+Options can be passed via data attributes or JavaScript. For data attributes, append the option name to `data-`, as in `data-source=""`.
+
+<table class="table table-bordered table-striped">
+              <thead>
+               <tr>
+                 <th style="width: 100px;">Name</th>
+                 <th style="width: 50px;">Type</th>
+                 <th style="width: 100px;">Default</th>
+                 <th>Description</th>
+               </tr>
+              </thead>
+              <tbody>
+                <tr>
+                 <td>source</td>
+                 <td>array, function</td>
+                 <td>[ ]</td>
+                 <td>The data source to query against. May be an array of strings, an array of JSON object with a name property or a function. The function accepts two arguments, the <code>query</code> value in the input field and the <code>process</code> callback. The function may be used synchronously by returning the data source directly or asynchronously via the <code>process</code> callback's single argument.</td>
+               </tr>
+               <tr>
+                 <td>items</td>
+                 <td>number</td>
+                 <td>8</td>
+                 <td>The max number of items to display in the dropdown. Can also be set to 'all'</td>
+               </tr>
+               <tr>
+                 <td>minLength</td>
+                 <td>number</td>
+                 <td>1</td>
+                 <td>The minimum character length needed before triggering autocomplete suggestions. You can set it to 0 so suggestion are shown even when there is no text when lookup function is called.</td>
+               </tr>
+               <tr>
+                 <td>showHintOnFocus</td>
+                 <td>boolean</td>
+                 <td>false</td>
+                 <td>If hints should be shown when applicable as soon as the input gets focus.</td>
+               </tr>
+              <tr>
+                 <td>scrollHeight</td>
+                 <td>number, function</td>
+                 <td>0</td>
+                 <td>Number of pixels the scrollable parent container scrolled down (scrolled out the viewport).</td>
+               </tr>
+               <tr>
+                 <td>matcher</td>
+                 <td>function</td>
+                 <td>case insensitive</td>
+                 <td>The method used to determine if a query matches an item. Accepts a single argument, the <code>item</code> against which to test the query. Access the current query with <code>this.query</code>. Return a boolean <code>true</code> if query is a match.</td>
+               </tr>
+               <tr>
+                 <td>sorter</td>
+                 <td>function</td>
+                 <td>exact match,<br> case sensitive,<br> case insensitive</td>
+                 <td>Method used to sort autocomplete results. Accepts a single argument <code>items</code> and has the scope of the typeahead instance. Reference the current query with <code>this.query</code>.</td>
+               </tr>
+               <tr>
+                 <td>updater</td>
+                 <td>function</td>
+                 <td>returns selected item</td>
+                 <td>The method used to return selected item. Accepts a single argument, the <code>item</code> and has the scope of the typeahead instance.</td>
+               </tr>
+               <tr>
+                 <td>highlighter</td>
+                 <td>function</td>
+                 <td>highlights all default matches</td>
+                 <td>Method used to highlight autocomplete results. Accepts a single argument <code>item</code> and has the scope of the typeahead instance. Should return html.</td>
+               </tr>
+			   <tr>
+                 <td>displayText</td>
+                 <td>function</td>
+                 <td>item.name || item</td>
+                 <td>Method used to get textual representation of an item of the sources. Accepts a single argument <code>item</code> and has the scope of the typeahead instance. Should return a String.</td>
+               </tr>
+              <tr>
+                 <td>autoSelect</td>
+                 <td>boolean</td>
+                 <td>true</td>
+                 <td>Allows you to dictate whether or not the first suggestion is selected automatically. Turning autoselect off also means that the input won't clear if nothing is selected and <kbd>enter</kbd> or <kbd>tab</kbd> is hit.</td>
+               </tr>
+               <tr>
+                 <td>afterSelect</td>
+                 <td>function</td>
+                 <td>$.noop()</td>
+                 <td>Call back function to execute after selected an item. It gets the current active item in parameter if any.</td>
+               </tr>
+			   <tr>
+                 <td>delay</td>
+                 <td>integer</td>
+                 <td>0</td>
+                 <td>Adds a delay between lookups.</td>
+               </tr>
+              <tr>
+              <tr>
+                <td>addItem</td>
+                <td>JSON object</td>
+                <td>false</td>
+                <td>Adds an item to the end of the list, for example "New Entry". This could be used, for example, to pop a dialog when an item is not found in the list of data. Example: <a href="http://cl.ly/image/2u170I1q1G3A/addItem.png">http://cl.ly/image/2u170I1q1G3A/addItem.png</a></td>
+              </tbody>
+            </table>
+
+Methods
+=======
+
+	.typeahead(options): Initializes an input with a typeahead.
+	.lookup: To trigger the lookup function externally
+	.getActive: To get the currently active item, you will get a String or a JSOn object depending on how you initialized typeahead. Works only for the first match.
+
+
+
+Bower
+=====
+
+To use with [Bower](http://bower.io/). Add to your bower.json file:
+
+
+	{
+            "name": "MyProject",
+            "dependencies": {
+            "bootstrap3-typeahead": "git@github.com:bassjobsen/Bootstrap-3-Typeahead.git#master"
+            }
+       }
+
+Bloodhound
+==========	
+[Bloodhound](https://github.com/twitter/typeahead.js/blob/master/doc/bloodhound.md) is the [typeahead.js](https://github.com/twitter/typeahead.js) suggestion engine, since version 0.10.0. Bloodhound is robust, flexible, and offers advanced functionalities such as prefetching, intelligent caching, fast lookups, and backfilling with remote data. To use Bloodhound with Bootstrap-3-Typeahead:
+
+	// instantiate the bloodhound suggestion engine
+	var numbers = new Bloodhound({
+	datumTokenizer: Bloodhound.tokenizers.whitespace,
+	queryTokenizer: Bloodhound.tokenizers.whitespace,
+	local:  ["(A)labama","Alaska","Arizona","Arkansas","Arkansas2","Barkansas"]
+	});
+	 
+	// initialize the bloodhound suggestion engine
+	numbers.initialize();
+
+	$('.typeahead').typeahead(
+	{
+	items: 4,
+	source:numbers.ttAdapter()	
+	});
+	
+
+Bootstrap Tags Input
+====================
+[Bootstrap Tags Input](http://timschlechter.github.io/bootstrap-tagsinput/examples/) is a jQuery plugin providing a Twitter Bootstrap user interface for managing tags. Bootstrap Tags Input has a typeahead option which allows you to set the source:
+
+    $('input').tagsinput({
+      typeahead: {
+        source: ['Amsterdam', 'Washington', 'Sydney', 'Beijing', 'Cairo']
+      }
+    });
+
+or
+
+    $('input').tagsinput({
+      typeahead: {                  
+        source: function(query) {
+          return $.get('http://someservice.com');
+        }
+      }
+    });
+
+See also: https://github.com/bassjobsen/Bootstrap-3-Typeahead/issues/40	
diff --git a/src/main/webapp/static/global/plugins/bootstrap-typeahead/bootstrap3-typeahead.min.js b/src/main/webapp/static/global/plugins/bootstrap-typeahead/bootstrap3-typeahead.min.js
new file mode 100644
index 000000000..ae19ae386
--- /dev/null
+++ b/src/main/webapp/static/global/plugins/bootstrap-typeahead/bootstrap3-typeahead.min.js
@@ -0,0 +1 @@
+!function(a,b){"use strict";"undefined"!=typeof module&&module.exports?module.exports=b(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],function(a){return b(a)}):b(a.jQuery)}(this,function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.typeahead.defaults,c),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.select=this.options.select||this.select,this.autoSelect="boolean"==typeof this.options.autoSelect?this.options.autoSelect:!0,this.highlighter=this.options.highlighter||this.highlighter,this.render=this.options.render||this.render,this.updater=this.options.updater||this.updater,this.displayText=this.options.displayText||this.displayText,this.source=this.options.source,this.delay=this.options.delay,this.$menu=a(this.options.menu),this.$appendTo=this.options.appendTo?a(this.options.appendTo):null,this.shown=!1,this.listen(),this.showHintOnFocus="boolean"==typeof this.options.showHintOnFocus?this.options.showHintOnFocus:!1,this.afterSelect=this.options.afterSelect,this.addItem=!1};b.prototype={constructor:b,select:function(){var a=this.$menu.find(".active").data("value");if(this.$element.data("active",a),this.autoSelect||a){var b=this.updater(a);this.$element.val(this.displayText(b)||b).change(),this.afterSelect(b)}return this.hide()},updater:function(a){return a},setSource:function(a){this.source=a},show:function(){var b,c=a.extend({},this.$element.position(),{height:this.$element[0].offsetHeight});return b="function"==typeof this.options.scrollHeight?this.options.scrollHeight.call():this.options.scrollHeight,(this.$appendTo?this.$menu.appendTo(this.$appendTo):this.$menu.insertAfter(this.$element)).css({top:c.top+c.height+b,left:c.left}).show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(b){if(this.query="undefined"!=typeof b&&null!==b?b:this.$element.val()||"",this.query.length<this.options.minLength)return this.shown?this.hide():this;var c=a.proxy(function(){a.isFunction(this.source)?this.source(this.query,a.proxy(this.process,this)):this.source&&this.process(this.source)},this);clearTimeout(this.lookupWorker),this.lookupWorker=setTimeout(c,this.delay)},process:function(b){var c=this;return b=a.grep(b,function(a){return c.matcher(a)}),b=this.sorter(b),b.length||this.options.addItem?(b.length>0?this.$element.data("active",b[0]):this.$element.data("active",null),this.options.addItem&&b.push(this.options.addItem),"all"==this.options.items?this.render(b).show():this.render(b.slice(0,this.options.items)).show()):this.shown?this.hide():this},matcher:function(a){var b=this.displayText(a);return~b.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(a){for(var b,c=[],d=[],e=[];b=a.shift();){var f=this.displayText(b);f.toLowerCase().indexOf(this.query.toLowerCase())?~f.indexOf(this.query)?d.push(b):e.push(b):c.push(b)}return c.concat(d,e)},highlighter:function(b){var c,d,e,f,g,h=a("<div></div>"),i=this.query,j=b.toLowerCase().indexOf(i.toLowerCase());if(c=i.length,0===c)return h.text(b).html();for(;j>-1;)d=b.substr(0,j),e=b.substr(j,c),f=b.substr(j+c),g=a("<strong></strong>").text(e),h.append(document.createTextNode(d)).append(g),b=f,j=b.toLowerCase().indexOf(i.toLowerCase());return h.append(document.createTextNode(b)).html()},render:function(b){var c=this,d=this,e=!1;return b=a(b).map(function(b,f){var g=d.displayText(f);return b=a(c.options.item).data("value",f),b.find("a").html(c.highlighter(g)),g==d.$element.val()&&(b.addClass("active"),d.$element.data("active",f),e=!0),b[0]}),this.autoSelect&&!e&&(b.first().addClass("active"),this.$element.data("active",b.first().data("value"))),this.$menu.html(b),this},displayText:function(a){return a.name||a},next:function(b){var c=this.$menu.find(".active").removeClass("active"),d=c.next();d.length||(d=a(this.$menu.find("li")[0])),d.addClass("active")},prev:function(a){var b=this.$menu.find(".active").removeClass("active"),c=b.prev();c.length||(c=this.$menu.find("li").last()),c.addClass("active")},listen:function(){this.$element.on("focus",a.proxy(this.focus,this)).on("blur",a.proxy(this.blur,this)).on("keypress",a.proxy(this.keypress,this)).on("keyup",a.proxy(this.keyup,this)),this.eventSupported("keydown")&&this.$element.on("keydown",a.proxy(this.keydown,this)),this.$menu.on("click",a.proxy(this.click,this)).on("mouseenter","li",a.proxy(this.mouseenter,this)).on("mouseleave","li",a.proxy(this.mouseleave,this))},destroy:function(){this.$element.data("typeahead",null),this.$element.data("active",null),this.$element.off("focus").off("blur").off("keypress").off("keyup"),this.eventSupported("keydown")&&this.$element.off("keydown"),this.$menu.remove()},eventSupported:function(a){var b=a in this.$element;return b||(this.$element.setAttribute(a,"return;"),b="function"==typeof this.$element[a]),b},move:function(a){if(this.shown){switch(a.keyCode){case 9:case 13:case 27:a.preventDefault();break;case 38:if(a.shiftKey)return;a.preventDefault(),this.prev();break;case 40:if(a.shiftKey)return;a.preventDefault(),this.next()}a.stopPropagation()}},keydown:function(b){this.suppressKeyPressRepeat=~a.inArray(b.keyCode,[40,38,9,13,27]),this.shown||40!=b.keyCode?this.move(b):this.lookup()},keypress:function(a){this.suppressKeyPressRepeat||this.move(a)},keyup:function(a){switch(a.keyCode){case 40:case 38:case 16:case 17:case 18:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}a.stopPropagation(),a.preventDefault()},focus:function(a){this.focused||(this.focused=!0,this.options.showHintOnFocus&&this.lookup(""))},blur:function(a){this.focused=!1,!this.mousedover&&this.shown&&this.hide()},click:function(a){a.stopPropagation(),a.preventDefault(),this.select(),this.$element.focus()},mouseenter:function(b){this.mousedover=!0,this.$menu.find(".active").removeClass("active"),a(b.currentTarget).addClass("active")},mouseleave:function(a){this.mousedover=!1,!this.focused&&this.shown&&this.hide()}};var c=a.fn.typeahead;a.fn.typeahead=function(c){var d=arguments;return"string"==typeof c&&"getActive"==c?this.data("active"):this.each(function(){var e=a(this),f=e.data("typeahead"),g="object"==typeof c&&c;f||e.data("typeahead",f=new b(this,g)),"string"==typeof c&&(d.length>1?f[c].apply(f,Array.prototype.slice.call(d,1)):f[c]())})},a.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu" role="listbox"></ul>',item:'<li><a href="#" role="option"></a></li>',minLength:1,scrollHeight:0,autoSelect:!0,afterSelect:a.noop,addItem:!1,delay:0},a.fn.typeahead.Constructor=b,a.fn.typeahead.noConflict=function(){return a.fn.typeahead=c,this},a(document).on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(b){var c=a(this);c.data("typeahead")||c.typeahead(c.data())})});
\ No newline at end of file
diff --git a/src/main/webapp/static/global/plugins/jquery-jbox/2.3/jquery.jBox-2.3.src.js b/src/main/webapp/static/global/plugins/jquery-jbox/2.3/jquery.jBox-2.3.src.js
index 944c32280..0e98b4144 100644
--- a/src/main/webapp/static/global/plugins/jquery-jbox/2.3/jquery.jBox-2.3.src.js
+++ b/src/main/webapp/static/global/plugins/jquery-jbox/2.3/jquery.jBox-2.3.src.js
@@ -591,16 +591,32 @@
         width: 350,
         height: 'auto',
         bottomText: '',
-        buttons: { '确定': 'ok' },
+        buttons: { 'ok': 'ok' },
         buttonsFocus: 0,
         loaded: function (h) { },
         submit: function (v, h, f) { return true; },
         closed: function () { }
     };
-    $.jBox.stateDefaults = { content: '', buttons: { '确定': 'ok' }, buttonsFocus: 0, submit: function (v, h, f) { return true; } };
+  //国际化切换
+    var type=navigator.appName;
+    if(type=="Netscape"){
+    	var lang = navigator.language;//获取浏览器语言配置支持非IE
+    }else{
+    	var lang = navigator.userLanguage;//支持IE
+    }
+	var lang = lang.toLowerCase();
+	if(lang.indexOf("zh")!=-1) {
+		
+		$.jBox.stateDefaults = { content: '', buttons: { '确定': 'ok' }, buttonsFocus: 0, submit: function (v, h, f) { return true; } };
+		$.jBox.languageDefaults = { close: '关闭', ok: '确定', yes: '是', no: '否', cancel: '取消' };
+	}else{
+		$.jBox.stateDefaults = { content: '', buttons: { 'ok': 'ok' }, buttonsFocus: 0, submit: function (v, h, f) { return true; } };
+		$.jBox.languageDefaults = { close: 'close', ok: 'ok', yes: 'yes', no: 'no', cancel: 'cancel' };
+	}
+    
+    
     $.jBox.tipDefaults = { content: '', icon: 'info', top: '40%', width: 'auto', height: 'auto', opacity: 0, timeout: 3000, closed: function () { } };
     $.jBox.messagerDefaults = { content: '', title: 'jBox', icon: 'none', width: 350, height: 'auto', timeout: 3000, showType: 'slide', showSpeed: 600, border: 0, buttons: {}, buttonsFocus: 0, loaded: function () { }, submit: function (v, h, f) { return true; }, closed: function () { } };
-    $.jBox.languageDefaults = { close: '关闭', ok: '确定', yes: '是', no: '否', cancel: '取消' };
 
     $.jBox.setDefaults = function (configs) {
         $.jBox.defaults = $.extend({}, $.jBox.defaults, configs.defaults);
diff --git a/src/main/webapp/static/global/plugins/typeahead/LICENSE b/src/main/webapp/static/global/plugins/typeahead/LICENSE
deleted file mode 100644
index 83817bace..000000000
--- a/src/main/webapp/static/global/plugins/typeahead/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2013-2014 Twitter, Inc
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/src/main/webapp/static/global/plugins/typeahead/README.md b/src/main/webapp/static/global/plugins/typeahead/README.md
deleted file mode 100644
index f218374c9..000000000
--- a/src/main/webapp/static/global/plugins/typeahead/README.md
+++ /dev/null
@@ -1,188 +0,0 @@
-[![build status](https://secure.travis-ci.org/twitter/typeahead.js.png?branch=master)](http://travis-ci.org/twitter/typeahead.js)
-[![Built with Grunt](https://cdn.gruntjs.com/builtwith.png)](http://gruntjs.com/)
-
-
-[typeahead.js][gh-page]
-=======================
-
-Inspired by [twitter.com]'s autocomplete search functionality, typeahead.js is 
-a flexible JavaScript library that provides a strong foundation for building 
-robust typeaheads.
-
-The typeahead.js library consists of 2 components: the suggestion engine, 
-[Bloodhound], and the UI view, [Typeahead]. 
-The suggestion engine is responsible for computing suggestions for a given 
-query. The UI view is responsible for rendering suggestions and handling DOM 
-interactions. Both components can be used separately, but when used together, 
-they can provide a rich typeahead experience.
-
-<!-- section links -->
-
-[gh-page]: http://twitter.github.io/typeahead.js/
-[twitter.com]: https://twitter.com
-[Bloodhound]: https://github.com/twitter/typeahead.js/blob/master/doc/bloodhound.md
-[Typeahead]: https://github.com/twitter/typeahead.js/blob/master/doc/jquery_typeahead.md
-
-Getting Started
----------------
-
-How you acquire typeahead.js is up to you.
-
-Preferred method:
-* Install with [Bower]: `$ bower install typeahead.js`
-
-Other methods:
-* [Download zipball of latest release][zipball].
-* Download the latest dist files individually:
-  * *[bloodhound.js]* (standalone suggestion engine)
-  * *[typeahead.jquery.js]* (standalone UI view)
-  * *[typeahead.bundle.js]* (*bloodhound.js* + *typeahead.jquery.js*)
-  * *[typeahead.bundle.min.js]*
-
-**Note:** both *bloodhound.js* and *typeahead.jquery.js* have a dependency on 
-[jQuery] 1.9+.
-
-<!-- section links -->
-
-[Bower]: http://bower.io/
-[zipball]: http://twitter.github.com/typeahead.js/releases/latest/typeahead.js.zip
-[bloodhound.js]: http://twitter.github.com/typeahead.js/releases/latest/bloodhound.js
-[typeahead.jquery.js]: http://twitter.github.com/typeahead.js/releases/latest/typeahead.jquery.js
-[typeahead.bundle.js]: http://twitter.github.com/typeahead.js/releases/latest/typeahead.bundle.js
-[typeahead.bundle.min.js]: http://twitter.github.com/typeahead.js/releases/latest/typeahead.bundle.min.js
-[jQuery]: http://jquery.com/
-
-Documentation 
--------------
-
-* [Typeahead Docs]
-* [Bloodhound Docs]
-
-[Typeahead Docs]: https://github.com/twitter/typeahead.js/blob/master/doc/jquery_typeahead.md
-[Bloodhound Docs]: https://github.com/twitter/typeahead.js/blob/master/doc/bloodhound.md
-
-Examples
---------
-
-For some working examples of typeahead.js, visit the [examples page].
-
-<!-- section links -->
-
-[examples page]: http://twitter.github.io/typeahead.js/examples
-
-Browser Support
----------------
-
-* Chrome
-* Firefox 3.5+
-* Safari 4+
-* Internet Explorer 7+
-* Opera 11+
-
-**NOTE:** typeahead.js is not tested on mobile browers.
-
-Customer Support
-----------------
-
-For general questions about typeahead.js, tweet at [@typeahead].
-
-For technical questions, you should post a question on [Stack Overflow] and tag 
-it with [typeahead.js][so tag].
-
-<!-- section links -->
-
-[Stack Overflow]: http://stackoverflow.com/
-[@typeahead]: https://twitter.com/typeahead
-[so tag]: http://stackoverflow.com/questions/tagged/typeahead.js
-
-Issues
-------
-
-Discovered a bug? Please create an issue here on GitHub!
-
-https://github.com/twitter/typeahead.js/issues
-
-Versioning
-----------
-
-For transparency and insight into our release cycle, releases will be numbered 
-with the follow format:
-
-`<major>.<minor>.<patch>`
-
-And constructed with the following guidelines:
-
-* Breaking backwards compatibility bumps the major
-* New additions without breaking backwards compatibility bumps the minor
-* Bug fixes and misc changes bump the patch
-
-For more information on semantic versioning, please visit http://semver.org/.
-
-Testing
--------
-
-Tests are written using [Jasmine] and ran with [Karma]. To run
-the test suite with PhantomJS, run `$ npm test`.
-
-<!-- section links -->
-
-[Jasmine]: http://pivotal.github.com/jasmine/
-[Karma]: http://karma-runner.github.io/
-
-Developers
-----------
-
-If you plan on contributing to typeahead.js, be sure to read the 
-[contributing guidelines]. A good starting place for new contributors are issues
-labeled with [entry-level]. Entry-level issues tend to require minor changes 
-and provide developers a chance to get more familiar with typeahead.js before
-taking on more challenging work.
-
-In order to build and test typeahead.js, you'll need to install its dev 
-dependencies (`$ npm install`) and have [grunt-cli] 
-installed (`$ npm install -g grunt-cli`). Below is an overview of the available 
-Grunt tasks that'll be useful in development.
-
-* `grunt build` – Builds *typeahead.js* from source.
-* `grunt lint` – Runs source and test files through JSHint.
-* `grunt watch` – Rebuilds *typeahead.js* whenever a source file is modified.
-* `grunt server` – Serves files from the root of typeahead.js on localhost:8888. 
-  Useful for using *test/playground.html* for debugging/testing.
-* `grunt dev` – Runs `grunt watch` and `grunt server` in parallel.
-
-<!-- section links -->
-
-[contributing guidelines]: https://github.com/twitter/typeahead.js/blob/master/CONTRIBUTING.md
-[entry-level]: https://github.com/twitter/typeahead.js/issues?&labels=entry-level&state=open
-[grunt-cli]: https://github.com/gruntjs/grunt-cli
-
-Maintainers
------------
-
-* **Jake Harding** 
-  * [@JakeHarding](https://twitter.com/JakeHarding) 
-  * [GitHub](https://github.com/jharding)
-
-* **You?**
-
-Authors
--------
-
-* **Jake Harding** 
-  * [@JakeHarding](https://twitter.com/JakeHarding) 
-  * [GitHub](https://github.com/jharding)
-
-* **Veljko Skarich**
-  * [@vskarich](https://twitter.com/vskarich) 
-  * [GitHub](https://github.com/vskarich)
-
-* **Tim Trueman**
-  * [@timtrueman](https://twitter.com/timtrueman) 
-  * [GitHub](https://github.com/timtrueman)
-
-License
--------
-
-Copyright 2013 Twitter, Inc.
-
-Licensed under the MIT License
diff --git a/src/main/webapp/static/global/plugins/typeahead/handlebars.min.js b/src/main/webapp/static/global/plugins/typeahead/handlebars.min.js
deleted file mode 100644
index fac92c923..000000000
--- a/src/main/webapp/static/global/plugins/typeahead/handlebars.min.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/*!
-
- handlebars v1.3.0
-
-Copyright (C) 2011 by Yehuda Katz
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-@license
-*/
-/* exported Handlebars */
-var Handlebars=function(){var t=function(){"use strict";function t(t){this.string=t}var e;return t.prototype.toString=function(){return""+this.string},e=t}(),e=function(t){"use strict";function e(t){return a[t]||"&amp;"}function s(t,e){for(var s in e)Object.prototype.hasOwnProperty.call(e,s)&&(t[s]=e[s])}function i(t){return t instanceof o?t.toString():t||0===t?(t=""+t,p.test(t)?t.replace(h,e):t):""}function n(t){return t||0===t?u(t)&&0===t.length?!0:!1:!0}var r={},o=t,a={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;"},h=/[&<>"'`]/g,p=/[&<>"'`]/;r.extend=s;var l=Object.prototype.toString;r.toString=l;var c=function(t){return"function"==typeof t};c(/x/)&&(c=function(t){return"function"==typeof t&&"[object Function]"===l.call(t)});var c;r.isFunction=c;var u=Array.isArray||function(t){return t&&"object"==typeof t?"[object Array]"===l.call(t):!1};return r.isArray=u,r.escapeExpression=i,r.isEmpty=n,r}(t),s=function(){"use strict";function t(t,e){var i;e&&e.firstLine&&(i=e.firstLine,t+=" - "+i+":"+e.firstColumn);for(var n=Error.prototype.constructor.call(this,t),r=0;r<s.length;r++)this[s[r]]=n[s[r]];i&&(this.lineNumber=i,this.column=e.firstColumn)}var e,s=["description","fileName","lineNumber","message","name","number","stack"];return t.prototype=new Error,e=t}(),i=function(t,e){"use strict";function s(t,e){this.helpers=t||{},this.partials=e||{},i(this)}function i(t){t.registerHelper("helperMissing",function(t){if(2===arguments.length)return void 0;throw new a("Missing helper: '"+t+"'")}),t.registerHelper("blockHelperMissing",function(e,s){var i=s.inverse||function(){},n=s.fn;return u(e)&&(e=e.call(this)),e===!0?n(this):e===!1||null==e?i(this):c(e)?e.length>0?t.helpers.each(e,s):i(this):n(e)}),t.registerHelper("each",function(t,e){var s,i=e.fn,n=e.inverse,r=0,o="";if(u(t)&&(t=t.call(this)),e.data&&(s=m(e.data)),t&&"object"==typeof t)if(c(t))for(var a=t.length;a>r;r++)s&&(s.index=r,s.first=0===r,s.last=r===t.length-1),o+=i(t[r],{data:s});else for(var h in t)t.hasOwnProperty(h)&&(s&&(s.key=h,s.index=r,s.first=0===r),o+=i(t[h],{data:s}),r++);return 0===r&&(o=n(this)),o}),t.registerHelper("if",function(t,e){return u(t)&&(t=t.call(this)),!e.hash.includeZero&&!t||o.isEmpty(t)?e.inverse(this):e.fn(this)}),t.registerHelper("unless",function(e,s){return t.helpers["if"].call(this,e,{fn:s.inverse,inverse:s.fn,hash:s.hash})}),t.registerHelper("with",function(t,e){return u(t)&&(t=t.call(this)),o.isEmpty(t)?void 0:e.fn(t)}),t.registerHelper("log",function(e,s){var i=s.data&&null!=s.data.level?parseInt(s.data.level,10):1;t.log(i,e)})}function n(t,e){g.log(t,e)}var r={},o=t,a=e,h="1.3.0";r.VERSION=h;var p=4;r.COMPILER_REVISION=p;var l={1:"<= 1.0.rc.2",2:"== 1.0.0-rc.3",3:"== 1.0.0-rc.4",4:">= 1.0.0"};r.REVISION_CHANGES=l;var c=o.isArray,u=o.isFunction,f=o.toString,d="[object Object]";r.HandlebarsEnvironment=s,s.prototype={constructor:s,logger:g,log:n,registerHelper:function(t,e,s){if(f.call(t)===d){if(s||e)throw new a("Arg not supported with multiple helpers");o.extend(this.helpers,t)}else s&&(e.not=s),this.helpers[t]=e},registerPartial:function(t,e){f.call(t)===d?o.extend(this.partials,t):this.partials[t]=e}};var g={methodMap:{0:"debug",1:"info",2:"warn",3:"error"},DEBUG:0,INFO:1,WARN:2,ERROR:3,level:3,log:function(t,e){if(g.level<=t){var s=g.methodMap[t];"undefined"!=typeof console&&console[s]&&console[s].call(console,e)}}};r.logger=g,r.log=n;var m=function(t){var e={};return o.extend(e,t),e};return r.createFrame=m,r}(e,s),n=function(t,e,s){"use strict";function i(t){var e=t&&t[0]||1,s=u;if(e!==s){if(s>e){var i=f[s],n=f[e];throw new c("Template was precompiled with an older version of Handlebars than the current runtime. Please update your precompiler to a newer version ("+i+") or downgrade your runtime to an older version ("+n+").")}throw new c("Template was precompiled with a newer version of Handlebars than the current runtime. Please update your runtime to a newer version ("+t[1]+").")}}function n(t,e){if(!e)throw new c("No environment passed to template");var s=function(t,s,i,n,r,o){var a=e.VM.invokePartial.apply(this,arguments);if(null!=a)return a;if(e.compile){var h={helpers:n,partials:r,data:o};return r[s]=e.compile(t,{data:void 0!==o},e),r[s](i,h)}throw new c("The partial "+s+" could not be compiled when running in runtime-only mode")},i={escapeExpression:l.escapeExpression,invokePartial:s,programs:[],program:function(t,e,s){var i=this.programs[t];return s?i=o(t,e,s):i||(i=this.programs[t]=o(t,e)),i},merge:function(t,e){var s=t||e;return t&&e&&t!==e&&(s={},l.extend(s,e),l.extend(s,t)),s},programWithDepth:e.VM.programWithDepth,noop:e.VM.noop,compilerInfo:null};return function(s,n){n=n||{};var r,o,a=n.partial?n:e;n.partial||(r=n.helpers,o=n.partials);var h=t.call(i,a,s,r,o,n.data);return n.partial||e.VM.checkRevision(i.compilerInfo),h}}function r(t,e,s){var i=Array.prototype.slice.call(arguments,3),n=function(t,n){return n=n||{},e.apply(this,[t,n.data||s].concat(i))};return n.program=t,n.depth=i.length,n}function o(t,e,s){var i=function(t,i){return i=i||{},e(t,i.data||s)};return i.program=t,i.depth=0,i}function a(t,e,s,i,n,r){var o={partial:!0,helpers:i,partials:n,data:r};if(void 0===t)throw new c("The partial "+e+" could not be found");return t instanceof Function?t(s,o):void 0}function h(){return""}var p={},l=t,c=e,u=s.COMPILER_REVISION,f=s.REVISION_CHANGES;return p.checkRevision=i,p.template=n,p.programWithDepth=r,p.program=o,p.invokePartial=a,p.noop=h,p}(e,s,i),r=function(t,e,s,i,n){"use strict";var r,o=t,a=e,h=s,p=i,l=n,c=function(){var t=new o.HandlebarsEnvironment;return p.extend(t,o),t.SafeString=a,t.Exception=h,t.Utils=p,t.VM=l,t.template=function(e){return l.template(e,t)},t},u=c();return u.create=c,r=u}(i,t,s,e,n),o=function(t){"use strict";function e(t){t=t||{},this.firstLine=t.first_line,this.firstColumn=t.first_column,this.lastColumn=t.last_column,this.lastLine=t.last_line}var s,i=t,n={ProgramNode:function(t,s,i,r){var o,a;3===arguments.length?(r=i,i=null):2===arguments.length&&(r=s,s=null),e.call(this,r),this.type="program",this.statements=t,this.strip={},i?(a=i[0],a?(o={first_line:a.firstLine,last_line:a.lastLine,last_column:a.lastColumn,first_column:a.firstColumn},this.inverse=new n.ProgramNode(i,s,o)):this.inverse=new n.ProgramNode(i,s),this.strip.right=s.left):s&&(this.strip.left=s.right)},MustacheNode:function(t,s,i,r,o){if(e.call(this,o),this.type="mustache",this.strip=r,null!=i&&i.charAt){var a=i.charAt(3)||i.charAt(2);this.escaped="{"!==a&&"&"!==a}else this.escaped=!!i;this.sexpr=t instanceof n.SexprNode?t:new n.SexprNode(t,s),this.sexpr.isRoot=!0,this.id=this.sexpr.id,this.params=this.sexpr.params,this.hash=this.sexpr.hash,this.eligibleHelper=this.sexpr.eligibleHelper,this.isHelper=this.sexpr.isHelper},SexprNode:function(t,s,i){e.call(this,i),this.type="sexpr",this.hash=s;var n=this.id=t[0],r=this.params=t.slice(1),o=this.eligibleHelper=n.isSimple;this.isHelper=o&&(r.length||s)},PartialNode:function(t,s,i,n){e.call(this,n),this.type="partial",this.partialName=t,this.context=s,this.strip=i},BlockNode:function(t,s,n,r,o){if(e.call(this,o),t.sexpr.id.original!==r.path.original)throw new i(t.sexpr.id.original+" doesn't match "+r.path.original,this);this.type="block",this.mustache=t,this.program=s,this.inverse=n,this.strip={left:t.strip.left,right:r.strip.right},(s||n).strip.left=t.strip.right,(n||s).strip.right=r.strip.left,n&&!s&&(this.isInverse=!0)},ContentNode:function(t,s){e.call(this,s),this.type="content",this.string=t},HashNode:function(t,s){e.call(this,s),this.type="hash",this.pairs=t},IdNode:function(t,s){e.call(this,s),this.type="ID";for(var n="",r=[],o=0,a=0,h=t.length;h>a;a++){var p=t[a].part;if(n+=(t[a].separator||"")+p,".."===p||"."===p||"this"===p){if(r.length>0)throw new i("Invalid path: "+n,this);".."===p?o++:this.isScoped=!0}else r.push(p)}this.original=n,this.parts=r,this.string=r.join("."),this.depth=o,this.isSimple=1===t.length&&!this.isScoped&&0===o,this.stringModeValue=this.string},PartialNameNode:function(t,s){e.call(this,s),this.type="PARTIAL_NAME",this.name=t.original},DataNode:function(t,s){e.call(this,s),this.type="DATA",this.id=t},StringNode:function(t,s){e.call(this,s),this.type="STRING",this.original=this.string=this.stringModeValue=t},IntegerNode:function(t,s){e.call(this,s),this.type="INTEGER",this.original=this.integer=t,this.stringModeValue=Number(t)},BooleanNode:function(t,s){e.call(this,s),this.type="BOOLEAN",this.bool=t,this.stringModeValue="true"===t},CommentNode:function(t,s){e.call(this,s),this.type="comment",this.comment=t}};return s=n}(s),a=function(){"use strict";var t,e=function(){function t(t,e){return{left:"~"===t.charAt(2),right:"~"===e.charAt(0)||"~"===e.charAt(1)}}function e(){this.yy={}}var s={trace:function(){},yy:{},symbols_:{error:2,root:3,statements:4,EOF:5,program:6,simpleInverse:7,statement:8,openInverse:9,closeBlock:10,openBlock:11,mustache:12,partial:13,CONTENT:14,COMMENT:15,OPEN_BLOCK:16,sexpr:17,CLOSE:18,OPEN_INVERSE:19,OPEN_ENDBLOCK:20,path:21,OPEN:22,OPEN_UNESCAPED:23,CLOSE_UNESCAPED:24,OPEN_PARTIAL:25,partialName:26,partial_option0:27,sexpr_repetition0:28,sexpr_option0:29,dataName:30,param:31,STRING:32,INTEGER:33,BOOLEAN:34,OPEN_SEXPR:35,CLOSE_SEXPR:36,hash:37,hash_repetition_plus0:38,hashSegment:39,ID:40,EQUALS:41,DATA:42,pathSegments:43,SEP:44,$accept:0,$end:1},terminals_:{2:"error",5:"EOF",14:"CONTENT",15:"COMMENT",16:"OPEN_BLOCK",18:"CLOSE",19:"OPEN_INVERSE",20:"OPEN_ENDBLOCK",22:"OPEN",23:"OPEN_UNESCAPED",24:"CLOSE_UNESCAPED",25:"OPEN_PARTIAL",32:"STRING",33:"INTEGER",34:"BOOLEAN",35:"OPEN_SEXPR",36:"CLOSE_SEXPR",40:"ID",41:"EQUALS",42:"DATA",44:"SEP"},productions_:[0,[3,2],[3,1],[6,2],[6,3],[6,2],[6,1],[6,1],[6,0],[4,1],[4,2],[8,3],[8,3],[8,1],[8,1],[8,1],[8,1],[11,3],[9,3],[10,3],[12,3],[12,3],[13,4],[7,2],[17,3],[17,1],[31,1],[31,1],[31,1],[31,1],[31,1],[31,3],[37,1],[39,3],[26,1],[26,1],[26,1],[30,2],[21,1],[43,3],[43,1],[27,0],[27,1],[28,0],[28,2],[29,0],[29,1],[38,1],[38,2]],performAction:function(e,s,i,n,r,o){var a=o.length-1;switch(r){case 1:return new n.ProgramNode(o[a-1],this._$);case 2:return new n.ProgramNode([],this._$);case 3:this.$=new n.ProgramNode([],o[a-1],o[a],this._$);break;case 4:this.$=new n.ProgramNode(o[a-2],o[a-1],o[a],this._$);break;case 5:this.$=new n.ProgramNode(o[a-1],o[a],[],this._$);break;case 6:this.$=new n.ProgramNode(o[a],this._$);break;case 7:this.$=new n.ProgramNode([],this._$);break;case 8:this.$=new n.ProgramNode([],this._$);break;case 9:this.$=[o[a]];break;case 10:o[a-1].push(o[a]),this.$=o[a-1];break;case 11:this.$=new n.BlockNode(o[a-2],o[a-1].inverse,o[a-1],o[a],this._$);break;case 12:this.$=new n.BlockNode(o[a-2],o[a-1],o[a-1].inverse,o[a],this._$);break;case 13:this.$=o[a];break;case 14:this.$=o[a];break;case 15:this.$=new n.ContentNode(o[a],this._$);break;case 16:this.$=new n.CommentNode(o[a],this._$);break;case 17:this.$=new n.MustacheNode(o[a-1],null,o[a-2],t(o[a-2],o[a]),this._$);break;case 18:this.$=new n.MustacheNode(o[a-1],null,o[a-2],t(o[a-2],o[a]),this._$);break;case 19:this.$={path:o[a-1],strip:t(o[a-2],o[a])};break;case 20:this.$=new n.MustacheNode(o[a-1],null,o[a-2],t(o[a-2],o[a]),this._$);break;case 21:this.$=new n.MustacheNode(o[a-1],null,o[a-2],t(o[a-2],o[a]),this._$);break;case 22:this.$=new n.PartialNode(o[a-2],o[a-1],t(o[a-3],o[a]),this._$);break;case 23:this.$=t(o[a-1],o[a]);break;case 24:this.$=new n.SexprNode([o[a-2]].concat(o[a-1]),o[a],this._$);break;case 25:this.$=new n.SexprNode([o[a]],null,this._$);break;case 26:this.$=o[a];break;case 27:this.$=new n.StringNode(o[a],this._$);break;case 28:this.$=new n.IntegerNode(o[a],this._$);break;case 29:this.$=new n.BooleanNode(o[a],this._$);break;case 30:this.$=o[a];break;case 31:o[a-1].isHelper=!0,this.$=o[a-1];break;case 32:this.$=new n.HashNode(o[a],this._$);break;case 33:this.$=[o[a-2],o[a]];break;case 34:this.$=new n.PartialNameNode(o[a],this._$);break;case 35:this.$=new n.PartialNameNode(new n.StringNode(o[a],this._$),this._$);break;case 36:this.$=new n.PartialNameNode(new n.IntegerNode(o[a],this._$));break;case 37:this.$=new n.DataNode(o[a],this._$);break;case 38:this.$=new n.IdNode(o[a],this._$);break;case 39:o[a-2].push({part:o[a],separator:o[a-1]}),this.$=o[a-2];break;case 40:this.$=[{part:o[a]}];break;case 43:this.$=[];break;case 44:o[a-1].push(o[a]);break;case 47:this.$=[o[a]];break;case 48:o[a-1].push(o[a])}},table:[{3:1,4:2,5:[1,3],8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],22:[1,13],23:[1,14],25:[1,15]},{1:[3]},{5:[1,16],8:17,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],22:[1,13],23:[1,14],25:[1,15]},{1:[2,2]},{5:[2,9],14:[2,9],15:[2,9],16:[2,9],19:[2,9],20:[2,9],22:[2,9],23:[2,9],25:[2,9]},{4:20,6:18,7:19,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,21],20:[2,8],22:[1,13],23:[1,14],25:[1,15]},{4:20,6:22,7:19,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,21],20:[2,8],22:[1,13],23:[1,14],25:[1,15]},{5:[2,13],14:[2,13],15:[2,13],16:[2,13],19:[2,13],20:[2,13],22:[2,13],23:[2,13],25:[2,13]},{5:[2,14],14:[2,14],15:[2,14],16:[2,14],19:[2,14],20:[2,14],22:[2,14],23:[2,14],25:[2,14]},{5:[2,15],14:[2,15],15:[2,15],16:[2,15],19:[2,15],20:[2,15],22:[2,15],23:[2,15],25:[2,15]},{5:[2,16],14:[2,16],15:[2,16],16:[2,16],19:[2,16],20:[2,16],22:[2,16],23:[2,16],25:[2,16]},{17:23,21:24,30:25,40:[1,28],42:[1,27],43:26},{17:29,21:24,30:25,40:[1,28],42:[1,27],43:26},{17:30,21:24,30:25,40:[1,28],42:[1,27],43:26},{17:31,21:24,30:25,40:[1,28],42:[1,27],43:26},{21:33,26:32,32:[1,34],33:[1,35],40:[1,28],43:26},{1:[2,1]},{5:[2,10],14:[2,10],15:[2,10],16:[2,10],19:[2,10],20:[2,10],22:[2,10],23:[2,10],25:[2,10]},{10:36,20:[1,37]},{4:38,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,7],22:[1,13],23:[1,14],25:[1,15]},{7:39,8:17,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,21],20:[2,6],22:[1,13],23:[1,14],25:[1,15]},{17:23,18:[1,40],21:24,30:25,40:[1,28],42:[1,27],43:26},{10:41,20:[1,37]},{18:[1,42]},{18:[2,43],24:[2,43],28:43,32:[2,43],33:[2,43],34:[2,43],35:[2,43],36:[2,43],40:[2,43],42:[2,43]},{18:[2,25],24:[2,25],36:[2,25]},{18:[2,38],24:[2,38],32:[2,38],33:[2,38],34:[2,38],35:[2,38],36:[2,38],40:[2,38],42:[2,38],44:[1,44]},{21:45,40:[1,28],43:26},{18:[2,40],24:[2,40],32:[2,40],33:[2,40],34:[2,40],35:[2,40],36:[2,40],40:[2,40],42:[2,40],44:[2,40]},{18:[1,46]},{18:[1,47]},{24:[1,48]},{18:[2,41],21:50,27:49,40:[1,28],43:26},{18:[2,34],40:[2,34]},{18:[2,35],40:[2,35]},{18:[2,36],40:[2,36]},{5:[2,11],14:[2,11],15:[2,11],16:[2,11],19:[2,11],20:[2,11],22:[2,11],23:[2,11],25:[2,11]},{21:51,40:[1,28],43:26},{8:17,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,3],22:[1,13],23:[1,14],25:[1,15]},{4:52,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,5],22:[1,13],23:[1,14],25:[1,15]},{14:[2,23],15:[2,23],16:[2,23],19:[2,23],20:[2,23],22:[2,23],23:[2,23],25:[2,23]},{5:[2,12],14:[2,12],15:[2,12],16:[2,12],19:[2,12],20:[2,12],22:[2,12],23:[2,12],25:[2,12]},{14:[2,18],15:[2,18],16:[2,18],19:[2,18],20:[2,18],22:[2,18],23:[2,18],25:[2,18]},{18:[2,45],21:56,24:[2,45],29:53,30:60,31:54,32:[1,57],33:[1,58],34:[1,59],35:[1,61],36:[2,45],37:55,38:62,39:63,40:[1,64],42:[1,27],43:26},{40:[1,65]},{18:[2,37],24:[2,37],32:[2,37],33:[2,37],34:[2,37],35:[2,37],36:[2,37],40:[2,37],42:[2,37]},{14:[2,17],15:[2,17],16:[2,17],19:[2,17],20:[2,17],22:[2,17],23:[2,17],25:[2,17]},{5:[2,20],14:[2,20],15:[2,20],16:[2,20],19:[2,20],20:[2,20],22:[2,20],23:[2,20],25:[2,20]},{5:[2,21],14:[2,21],15:[2,21],16:[2,21],19:[2,21],20:[2,21],22:[2,21],23:[2,21],25:[2,21]},{18:[1,66]},{18:[2,42]},{18:[1,67]},{8:17,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,4],22:[1,13],23:[1,14],25:[1,15]},{18:[2,24],24:[2,24],36:[2,24]},{18:[2,44],24:[2,44],32:[2,44],33:[2,44],34:[2,44],35:[2,44],36:[2,44],40:[2,44],42:[2,44]},{18:[2,46],24:[2,46],36:[2,46]},{18:[2,26],24:[2,26],32:[2,26],33:[2,26],34:[2,26],35:[2,26],36:[2,26],40:[2,26],42:[2,26]},{18:[2,27],24:[2,27],32:[2,27],33:[2,27],34:[2,27],35:[2,27],36:[2,27],40:[2,27],42:[2,27]},{18:[2,28],24:[2,28],32:[2,28],33:[2,28],34:[2,28],35:[2,28],36:[2,28],40:[2,28],42:[2,28]},{18:[2,29],24:[2,29],32:[2,29],33:[2,29],34:[2,29],35:[2,29],36:[2,29],40:[2,29],42:[2,29]},{18:[2,30],24:[2,30],32:[2,30],33:[2,30],34:[2,30],35:[2,30],36:[2,30],40:[2,30],42:[2,30]},{17:68,21:24,30:25,40:[1,28],42:[1,27],43:26},{18:[2,32],24:[2,32],36:[2,32],39:69,40:[1,70]},{18:[2,47],24:[2,47],36:[2,47],40:[2,47]},{18:[2,40],24:[2,40],32:[2,40],33:[2,40],34:[2,40],35:[2,40],36:[2,40],40:[2,40],41:[1,71],42:[2,40],44:[2,40]},{18:[2,39],24:[2,39],32:[2,39],33:[2,39],34:[2,39],35:[2,39],36:[2,39],40:[2,39],42:[2,39],44:[2,39]},{5:[2,22],14:[2,22],15:[2,22],16:[2,22],19:[2,22],20:[2,22],22:[2,22],23:[2,22],25:[2,22]},{5:[2,19],14:[2,19],15:[2,19],16:[2,19],19:[2,19],20:[2,19],22:[2,19],23:[2,19],25:[2,19]},{36:[1,72]},{18:[2,48],24:[2,48],36:[2,48],40:[2,48]},{41:[1,71]},{21:56,30:60,31:73,32:[1,57],33:[1,58],34:[1,59],35:[1,61],40:[1,28],42:[1,27],43:26},{18:[2,31],24:[2,31],32:[2,31],33:[2,31],34:[2,31],35:[2,31],36:[2,31],40:[2,31],42:[2,31]},{18:[2,33],24:[2,33],36:[2,33],40:[2,33]}],defaultActions:{3:[2,2],16:[2,1],50:[2,42]},parseError:function(t){throw new Error(t)},parse:function(t){function e(){var t;return t=s.lexer.lex()||1,"number"!=typeof t&&(t=s.symbols_[t]||t),t}var s=this,i=[0],n=[null],r=[],o=this.table,a="",h=0,p=0,l=0;this.lexer.setInput(t),this.lexer.yy=this.yy,this.yy.lexer=this.lexer,this.yy.parser=this,"undefined"==typeof this.lexer.yylloc&&(this.lexer.yylloc={});var c=this.lexer.yylloc;r.push(c);var u=this.lexer.options&&this.lexer.options.ranges;"function"==typeof this.yy.parseError&&(this.parseError=this.yy.parseError);for(var f,d,g,m,v,y,S,k,x,b={};;){if(g=i[i.length-1],this.defaultActions[g]?m=this.defaultActions[g]:((null===f||"undefined"==typeof f)&&(f=e()),m=o[g]&&o[g][f]),"undefined"==typeof m||!m.length||!m[0]){var _="";if(!l){x=[];for(y in o[g])this.terminals_[y]&&y>2&&x.push("'"+this.terminals_[y]+"'");_=this.lexer.showPosition?"Parse error on line "+(h+1)+":\n"+this.lexer.showPosition()+"\nExpecting "+x.join(", ")+", got '"+(this.terminals_[f]||f)+"'":"Parse error on line "+(h+1)+": Unexpected "+(1==f?"end of input":"'"+(this.terminals_[f]||f)+"'"),this.parseError(_,{text:this.lexer.match,token:this.terminals_[f]||f,line:this.lexer.yylineno,loc:c,expected:x})}}if(m[0]instanceof Array&&m.length>1)throw new Error("Parse Error: multiple actions possible at state: "+g+", token: "+f);switch(m[0]){case 1:i.push(f),n.push(this.lexer.yytext),r.push(this.lexer.yylloc),i.push(m[1]),f=null,d?(f=d,d=null):(p=this.lexer.yyleng,a=this.lexer.yytext,h=this.lexer.yylineno,c=this.lexer.yylloc,l>0&&l--);break;case 2:if(S=this.productions_[m[1]][1],b.$=n[n.length-S],b._$={first_line:r[r.length-(S||1)].first_line,last_line:r[r.length-1].last_line,first_column:r[r.length-(S||1)].first_column,last_column:r[r.length-1].last_column},u&&(b._$.range=[r[r.length-(S||1)].range[0],r[r.length-1].range[1]]),v=this.performAction.call(b,a,p,h,this.yy,m[1],n,r),"undefined"!=typeof v)return v;S&&(i=i.slice(0,-1*S*2),n=n.slice(0,-1*S),r=r.slice(0,-1*S)),i.push(this.productions_[m[1]][0]),n.push(b.$),r.push(b._$),k=o[i[i.length-2]][i[i.length-1]],i.push(k);break;case 3:return!0}}return!0}},i=function(){var t={EOF:1,parseError:function(t,e){if(!this.yy.parser)throw new Error(t);this.yy.parser.parseError(t,e)},setInput:function(t){return this._input=t,this._more=this._less=this.done=!1,this.yylineno=this.yyleng=0,this.yytext=this.matched=this.match="",this.conditionStack=["INITIAL"],this.yylloc={first_line:1,first_column:0,last_line:1,last_column:0},this.options.ranges&&(this.yylloc.range=[0,0]),this.offset=0,this},input:function(){var t=this._input[0];this.yytext+=t,this.yyleng++,this.offset++,this.match+=t,this.matched+=t;var e=t.match(/(?:\r\n?|\n).*/g);return e?(this.yylineno++,this.yylloc.last_line++):this.yylloc.last_column++,this.options.ranges&&this.yylloc.range[1]++,this._input=this._input.slice(1),t},unput:function(t){var e=t.length,s=t.split(/(?:\r\n?|\n)/g);this._input=t+this._input,this.yytext=this.yytext.substr(0,this.yytext.length-e-1),this.offset-=e;var i=this.match.split(/(?:\r\n?|\n)/g);this.match=this.match.substr(0,this.match.length-1),this.matched=this.matched.substr(0,this.matched.length-1),s.length-1&&(this.yylineno-=s.length-1);var n=this.yylloc.range;return this.yylloc={first_line:this.yylloc.first_line,last_line:this.yylineno+1,first_column:this.yylloc.first_column,last_column:s?(s.length===i.length?this.yylloc.first_column:0)+i[i.length-s.length].length-s[0].length:this.yylloc.first_column-e},this.options.ranges&&(this.yylloc.range=[n[0],n[0]+this.yyleng-e]),this},more:function(){return this._more=!0,this},less:function(t){this.unput(this.match.slice(t))},pastInput:function(){var t=this.matched.substr(0,this.matched.length-this.match.length);return(t.length>20?"...":"")+t.substr(-20).replace(/\n/g,"")},upcomingInput:function(){var t=this.match;return t.length<20&&(t+=this._input.substr(0,20-t.length)),(t.substr(0,20)+(t.length>20?"...":"")).replace(/\n/g,"")},showPosition:function(){var t=this.pastInput(),e=new Array(t.length+1).join("-");return t+this.upcomingInput()+"\n"+e+"^"},next:function(){if(this.done)return this.EOF;this._input||(this.done=!0);var t,e,s,i,n;this._more||(this.yytext="",this.match="");for(var r=this._currentRules(),o=0;o<r.length&&(s=this._input.match(this.rules[r[o]]),!s||e&&!(s[0].length>e[0].length)||(e=s,i=o,this.options.flex));o++);return e?(n=e[0].match(/(?:\r\n?|\n).*/g),n&&(this.yylineno+=n.length),this.yylloc={first_line:this.yylloc.last_line,last_line:this.yylineno+1,first_column:this.yylloc.last_column,last_column:n?n[n.length-1].length-n[n.length-1].match(/\r?\n?/)[0].length:this.yylloc.last_column+e[0].length},this.yytext+=e[0],this.match+=e[0],this.matches=e,this.yyleng=this.yytext.length,this.options.ranges&&(this.yylloc.range=[this.offset,this.offset+=this.yyleng]),this._more=!1,this._input=this._input.slice(e[0].length),this.matched+=e[0],t=this.performAction.call(this,this.yy,this,r[i],this.conditionStack[this.conditionStack.length-1]),this.done&&this._input&&(this.done=!1),t?t:void 0):""===this._input?this.EOF:this.parseError("Lexical error on line "+(this.yylineno+1)+". Unrecognized text.\n"+this.showPosition(),{text:"",token:null,line:this.yylineno})},lex:function(){var t=this.next();return"undefined"!=typeof t?t:this.lex()},begin:function(t){this.conditionStack.push(t)},popState:function(){return this.conditionStack.pop()},_currentRules:function(){return this.conditions[this.conditionStack[this.conditionStack.length-1]].rules},topState:function(){return this.conditionStack[this.conditionStack.length-2]},pushState:function(t){this.begin(t)}};return t.options={},t.performAction=function(t,e,s,i){function n(t,s){return e.yytext=e.yytext.substr(t,e.yyleng-s)}switch(s){case 0:if("\\\\"===e.yytext.slice(-2)?(n(0,1),this.begin("mu")):"\\"===e.yytext.slice(-1)?(n(0,1),this.begin("emu")):this.begin("mu"),e.yytext)return 14;break;case 1:return 14;case 2:return this.popState(),14;case 3:return n(0,4),this.popState(),15;case 4:return 35;case 5:return 36;case 6:return 25;case 7:return 16;case 8:return 20;case 9:return 19;case 10:return 19;case 11:return 23;case 12:return 22;case 13:this.popState(),this.begin("com");break;case 14:return n(3,5),this.popState(),15;case 15:return 22;case 16:return 41;case 17:return 40;case 18:return 40;case 19:return 44;case 20:break;case 21:return this.popState(),24;case 22:return this.popState(),18;case 23:return e.yytext=n(1,2).replace(/\\"/g,'"'),32;case 24:return e.yytext=n(1,2).replace(/\\'/g,"'"),32;case 25:return 42;case 26:return 34;case 27:return 34;case 28:return 33;case 29:return 40;case 30:return e.yytext=n(1,2),40;case 31:return"INVALID";case 32:return 5}},t.rules=[/^(?:[^\x00]*?(?=(\{\{)))/,/^(?:[^\x00]+)/,/^(?:[^\x00]{2,}?(?=(\{\{|\\\{\{|\\\\\{\{|$)))/,/^(?:[\s\S]*?--\}\})/,/^(?:\()/,/^(?:\))/,/^(?:\{\{(~)?>)/,/^(?:\{\{(~)?#)/,/^(?:\{\{(~)?\/)/,/^(?:\{\{(~)?\^)/,/^(?:\{\{(~)?\s*else\b)/,/^(?:\{\{(~)?\{)/,/^(?:\{\{(~)?&)/,/^(?:\{\{!--)/,/^(?:\{\{![\s\S]*?\}\})/,/^(?:\{\{(~)?)/,/^(?:=)/,/^(?:\.\.)/,/^(?:\.(?=([=~}\s\/.)])))/,/^(?:[\/.])/,/^(?:\s+)/,/^(?:\}(~)?\}\})/,/^(?:(~)?\}\})/,/^(?:"(\\["]|[^"])*")/,/^(?:'(\\[']|[^'])*')/,/^(?:@)/,/^(?:true(?=([~}\s)])))/,/^(?:false(?=([~}\s)])))/,/^(?:-?[0-9]+(?=([~}\s)])))/,/^(?:([^\s!"#%-,\.\/;->@\[-\^`\{-~]+(?=([=~}\s\/.)]))))/,/^(?:\[[^\]]*\])/,/^(?:.)/,/^(?:$)/],t.conditions={mu:{rules:[4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32],inclusive:!1},emu:{rules:[2],inclusive:!1},com:{rules:[3],inclusive:!1},INITIAL:{rules:[0,1,32],inclusive:!0}},t}();return s.lexer=i,e.prototype=s,s.Parser=e,new e}();return t=e}(),h=function(t,e){"use strict";function s(t){return t.constructor===r.ProgramNode?t:(n.yy=r,n.parse(t))}var i={},n=t,r=e;return i.parser=n,i.parse=s,i}(a,o),p=function(t){"use strict";function e(){}function s(t,e,s){if(null==t||"string"!=typeof t&&t.constructor!==s.AST.ProgramNode)throw new r("You must pass a string or Handlebars AST to Handlebars.precompile. You passed "+t);e=e||{},"data"in e||(e.data=!0);var i=s.parse(t),n=(new s.Compiler).compile(i,e);return(new s.JavaScriptCompiler).compile(n,e)}function i(t,e,s){function i(){var i=s.parse(t),n=(new s.Compiler).compile(i,e),r=(new s.JavaScriptCompiler).compile(n,e,void 0,!0);return s.template(r)}if(null==t||"string"!=typeof t&&t.constructor!==s.AST.ProgramNode)throw new r("You must pass a string or Handlebars AST to Handlebars.compile. You passed "+t);e=e||{},"data"in e||(e.data=!0);var n;return function(t,e){return n||(n=i()),n.call(this,t,e)}}var n={},r=t;return n.Compiler=e,e.prototype={compiler:e,disassemble:function(){for(var t,e,s,i=this.opcodes,n=[],r=0,o=i.length;o>r;r++)if(t=i[r],"DECLARE"===t.opcode)n.push("DECLARE "+t.name+"="+t.value);else{e=[];for(var a=0;a<t.args.length;a++)s=t.args[a],"string"==typeof s&&(s='"'+s.replace("\n","\\n")+'"'),e.push(s);n.push(t.opcode+" "+e.join(" "))}return n.join("\n")},equals:function(t){var e=this.opcodes.length;if(t.opcodes.length!==e)return!1;for(var s=0;e>s;s++){var i=this.opcodes[s],n=t.opcodes[s];if(i.opcode!==n.opcode||i.args.length!==n.args.length)return!1;for(var r=0;r<i.args.length;r++)if(i.args[r]!==n.args[r])return!1}if(e=this.children.length,t.children.length!==e)return!1;for(s=0;e>s;s++)if(!this.children[s].equals(t.children[s]))return!1;return!0},guid:0,compile:function(t,e){this.opcodes=[],this.children=[],this.depths={list:[]},this.options=e;var s=this.options.knownHelpers;if(this.options.knownHelpers={helperMissing:!0,blockHelperMissing:!0,each:!0,"if":!0,unless:!0,"with":!0,log:!0},s)for(var i in s)this.options.knownHelpers[i]=s[i];return this.accept(t)},accept:function(t){var e,s=t.strip||{};return s.left&&this.opcode("strip"),e=this[t.type](t),s.right&&this.opcode("strip"),e},program:function(t){for(var e=t.statements,s=0,i=e.length;i>s;s++)this.accept(e[s]);return this.isSimple=1===i,this.depths.list=this.depths.list.sort(function(t,e){return t-e}),this},compileProgram:function(t){var e,s=(new this.compiler).compile(t,this.options),i=this.guid++;this.usePartial=this.usePartial||s.usePartial,this.children[i]=s;for(var n=0,r=s.depths.list.length;r>n;n++)e=s.depths.list[n],2>e||this.addDepth(e-1);return i},block:function(t){var e=t.mustache,s=t.program,i=t.inverse;s&&(s=this.compileProgram(s)),i&&(i=this.compileProgram(i));var n=e.sexpr,r=this.classifySexpr(n);"helper"===r?this.helperSexpr(n,s,i):"simple"===r?(this.simpleSexpr(n),this.opcode("pushProgram",s),this.opcode("pushProgram",i),this.opcode("emptyHash"),this.opcode("blockValue")):(this.ambiguousSexpr(n,s,i),this.opcode("pushProgram",s),this.opcode("pushProgram",i),this.opcode("emptyHash"),this.opcode("ambiguousBlockValue")),this.opcode("append")},hash:function(t){var e,s,i=t.pairs;this.opcode("pushHash");for(var n=0,r=i.length;r>n;n++)e=i[n],s=e[1],this.options.stringParams?(s.depth&&this.addDepth(s.depth),this.opcode("getContext",s.depth||0),this.opcode("pushStringParam",s.stringModeValue,s.type),"sexpr"===s.type&&this.sexpr(s)):this.accept(s),this.opcode("assignToHash",e[0]);this.opcode("popHash")},partial:function(t){var e=t.partialName;this.usePartial=!0,t.context?this.ID(t.context):this.opcode("push","depth0"),this.opcode("invokePartial",e.name),this.opcode("append")},content:function(t){this.opcode("appendContent",t.string)},mustache:function(t){this.sexpr(t.sexpr),this.opcode(t.escaped&&!this.options.noEscape?"appendEscaped":"append")},ambiguousSexpr:function(t,e,s){var i=t.id,n=i.parts[0],r=null!=e||null!=s;this.opcode("getContext",i.depth),this.opcode("pushProgram",e),this.opcode("pushProgram",s),this.opcode("invokeAmbiguous",n,r)},simpleSexpr:function(t){var e=t.id;"DATA"===e.type?this.DATA(e):e.parts.length?this.ID(e):(this.addDepth(e.depth),this.opcode("getContext",e.depth),this.opcode("pushContext")),this.opcode("resolvePossibleLambda")},helperSexpr:function(t,e,s){var i=this.setupFullMustacheParams(t,e,s),n=t.id.parts[0];if(this.options.knownHelpers[n])this.opcode("invokeKnownHelper",i.length,n);else{if(this.options.knownHelpersOnly)throw new r("You specified knownHelpersOnly, but used the unknown helper "+n,t);this.opcode("invokeHelper",i.length,n,t.isRoot)}},sexpr:function(t){var e=this.classifySexpr(t);"simple"===e?this.simpleSexpr(t):"helper"===e?this.helperSexpr(t):this.ambiguousSexpr(t)},ID:function(t){this.addDepth(t.depth),this.opcode("getContext",t.depth);var e=t.parts[0];e?this.opcode("lookupOnContext",t.parts[0]):this.opcode("pushContext");for(var s=1,i=t.parts.length;i>s;s++)this.opcode("lookup",t.parts[s])},DATA:function(t){if(this.options.data=!0,t.id.isScoped||t.id.depth)throw new r("Scoped data references are not supported: "+t.original,t);this.opcode("lookupData");for(var e=t.id.parts,s=0,i=e.length;i>s;s++)this.opcode("lookup",e[s])},STRING:function(t){this.opcode("pushString",t.string)},INTEGER:function(t){this.opcode("pushLiteral",t.integer)},BOOLEAN:function(t){this.opcode("pushLiteral",t.bool)},comment:function(){},opcode:function(t){this.opcodes.push({opcode:t,args:[].slice.call(arguments,1)})},declare:function(t,e){this.opcodes.push({opcode:"DECLARE",name:t,value:e})},addDepth:function(t){0!==t&&(this.depths[t]||(this.depths[t]=!0,this.depths.list.push(t)))},classifySexpr:function(t){var e=t.isHelper,s=t.eligibleHelper,i=this.options;if(s&&!e){var n=t.id.parts[0];i.knownHelpers[n]?e=!0:i.knownHelpersOnly&&(s=!1)}return e?"helper":s?"ambiguous":"simple"},pushParams:function(t){for(var e,s=t.length;s--;)e=t[s],this.options.stringParams?(e.depth&&this.addDepth(e.depth),this.opcode("getContext",e.depth||0),this.opcode("pushStringParam",e.stringModeValue,e.type),"sexpr"===e.type&&this.sexpr(e)):this[e.type](e)},setupFullMustacheParams:function(t,e,s){var i=t.params;return this.pushParams(i),this.opcode("pushProgram",e),this.opcode("pushProgram",s),t.hash?this.hash(t.hash):this.opcode("emptyHash"),i}},n.precompile=s,n.compile=i,n}(s),l=function(t,e){"use strict";function s(t){this.value=t}function i(){}var n,r=t.COMPILER_REVISION,o=t.REVISION_CHANGES,a=t.log,h=e;i.prototype={nameLookup:function(t,e){var s,n;return 0===t.indexOf("depth")&&(s=!0),n=/^[0-9]+$/.test(e)?t+"["+e+"]":i.isValidJavaScriptVariableName(e)?t+"."+e:t+"['"+e+"']",s?"("+t+" && "+n+")":n},compilerInfo:function(){var t=r,e=o[t];return"this.compilerInfo = ["+t+",'"+e+"'];\n"},appendToBuffer:function(t){return this.environment.isSimple?"return "+t+";":{appendToBuffer:!0,content:t,toString:function(){return"buffer += "+t+";"}}},initializeBuffer:function(){return this.quotedString("")},namespace:"Handlebars",compile:function(t,e,s,i){this.environment=t,this.options=e||{},a("debug",this.environment.disassemble()+"\n\n"),this.name=this.environment.name,this.isChild=!!s,this.context=s||{programs:[],environments:[],aliases:{}},this.preamble(),this.stackSlot=0,this.stackVars=[],this.registers={list:[]},this.hashes=[],this.compileStack=[],this.inlineStack=[],this.compileChildren(t,e);
-var n,r=t.opcodes;this.i=0;for(var o=r.length;this.i<o;this.i++)n=r[this.i],"DECLARE"===n.opcode?this[n.name]=n.value:this[n.opcode].apply(this,n.args),n.opcode!==this.stripNext&&(this.stripNext=!1);if(this.pushSource(""),this.stackSlot||this.inlineStack.length||this.compileStack.length)throw new h("Compile completed with content left on stack");return this.createFunctionContext(i)},preamble:function(){var t=[];if(this.isChild)t.push("");else{var e=this.namespace,s="helpers = this.merge(helpers, "+e+".helpers);";this.environment.usePartial&&(s=s+" partials = this.merge(partials, "+e+".partials);"),this.options.data&&(s+=" data = data || {};"),t.push(s)}t.push(this.environment.isSimple?"":", buffer = "+this.initializeBuffer()),this.lastContext=0,this.source=t},createFunctionContext:function(t){var e=this.stackVars.concat(this.registers.list);if(e.length>0&&(this.source[1]=this.source[1]+", "+e.join(", ")),!this.isChild)for(var s in this.context.aliases)this.context.aliases.hasOwnProperty(s)&&(this.source[1]=this.source[1]+", "+s+"="+this.context.aliases[s]);this.source[1]&&(this.source[1]="var "+this.source[1].substring(2)+";"),this.isChild||(this.source[1]+="\n"+this.context.programs.join("\n")+"\n"),this.environment.isSimple||this.pushSource("return buffer;");for(var i=this.isChild?["depth0","data"]:["Handlebars","depth0","helpers","partials","data"],n=0,r=this.environment.depths.list.length;r>n;n++)i.push("depth"+this.environment.depths.list[n]);var o=this.mergeSource();if(this.isChild||(o=this.compilerInfo()+o),t)return i.push(o),Function.apply(this,i);var h="function "+(this.name||"")+"("+i.join(",")+") {\n  "+o+"}";return a("debug",h+"\n\n"),h},mergeSource:function(){for(var t,e="",s=0,i=this.source.length;i>s;s++){var n=this.source[s];n.appendToBuffer?t=t?t+"\n    + "+n.content:n.content:(t&&(e+="buffer += "+t+";\n  ",t=void 0),e+=n+"\n  ")}return e},blockValue:function(){this.context.aliases.blockHelperMissing="helpers.blockHelperMissing";var t=["depth0"];this.setupParams(0,t),this.replaceStack(function(e){return t.splice(1,0,e),"blockHelperMissing.call("+t.join(", ")+")"})},ambiguousBlockValue:function(){this.context.aliases.blockHelperMissing="helpers.blockHelperMissing";var t=["depth0"];this.setupParams(0,t);var e=this.topStack();t.splice(1,0,e),this.pushSource("if (!"+this.lastHelper+") { "+e+" = blockHelperMissing.call("+t.join(", ")+"); }")},appendContent:function(t){this.pendingContent&&(t=this.pendingContent+t),this.stripNext&&(t=t.replace(/^\s+/,"")),this.pendingContent=t},strip:function(){this.pendingContent&&(this.pendingContent=this.pendingContent.replace(/\s+$/,"")),this.stripNext="strip"},append:function(){this.flushInline();var t=this.popStack();this.pushSource("if("+t+" || "+t+" === 0) { "+this.appendToBuffer(t)+" }"),this.environment.isSimple&&this.pushSource("else { "+this.appendToBuffer("''")+" }")},appendEscaped:function(){this.context.aliases.escapeExpression="this.escapeExpression",this.pushSource(this.appendToBuffer("escapeExpression("+this.popStack()+")"))},getContext:function(t){this.lastContext!==t&&(this.lastContext=t)},lookupOnContext:function(t){this.push(this.nameLookup("depth"+this.lastContext,t,"context"))},pushContext:function(){this.pushStackLiteral("depth"+this.lastContext)},resolvePossibleLambda:function(){this.context.aliases.functionType='"function"',this.replaceStack(function(t){return"typeof "+t+" === functionType ? "+t+".apply(depth0) : "+t})},lookup:function(t){this.replaceStack(function(e){return e+" == null || "+e+" === false ? "+e+" : "+this.nameLookup(e,t,"context")})},lookupData:function(){this.pushStackLiteral("data")},pushStringParam:function(t,e){this.pushStackLiteral("depth"+this.lastContext),this.pushString(e),"sexpr"!==e&&("string"==typeof t?this.pushString(t):this.pushStackLiteral(t))},emptyHash:function(){this.pushStackLiteral("{}"),this.options.stringParams&&(this.push("{}"),this.push("{}"))},pushHash:function(){this.hash&&this.hashes.push(this.hash),this.hash={values:[],types:[],contexts:[]}},popHash:function(){var t=this.hash;this.hash=this.hashes.pop(),this.options.stringParams&&(this.push("{"+t.contexts.join(",")+"}"),this.push("{"+t.types.join(",")+"}")),this.push("{\n    "+t.values.join(",\n    ")+"\n  }")},pushString:function(t){this.pushStackLiteral(this.quotedString(t))},push:function(t){return this.inlineStack.push(t),t},pushLiteral:function(t){this.pushStackLiteral(t)},pushProgram:function(t){this.pushStackLiteral(null!=t?this.programExpression(t):null)},invokeHelper:function(t,e,s){this.context.aliases.helperMissing="helpers.helperMissing",this.useRegister("helper");var i=this.lastHelper=this.setupHelper(t,e,!0),n=this.nameLookup("depth"+this.lastContext,e,"context"),r="helper = "+i.name+" || "+n;i.paramsInit&&(r+=","+i.paramsInit),this.push("("+r+",helper ? helper.call("+i.callParams+") : helperMissing.call("+i.helperMissingParams+"))"),s||this.flushInline()},invokeKnownHelper:function(t,e){var s=this.setupHelper(t,e);this.push(s.name+".call("+s.callParams+")")},invokeAmbiguous:function(t,e){this.context.aliases.functionType='"function"',this.useRegister("helper"),this.emptyHash();var s=this.setupHelper(0,t,e),i=this.lastHelper=this.nameLookup("helpers",t,"helper"),n=this.nameLookup("depth"+this.lastContext,t,"context"),r=this.nextStack();s.paramsInit&&this.pushSource(s.paramsInit),this.pushSource("if (helper = "+i+") { "+r+" = helper.call("+s.callParams+"); }"),this.pushSource("else { helper = "+n+"; "+r+" = typeof helper === functionType ? helper.call("+s.callParams+") : helper; }")},invokePartial:function(t){var e=[this.nameLookup("partials",t,"partial"),"'"+t+"'",this.popStack(),"helpers","partials"];this.options.data&&e.push("data"),this.context.aliases.self="this",this.push("self.invokePartial("+e.join(", ")+")")},assignToHash:function(t){var e,s,i=this.popStack();this.options.stringParams&&(s=this.popStack(),e=this.popStack());var n=this.hash;e&&n.contexts.push("'"+t+"': "+e),s&&n.types.push("'"+t+"': "+s),n.values.push("'"+t+"': ("+i+")")},compiler:i,compileChildren:function(t,e){for(var s,i,n=t.children,r=0,o=n.length;o>r;r++){s=n[r],i=new this.compiler;var a=this.matchExistingProgram(s);null==a?(this.context.programs.push(""),a=this.context.programs.length,s.index=a,s.name="program"+a,this.context.programs[a]=i.compile(s,e,this.context),this.context.environments[a]=s):(s.index=a,s.name="program"+a)}},matchExistingProgram:function(t){for(var e=0,s=this.context.environments.length;s>e;e++){var i=this.context.environments[e];if(i&&i.equals(t))return e}},programExpression:function(t){if(this.context.aliases.self="this",null==t)return"self.noop";for(var e,s=this.environment.children[t],i=s.depths.list,n=[s.index,s.name,"data"],r=0,o=i.length;o>r;r++)e=i[r],n.push(1===e?"depth0":"depth"+(e-1));return(0===i.length?"self.program(":"self.programWithDepth(")+n.join(", ")+")"},register:function(t,e){this.useRegister(t),this.pushSource(t+" = "+e+";")},useRegister:function(t){this.registers[t]||(this.registers[t]=!0,this.registers.list.push(t))},pushStackLiteral:function(t){return this.push(new s(t))},pushSource:function(t){this.pendingContent&&(this.source.push(this.appendToBuffer(this.quotedString(this.pendingContent))),this.pendingContent=void 0),t&&this.source.push(t)},pushStack:function(t){this.flushInline();var e=this.incrStack();return t&&this.pushSource(e+" = "+t+";"),this.compileStack.push(e),e},replaceStack:function(t){var e,i,n,r="",o=this.isInline();if(o){var a=this.popStack(!0);if(a instanceof s)e=a.value,n=!0;else{i=!this.stackSlot;var h=i?this.incrStack():this.topStackName();r="("+this.push(h)+" = "+a+"),",e=this.topStack()}}else e=this.topStack();var p=t.call(this,e);return o?(n||this.popStack(),i&&this.stackSlot--,this.push("("+r+p+")")):(/^stack/.test(e)||(e=this.nextStack()),this.pushSource(e+" = ("+r+p+");")),e},nextStack:function(){return this.pushStack()},incrStack:function(){return this.stackSlot++,this.stackSlot>this.stackVars.length&&this.stackVars.push("stack"+this.stackSlot),this.topStackName()},topStackName:function(){return"stack"+this.stackSlot},flushInline:function(){var t=this.inlineStack;if(t.length){this.inlineStack=[];for(var e=0,i=t.length;i>e;e++){var n=t[e];n instanceof s?this.compileStack.push(n):this.pushStack(n)}}},isInline:function(){return this.inlineStack.length},popStack:function(t){var e=this.isInline(),i=(e?this.inlineStack:this.compileStack).pop();if(!t&&i instanceof s)return i.value;if(!e){if(!this.stackSlot)throw new h("Invalid stack pop");this.stackSlot--}return i},topStack:function(t){var e=this.isInline()?this.inlineStack:this.compileStack,i=e[e.length-1];return!t&&i instanceof s?i.value:i},quotedString:function(t){return'"'+t.replace(/\\/g,"\\\\").replace(/"/g,'\\"').replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/\u2028/g,"\\u2028").replace(/\u2029/g,"\\u2029")+'"'},setupHelper:function(t,e,s){var i=[],n=this.setupParams(t,i,s),r=this.nameLookup("helpers",e,"helper");return{params:i,paramsInit:n,name:r,callParams:["depth0"].concat(i).join(", "),helperMissingParams:s&&["depth0",this.quotedString(e)].concat(i).join(", ")}},setupOptions:function(t,e){var s,i,n,r=[],o=[],a=[];r.push("hash:"+this.popStack()),this.options.stringParams&&(r.push("hashTypes:"+this.popStack()),r.push("hashContexts:"+this.popStack())),i=this.popStack(),n=this.popStack(),(n||i)&&(n||(this.context.aliases.self="this",n="self.noop"),i||(this.context.aliases.self="this",i="self.noop"),r.push("inverse:"+i),r.push("fn:"+n));for(var h=0;t>h;h++)s=this.popStack(),e.push(s),this.options.stringParams&&(a.push(this.popStack()),o.push(this.popStack()));return this.options.stringParams&&(r.push("contexts:["+o.join(",")+"]"),r.push("types:["+a.join(",")+"]")),this.options.data&&r.push("data:data"),r},setupParams:function(t,e,s){var i="{"+this.setupOptions(t,e).join(",")+"}";return s?(this.useRegister("options"),e.push("options"),"options="+i):(e.push(i),"")}};for(var p="break else new var case finally return void catch for switch while continue function this with default if throw delete in try do instanceof typeof abstract enum int short boolean export interface static byte extends long super char final native synchronized class float package throws const goto private transient debugger implements protected volatile double import public let yield".split(" "),l=i.RESERVED_WORDS={},c=0,u=p.length;u>c;c++)l[p[c]]=!0;return i.isValidJavaScriptVariableName=function(t){return!i.RESERVED_WORDS[t]&&/^[a-zA-Z_$][0-9a-zA-Z_$]*$/.test(t)?!0:!1},n=i}(i,s),c=function(t,e,s,i,n){"use strict";var r,o=t,a=e,h=s.parser,p=s.parse,l=i.Compiler,c=i.compile,u=i.precompile,f=n,d=o.create,g=function(){var t=d();return t.compile=function(e,s){return c(e,s,t)},t.precompile=function(e,s){return u(e,s,t)},t.AST=a,t.Compiler=l,t.JavaScriptCompiler=f,t.Parser=h,t.parse=p,t};return o=g(),o.create=g,r=o}(r,o,h,p,l);return c}();
\ No newline at end of file
diff --git a/src/main/webapp/static/global/plugins/typeahead/typeahead.bundle.min.js b/src/main/webapp/static/global/plugins/typeahead/typeahead.bundle.min.js
deleted file mode 100644
index ffd98f320..000000000
--- a/src/main/webapp/static/global/plugins/typeahead/typeahead.bundle.min.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*!
- * typeahead.js 0.11.1
- * https://github.com/twitter/typeahead.js
- * Copyright 2013-2015 Twitter, Inc. and other contributors; Licensed MIT
- */
-
-!function(a,b){"function"==typeof define&&define.amd?define("bloodhound",["jquery"],function(c){return a.Bloodhound=b(c)}):"object"==typeof exports?module.exports=b(require("jquery")):a.Bloodhound=b(jQuery)}(this,function(a){var b=function(){"use strict";return{isMsie:function(){return/(msie|trident)/i.test(navigator.userAgent)?navigator.userAgent.match(/(msie |rv:)(\d+(.\d+)?)/i)[2]:!1},isBlankString:function(a){return!a||/^\s*$/.test(a)},escapeRegExChars:function(a){return a.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&")},isString:function(a){return"string"==typeof a},isNumber:function(a){return"number"==typeof a},isArray:a.isArray,isFunction:a.isFunction,isObject:a.isPlainObject,isUndefined:function(a){return"undefined"==typeof a},isElement:function(a){return!(!a||1!==a.nodeType)},isJQuery:function(b){return b instanceof a},toStr:function(a){return b.isUndefined(a)||null===a?"":a+""},bind:a.proxy,each:function(b,c){function d(a,b){return c(b,a)}a.each(b,d)},map:a.map,filter:a.grep,every:function(b,c){var d=!0;return b?(a.each(b,function(a,e){return(d=c.call(null,e,a,b))?void 0:!1}),!!d):d},some:function(b,c){var d=!1;return b?(a.each(b,function(a,e){return(d=c.call(null,e,a,b))?!1:void 0}),!!d):d},mixin:a.extend,identity:function(a){return a},clone:function(b){return a.extend(!0,{},b)},getIdGenerator:function(){var a=0;return function(){return a++}},templatify:function(b){function c(){return String(b)}return a.isFunction(b)?b:c},defer:function(a){setTimeout(a,0)},debounce:function(a,b,c){var d,e;return function(){var f,g,h=this,i=arguments;return f=function(){d=null,c||(e=a.apply(h,i))},g=c&&!d,clearTimeout(d),d=setTimeout(f,b),g&&(e=a.apply(h,i)),e}},throttle:function(a,b){var c,d,e,f,g,h;return g=0,h=function(){g=new Date,e=null,f=a.apply(c,d)},function(){var i=new Date,j=b-(i-g);return c=this,d=arguments,0>=j?(clearTimeout(e),e=null,g=i,f=a.apply(c,d)):e||(e=setTimeout(h,j)),f}},stringify:function(a){return b.isString(a)?a:JSON.stringify(a)},noop:function(){}}}(),c="0.11.1",d=function(){"use strict";function a(a){return a=b.toStr(a),a?a.split(/\s+/):[]}function c(a){return a=b.toStr(a),a?a.split(/\W+/):[]}function d(a){return function(c){return c=b.isArray(c)?c:[].slice.call(arguments,0),function(d){var e=[];return b.each(c,function(c){e=e.concat(a(b.toStr(d[c])))}),e}}}return{nonword:c,whitespace:a,obj:{nonword:d(c),whitespace:d(a)}}}(),e=function(){"use strict";function c(c){this.maxSize=b.isNumber(c)?c:100,this.reset(),this.maxSize<=0&&(this.set=this.get=a.noop)}function d(){this.head=this.tail=null}function e(a,b){this.key=a,this.val=b,this.prev=this.next=null}return b.mixin(c.prototype,{set:function(a,b){var c,d=this.list.tail;this.size>=this.maxSize&&(this.list.remove(d),delete this.hash[d.key],this.size--),(c=this.hash[a])?(c.val=b,this.list.moveToFront(c)):(c=new e(a,b),this.list.add(c),this.hash[a]=c,this.size++)},get:function(a){var b=this.hash[a];return b?(this.list.moveToFront(b),b.val):void 0},reset:function(){this.size=0,this.hash={},this.list=new d}}),b.mixin(d.prototype,{add:function(a){this.head&&(a.next=this.head,this.head.prev=a),this.head=a,this.tail=this.tail||a},remove:function(a){a.prev?a.prev.next=a.next:this.head=a.next,a.next?a.next.prev=a.prev:this.tail=a.prev},moveToFront:function(a){this.remove(a),this.add(a)}}),c}(),f=function(){"use strict";function c(a,c){this.prefix=["__",a,"__"].join(""),this.ttlKey="__ttl__",this.keyMatcher=new RegExp("^"+b.escapeRegExChars(this.prefix)),this.ls=c||h,!this.ls&&this._noop()}function d(){return(new Date).getTime()}function e(a){return JSON.stringify(b.isUndefined(a)?null:a)}function f(b){return a.parseJSON(b)}function g(a){var b,c,d=[],e=h.length;for(b=0;e>b;b++)(c=h.key(b)).match(a)&&d.push(c.replace(a,""));return d}var h;try{h=window.localStorage,h.setItem("~~~","!"),h.removeItem("~~~")}catch(i){h=null}return b.mixin(c.prototype,{_prefix:function(a){return this.prefix+a},_ttlKey:function(a){return this._prefix(a)+this.ttlKey},_noop:function(){this.get=this.set=this.remove=this.clear=this.isExpired=b.noop},_safeSet:function(a,b){try{this.ls.setItem(a,b)}catch(c){"QuotaExceededError"===c.name&&(this.clear(),this._noop())}},get:function(a){return this.isExpired(a)&&this.remove(a),f(this.ls.getItem(this._prefix(a)))},set:function(a,c,f){return b.isNumber(f)?this._safeSet(this._ttlKey(a),e(d()+f)):this.ls.removeItem(this._ttlKey(a)),this._safeSet(this._prefix(a),e(c))},remove:function(a){return this.ls.removeItem(this._ttlKey(a)),this.ls.removeItem(this._prefix(a)),this},clear:function(){var a,b=g(this.keyMatcher);for(a=b.length;a--;)this.remove(b[a]);return this},isExpired:function(a){var c=f(this.ls.getItem(this._ttlKey(a)));return b.isNumber(c)&&d()>c?!0:!1}}),c}(),g=function(){"use strict";function c(a){a=a||{},this.cancelled=!1,this.lastReq=null,this._send=a.transport,this._get=a.limiter?a.limiter(this._get):this._get,this._cache=a.cache===!1?new e(0):h}var d=0,f={},g=6,h=new e(10);return c.setMaxPendingRequests=function(a){g=a},c.resetCache=function(){h.reset()},b.mixin(c.prototype,{_fingerprint:function(b){return b=b||{},b.url+b.type+a.param(b.data||{})},_get:function(a,b){function c(a){b(null,a),k._cache.set(i,a)}function e(){b(!0)}function h(){d--,delete f[i],k.onDeckRequestArgs&&(k._get.apply(k,k.onDeckRequestArgs),k.onDeckRequestArgs=null)}var i,j,k=this;i=this._fingerprint(a),this.cancelled||i!==this.lastReq||((j=f[i])?j.done(c).fail(e):g>d?(d++,f[i]=this._send(a).done(c).fail(e).always(h)):this.onDeckRequestArgs=[].slice.call(arguments,0))},get:function(c,d){var e,f;d=d||a.noop,c=b.isString(c)?{url:c}:c||{},f=this._fingerprint(c),this.cancelled=!1,this.lastReq=f,(e=this._cache.get(f))?d(null,e):this._get(c,d)},cancel:function(){this.cancelled=!0}}),c}(),h=window.SearchIndex=function(){"use strict";function c(c){c=c||{},c.datumTokenizer&&c.queryTokenizer||a.error("datumTokenizer and queryTokenizer are both required"),this.identify=c.identify||b.stringify,this.datumTokenizer=c.datumTokenizer,this.queryTokenizer=c.queryTokenizer,this.reset()}function d(a){return a=b.filter(a,function(a){return!!a}),a=b.map(a,function(a){return a.toLowerCase()})}function e(){var a={};return a[i]=[],a[h]={},a}function f(a){for(var b={},c=[],d=0,e=a.length;e>d;d++)b[a[d]]||(b[a[d]]=!0,c.push(a[d]));return c}function g(a,b){var c=0,d=0,e=[];a=a.sort(),b=b.sort();for(var f=a.length,g=b.length;f>c&&g>d;)a[c]<b[d]?c++:a[c]>b[d]?d++:(e.push(a[c]),c++,d++);return e}var h="c",i="i";return b.mixin(c.prototype,{bootstrap:function(a){this.datums=a.datums,this.trie=a.trie},add:function(a){var c=this;a=b.isArray(a)?a:[a],b.each(a,function(a){var f,g;c.datums[f=c.identify(a)]=a,g=d(c.datumTokenizer(a)),b.each(g,function(a){var b,d,g;for(b=c.trie,d=a.split("");g=d.shift();)b=b[h][g]||(b[h][g]=e()),b[i].push(f)})})},get:function(a){var c=this;return b.map(a,function(a){return c.datums[a]})},search:function(a){var c,e,j=this;return c=d(this.queryTokenizer(a)),b.each(c,function(a){var b,c,d,f;if(e&&0===e.length)return!1;for(b=j.trie,c=a.split("");b&&(d=c.shift());)b=b[h][d];return b&&0===c.length?(f=b[i].slice(0),void(e=e?g(e,f):f)):(e=[],!1)}),e?b.map(f(e),function(a){return j.datums[a]}):[]},all:function(){var a=[];for(var b in this.datums)a.push(this.datums[b]);return a},reset:function(){this.datums={},this.trie=e()},serialize:function(){return{datums:this.datums,trie:this.trie}}}),c}(),i=function(){"use strict";function a(a){this.url=a.url,this.ttl=a.ttl,this.cache=a.cache,this.prepare=a.prepare,this.transform=a.transform,this.transport=a.transport,this.thumbprint=a.thumbprint,this.storage=new f(a.cacheKey)}var c;return c={data:"data",protocol:"protocol",thumbprint:"thumbprint"},b.mixin(a.prototype,{_settings:function(){return{url:this.url,type:"GET",dataType:"json"}},store:function(a){this.cache&&(this.storage.set(c.data,a,this.ttl),this.storage.set(c.protocol,location.protocol,this.ttl),this.storage.set(c.thumbprint,this.thumbprint,this.ttl))},fromCache:function(){var a,b={};return this.cache?(b.data=this.storage.get(c.data),b.protocol=this.storage.get(c.protocol),b.thumbprint=this.storage.get(c.thumbprint),a=b.thumbprint!==this.thumbprint||b.protocol!==location.protocol,b.data&&!a?b.data:null):null},fromNetwork:function(a){function b(){a(!0)}function c(b){a(null,e.transform(b))}var d,e=this;a&&(d=this.prepare(this._settings()),this.transport(d).fail(b).done(c))},clear:function(){return this.storage.clear(),this}}),a}(),j=function(){"use strict";function a(a){this.url=a.url,this.prepare=a.prepare,this.transform=a.transform,this.transport=new g({cache:a.cache,limiter:a.limiter,transport:a.transport})}return b.mixin(a.prototype,{_settings:function(){return{url:this.url,type:"GET",dataType:"json"}},get:function(a,b){function c(a,c){b(a?[]:e.transform(c))}var d,e=this;if(b)return a=a||"",d=this.prepare(a,this._settings()),this.transport.get(d,c)},cancelLastRequest:function(){this.transport.cancel()}}),a}(),k=function(){"use strict";function d(d){var e;return d?(e={url:null,ttl:864e5,cache:!0,cacheKey:null,thumbprint:"",prepare:b.identity,transform:b.identity,transport:null},d=b.isString(d)?{url:d}:d,d=b.mixin(e,d),!d.url&&a.error("prefetch requires url to be set"),d.transform=d.filter||d.transform,d.cacheKey=d.cacheKey||d.url,d.thumbprint=c+d.thumbprint,d.transport=d.transport?h(d.transport):a.ajax,d):null}function e(c){var d;if(c)return d={url:null,cache:!0,prepare:null,replace:null,wildcard:null,limiter:null,rateLimitBy:"debounce",rateLimitWait:300,transform:b.identity,transport:null},c=b.isString(c)?{url:c}:c,c=b.mixin(d,c),!c.url&&a.error("remote requires url to be set"),c.transform=c.filter||c.transform,c.prepare=f(c),c.limiter=g(c),c.transport=c.transport?h(c.transport):a.ajax,delete c.replace,delete c.wildcard,delete c.rateLimitBy,delete c.rateLimitWait,c}function f(a){function b(a,b){return b.url=f(b.url,a),b}function c(a,b){return b.url=b.url.replace(g,encodeURIComponent(a)),b}function d(a,b){return b}var e,f,g;return e=a.prepare,f=a.replace,g=a.wildcard,e?e:e=f?b:a.wildcard?c:d}function g(a){function c(a){return function(c){return b.debounce(c,a)}}function d(a){return function(c){return b.throttle(c,a)}}var e,f,g;return e=a.limiter,f=a.rateLimitBy,g=a.rateLimitWait,e||(e=/^throttle$/i.test(f)?d(g):c(g)),e}function h(c){return function(d){function e(a){b.defer(function(){g.resolve(a)})}function f(a){b.defer(function(){g.reject(a)})}var g=a.Deferred();return c(d,e,f),g}}return function(c){var f,g;return f={initialize:!0,identify:b.stringify,datumTokenizer:null,queryTokenizer:null,sufficient:5,sorter:null,local:[],prefetch:null,remote:null},c=b.mixin(f,c||{}),!c.datumTokenizer&&a.error("datumTokenizer is required"),!c.queryTokenizer&&a.error("queryTokenizer is required"),g=c.sorter,c.sorter=g?function(a){return a.sort(g)}:b.identity,c.local=b.isFunction(c.local)?c.local():c.local,c.prefetch=d(c.prefetch),c.remote=e(c.remote),c}}(),l=function(){"use strict";function c(a){a=k(a),this.sorter=a.sorter,this.identify=a.identify,this.sufficient=a.sufficient,this.local=a.local,this.remote=a.remote?new j(a.remote):null,this.prefetch=a.prefetch?new i(a.prefetch):null,this.index=new h({identify:this.identify,datumTokenizer:a.datumTokenizer,queryTokenizer:a.queryTokenizer}),a.initialize!==!1&&this.initialize()}var e;return e=window&&window.Bloodhound,c.noConflict=function(){return window&&(window.Bloodhound=e),c},c.tokenizers=d,b.mixin(c.prototype,{__ttAdapter:function(){function a(a,b,d){return c.search(a,b,d)}function b(a,b){return c.search(a,b)}var c=this;return this.remote?a:b},_loadPrefetch:function(){function b(a,b){return a?c.reject():(e.add(b),e.prefetch.store(e.index.serialize()),void c.resolve())}var c,d,e=this;return c=a.Deferred(),this.prefetch?(d=this.prefetch.fromCache())?(this.index.bootstrap(d),c.resolve()):this.prefetch.fromNetwork(b):c.resolve(),c.promise()},_initialize:function(){function a(){b.add(b.local)}var b=this;return this.clear(),(this.initPromise=this._loadPrefetch()).done(a),this.initPromise},initialize:function(a){return!this.initPromise||a?this._initialize():this.initPromise},add:function(a){return this.index.add(a),this},get:function(a){return a=b.isArray(a)?a:[].slice.call(arguments),this.index.get(a)},search:function(a,c,d){function e(a){var c=[];b.each(a,function(a){!b.some(f,function(b){return g.identify(a)===g.identify(b)})&&c.push(a)}),d&&d(c)}var f,g=this;return f=this.sorter(this.index.search(a)),c(this.remote?f.slice():f),this.remote&&f.length<this.sufficient?this.remote.get(a,e):this.remote&&this.remote.cancelLastRequest(),this},all:function(){return this.index.all()},clear:function(){return this.index.reset(),this},clearPrefetchCache:function(){return this.prefetch&&this.prefetch.clear(),this},clearRemoteCache:function(){return g.resetCache(),this},ttAdapter:function(){return this.__ttAdapter()}}),c}();return l}),function(a,b){"function"==typeof define&&define.amd?define("typeahead.js",["jquery"],function(a){return b(a)}):"object"==typeof exports?module.exports=b(require("jquery")):b(jQuery)}(this,function(a){var b=function(){"use strict";return{isMsie:function(){return/(msie|trident)/i.test(navigator.userAgent)?navigator.userAgent.match(/(msie |rv:)(\d+(.\d+)?)/i)[2]:!1},isBlankString:function(a){return!a||/^\s*$/.test(a)},escapeRegExChars:function(a){return a.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&")},isString:function(a){return"string"==typeof a},isNumber:function(a){return"number"==typeof a},isArray:a.isArray,isFunction:a.isFunction,isObject:a.isPlainObject,isUndefined:function(a){return"undefined"==typeof a},isElement:function(a){return!(!a||1!==a.nodeType)},isJQuery:function(b){return b instanceof a},toStr:function(a){return b.isUndefined(a)||null===a?"":a+""},bind:a.proxy,each:function(b,c){function d(a,b){return c(b,a)}a.each(b,d)},map:a.map,filter:a.grep,every:function(b,c){var d=!0;return b?(a.each(b,function(a,e){return(d=c.call(null,e,a,b))?void 0:!1}),!!d):d},some:function(b,c){var d=!1;return b?(a.each(b,function(a,e){return(d=c.call(null,e,a,b))?!1:void 0}),!!d):d},mixin:a.extend,identity:function(a){return a},clone:function(b){return a.extend(!0,{},b)},getIdGenerator:function(){var a=0;return function(){return a++}},templatify:function(b){function c(){return String(b)}return a.isFunction(b)?b:c},defer:function(a){setTimeout(a,0)},debounce:function(a,b,c){var d,e;return function(){var f,g,h=this,i=arguments;return f=function(){d=null,c||(e=a.apply(h,i))},g=c&&!d,clearTimeout(d),d=setTimeout(f,b),g&&(e=a.apply(h,i)),e}},throttle:function(a,b){var c,d,e,f,g,h;return g=0,h=function(){g=new Date,e=null,f=a.apply(c,d)},function(){var i=new Date,j=b-(i-g);return c=this,d=arguments,0>=j?(clearTimeout(e),e=null,g=i,f=a.apply(c,d)):e||(e=setTimeout(h,j)),f}},stringify:function(a){return b.isString(a)?a:JSON.stringify(a)},noop:function(){}}}(),c=function(){"use strict";function a(a){var g,h;return h=b.mixin({},f,a),g={css:e(),classes:h,html:c(h),selectors:d(h)},{css:g.css,html:g.html,classes:g.classes,selectors:g.selectors,mixin:function(a){b.mixin(a,g)}}}function c(a){return{wrapper:'<span class="'+a.wrapper+'"></span>',menu:'<div class="'+a.menu+'"></div>'}}function d(a){var c={};return b.each(a,function(a,b){c[b]="."+a}),c}function e(){var a={wrapper:{position:"relative",display:"inline-block"},hint:{position:"absolute",top:"0",left:"0",borderColor:"transparent",boxShadow:"none",opacity:"1"},input:{position:"relative",verticalAlign:"top",backgroundColor:"transparent"},inputWithNoHint:{position:"relative",verticalAlign:"top"},menu:{position:"absolute",top:"100%",left:"0",zIndex:"100",display:"none"},ltr:{left:"0",right:"auto"},rtl:{left:"auto",right:" 0"}};return b.isMsie()&&b.mixin(a.input,{backgroundImage:"url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)"}),a}var f={wrapper:"twitter-typeahead",input:"tt-input",hint:"tt-hint",menu:"tt-menu",dataset:"tt-dataset",suggestion:"tt-suggestion",selectable:"tt-selectable",empty:"tt-empty",open:"tt-open",cursor:"tt-cursor",highlight:"tt-highlight"};return a}(),d=function(){"use strict";function c(b){b&&b.el||a.error("EventBus initialized without el"),this.$el=a(b.el)}var d,e;return d="typeahead:",e={render:"rendered",cursorchange:"cursorchanged",select:"selected",autocomplete:"autocompleted"},b.mixin(c.prototype,{_trigger:function(b,c){var e;return e=a.Event(d+b),(c=c||[]).unshift(e),this.$el.trigger.apply(this.$el,c),e},before:function(a){var b,c;return b=[].slice.call(arguments,1),c=this._trigger("before"+a,b),c.isDefaultPrevented()},trigger:function(a){var b;this._trigger(a,[].slice.call(arguments,1)),(b=e[a])&&this._trigger(b,[].slice.call(arguments,1))}}),c}(),e=function(){"use strict";function a(a,b,c,d){var e;if(!c)return this;for(b=b.split(i),c=d?h(c,d):c,this._callbacks=this._callbacks||{};e=b.shift();)this._callbacks[e]=this._callbacks[e]||{sync:[],async:[]},this._callbacks[e][a].push(c);return this}function b(b,c,d){return a.call(this,"async",b,c,d)}function c(b,c,d){return a.call(this,"sync",b,c,d)}function d(a){var b;if(!this._callbacks)return this;for(a=a.split(i);b=a.shift();)delete this._callbacks[b];return this}function e(a){var b,c,d,e,g;if(!this._callbacks)return this;for(a=a.split(i),d=[].slice.call(arguments,1);(b=a.shift())&&(c=this._callbacks[b]);)e=f(c.sync,this,[b].concat(d)),g=f(c.async,this,[b].concat(d)),e()&&j(g);return this}function f(a,b,c){function d(){for(var d,e=0,f=a.length;!d&&f>e;e+=1)d=a[e].apply(b,c)===!1;return!d}return d}function g(){var a;return a=window.setImmediate?function(a){setImmediate(function(){a()})}:function(a){setTimeout(function(){a()},0)}}function h(a,b){return a.bind?a.bind(b):function(){a.apply(b,[].slice.call(arguments,0))}}var i=/\s+/,j=g();return{onSync:c,onAsync:b,off:d,trigger:e}}(),f=function(a){"use strict";function c(a,c,d){for(var e,f=[],g=0,h=a.length;h>g;g++)f.push(b.escapeRegExChars(a[g]));return e=d?"\\b("+f.join("|")+")\\b":"("+f.join("|")+")",c?new RegExp(e):new RegExp(e,"i")}var d={node:null,pattern:null,tagName:"strong",className:null,wordsOnly:!1,caseSensitive:!1};return function(e){function f(b){var c,d,f;return(c=h.exec(b.data))&&(f=a.createElement(e.tagName),e.className&&(f.className=e.className),d=b.splitText(c.index),d.splitText(c[0].length),f.appendChild(d.cloneNode(!0)),b.parentNode.replaceChild(f,d)),!!c}function g(a,b){for(var c,d=3,e=0;e<a.childNodes.length;e++)c=a.childNodes[e],c.nodeType===d?e+=b(c)?1:0:g(c,b)}var h;e=b.mixin({},d,e),e.node&&e.pattern&&(e.pattern=b.isArray(e.pattern)?e.pattern:[e.pattern],h=c(e.pattern,e.caseSensitive,e.wordsOnly),g(e.node,f))}}(window.document),g=function(){"use strict";function c(c,e){c=c||{},c.input||a.error("input is missing"),e.mixin(this),this.$hint=a(c.hint),this.$input=a(c.input),this.query=this.$input.val(),this.queryWhenFocused=this.hasFocus()?this.query:null,this.$overflowHelper=d(this.$input),this._checkLanguageDirection(),0===this.$hint.length&&(this.setHint=this.getHint=this.clearHint=this.clearHintIfInvalid=b.noop)}function d(b){return a('<pre aria-hidden="true"></pre>').css({position:"absolute",visibility:"hidden",whiteSpace:"pre",fontFamily:b.css("font-family"),fontSize:b.css("font-size"),fontStyle:b.css("font-style"),fontVariant:b.css("font-variant"),fontWeight:b.css("font-weight"),wordSpacing:b.css("word-spacing"),letterSpacing:b.css("letter-spacing"),textIndent:b.css("text-indent"),textRendering:b.css("text-rendering"),textTransform:b.css("text-transform")}).insertAfter(b)}function f(a,b){return c.normalizeQuery(a)===c.normalizeQuery(b)}function g(a){return a.altKey||a.ctrlKey||a.metaKey||a.shiftKey}var h;return h={9:"tab",27:"esc",37:"left",39:"right",13:"enter",38:"up",40:"down"},c.normalizeQuery=function(a){return b.toStr(a).replace(/^\s*/g,"").replace(/\s{2,}/g," ")},b.mixin(c.prototype,e,{_onBlur:function(){this.resetInputValue(),this.trigger("blurred")},_onFocus:function(){this.queryWhenFocused=this.query,this.trigger("focused")},_onKeydown:function(a){var b=h[a.which||a.keyCode];this._managePreventDefault(b,a),b&&this._shouldTrigger(b,a)&&this.trigger(b+"Keyed",a)},_onInput:function(){this._setQuery(this.getInputValue()),this.clearHintIfInvalid(),this._checkLanguageDirection()},_managePreventDefault:function(a,b){var c;switch(a){case"up":case"down":c=!g(b);break;default:c=!1}c&&b.preventDefault()},_shouldTrigger:function(a,b){var c;switch(a){case"tab":c=!g(b);break;default:c=!0}return c},_checkLanguageDirection:function(){var a=(this.$input.css("direction")||"ltr").toLowerCase();this.dir!==a&&(this.dir=a,this.$hint.attr("dir",a),this.trigger("langDirChanged",a))},_setQuery:function(a,b){var c,d;c=f(a,this.query),d=c?this.query.length!==a.length:!1,this.query=a,b||c?!b&&d&&this.trigger("whitespaceChanged",this.query):this.trigger("queryChanged",this.query)},bind:function(){var a,c,d,e,f=this;return a=b.bind(this._onBlur,this),c=b.bind(this._onFocus,this),d=b.bind(this._onKeydown,this),e=b.bind(this._onInput,this),this.$input.on("blur.tt",a).on("focus.tt",c).on("keydown.tt",d),!b.isMsie()||b.isMsie()>9?this.$input.on("input.tt",e):this.$input.on("keydown.tt keypress.tt cut.tt paste.tt",function(a){h[a.which||a.keyCode]||b.defer(b.bind(f._onInput,f,a))}),this},focus:function(){this.$input.focus()},blur:function(){this.$input.blur()},getLangDir:function(){return this.dir},getQuery:function(){return this.query||""},setQuery:function(a,b){this.setInputValue(a),this._setQuery(a,b)},hasQueryChangedSinceLastFocus:function(){return this.query!==this.queryWhenFocused},getInputValue:function(){return this.$input.val()},setInputValue:function(a){this.$input.val(a),this.clearHintIfInvalid(),this._checkLanguageDirection()},resetInputValue:function(){this.setInputValue(this.query)},getHint:function(){return this.$hint.val()},setHint:function(a){this.$hint.val(a)},clearHint:function(){this.setHint("")},clearHintIfInvalid:function(){var a,b,c,d;a=this.getInputValue(),b=this.getHint(),c=a!==b&&0===b.indexOf(a),d=""!==a&&c&&!this.hasOverflow(),!d&&this.clearHint()},hasFocus:function(){return this.$input.is(":focus")},hasOverflow:function(){var a=this.$input.width()-2;return this.$overflowHelper.text(this.getInputValue()),this.$overflowHelper.width()>=a},isCursorAtEnd:function(){var a,c,d;return a=this.$input.val().length,c=this.$input[0].selectionStart,b.isNumber(c)?c===a:document.selection?(d=document.selection.createRange(),d.moveStart("character",-a),a===d.text.length):!0},destroy:function(){this.$hint.off(".tt"),this.$input.off(".tt"),this.$overflowHelper.remove(),this.$hint=this.$input=this.$overflowHelper=a("<div>")}}),c}(),h=function(){"use strict";function c(c,e){c=c||{},c.templates=c.templates||{},c.templates.notFound=c.templates.notFound||c.templates.empty,c.source||a.error("missing source"),c.node||a.error("missing node"),c.name&&!h(c.name)&&a.error("invalid dataset name: "+c.name),e.mixin(this),this.highlight=!!c.highlight,this.name=c.name||j(),this.limit=c.limit||5,this.displayFn=d(c.display||c.displayKey),this.templates=g(c.templates,this.displayFn),this.source=c.source.__ttAdapter?c.source.__ttAdapter():c.source,this.async=b.isUndefined(c.async)?this.source.length>2:!!c.async,this._resetLastSuggestion(),this.$el=a(c.node).addClass(this.classes.dataset).addClass(this.classes.dataset+"-"+this.name)}function d(a){function c(b){return b[a]}return a=a||b.stringify,b.isFunction(a)?a:c}function g(c,d){function e(b){return a("<div>").text(d(b))}return{notFound:c.notFound&&b.templatify(c.notFound),pending:c.pending&&b.templatify(c.pending),header:c.header&&b.templatify(c.header),footer:c.footer&&b.templatify(c.footer),suggestion:c.suggestion||e}}function h(a){return/^[_a-zA-Z0-9-]+$/.test(a)}var i,j;return i={val:"tt-selectable-display",obj:"tt-selectable-object"},j=b.getIdGenerator(),c.extractData=function(b){var c=a(b);return c.data(i.obj)?{val:c.data(i.val)||"",obj:c.data(i.obj)||null}:null},b.mixin(c.prototype,e,{_overwrite:function(a,b){b=b||[],b.length?this._renderSuggestions(a,b):this.async&&this.templates.pending?this._renderPending(a):!this.async&&this.templates.notFound?this._renderNotFound(a):this._empty(),this.trigger("rendered",this.name,b,!1)},_append:function(a,b){b=b||[],b.length&&this.$lastSuggestion.length?this._appendSuggestions(a,b):b.length?this._renderSuggestions(a,b):!this.$lastSuggestion.length&&this.templates.notFound&&this._renderNotFound(a),this.trigger("rendered",this.name,b,!0)},_renderSuggestions:function(a,b){var c;c=this._getSuggestionsFragment(a,b),this.$lastSuggestion=c.children().last(),this.$el.html(c).prepend(this._getHeader(a,b)).append(this._getFooter(a,b))},_appendSuggestions:function(a,b){var c,d;c=this._getSuggestionsFragment(a,b),d=c.children().last(),this.$lastSuggestion.after(c),this.$lastSuggestion=d},_renderPending:function(a){var b=this.templates.pending;this._resetLastSuggestion(),b&&this.$el.html(b({query:a,dataset:this.name}))},_renderNotFound:function(a){var b=this.templates.notFound;this._resetLastSuggestion(),b&&this.$el.html(b({query:a,dataset:this.name}))},_empty:function(){this.$el.empty(),this._resetLastSuggestion()},_getSuggestionsFragment:function(c,d){var e,g=this;return e=document.createDocumentFragment(),b.each(d,function(b){var d,f;f=g._injectQuery(c,b),d=a(g.templates.suggestion(f)).data(i.obj,b).data(i.val,g.displayFn(b)).addClass(g.classes.suggestion+" "+g.classes.selectable),e.appendChild(d[0])}),this.highlight&&f({className:this.classes.highlight,node:e,pattern:c}),a(e)},_getFooter:function(a,b){return this.templates.footer?this.templates.footer({query:a,suggestions:b,dataset:this.name}):null},_getHeader:function(a,b){return this.templates.header?this.templates.header({query:a,suggestions:b,dataset:this.name}):null},_resetLastSuggestion:function(){this.$lastSuggestion=a()},_injectQuery:function(a,c){return b.isObject(c)?b.mixin({_query:a},c):c},update:function(b){function c(a){g||(g=!0,a=(a||[]).slice(0,e.limit),h=a.length,e._overwrite(b,a),h<e.limit&&e.async&&e.trigger("asyncRequested",b))}function d(c){c=c||[],!f&&h<e.limit&&(e.cancel=a.noop,h+=c.length,e._append(b,c.slice(0,e.limit-h)),e.async&&e.trigger("asyncReceived",b))}var e=this,f=!1,g=!1,h=0;this.cancel(),this.cancel=function(){f=!0,e.cancel=a.noop,e.async&&e.trigger("asyncCanceled",b)},this.source(b,c,d),!g&&c([])},cancel:a.noop,clear:function(){this._empty(),this.cancel(),this.trigger("cleared")},isEmpty:function(){return this.$el.is(":empty")},destroy:function(){this.$el=a("<div>")}}),c}(),i=function(){"use strict";function c(c,d){function e(b){var c=f.$node.find(b.node).first();return b.node=c.length?c:a("<div>").appendTo(f.$node),new h(b,d)}var f=this;c=c||{},c.node||a.error("node is required"),d.mixin(this),this.$node=a(c.node),this.query=null,this.datasets=b.map(c.datasets,e)}return b.mixin(c.prototype,e,{_onSelectableClick:function(b){this.trigger("selectableClicked",a(b.currentTarget))},_onRendered:function(a,b,c,d){this.$node.toggleClass(this.classes.empty,this._allDatasetsEmpty()),this.trigger("datasetRendered",b,c,d)},_onCleared:function(){this.$node.toggleClass(this.classes.empty,this._allDatasetsEmpty()),this.trigger("datasetCleared")},_propagate:function(){this.trigger.apply(this,arguments)},_allDatasetsEmpty:function(){function a(a){return a.isEmpty()}return b.every(this.datasets,a)},_getSelectables:function(){return this.$node.find(this.selectors.selectable)},_removeCursor:function(){var a=this.getActiveSelectable();a&&a.removeClass(this.classes.cursor)},_ensureVisible:function(a){var b,c,d,e;b=a.position().top,c=b+a.outerHeight(!0),d=this.$node.scrollTop(),e=this.$node.height()+parseInt(this.$node.css("paddingTop"),10)+parseInt(this.$node.css("paddingBottom"),10),0>b?this.$node.scrollTop(d+b):c>e&&this.$node.scrollTop(d+(c-e))},bind:function(){var a,c=this;return a=b.bind(this._onSelectableClick,this),this.$node.on("click.tt",this.selectors.selectable,a),b.each(this.datasets,function(a){a.onSync("asyncRequested",c._propagate,c).onSync("asyncCanceled",c._propagate,c).onSync("asyncReceived",c._propagate,c).onSync("rendered",c._onRendered,c).onSync("cleared",c._onCleared,c)}),this},isOpen:function(){return this.$node.hasClass(this.classes.open)},open:function(){this.$node.addClass(this.classes.open)},close:function(){this.$node.removeClass(this.classes.open),this._removeCursor()},setLanguageDirection:function(a){this.$node.attr("dir",a)},selectableRelativeToCursor:function(a){var b,c,d,e;return c=this.getActiveSelectable(),b=this._getSelectables(),d=c?b.index(c):-1,e=d+a,e=(e+1)%(b.length+1)-1,e=-1>e?b.length-1:e,-1===e?null:b.eq(e)},setCursor:function(a){this._removeCursor(),(a=a&&a.first())&&(a.addClass(this.classes.cursor),this._ensureVisible(a))},getSelectableData:function(a){return a&&a.length?h.extractData(a):null},getActiveSelectable:function(){var a=this._getSelectables().filter(this.selectors.cursor).first();return a.length?a:null},getTopSelectable:function(){var a=this._getSelectables().first();return a.length?a:null},update:function(a){function c(b){b.update(a)}var d=a!==this.query;return d&&(this.query=a,b.each(this.datasets,c)),d},empty:function(){function a(a){a.clear()}b.each(this.datasets,a),this.query=null,this.$node.addClass(this.classes.empty)},destroy:function(){function c(a){a.destroy()}this.$node.off(".tt"),this.$node=a("<div>"),b.each(this.datasets,c)}}),c}(),j=function(){"use strict";function a(){i.apply(this,[].slice.call(arguments,0))}var c=i.prototype;return b.mixin(a.prototype,i.prototype,{open:function(){return!this._allDatasetsEmpty()&&this._show(),c.open.apply(this,[].slice.call(arguments,0))},close:function(){return this._hide(),c.close.apply(this,[].slice.call(arguments,0))},_onRendered:function(){return this._allDatasetsEmpty()?this._hide():this.isOpen()&&this._show(),c._onRendered.apply(this,[].slice.call(arguments,0))},_onCleared:function(){return this._allDatasetsEmpty()?this._hide():this.isOpen()&&this._show(),c._onCleared.apply(this,[].slice.call(arguments,0))},setLanguageDirection:function(a){return this.$node.css("ltr"===a?this.css.ltr:this.css.rtl),c.setLanguageDirection.apply(this,[].slice.call(arguments,0))},_hide:function(){this.$node.hide()},_show:function(){this.$node.css("display","block")}}),a}(),k=function(){"use strict";function c(c,e){var f,g,h,i,j,k,l,m,n,o,p;c=c||{},c.input||a.error("missing input"),c.menu||a.error("missing menu"),c.eventBus||a.error("missing event bus"),e.mixin(this),this.eventBus=c.eventBus,this.minLength=b.isNumber(c.minLength)?c.minLength:1,this.input=c.input,this.menu=c.menu,this.enabled=!0,this.active=!1,this.input.hasFocus()&&this.activate(),this.dir=this.input.getLangDir(),this._hacks(),this.menu.bind().onSync("selectableClicked",this._onSelectableClicked,this).onSync("asyncRequested",this._onAsyncRequested,this).onSync("asyncCanceled",this._onAsyncCanceled,this).onSync("asyncReceived",this._onAsyncReceived,this).onSync("datasetRendered",this._onDatasetRendered,this).onSync("datasetCleared",this._onDatasetCleared,this),f=d(this,"activate","open","_onFocused"),g=d(this,"deactivate","_onBlurred"),h=d(this,"isActive","isOpen","_onEnterKeyed"),i=d(this,"isActive","isOpen","_onTabKeyed"),j=d(this,"isActive","_onEscKeyed"),k=d(this,"isActive","open","_onUpKeyed"),l=d(this,"isActive","open","_onDownKeyed"),m=d(this,"isActive","isOpen","_onLeftKeyed"),n=d(this,"isActive","isOpen","_onRightKeyed"),o=d(this,"_openIfActive","_onQueryChanged"),p=d(this,"_openIfActive","_onWhitespaceChanged"),this.input.bind().onSync("focused",f,this).onSync("blurred",g,this).onSync("enterKeyed",h,this).onSync("tabKeyed",i,this).onSync("escKeyed",j,this).onSync("upKeyed",k,this).onSync("downKeyed",l,this).onSync("leftKeyed",m,this).onSync("rightKeyed",n,this).onSync("queryChanged",o,this).onSync("whitespaceChanged",p,this).onSync("langDirChanged",this._onLangDirChanged,this)}function d(a){var c=[].slice.call(arguments,1);return function(){var d=[].slice.call(arguments);b.each(c,function(b){return a[b].apply(a,d)})}}return b.mixin(c.prototype,{_hacks:function(){var c,d;c=this.input.$input||a("<div>"),d=this.menu.$node||a("<div>"),c.on("blur.tt",function(a){var e,f,g;
-e=document.activeElement,f=d.is(e),g=d.has(e).length>0,b.isMsie()&&(f||g)&&(a.preventDefault(),a.stopImmediatePropagation(),b.defer(function(){c.focus()}))}),d.on("mousedown.tt",function(a){a.preventDefault()})},_onSelectableClicked:function(a,b){this.select(b)},_onDatasetCleared:function(){this._updateHint()},_onDatasetRendered:function(a,b,c,d){this._updateHint(),this.eventBus.trigger("render",c,d,b)},_onAsyncRequested:function(a,b,c){this.eventBus.trigger("asyncrequest",c,b)},_onAsyncCanceled:function(a,b,c){this.eventBus.trigger("asynccancel",c,b)},_onAsyncReceived:function(a,b,c){this.eventBus.trigger("asyncreceive",c,b)},_onFocused:function(){this._minLengthMet()&&this.menu.update(this.input.getQuery())},_onBlurred:function(){this.input.hasQueryChangedSinceLastFocus()&&this.eventBus.trigger("change",this.input.getQuery())},_onEnterKeyed:function(a,b){var c;(c=this.menu.getActiveSelectable())&&this.select(c)&&b.preventDefault()},_onTabKeyed:function(a,b){var c;(c=this.menu.getActiveSelectable())?this.select(c)&&b.preventDefault():(c=this.menu.getTopSelectable())&&this.autocomplete(c)&&b.preventDefault()},_onEscKeyed:function(){this.close()},_onUpKeyed:function(){this.moveCursor(-1)},_onDownKeyed:function(){this.moveCursor(1)},_onLeftKeyed:function(){"rtl"===this.dir&&this.input.isCursorAtEnd()&&this.autocomplete(this.menu.getTopSelectable())},_onRightKeyed:function(){"ltr"===this.dir&&this.input.isCursorAtEnd()&&this.autocomplete(this.menu.getTopSelectable())},_onQueryChanged:function(a,b){this._minLengthMet(b)?this.menu.update(b):this.menu.empty()},_onWhitespaceChanged:function(){this._updateHint()},_onLangDirChanged:function(a,b){this.dir!==b&&(this.dir=b,this.menu.setLanguageDirection(b))},_openIfActive:function(){this.isActive()&&this.open()},_minLengthMet:function(a){return a=b.isString(a)?a:this.input.getQuery()||"",a.length>=this.minLength},_updateHint:function(){var a,c,d,e,f,h,i;a=this.menu.getTopSelectable(),c=this.menu.getSelectableData(a),d=this.input.getInputValue(),!c||b.isBlankString(d)||this.input.hasOverflow()?this.input.clearHint():(e=g.normalizeQuery(d),f=b.escapeRegExChars(e),h=new RegExp("^(?:"+f+")(.+$)","i"),i=h.exec(c.val),i&&this.input.setHint(d+i[1]))},isEnabled:function(){return this.enabled},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},isActive:function(){return this.active},activate:function(){return this.isActive()?!0:!this.isEnabled()||this.eventBus.before("active")?!1:(this.active=!0,this.eventBus.trigger("active"),!0)},deactivate:function(){return this.isActive()?this.eventBus.before("idle")?!1:(this.active=!1,this.close(),this.eventBus.trigger("idle"),!0):!0},isOpen:function(){return this.menu.isOpen()},open:function(){return this.isOpen()||this.eventBus.before("open")||(this.menu.open(),this._updateHint(),this.eventBus.trigger("open")),this.isOpen()},close:function(){return this.isOpen()&&!this.eventBus.before("close")&&(this.menu.close(),this.input.clearHint(),this.input.resetInputValue(),this.eventBus.trigger("close")),!this.isOpen()},setVal:function(a){this.input.setQuery(b.toStr(a))},getVal:function(){return this.input.getQuery()},select:function(a){var b=this.menu.getSelectableData(a);return b&&!this.eventBus.before("select",b.obj)?(this.input.setQuery(b.val,!0),this.eventBus.trigger("select",b.obj),this.close(),!0):!1},autocomplete:function(a){var b,c,d;return b=this.input.getQuery(),c=this.menu.getSelectableData(a),d=c&&b!==c.val,d&&!this.eventBus.before("autocomplete",c.obj)?(this.input.setQuery(c.val),this.eventBus.trigger("autocomplete",c.obj),!0):!1},moveCursor:function(a){var b,c,d,e,f;return b=this.input.getQuery(),c=this.menu.selectableRelativeToCursor(a),d=this.menu.getSelectableData(c),e=d?d.obj:null,f=this._minLengthMet()&&this.menu.update(b),f||this.eventBus.before("cursorchange",e)?!1:(this.menu.setCursor(c),d?this.input.setInputValue(d.val):(this.input.resetInputValue(),this._updateHint()),this.eventBus.trigger("cursorchange",e),!0)},destroy:function(){this.input.destroy(),this.menu.destroy()}}),c}();!function(){"use strict";function e(b,c){b.each(function(){var b,d=a(this);(b=d.data(p.typeahead))&&c(b,d)})}function f(a,b){return a.clone().addClass(b.classes.hint).removeData().css(b.css.hint).css(l(a)).prop("readonly",!0).removeAttr("id name placeholder required").attr({autocomplete:"off",spellcheck:"false",tabindex:-1})}function h(a,b){a.data(p.attrs,{dir:a.attr("dir"),autocomplete:a.attr("autocomplete"),spellcheck:a.attr("spellcheck"),style:a.attr("style")}),a.addClass(b.classes.input).attr({autocomplete:"off",spellcheck:!1});try{!a.attr("dir")&&a.attr("dir","auto")}catch(c){}return a}function l(a){return{backgroundAttachment:a.css("background-attachment"),backgroundClip:a.css("background-clip"),backgroundColor:a.css("background-color"),backgroundImage:a.css("background-image"),backgroundOrigin:a.css("background-origin"),backgroundPosition:a.css("background-position"),backgroundRepeat:a.css("background-repeat"),backgroundSize:a.css("background-size")}}function m(a){var c,d;c=a.data(p.www),d=a.parent().filter(c.selectors.wrapper),b.each(a.data(p.attrs),function(c,d){b.isUndefined(c)?a.removeAttr(d):a.attr(d,c)}),a.removeData(p.typeahead).removeData(p.www).removeData(p.attr).removeClass(c.classes.input),d.length&&(a.detach().insertAfter(d),d.remove())}function n(c){var d,e;return d=b.isJQuery(c)||b.isElement(c),e=d?a(c).first():[],e.length?e:null}var o,p,q;o=a.fn.typeahead,p={www:"tt-www",attrs:"tt-attrs",typeahead:"tt-typeahead"},q={initialize:function(e,l){function m(){var c,m,q,r,s,t,u,v,w,x,y;b.each(l,function(a){a.highlight=!!e.highlight}),c=a(this),m=a(o.html.wrapper),q=n(e.hint),r=n(e.menu),s=e.hint!==!1&&!q,t=e.menu!==!1&&!r,s&&(q=f(c,o)),t&&(r=a(o.html.menu).css(o.css.menu)),q&&q.val(""),c=h(c,o),(s||t)&&(m.css(o.css.wrapper),c.css(s?o.css.input:o.css.inputWithNoHint),c.wrap(m).parent().prepend(s?q:null).append(t?r:null)),y=t?j:i,u=new d({el:c}),v=new g({hint:q,input:c},o),w=new y({node:r,datasets:l},o),x=new k({input:v,menu:w,eventBus:u,minLength:e.minLength},o),c.data(p.www,o),c.data(p.typeahead,x)}var o;return l=b.isArray(l)?l:[].slice.call(arguments,1),e=e||{},o=c(e.classNames),this.each(m)},isEnabled:function(){var a;return e(this.first(),function(b){a=b.isEnabled()}),a},enable:function(){return e(this,function(a){a.enable()}),this},disable:function(){return e(this,function(a){a.disable()}),this},isActive:function(){var a;return e(this.first(),function(b){a=b.isActive()}),a},activate:function(){return e(this,function(a){a.activate()}),this},deactivate:function(){return e(this,function(a){a.deactivate()}),this},isOpen:function(){var a;return e(this.first(),function(b){a=b.isOpen()}),a},open:function(){return e(this,function(a){a.open()}),this},close:function(){return e(this,function(a){a.close()}),this},select:function(b){var c=!1,d=a(b);return e(this.first(),function(a){c=a.select(d)}),c},autocomplete:function(b){var c=!1,d=a(b);return e(this.first(),function(a){c=a.autocomplete(d)}),c},moveCursor:function(a){var b=!1;return e(this.first(),function(c){b=c.moveCursor(a)}),b},val:function(a){var b;return arguments.length?(e(this,function(b){b.setVal(a)}),this):(e(this.first(),function(a){b=a.getVal()}),b)},destroy:function(){return e(this,function(a,b){m(b),a.destroy()}),this}},a.fn.typeahead=function(a){return q[a]?q[a].apply(this,[].slice.call(arguments,1)):q.initialize.apply(this,arguments)},a.fn.typeahead.noConflict=function(){return a.fn.typeahead=o,this}}()});
\ No newline at end of file
diff --git a/src/main/webapp/static/global/plugins/typeahead/typeahead.css b/src/main/webapp/static/global/plugins/typeahead/typeahead.css
deleted file mode 100644
index 2188f9a78..000000000
--- a/src/main/webapp/static/global/plugins/typeahead/typeahead.css
+++ /dev/null
@@ -1,68 +0,0 @@
-.twitter-typeahead {
-  width: 100%;
-  display: table !important;
-}
-
-.twitter-typeahead .form-control {
-  margin: 0 !important;
-}
-
-.tt-hint,
-.tt-input {
-  color: #999;
-  font-size: 14px;
-  height: 34px;
-  padding: 6px 12px;
-  font-size: 14px;
-  line-height: 1.428571429;
-  width: 100%;
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-}
-
-.tt-hint[disabled] {
-  background-color: #fff !important;
-}
-
-
-.tt-menu {
-  min-width: 160px;
-  margin-top: 2px;
-  padding: 5px 0;
-  background-color: #fff;
-  border: 1px solid #ebebeb;
-  -webkit-background-clip: padding-box;
-     -moz-background-clip: padding;
-          background-clip: padding-box;
-  width: 100%;
-  overflow-y: auto;
-  max-height: 250px;
-}
-
-.tt-menu h3 {
-  margin: 5px 0;
-  padding: 6px 12px;
-  font-size: 18px;
-  font-weight: 700; 
-  border-bottom: 1px solid #eee;
-}
-
-.modal-open .tt-menu {
-  z-index: 10055 !important;
-}
-
-.tt-suggestion {
-    padding: 6px 12px;
-    font-size: 14px;
-    line-height: 16px;
-}
-
-.tt-suggestion:hover {
-    cursor: pointer;
-    background: #eee;
-}
-
-.tt-suggestion p {
-  margin: 0;
-}
diff --git a/src/main/webapp/static/global/plugins/unicodes.js b/src/main/webapp/static/global/plugins/unicodes.js
new file mode 100644
index 000000000..2432622c4
--- /dev/null
+++ b/src/main/webapp/static/global/plugins/unicodes.js
@@ -0,0 +1,187 @@
+		
+	var pinyin = function(){
+		//dic
+		var d={a:"\u554a\u963f\u9515",ai:"\u57c3\u6328\u54ce\u5509\u54c0\u7691\u764c\u853c\u77ee\u827e\u788d\u7231\u9698\u8bf6\u6371\u55f3\u55cc\u5ad2\u7477\u66a7\u7839\u953f\u972d",an:"\u978d\u6c28\u5b89\u4ffa\u6309\u6697\u5cb8\u80fa\u6848\u8c19\u57ef\u63de\u72b4\u5eb5\u6849\u94f5\u9e4c\u9878\u9eef",ang:"\u80ae\u6602\u76ce",ao:"\u51f9\u6556\u71ac\u7ff1\u8884\u50b2\u5965\u61ca\u6fb3\u5773\u62d7\u55f7\u5662\u5c99\u5ed2\u9068\u5aaa\u9a9c\u8071\u87af\u93ca\u9ccc\u93d6",ba:"\u82ad\u634c\u6252\u53ed\u5427\u7b06\u516b\u75a4\u5df4\u62d4\u8dcb\u9776\u628a\u8019\u575d\u9738\u7f62\u7238\u8307\u83dd\u8406\u636d\u5c9c\u705e\u6777\u94af\u7c91\u9c85\u9b43",bai:"\u767d\u67cf\u767e\u6446\u4f70\u8d25\u62dc\u7a17\u859c\u63b0\u97b4",ban:"\u6591\u73ed\u642c\u6273\u822c\u9881\u677f\u7248\u626e\u62cc\u4f34\u74e3\u534a\u529e\u7eca\u962a\u5742\u8c73\u94a3\u7622\u764d\u8228",bang:"\u90a6\u5e2e\u6886\u699c\u8180\u7ed1\u68d2\u78c5\u868c\u9551\u508d\u8c24\u84a1\u8783",bao:"\u82de\u80de\u5305\u8912\u96f9\u4fdd\u5821\u9971\u5b9d\u62b1\u62a5\u66b4\u8c79\u9c8d\u7206\u52f9\u8446\u5b80\u5b62\u7172\u9e28\u8913\u8db5\u9f85",bo:"\u5265\u8584\u73bb\u83e0\u64ad\u62e8\u94b5\u6ce2\u535a\u52c3\u640f\u94c2\u7b94\u4f2f\u5e1b\u8236\u8116\u818a\u6e24\u6cca\u9a73\u4eb3\u8543\u5575\u997d\u6a97\u64d8\u7934\u94b9\u9e41\u7c38\u8ddb",bei:"\u676f\u7891\u60b2\u5351\u5317\u8f88\u80cc\u8d1d\u94a1\u500d\u72c8\u5907\u60eb\u7119\u88ab\u5b5b\u9642\u90b6\u57e4\u84d3\u5457\u602b\u6096\u789a\u9e4e\u8919\u943e",ben:"\u5954\u82ef\u672c\u7b28\u755a\u574c\u951b",beng:"\u5d29\u7ef7\u752d\u6cf5\u8e66\u8ff8\u552a\u5623\u750f",bi:"\u903c\u9f3b\u6bd4\u9119\u7b14\u5f7c\u78a7\u84d6\u853d\u6bd5\u6bd9\u6bd6\u5e01\u5e87\u75f9\u95ed\u655d\u5f0a\u5fc5\u8f9f\u58c1\u81c2\u907f\u965b\u5315\u4ef3\u4ffe\u8298\u835c\u8378\u5421\u54d4\u72f4\u5eb3\u610e\u6ed7\u6fde\u5f3c\u59a3\u5a62\u5b16\u74a7\u8d32\u7540\u94cb\u79d5\u88e8\u7b5a\u7b85\u7be6\u822d\u895e\u8df8\u9ac0",bian:"\u97ad\u8fb9\u7f16\u8d2c\u6241\u4fbf\u53d8\u535e\u8fa8\u8fa9\u8fab\u904d\u533e\u5f01\u82c4\u5fed\u6c74\u7f0f\u7178\u782d\u78a5\u7a39\u7a86\u8759\u7b3e\u9cca",biao:"\u6807\u5f6a\u8198\u8868\u5a4a\u9aa0\u98d1\u98d9\u98da\u706c\u9556\u9573\u762d\u88f1\u9cd4",bie:"\u9cd6\u618b\u522b\u762a\u8e69\u9cd8",bin:"\u5f6c\u658c\u6fd2\u6ee8\u5bbe\u6448\u50a7\u6d5c\u7f24\u73a2\u6ba1\u8191\u9554\u9acc\u9b13",bing:"\u5175\u51b0\u67c4\u4e19\u79c9\u997c\u70b3\u75c5\u5e76\u7980\u90b4\u6452\u7ee0\u678b\u69df\u71f9",bu:"\u6355\u535c\u54fa\u8865\u57e0\u4e0d\u5e03\u6b65\u7c3f\u90e8\u6016\u62ca\u535f\u900b\u74ff\u6661\u949a\u91ad",ca:"\u64e6\u5693\u7924",cai:"\u731c\u88c1\u6750\u624d\u8d22\u776c\u8e29\u91c7\u5f69\u83dc\u8521",can:"\u9910\u53c2\u8695\u6b8b\u60ed\u60e8\u707f\u9a96\u74a8\u7cb2\u9eea",cang:"\u82cd\u8231\u4ed3\u6ca7\u85cf\u4f27",cao:"\u64cd\u7cd9\u69fd\u66f9\u8349\u8279\u5608\u6f15\u87ac\u825a",ce:"\u5395\u7b56\u4fa7\u518c\u6d4b\u5202\u5e3b\u607b",ceng:"\u5c42\u8e6d\u564c",cha:"\u63d2\u53c9\u832c\u8336\u67e5\u78b4\u643d\u5bdf\u5c94\u5dee\u8be7\u7339\u9987\u6c4a\u59f9\u6748\u6942\u69ce\u6aab\u9497\u9538\u9572\u8869",chai:"\u62c6\u67f4\u8c7a\u4faa\u8308\u7625\u867f\u9f87",chan:"\u6400\u63ba\u8749\u998b\u8c17\u7f20\u94f2\u4ea7\u9610\u98a4\u5181\u8c04\u8c36\u8487\u5edb\u5fcf\u6f7a\u6fb6\u5b71\u7fbc\u5a75\u5b17\u9aa3\u89c7\u7985\u9561\u88e3\u87fe\u8e94",chang:"\u660c\u7316\u573a\u5c1d\u5e38\u957f\u507f\u80a0\u5382\u655e\u7545\u5531\u5021\u4f25\u9b2f\u82cc\u83d6\u5f9c\u6005\u60dd\u960a\u5a3c\u5ae6\u6636\u6c05\u9cb3",chao:"\u8d85\u6284\u949e\u671d\u5632\u6f6e\u5de2\u5435\u7092\u600a\u7ec9\u6641\u8016",che:"\u8f66\u626f\u64a4\u63a3\u5f7b\u6f88\u577c\u5c6e\u7817",chen:"\u90f4\u81e3\u8fb0\u5c18\u6668\u5ff1\u6c89\u9648\u8d81\u886c\u79f0\u8c0c\u62bb\u55d4\u5bb8\u741b\u6987\u809c\u80c2\u789c\u9f80",cheng:"\u6491\u57ce\u6a59\u6210\u5448\u4e58\u7a0b\u60e9\u6f84\u8bda\u627f\u901e\u9a8b\u79e4\u57d5\u5d4a\u5fb5\u6d48\u67a8\u67fd\u6a18\u665f\u584d\u77a0\u94d6\u88ce\u86cf\u9172",chi:"\u5403\u75f4\u6301\u5319\u6c60\u8fdf\u5f1b\u9a70\u803b\u9f7f\u4f88\u5c3a\u8d64\u7fc5\u65a5\u70bd\u50ba\u5880\u82aa\u830c\u640b\u53f1\u54e7\u557b\u55e4\u5f73\u996c\u6cb2\u5ab8\u6555\u80dd\u7719\u7735\u9e31\u761b\u892b\u86a9\u87ad\u7b1e\u7bea\u8c49\u8e05\u8e1f\u9b51",chong:"\u5145\u51b2\u866b\u5d07\u5ba0\u833a\u5fe1\u61a7\u94f3\u825f",chou:"\u62bd\u916c\u7574\u8e0c\u7a20\u6101\u7b79\u4ec7\u7ef8\u7785\u4e11\u4fe6\u5733\u5e31\u60c6\u6eb4\u59af\u7633\u96e0\u9c8b",chu:"\u81ed\u521d\u51fa\u6a71\u53a8\u8e87\u9504\u96cf\u6ec1\u9664\u695a\u7840\u50a8\u77d7\u6410\u89e6\u5904\u4e8d\u520d\u61b7\u7ecc\u6775\u696e\u6a17\u870d\u8e70\u9edc",chuan:"\u63e3\u5ddd\u7a7f\u693d\u4f20\u8239\u5598\u4e32\u63be\u821b\u60f4\u9044\u5ddb\u6c1a\u948f\u9569\u8221",chuang:"\u75ae\u7a97\u5e62\u5e8a\u95ef\u521b\u6006",chui:"\u5439\u708a\u6376\u9524\u5782\u9672\u68f0\u69cc",chun:"\u6625\u693f\u9187\u5507\u6df3\u7eaf\u8822\u4fc3\u83bc\u6c8c\u80ab\u6710\u9e51\u877d",chuo:"\u6233\u7ef0\u851f\u8fb6\u8f8d\u955e\u8e14\u9f8a",ci:"\u75b5\u8328\u78c1\u96cc\u8f9e\u6148\u74f7\u8bcd\u6b64\u523a\u8d50\u6b21\u8360\u5472\u5d6f\u9e5a\u8785\u7ccd\u8d91",cong:"\u806a\u8471\u56f1\u5306\u4ece\u4e1b\u506c\u82c1\u6dd9\u9aa2\u742e\u7481\u679e",cu:"\u51d1\u7c97\u918b\u7c07\u731d\u6b82\u8e59",cuan:"\u8e7f\u7be1\u7a9c\u6c46\u64ba\u6615\u7228",cui:"\u6467\u5d14\u50ac\u8106\u7601\u7cb9\u6dec\u7fe0\u8403\u60b4\u7480\u69b1\u96b9",cun:"\u6751\u5b58\u5bf8\u78cb\u5fd6\u76b4",cuo:"\u64ae\u6413\u63aa\u632b\u9519\u539d\u811e\u9509\u77ec\u75e4\u9e7e\u8e49\u8e9c",da:"\u642d\u8fbe\u7b54\u7629\u6253\u5927\u8037\u54d2\u55d2\u601b\u59b2\u75b8\u8921\u7b2a\u977c\u9791",dai:"\u5446\u6b79\u50a3\u6234\u5e26\u6b86\u4ee3\u8d37\u888b\u5f85\u902e\u6020\u57ed\u7519\u5454\u5cb1\u8fe8\u902f\u9a80\u7ed0\u73b3\u9edb",dan:"\u803d\u62c5\u4e39\u5355\u90f8\u63b8\u80c6\u65e6\u6c2e\u4f46\u60ee\u6de1\u8bde\u5f39\u86cb\u4ebb\u510b\u5369\u840f\u5556\u6fb9\u6a90\u6b9a\u8d55\u7708\u7605\u8043\u7baa",dang:"\u5f53\u6321\u515a\u8361\u6863\u8c20\u51fc\u83ea\u5b95\u7800\u94db\u88c6",dao:"\u5200\u6363\u8e48\u5012\u5c9b\u7977\u5bfc\u5230\u7a3b\u60bc\u9053\u76d7\u53e8\u5541\u5fc9\u6d2e\u6c18\u7118\u5fd1\u7e9b",de:"\u5fb7\u5f97\u7684\u951d",deng:"\u8e6c\u706f\u767b\u7b49\u77aa\u51f3\u9093\u5654\u5d9d\u6225\u78f4\u956b\u7c26",di:"\u5824\u4f4e\u6ef4\u8fea\u654c\u7b1b\u72c4\u6da4\u7fdf\u5ae1\u62b5\u5e95\u5730\u8482\u7b2c\u5e1d\u5f1f\u9012\u7f14\u6c10\u7c74\u8bcb\u8c1b\u90b8\u577b\u839c\u837b\u5600\u5a23\u67e2\u68e3\u89cc\u7825\u78b2\u7747\u955d\u7f9d\u9ab6",dian:"\u98a0\u6382\u6ec7\u7898\u70b9\u5178\u975b\u57ab\u7535\u4f43\u7538\u5e97\u60e6\u5960\u6dc0\u6bbf\u4e36\u963d\u576b\u57dd\u5dc5\u73b7\u765c\u766b\u7c1f\u8e2e",diao:"\u7889\u53fc\u96d5\u51cb\u5201\u6389\u540a\u9493\u8c03\u8f7a\u94de\u8729\u7c9c\u8c82",die:"\u8dcc\u7239\u789f\u8776\u8fed\u8c0d\u53e0\u4f5a\u57a4\u581e\u63f2\u558b\u6e2b\u8f76\u7252\u74de\u8936\u800b\u8e40\u9cbd\u9cce",ding:"\u4e01\u76ef\u53ee\u9489\u9876\u9f0e\u952d\u5b9a\u8ba2\u4e22\u4ec3\u5576\u738e\u815a\u7887\u753a\u94e4\u7594\u8035\u914a",dong:"\u4e1c\u51ac\u8463\u61c2\u52a8\u680b\u4f97\u606b\u51bb\u6d1e\u578c\u549a\u5cbd\u5cd2\u5902\u6c21\u80e8\u80f4\u7850\u9e2b",dou:"\u515c\u6296\u6597\u9661\u8c46\u9017\u75d8\u8538\u94ad\u7aa6\u7aac\u86aa\u7bfc\u9161",du:"\u90fd\u7763\u6bd2\u728a\u72ec\u8bfb\u5835\u7779\u8d4c\u675c\u9540\u809a\u5ea6\u6e21\u5992\u828f\u561f\u6e0e\u691f\u6a50\u724d\u8839\u7b03\u9ad1\u9ee9",duan:"\u7aef\u77ed\u953b\u6bb5\u65ad\u7f0e\u5f56\u6934\u7145\u7c16",dui:"\u5806\u5151\u961f\u5bf9\u603c\u619d\u7893",dun:"\u58a9\u5428\u8e72\u6566\u987f\u56e4\u949d\u76fe\u9041\u7096\u7818\u7905\u76f9\u9566\u8db8",duo:"\u6387\u54c6\u591a\u593a\u579b\u8eb2\u6735\u8dfa\u8235\u5241\u60f0\u5815\u5484\u54da\u7f0d\u67c1\u94ce\u88f0\u8e31",e:"\u86fe\u5ce8\u9e45\u4fc4\u989d\u8bb9\u5a25\u6076\u5384\u627c\u904f\u9102\u997f\u5669\u8c14\u57a9\u57ad\u82ca\u83aa\u843c\u5443\u6115\u5c59\u5a40\u8f6d\u66f7\u816d\u786a\u9507\u9537\u9e57\u989a\u9cc4",en:"\u6069\u84bd\u6441\u5514\u55ef",er:"\u800c\u513f\u8033\u5c14\u9975\u6d31\u4e8c\u8d30\u8fe9\u73e5\u94d2\u9e38\u9c95",fa:"\u53d1\u7f5a\u7b4f\u4f10\u4e4f\u9600\u6cd5\u73d0\u57a1\u781d",fan:"\u85e9\u5e06\u756a\u7ffb\u6a0a\u77fe\u9492\u7e41\u51e1\u70e6\u53cd\u8fd4\u8303\u8d29\u72af\u996d\u6cdb\u8629\u5e61\u72ad\u68b5\u6535\u71d4\u7548\u8e6f",fang:"\u574a\u82b3\u65b9\u80aa\u623f\u9632\u59a8\u4eff\u8bbf\u7eba\u653e\u531a\u90a1\u5f77\u94ab\u822b\u9c82",fei:"\u83f2\u975e\u5561\u98de\u80a5\u532a\u8bfd\u5420\u80ba\u5e9f\u6cb8\u8d39\u82be\u72d2\u60b1\u6ddd\u5983\u7ecb\u7eef\u69a7\u8153\u6590\u6249\u7953\u7829\u9544\u75f1\u871a\u7bda\u7fe1\u970f\u9cb1",fen:"\u82ac\u915a\u5429\u6c1b\u5206\u7eb7\u575f\u711a\u6c7e\u7c89\u594b\u4efd\u5fff\u6124\u7caa\u507e\u7035\u68fc\u610d\u9cbc\u9f22",feng:"\u4e30\u5c01\u67ab\u8702\u5cf0\u950b\u98ce\u75af\u70fd\u9022\u51af\u7f1d\u8bbd\u5949\u51e4\u4ff8\u9146\u8451\u6ca3\u781c",fu:"\u4f5b\u5426\u592b\u6577\u80a4\u5b75\u6276\u62c2\u8f90\u5e45\u6c1f\u7b26\u4f0f\u4fd8\u670d\u6d6e\u6daa\u798f\u88b1\u5f17\u752b\u629a\u8f85\u4fef\u91dc\u65a7\u812f\u8151\u5e9c\u8150\u8d74\u526f\u8986\u8d4b\u590d\u5085\u4ed8\u961c\u7236\u8179\u8d1f\u5bcc\u8ba3\u9644\u5987\u7f1a\u5490\u5310\u51eb\u90db\u8299\u82fb\u832f\u83a9\u83d4\u544b\u5e5e\u6ecf\u8274\u5b5a\u9a78\u7ec2\u6874\u8d59\u9efb\u9efc\u7f58\u7a03\u99a5\u864d\u86a8\u8709\u8760\u876e\u9eb8\u8dba\u8dd7\u9cc6",ga:"\u5676\u560e\u86e4\u5c2c\u5477\u5c15\u5c1c\u65ee\u9486",gai:"\u8be5\u6539\u6982\u9499\u76d6\u6e89\u4e10\u9654\u5793\u6224\u8d45\u80f2",gan:"\u5e72\u7518\u6746\u67d1\u7aff\u809d\u8d76\u611f\u79c6\u6562\u8d63\u5769\u82f7\u5c34\u64c0\u6cd4\u6de6\u6f89\u7ec0\u6a44\u65f0\u77f8\u75b3\u9150",gang:"\u5188\u521a\u94a2\u7f38\u809b\u7eb2\u5c97\u6e2f\u6206\u7f61\u9883\u7b7b",gong:"\u6760\u5de5\u653b\u529f\u606d\u9f9a\u4f9b\u8eac\u516c\u5bab\u5f13\u5de9\u6c5e\u62f1\u8d21\u5171\u857b\u5efe\u54a3\u73d9\u80b1\u86a3\u86e9\u89e5",gao:"\u7bd9\u768b\u9ad8\u818f\u7f94\u7cd5\u641e\u9550\u7a3f\u544a\u777e\u8bf0\u90dc\u84bf\u85c1\u7f1f\u69d4\u69c1\u6772\u9506",ge:"\u54e5\u6b4c\u6401\u6208\u9e3d\u80f3\u7599\u5272\u9769\u845b\u683c\u9601\u9694\u94ec\u4e2a\u5404\u9b32\u4ee1\u54ff\u5865\u55dd\u7ea5\u643f\u8188\u784c\u94ea\u9549\u88bc\u988c\u867c\u8238\u9abc\u9ac2",gei:"\u7ed9",gen:"\u6839\u8ddf\u4e98\u831b\u54cf\u826e",geng:"\u8015\u66f4\u5e9a\u7fb9\u57c2\u803f\u6897\u54fd\u8d53\u9ca0",gou:"\u94a9\u52fe\u6c9f\u82df\u72d7\u57a2\u6784\u8d2d\u591f\u4f5d\u8bdf\u5ca3\u9058\u5abe\u7f11\u89cf\u5f40\u9e32\u7b31\u7bdd\u97b2",gu:"\u8f9c\u83c7\u5495\u7b8d\u4f30\u6cbd\u5b64\u59d1\u9f13\u53e4\u86ca\u9aa8\u8c37\u80a1\u6545\u987e\u56fa\u96c7\u560f\u8bc2\u83f0\u54cc\u5d2e\u6c69\u688f\u8f71\u726f\u727f\u80cd\u81cc\u6bc2\u77bd\u7f5f\u94b4\u9522\u74e0\u9e2a\u9e44\u75fc\u86c4\u9164\u89da\u9cb4\u9ab0\u9e58",gua:"\u522e\u74dc\u5250\u5be1\u6302\u8902\u5366\u8bd6\u5471\u681d\u9e39",guai:"\u4e56\u62d0\u602a\u54d9",guan:"\u68fa\u5173\u5b98\u51a0\u89c2\u7ba1\u9986\u7f50\u60ef\u704c\u8d2f\u500c\u839e\u63bc\u6dab\u76e5\u9e73\u9ccf",guang:"\u5149\u5e7f\u901b\u72b7\u6844\u80f1\u7592",gui:"\u7470\u89c4\u572d\u7845\u5f52\u9f9f\u95fa\u8f68\u9b3c\u8be1\u7678\u6842\u67dc\u8dea\u8d35\u523d\u5326\u523f\u5e8b\u5b84\u59ab\u6867\u7085\u6677\u7688\u7c0b\u9c91\u9cdc",gun:"\u8f8a\u6eda\u68cd\u4e28\u886e\u7ef2\u78d9\u9ca7",guo:"\u9505\u90ed\u56fd\u679c\u88f9\u8fc7\u9998\u8803\u57da\u63b4\u5459\u56d7\u5e3c\u5d1e\u7313\u6901\u8662\u951e\u8052\u872e\u873e\u8748",ha:"\u54c8",hai:"\u9ab8\u5b69\u6d77\u6c26\u4ea5\u5bb3\u9a87\u54b4\u55e8\u988f\u91a2",han:"\u9163\u61a8\u90af\u97e9\u542b\u6db5\u5bd2\u51fd\u558a\u7f55\u7ff0\u64bc\u634d\u65f1\u61be\u608d\u710a\u6c57\u6c49\u9097\u83e1\u6496\u961a\u701a\u6657\u7113\u9894\u86b6\u9f3e",hen:"\u592f\u75d5\u5f88\u72e0\u6068",hang:"\u676d\u822a\u6c86\u7ed7\u73e9\u6841",hao:"\u58d5\u568e\u8c6a\u6beb\u90dd\u597d\u8017\u53f7\u6d69\u8585\u55e5\u5686\u6fe0\u704f\u660a\u7693\u98a2\u869d",he:"\u5475\u559d\u8377\u83cf\u6838\u79be\u548c\u4f55\u5408\u76d2\u8c89\u9602\u6cb3\u6db8\u8d6b\u8910\u9e64\u8d3a\u8bc3\u52be\u58d1\u85ff\u55d1\u55ec\u9616\u76cd\u86b5\u7fee",hei:"\u563f\u9ed1",heng:"\u54fc\u4ea8\u6a2a\u8861\u6052\u8a07\u8605",hong:"\u8f70\u54c4\u70d8\u8679\u9e3f\u6d2a\u5b8f\u5f18\u7ea2\u9ec9\u8ba7\u836d\u85a8\u95f3\u6cd3",hou:"\u5589\u4faf\u7334\u543c\u539a\u5019\u540e\u5820\u5f8c\u9005\u760a\u7bcc\u7cc7\u9c8e\u9aba",hu:"\u547c\u4e4e\u5ffd\u745a\u58f6\u846b\u80e1\u8774\u72d0\u7cca\u6e56\u5f27\u864e\u552c\u62a4\u4e92\u6caa\u6237\u51b1\u553f\u56eb\u5cb5\u7322\u6019\u60da\u6d52\u6ef9\u7425\u69f2\u8f77\u89f3\u70c0\u7173\u623d\u6248\u795c\u9e55\u9e71\u7b0f\u9190\u659b",hua:"\u82b1\u54d7\u534e\u733e\u6ed1\u753b\u5212\u5316\u8bdd\u5290\u6d4d\u9a85\u6866\u94e7\u7a1e",huai:"\u69d0\u5f8a\u6000\u6dee\u574f\u8fd8\u8e1d",huan:"\u6b22\u73af\u6853\u7f13\u6362\u60a3\u5524\u75ea\u8c62\u7115\u6da3\u5ba6\u5e7b\u90c7\u5942\u57b8\u64d0\u571c\u6d39\u6d63\u6f36\u5bf0\u902d\u7f33\u953e\u9ca9\u9b1f",huang:"\u8352\u614c\u9ec4\u78fa\u8757\u7c27\u7687\u51f0\u60f6\u714c\u6643\u5e4c\u604d\u8c0e\u968d\u5fa8\u6e5f\u6f62\u9051\u749c\u8093\u7640\u87e5\u7bc1\u9cc7",hui:"\u7070\u6325\u8f89\u5fbd\u6062\u86d4\u56de\u6bc1\u6094\u6167\u5349\u60e0\u6666\u8d3f\u79fd\u4f1a\u70e9\u6c47\u8bb3\u8bf2\u7ed8\u8bd9\u8334\u835f\u8559\u54d5\u5599\u96b3\u6d04\u5f57\u7f0b\u73f2\u6656\u605a\u867a\u87ea\u9ebe",hun:"\u8364\u660f\u5a5a\u9b42\u6d51\u6df7\u8be8\u9984\u960d\u6eb7\u7f17",huo:"\u8c41\u6d3b\u4f19\u706b\u83b7\u6216\u60d1\u970d\u8d27\u7978\u6509\u56af\u5925\u94ac\u952a\u956c\u8020\u8816",ji:"\u51fb\u573e\u57fa\u673a\u7578\u7a3d\u79ef\u7b95\u808c\u9965\u8ff9\u6fc0\u8ba5\u9e21\u59ec\u7ee9\u7f09\u5409\u6781\u68d8\u8f91\u7c4d\u96c6\u53ca\u6025\u75be\u6c72\u5373\u5ac9\u7ea7\u6324\u51e0\u810a\u5df1\u84df\u6280\u5180\u5b63\u4f0e\u796d\u5242\u60b8\u6d4e\u5bc4\u5bc2\u8ba1\u8bb0\u65e2\u5fcc\u9645\u5993\u7ee7\u7eaa\u5c45\u4e0c\u4e69\u525e\u4f76\u4f74\u8114\u58bc\u82a8\u82b0\u8401\u84ba\u857a\u638e\u53fd\u54ad\u54dc\u5527\u5c8c\u5d74\u6d0e\u5f50\u5c50\u9aa5\u757f\u7391\u696b\u6b9b\u621f\u6222\u8d4d\u89ca\u7284\u9f51\u77f6\u7f81\u5d47\u7a37\u7620\u7635\u866e\u7b08\u7b04\u66a8\u8dfb\u8dfd\u9701\u9c9a\u9cab\u9afb\u9e82",jia:"\u5609\u67b7\u5939\u4f73\u5bb6\u52a0\u835a\u988a\u8d3e\u7532\u94be\u5047\u7a3c\u4ef7\u67b6\u9a7e\u5ac1\u4f3d\u90cf\u62ee\u5cac\u6d43\u8fe6\u73c8\u621b\u80db\u605d\u94d7\u9553\u75c2\u86f1\u7b33\u8888\u8dcf",jian:"\u6b7c\u76d1\u575a\u5c16\u7b3a\u95f4\u714e\u517c\u80a9\u8270\u5978\u7f04\u8327\u68c0\u67ec\u78b1\u7877\u62e3\u6361\u7b80\u4fed\u526a\u51cf\u8350\u69db\u9274\u8df5\u8d31\u89c1\u952e\u7bad\u4ef6\u5065\u8230\u5251\u996f\u6e10\u6e85\u6da7\u5efa\u50ed\u8c0f\u8c2b\u83c5\u84b9\u641b\u56dd\u6e54\u8e47\u8b07\u7f23\u67a7\u67d9\u6957\u620b\u622c\u726e\u728d\u6bfd\u8171\u7751\u950f\u9e63\u88e5\u7b15\u7bb4\u7fe6\u8dbc\u8e3a\u9ca3\u97af",jiang:"\u50f5\u59dc\u5c06\u6d46\u6c5f\u7586\u848b\u6868\u5956\u8bb2\u5320\u9171\u964d\u8333\u6d1a\u7edb\u7f30\u729f\u7913\u8029\u7ce8\u8c47",jiao:"\u8549\u6912\u7901\u7126\u80f6\u4ea4\u90ca\u6d47\u9a84\u5a07\u56bc\u6405\u94f0\u77eb\u4fa5\u811a\u72e1\u89d2\u997a\u7f34\u7ede\u527f\u6559\u9175\u8f7f\u8f83\u53eb\u4f7c\u50ec\u832d\u6322\u564d\u5ce4\u5fbc\u59e3\u7e9f\u656b\u768e\u9e6a\u86df\u91ae\u8de4\u9c9b",jie:"\u7a96\u63ed\u63a5\u7686\u79f8\u8857\u9636\u622a\u52ab\u8282\u6854\u6770\u6377\u776b\u7aed\u6d01\u7ed3\u89e3\u59d0\u6212\u85c9\u82a5\u754c\u501f\u4ecb\u75a5\u8beb\u5c4a\u5048\u8ba6\u8bd8\u5588\u55df\u736c\u5a55\u5b51\u6840\u7352\u78a3\u9534\u7596\u88b7\u9889\u86a7\u7faf\u9c92\u9ab1\u9aeb",jin:"\u5dfe\u7b4b\u65a4\u91d1\u4eca\u6d25\u895f\u7d27\u9526\u4ec5\u8c28\u8fdb\u9773\u664b\u7981\u8fd1\u70ec\u6d78\u5c3d\u537a\u8369\u5807\u5664\u9991\u5ed1\u5997\u7f19\u747e\u69ff\u8d46\u89d0\u9485\u9513\u887f\u77dc",jing:"\u52b2\u8346\u5162\u830e\u775b\u6676\u9cb8\u4eac\u60ca\u7cbe\u7cb3\u7ecf\u4e95\u8b66\u666f\u9888\u9759\u5883\u656c\u955c\u5f84\u75c9\u9756\u7adf\u7ade\u51c0\u522d\u5106\u9631\u83c1\u734d\u61ac\u6cfe\u8ff3\u5f2a\u5a67\u80bc\u80eb\u8148\u65cc",jiong:"\u70af\u7a98\u5182\u8fe5\u6243",jiu:"\u63ea\u7a76\u7ea0\u7396\u97ed\u4e45\u7078\u4e5d\u9152\u53a9\u6551\u65e7\u81fc\u8205\u548e\u5c31\u759a\u50e6\u557e\u9604\u67e9\u6855\u9e6b\u8d73\u9b0f",ju:"\u97a0\u62d8\u72d9\u75bd\u9a79\u83ca\u5c40\u5480\u77e9\u4e3e\u6cae\u805a\u62d2\u636e\u5de8\u5177\u8ddd\u8e1e\u952f\u4ff1\u53e5\u60e7\u70ac\u5267\u5028\u8bb5\u82e3\u82f4\u8392\u63ac\u907d\u5c66\u741a\u67b8\u6910\u6998\u6989\u6a58\u728b\u98d3\u949c\u9514\u7aad\u88fe\u8d84\u91b5\u8e3d\u9f83\u96ce\u97ab",juan:"\u6350\u9e43\u5a1f\u5026\u7737\u5377\u7ee2\u9104\u72f7\u6d93\u684a\u8832\u9529\u954c\u96bd",jue:"\u6485\u652b\u6289\u6398\u5014\u7235\u89c9\u51b3\u8bc0\u7edd\u53a5\u5282\u8c32\u77cd\u8568\u5658\u5d1b\u7357\u5b53\u73cf\u6877\u6a5b\u721d\u9562\u8e76\u89d6",jun:"\u5747\u83cc\u94a7\u519b\u541b\u5cfb\u4fca\u7ae3\u6d5a\u90e1\u9a8f\u6343\u72fb\u76b2\u7b60\u9e87",ka:"\u5580\u5496\u5361\u4f67\u5494\u80e9",ke:"\u54af\u5777\u82db\u67ef\u68f5\u78d5\u9897\u79d1\u58f3\u54b3\u53ef\u6e34\u514b\u523b\u5ba2\u8bfe\u5ca2\u606a\u6e98\u9a92\u7f02\u73c2\u8f72\u6c2a\u778c\u94b6\u75b4\u7aa0\u874c\u9ac1",kai:"\u5f00\u63e9\u6977\u51ef\u6168\u5240\u57b2\u8488\u5ffe\u607a\u94e0\u950e",kan:"\u520a\u582a\u52d8\u574e\u780d\u770b\u4f83\u51f5\u83b0\u83b6\u6221\u9f9b\u77b0",kang:"\u5eb7\u6177\u7ce0\u625b\u6297\u4ea2\u7095\u5751\u4f09\u95f6\u94aa",kao:"\u8003\u62f7\u70e4\u9760\u5c3b\u6832\u7292\u94d0",ken:"\u80af\u5543\u57a6\u6073\u57a0\u88c9\u9880",keng:"\u542d\u5fd0\u94ff",kong:"\u7a7a\u6050\u5b54\u63a7\u5025\u5d06\u7b9c",kou:"\u62a0\u53e3\u6263\u5bc7\u82a4\u853b\u53e9\u770d\u7b58",ku:"\u67af\u54ed\u7a9f\u82e6\u9177\u5e93\u88e4\u5233\u5800\u55be\u7ed4\u9ab7",kua:"\u5938\u57ae\u630e\u8de8\u80ef\u4f89",kuai:"\u5757\u7b77\u4fa9\u5feb\u84af\u90d0\u8489\u72ef\u810d",kuan:"\u5bbd\u6b3e\u9acb",kuang:"\u5321\u7b50\u72c2\u6846\u77ff\u7736\u65f7\u51b5\u8bd3\u8bf3\u909d\u5739\u593c\u54d0\u7ea9\u8d36",kui:"\u4e8f\u76d4\u5cbf\u7aa5\u8475\u594e\u9b41\u5080\u9988\u6127\u6e83\u9997\u532e\u5914\u9697\u63c6\u55b9\u559f\u609d\u6126\u9615\u9035\u668c\u777d\u8069\u8770\u7bd1\u81fe\u8dec",kun:"\u5764\u6606\u6346\u56f0\u6083\u9603\u7428\u951f\u918c\u9cb2\u9ae1",kuo:"\u62ec\u6269\u5ed3\u9614\u86de",la:"\u5783\u62c9\u5587\u8721\u814a\u8fa3\u5566\u524c\u647a\u908b\u65ef\u782c\u760c",lai:"\u83b1\u6765\u8d56\u5d03\u5f95\u6d9e\u6fd1\u8d49\u7750\u94fc\u765e\u7c41",lan:"\u84dd\u5a6a\u680f\u62e6\u7bee\u9611\u5170\u6f9c\u8c30\u63fd\u89c8\u61d2\u7f06\u70c2\u6ee5\u5549\u5c9a\u61d4\u6f24\u6984\u6593\u7f71\u9567\u8934",lang:"\u7405\u6994\u72fc\u5eca\u90ce\u6717\u6d6a\u83a8\u8497\u5577\u9606\u9512\u7a02\u8782",lao:"\u635e\u52b3\u7262\u8001\u4f6c\u59e5\u916a\u70d9\u6d9d\u5520\u5d02\u6833\u94d1\u94f9\u75e8\u91aa",le:"\u52d2\u4e50\u808b\u4ec2\u53fb\u561e\u6cd0\u9cd3",lei:"\u96f7\u956d\u857e\u78ca\u7d2f\u5121\u5792\u64c2\u7c7b\u6cea\u7fb8\u8bd4\u837d\u54a7\u6f2f\u5ad8\u7f27\u6a91\u8012\u9179",ling:"\u68f1\u51b7\u62ce\u73b2\u83f1\u96f6\u9f84\u94c3\u4f36\u7f9a\u51cc\u7075\u9675\u5cad\u9886\u53e6\u4ee4\u9143\u5844\u82d3\u5464\u56f9\u6ce0\u7eeb\u67c3\u68c2\u74f4\u8046\u86c9\u7fce\u9cae",leng:"\u695e\u6123",li:"\u5398\u68a8\u7281\u9ece\u7bf1\u72f8\u79bb\u6f13\u7406\u674e\u91cc\u9ca4\u793c\u8389\u8354\u540f\u6817\u4e3d\u5389\u52b1\u783e\u5386\u5229\u5088\u4f8b\u4fd0\u75e2\u7acb\u7c92\u6ca5\u96b6\u529b\u7483\u54e9\u4fea\u4fda\u90e6\u575c\u82c8\u8385\u84e0\u85dc\u6369\u5456\u5533\u55b1\u7301\u6ea7\u6fa7\u9026\u5a0c\u5ae0\u9a8a\u7f21\u73de\u67a5\u680e\u8f79\u623e\u783a\u8a48\u7f79\u9502\u9e42\u75a0\u75ac\u86ce\u870a\u8821\u7b20\u7be5\u7c9d\u91b4\u8dde\u96f3\u9ca1\u9ce2\u9ee7",lian:"\u4fe9\u8054\u83b2\u8fde\u9570\u5ec9\u601c\u6d9f\u5e18\u655b\u8138\u94fe\u604b\u70bc\u7ec3\u631b\u8539\u5941\u6f4b\u6fc2\u5a08\u740f\u695d\u6b93\u81c1\u81a6\u88e2\u880a\u9ca2",liang:"\u7cae\u51c9\u6881\u7cb1\u826f\u4e24\u8f86\u91cf\u667e\u4eae\u8c05\u589a\u690b\u8e09\u9753\u9b49",liao:"\u64a9\u804a\u50da\u7597\u71ce\u5be5\u8fbd\u6f66\u4e86\u6482\u9563\u5ed6\u6599\u84fc\u5c25\u5639\u7360\u5bee\u7f2d\u948c\u9e69\u8022",lie:"\u5217\u88c2\u70c8\u52a3\u730e\u51bd\u57d2\u6d0c\u8d94\u8e90\u9b23",lin:"\u7433\u6797\u78f7\u9716\u4e34\u90bb\u9cde\u6dcb\u51db\u8d41\u541d\u853a\u5d99\u5eea\u9074\u6aa9\u8f9a\u77b5\u7cbc\u8e8f\u9e9f",liu:"\u6e9c\u7409\u69b4\u786b\u998f\u7559\u5218\u7624\u6d41\u67f3\u516d\u62a1\u507b\u848c\u6cd6\u6d4f\u905b\u9a9d\u7efa\u65d2\u7198\u950d\u954f\u9e68\u938f","long":"\u9f99\u804b\u5499\u7b3c\u7abf\u9686\u5784\u62e2\u9647\u5f04\u5785\u830f\u6cf7\u73d1\u680a\u80e7\u783b\u7643",lou:"\u697c\u5a04\u6402\u7bd3\u6f0f\u964b\u55bd\u5d5d\u9542\u7618\u8027\u877c\u9ac5",lu:"\u82a6\u5362\u9885\u5e90\u7089\u63b3\u5364\u864f\u9c81\u9e93\u788c\u9732\u8def\u8d42\u9e7f\u6f5e\u7984\u5f55\u9646\u622e\u5786\u6445\u64b8\u565c\u6cf8\u6e0c\u6f09\u7490\u680c\u6a79\u8f73\u8f82\u8f98\u6c07\u80ea\u9565\u9e2c\u9e6d\u7c0f\u823b\u9c88",lv:"\u9a74\u5415\u94dd\u4fa3\u65c5\u5c65\u5c61\u7f15\u8651\u6c2f\u5f8b\u7387\u6ee4\u7eff\u634b\u95fe\u6988\u8182\u7a06\u891b",luan:"\u5ce6\u5b6a\u6ee6\u5375\u4e71\u683e\u9e3e\u92ae",lue:"\u63a0\u7565\u950a",lun:"\u8f6e\u4f26\u4ed1\u6ca6\u7eb6\u8bba\u56f5",luo:"\u841d\u87ba\u7f57\u903b\u9523\u7ba9\u9aa1\u88f8\u843d\u6d1b\u9a86\u7edc\u502e\u8366\u645e\u7321\u6cfa\u6924\u8136\u9559\u7630\u96d2",ma:"\u5988\u9ebb\u739b\u7801\u8682\u9a6c\u9a82\u561b\u5417\u551b\u72b8\u5b37\u6769\u9ebd",mai:"\u57cb\u4e70\u9ea6\u5356\u8fc8\u8109\u52a2\u836c\u54aa\u973e",man:"\u7792\u9992\u86ee\u6ee1\u8513\u66fc\u6162\u6f2b\u8c29\u5881\u5e54\u7f26\u71b3\u9558\u989f\u87a8\u9cd7\u9794",mang:"\u8292\u832b\u76f2\u5fd9\u83bd\u9099\u6f2d\u6726\u786d\u87d2",meng:"\u6c13\u840c\u8499\u6aac\u76df\u9530\u731b\u68a6\u5b5f\u52d0\u750d\u77a2\u61f5\u791e\u867b\u8722\u8813\u824b\u8268\u9efe",miao:"\u732b\u82d7\u63cf\u7784\u85d0\u79d2\u6e3a\u5e99\u5999\u55b5\u9088\u7f08\u7f2a\u676a\u6dfc\u7707\u9e4b\u8731",mao:"\u8305\u951a\u6bdb\u77db\u94c6\u536f\u8302\u5192\u5e3d\u8c8c\u8d38\u4f94\u88a4\u52d6\u8306\u5cc1\u7441\u6634\u7266\u8004\u65c4\u61cb\u7780\u86d1\u8765\u87ca\u9ae6",me:"\u4e48",mei:"\u73ab\u679a\u6885\u9176\u9709\u7164\u6ca1\u7709\u5a92\u9541\u6bcf\u7f8e\u6627\u5bd0\u59b9\u5a9a\u5776\u8393\u5d4b\u7338\u6d7c\u6e44\u6963\u9545\u9e5b\u8882\u9b45",men:"\u95e8\u95f7\u4eec\u626a\u739f\u7116\u61d1\u9494",mi:"\u772f\u919a\u9761\u7cdc\u8ff7\u8c1c\u5f25\u7c73\u79d8\u89c5\u6ccc\u871c\u5bc6\u5e42\u8288\u5196\u8c27\u863c\u5627\u7315\u736f\u6c68\u5b93\u5f2d\u8112\u6549\u7cf8\u7e3b\u9e8b",mian:"\u68c9\u7720\u7ef5\u5195\u514d\u52c9\u5a29\u7f05\u9762\u6c94\u6e4e\u817c\u7704",mie:"\u8511\u706d\u54a9\u881b\u7bfe",min:"\u6c11\u62bf\u76bf\u654f\u60af\u95fd\u82e0\u5cb7\u95f5\u6cef\u73c9",ming:"\u660e\u879f\u9e23\u94ed\u540d\u547d\u51a5\u8317\u6e9f\u669d\u7791\u9169",miu:"\u8c2c",mo:"\u6478\u6479\u8611\u6a21\u819c\u78e8\u6469\u9b54\u62b9\u672b\u83ab\u58a8\u9ed8\u6cab\u6f20\u5bde\u964c\u8c1f\u8309\u84e6\u998d\u5aeb\u9546\u79e3\u763c\u8031\u87c6\u8c8a\u8c98",mou:"\u8c0b\u725f\u67d0\u53b6\u54de\u5a7a\u7738\u936a",mu:"\u62c7\u7261\u4ea9\u59c6\u6bcd\u5893\u66ae\u5e55\u52df\u6155\u6728\u76ee\u7766\u7267\u7a46\u4eeb\u82dc\u5452\u6c90\u6bea\u94bc",na:"\u62ff\u54ea\u5450\u94a0\u90a3\u5a1c\u7eb3\u5185\u637a\u80ad\u954e\u8872\u7bac",nai:"\u6c16\u4e43\u5976\u8010\u5948\u9f10\u827f\u8418\u67f0",nan:"\u5357\u7537\u96be\u56ca\u5583\u56e1\u6960\u8169\u877b\u8d67",nao:"\u6320\u8111\u607c\u95f9\u5b6c\u57b4\u7331\u7459\u7847\u94d9\u86f2",ne:"\u6dd6\u5462\u8bb7",nei:"\u9981",nen:"\u5ae9\u80fd\u6798\u6041",ni:"\u59ae\u9713\u502a\u6ce5\u5c3c\u62df\u4f60\u533f\u817b\u9006\u6eba\u4f32\u576d\u730a\u6029\u6ee0\u6635\u65ce\u7962\u615d\u7768\u94cc\u9cb5",nian:"\u852b\u62c8\u5e74\u78be\u64b5\u637b\u5ff5\u5eff\u8f87\u9ecf\u9c87\u9cb6",niang:"\u5a18\u917f",niao:"\u9e1f\u5c3f\u8311\u5b32\u8132\u8885",nie:"\u634f\u8042\u5b7d\u556e\u954a\u954d\u6d85\u4e5c\u9667\u8616\u55eb\u8080\u989e\u81ec\u8e51",nin:"\u60a8\u67e0",ning:"\u72de\u51dd\u5b81\u62e7\u6cde\u4f5e\u84e5\u549b\u752f\u804d",niu:"\u725b\u626d\u94ae\u7ebd\u72c3\u5ff8\u599e\u86b4",nong:"\u8113\u6d53\u519c\u4fac",nu:"\u5974\u52aa\u6012\u5476\u5e11\u5f29\u80ec\u5b65\u9a7d",nv:"\u5973\u6067\u9495\u8844",nuan:"\u6696",nuenue:"\u8650",nue:"\u759f\u8c11",nuo:"\u632a\u61e6\u7cef\u8bfa\u50a9\u6426\u558f\u9518",ou:"\u54e6\u6b27\u9e25\u6bb4\u85d5\u5455\u5076\u6ca4\u6004\u74ef\u8026",pa:"\u556a\u8db4\u722c\u5e15\u6015\u7436\u8469\u7b62",pai:"\u62cd\u6392\u724c\u5f98\u6e43\u6d3e\u4ff3\u848e",pan:"\u6500\u6f58\u76d8\u78d0\u76fc\u7554\u5224\u53db\u723f\u6cee\u88a2\u897b\u87e0\u8e52",pang:"\u4e53\u5e9e\u65c1\u802a\u80d6\u6ec2\u9004",pao:"\u629b\u5486\u5228\u70ae\u888d\u8dd1\u6ce1\u530f\u72cd\u5e96\u812c\u75b1",pei:"\u5478\u80da\u57f9\u88f4\u8d54\u966a\u914d\u4f69\u6c9b\u638a\u8f94\u5e14\u6de0\u65c6\u952b\u9185\u9708",pen:"\u55b7\u76c6\u6e53",peng:"\u7830\u62a8\u70f9\u6f8e\u5f6d\u84ec\u68da\u787c\u7bf7\u81a8\u670b\u9e4f\u6367\u78b0\u576f\u580b\u562d\u6026\u87db",pi:"\u7812\u9739\u6279\u62ab\u5288\u7435\u6bd7\u5564\u813e\u75b2\u76ae\u5339\u75de\u50fb\u5c41\u8b6c\u4e15\u9674\u90b3\u90eb\u572e\u9f19\u64d7\u567c\u5e80\u5ab2\u7eb0\u6787\u7513\u7765\u7f74\u94cd\u75e6\u7656\u758b\u868d\u8c94",pian:"\u7bc7\u504f\u7247\u9a97\u8c1d\u9a88\u728f\u80fc\u890a\u7fe9\u8e41",piao:"\u98d8\u6f02\u74e2\u7968\u527d\u560c\u5ad6\u7f25\u6b8d\u779f\u87b5",pie:"\u6487\u77a5\u4e3f\u82e4\u6c15",pin:"\u62fc\u9891\u8d2b\u54c1\u8058\u62da\u59d8\u5ad4\u6980\u725d\u98a6",ping:"\u4e52\u576a\u82f9\u840d\u5e73\u51ed\u74f6\u8bc4\u5c4f\u4fdc\u5a09\u67b0\u9c86",po:"\u5761\u6cfc\u9887\u5a46\u7834\u9b44\u8feb\u7c95\u53f5\u9131\u6ea5\u73c0\u948b\u94b7\u76a4\u7b38",pou:"\u5256\u88d2\u8e23",pu:"\u6251\u94fa\u4ec6\u8386\u8461\u83e9\u84b2\u57d4\u6734\u5703\u666e\u6d66\u8c31\u66dd\u7011\u530d\u5657\u6fee\u749e\u6c06\u9564\u9568\u8e7c",qi:"\u671f\u6b3a\u6816\u621a\u59bb\u4e03\u51c4\u6f06\u67d2\u6c8f\u5176\u68cb\u5947\u6b67\u7566\u5d0e\u8110\u9f50\u65d7\u7948\u7941\u9a91\u8d77\u5c82\u4e5e\u4f01\u542f\u5951\u780c\u5668\u6c14\u8fc4\u5f03\u6c7d\u6ce3\u8bab\u4e9f\u4e93\u573b\u8291\u840b\u847a\u5601\u5c7a\u5c90\u6c54\u6dc7\u9a90\u7eee\u742a\u7426\u675e\u6864\u69ed\u6b39\u797a\u61a9\u789b\u86f4\u871e\u7da6\u7dae\u8dbf\u8e4a\u9ccd\u9e92",qia:"\u6390\u6070\u6d3d\u845c",qian:"\u7275\u6266\u948e\u94c5\u5343\u8fc1\u7b7e\u4edf\u8c26\u4e7e\u9ed4\u94b1\u94b3\u524d\u6f5c\u9063\u6d45\u8c34\u5811\u5d4c\u6b20\u6b49\u4f65\u9621\u828a\u82a1\u8368\u63ae\u5c8d\u60ad\u614a\u9a9e\u6434\u8930\u7f31\u6920\u80b7\u6106\u94a4\u8654\u7b9d",qiang:"\u67aa\u545b\u8154\u7f8c\u5899\u8537\u5f3a\u62a2\u5af1\u6a2f\u6217\u709d\u9516\u9535\u956a\u8941\u8723\u7f9f\u8deb\u8dc4",qiao:"\u6a47\u9539\u6572\u6084\u6865\u77a7\u4e54\u4fa8\u5de7\u9798\u64ac\u7fd8\u5ced\u4fcf\u7a8d\u5281\u8bee\u8c2f\u835e\u6100\u6194\u7f32\u6a35\u6bf3\u7857\u8df7\u9792",qie:"\u5207\u8304\u4e14\u602f\u7a83\u90c4\u553c\u60ec\u59be\u6308\u9532\u7ba7",qin:"\u94a6\u4fb5\u4eb2\u79e6\u7434\u52e4\u82b9\u64d2\u79bd\u5bdd\u6c81\u82a9\u84c1\u8572\u63ff\u5423\u55ea\u5659\u6eb1\u6a8e\u8793\u887e",qing:"\u9752\u8f7b\u6c22\u503e\u537f\u6e05\u64ce\u6674\u6c30\u60c5\u9877\u8bf7\u5e86\u5029\u82d8\u570a\u6aa0\u78ec\u873b\u7f44\u7b90\u8b26\u9cad\u9ee5",qiong:"\u743c\u7a77\u909b\u8315\u7a79\u7b47\u928e",qiu:"\u79cb\u4e18\u90b1\u7403\u6c42\u56da\u914b\u6cc5\u4fc5\u6c3d\u5def\u827d\u72b0\u6e6b\u9011\u9052\u6978\u8d47\u9e20\u866c\u86af\u8764\u88d8\u7cd7\u9cc5\u9f3d",qu:"\u8d8b\u533a\u86c6\u66f2\u8eaf\u5c48\u9a71\u6e20\u53d6\u5a36\u9f8b\u8da3\u53bb\u8bce\u52ac\u8556\u8627\u5c96\u8862\u9612\u74a9\u89d1\u6c0d\u795b\u78f2\u766f\u86d0\u883c\u9eb4\u77bf\u9ee2",quan:"\u5708\u98a7\u6743\u919b\u6cc9\u5168\u75ca\u62f3\u72ac\u5238\u529d\u8be0\u8343\u737e\u609b\u7efb\u8f81\u754e\u94e8\u8737\u7b4c\u9b08",que:"\u7f3a\u7094\u7638\u5374\u9e4a\u69b7\u786e\u96c0\u9619\u60ab",qun:"\u88d9\u7fa4\u9021",ran:"\u7136\u71c3\u5189\u67d3\u82d2\u9aef",rang:"\u74e4\u58e4\u6518\u56b7\u8ba9\u79b3\u7a70",rao:"\u9976\u6270\u7ed5\u835b\u5a06\u6861",ruo:"\u60f9\u82e5\u5f31",re:"\u70ed\u504c",ren:"\u58ec\u4ec1\u4eba\u5fcd\u97e7\u4efb\u8ba4\u5203\u598a\u7eab\u4ede\u834f\u845a\u996a\u8f6b\u7a14\u887d",reng:"\u6254\u4ecd",ri:"\u65e5",rong:"\u620e\u8338\u84c9\u8363\u878d\u7194\u6eb6\u5bb9\u7ed2\u5197\u5d58\u72e8\u7f1b\u6995\u877e",rou:"\u63c9\u67d4\u8089\u7cc5\u8e42\u97a3",ru:"\u8339\u8815\u5112\u5b7a\u5982\u8fb1\u4e73\u6c5d\u5165\u8925\u84d0\u85b7\u5685\u6d33\u6ebd\u6fe1\u94f7\u8966\u98a5",ruan:"\u8f6f\u962e\u670a",rui:"\u854a\u745e\u9510\u82ae\u8564\u777f\u868b",run:"\u95f0\u6da6",sa:"\u6492\u6d12\u8428\u5345\u4ee8\u6332\u98d2",sai:"\u816e\u9cc3\u585e\u8d5b\u567b",san:"\u4e09\u53c1\u4f1e\u6563\u5f61\u9993\u6c35\u6bf5\u7cc1\u9730",sang:"\u6851\u55d3\u4e27\u6421\u78c9\u98a1",sao:"\u6414\u9a9a\u626b\u5ac2\u57fd\u81ca\u7619\u9ccb",se:"\u745f\u8272\u6da9\u556c\u94e9\u94ef\u7a51",sen:"\u68ee",seng:"\u50e7",sha:"\u838e\u7802\u6740\u5239\u6c99\u7eb1\u50bb\u5565\u715e\u810e\u6b43\u75e7\u88df\u970e\u9ca8",shai:"\u7b5b\u6652\u917e",shan:"\u73ca\u82eb\u6749\u5c71\u5220\u717d\u886b\u95ea\u9655\u64c5\u8d61\u81b3\u5584\u6c55\u6247\u7f2e\u5261\u8baa\u912f\u57cf\u829f\u6f78\u59d7\u9a9f\u81bb\u9490\u759d\u87ee\u8222\u8dda\u9cdd",shang:"\u5892\u4f24\u5546\u8d4f\u664c\u4e0a\u5c1a\u88f3\u57a7\u7ef1\u6b87\u71b5\u89de",shao:"\u68a2\u634e\u7a0d\u70e7\u828d\u52fa\u97f6\u5c11\u54e8\u90b5\u7ecd\u52ad\u82d5\u6f72\u86f8\u7b24\u7b72\u8244",she:"\u5962\u8d4a\u86c7\u820c\u820d\u8d66\u6444\u5c04\u6151\u6d89\u793e\u8bbe\u538d\u4f58\u731e\u7572\u9e9d",shen:"\u7837\u7533\u547b\u4f38\u8eab\u6df1\u5a20\u7ec5\u795e\u6c88\u5ba1\u5a76\u751a\u80be\u614e\u6e17\u8bdc\u8c02\u5432\u54c2\u6e16\u6939\u77e7\u8703",sheng:"\u58f0\u751f\u7525\u7272\u5347\u7ef3\u7701\u76db\u5269\u80dc\u5723\u4e1e\u6e11\u5ab5\u771a\u7b19",shi:"\u5e08\u5931\u72ee\u65bd\u6e7f\u8bd7\u5c38\u8671\u5341\u77f3\u62fe\u65f6\u4ec0\u98df\u8680\u5b9e\u8bc6\u53f2\u77e2\u4f7f\u5c4e\u9a76\u59cb\u5f0f\u793a\u58eb\u4e16\u67ff\u4e8b\u62ed\u8a93\u901d\u52bf\u662f\u55dc\u566c\u9002\u4ed5\u4f8d\u91ca\u9970\u6c0f\u5e02\u6043\u5ba4\u89c6\u8bd5\u8c25\u57d8\u83b3\u84cd\u5f11\u5511\u9963\u8f7c\u8006\u8d33\u70bb\u793b\u94c8\u94ca\u87ab\u8210\u7b6e\u8c55\u9ca5\u9cba",shou:"\u6536\u624b\u9996\u5b88\u5bff\u6388\u552e\u53d7\u7626\u517d\u624c\u72e9\u7ef6\u824f",shu:"\u852c\u67a2\u68b3\u6b8a\u6292\u8f93\u53d4\u8212\u6dd1\u758f\u4e66\u8d4e\u5b70\u719f\u85af\u6691\u66d9\u7f72\u8700\u9ecd\u9f20\u5c5e\u672f\u8ff0\u6811\u675f\u620d\u7ad6\u5885\u5eb6\u6570\u6f31\u6055\u500f\u587e\u83fd\u5fc4\u6cad\u6d91\u6f8d\u59dd\u7ebe\u6bf9\u8167\u6bb3\u956f\u79eb\u9e6c",shua:"\u5237\u800d\u5530\u6dae",shuai:"\u6454\u8870\u7529\u5e05\u87c0",shuan:"\u6813\u62f4\u95e9",shuang:"\u971c\u53cc\u723d\u5b40",shui:"\u8c01\u6c34\u7761\u7a0e",shun:"\u542e\u77ac\u987a\u821c\u6042",shuo:"\u8bf4\u7855\u6714\u70c1\u84b4\u6420\u55cd\u6fef\u5981\u69ca\u94c4",si:"\u65af\u6495\u5636\u601d\u79c1\u53f8\u4e1d\u6b7b\u8086\u5bfa\u55e3\u56db\u4f3a\u4f3c\u9972\u5df3\u53ae\u4fdf\u5155\u83e5\u549d\u6c5c\u6cd7\u6f8c\u59d2\u9a77\u7f0c\u7940\u7960\u9536\u9e36\u801c\u86f3\u7b25",song:"\u677e\u8038\u6002\u9882\u9001\u5b8b\u8bbc\u8bf5\u51c7\u83d8\u5d27\u5d69\u5fea\u609a\u6dde\u7ae6",sou:"\u641c\u8258\u64de\u55fd\u53df\u55d6\u55fe\u998a\u6eb2\u98d5\u778d\u953c\u878b",su:"\u82cf\u9165\u4fd7\u7d20\u901f\u7c9f\u50f3\u5851\u6eaf\u5bbf\u8bc9\u8083\u5919\u8c21\u850c\u55c9\u612b\u7c0c\u89eb\u7a23",suan:"\u9178\u849c\u7b97",sui:"\u867d\u968b\u968f\u7ee5\u9ad3\u788e\u5c81\u7a57\u9042\u96a7\u795f\u84d1\u51ab\u8c07\u6fc9\u9083\u71e7\u772d\u7762",sun:"\u5b59\u635f\u7b0b\u836a\u72f2\u98e7\u69ab\u8de3\u96bc",suo:"\u68ad\u5506\u7f29\u7410\u7d22\u9501\u6240\u5522\u55e6\u5a11\u686b\u7743\u7fa7",ta:"\u584c\u4ed6\u5b83\u5979\u5854\u736d\u631e\u8e4b\u8e0f\u95fc\u6ebb\u9062\u69bb\u6c93",tai:"\u80ce\u82d4\u62ac\u53f0\u6cf0\u915e\u592a\u6001\u6c70\u90b0\u85b9\u80bd\u70b1\u949b\u8dc6\u9c90",tan:"\u574d\u644a\u8d2a\u762b\u6ee9\u575b\u6a80\u75f0\u6f6d\u8c2d\u8c08\u5766\u6bef\u8892\u78b3\u63a2\u53f9\u70ad\u90ef\u8548\u6619\u94bd\u952c\u8983",tang:"\u6c64\u5858\u642a\u5802\u68e0\u819b\u5510\u7cd6\u50a5\u9967\u6e8f\u746d\u94f4\u9557\u8025\u8797\u87b3\u7fb0\u91a3",thang:"\u5018\u8eba\u6dcc",theng:"\u8d9f\u70eb",tao:"\u638f\u6d9b\u6ed4\u7ee6\u8404\u6843\u9003\u6dd8\u9676\u8ba8\u5957\u6311\u9f17\u5555\u97ec\u9955",te:"\u7279",teng:"\u85e4\u817e\u75bc\u8a8a\u6ed5",ti:"\u68af\u5254\u8e22\u9511\u63d0\u9898\u8e44\u557c\u4f53\u66ff\u568f\u60d5\u6d95\u5243\u5c49\u8351\u608c\u9016\u7ee8\u7f07\u9e48\u88fc\u918d",tian:"\u5929\u6dfb\u586b\u7530\u751c\u606c\u8214\u8146\u63ad\u5fdd\u9617\u6b84\u754b\u94bf\u86ba",tiao:"\u6761\u8fe2\u773a\u8df3\u4f7b\u7967\u94eb\u7a95\u9f86\u9ca6",tie:"\u8d34\u94c1\u5e16\u841c\u992e",ting:"\u5385\u542c\u70c3\u6c40\u5ef7\u505c\u4ead\u5ead\u633a\u8247\u839b\u8476\u5a77\u6883\u8713\u9706",tong:"\u901a\u6850\u916e\u77b3\u540c\u94dc\u5f64\u7ae5\u6876\u6345\u7b52\u7edf\u75db\u4f5f\u50ee\u4edd\u833c\u55f5\u6078\u6f7c\u783c",tou:"\u5077\u6295\u5934\u900f\u4ea0",tu:"\u51f8\u79c3\u7a81\u56fe\u5f92\u9014\u6d82\u5c60\u571f\u5410\u5154\u580d\u837c\u83df\u948d\u9174",tuan:"\u6e4d\u56e2\u7583",tui:"\u63a8\u9893\u817f\u8715\u892a\u9000\u5fd2\u717a",tun:"\u541e\u5c6f\u81c0\u9968\u66be\u8c5a\u7a80",tuo:"\u62d6\u6258\u8131\u9e35\u9640\u9a6e\u9a7c\u692d\u59a5\u62d3\u553e\u4e47\u4f57\u5768\u5eb9\u6cb1\u67dd\u7823\u7ba8\u8204\u8dce\u9f0d",wa:"\u6316\u54c7\u86d9\u6d3c\u5a03\u74e6\u889c\u4f64\u5a32\u817d",wai:"\u6b6a\u5916",wan:"\u8c4c\u5f2f\u6e7e\u73a9\u987d\u4e38\u70f7\u5b8c\u7897\u633d\u665a\u7696\u60cb\u5b9b\u5a49\u4e07\u8155\u525c\u8284\u82cb\u83c0\u7ea8\u7efe\u742c\u8118\u7579\u873f\u7ba2",wang:"\u6c6a\u738b\u4ea1\u6789\u7f51\u5f80\u65fa\u671b\u5fd8\u5984\u7f54\u5c22\u60d8\u8f8b\u9b4d",wei:"\u5a01\u5dcd\u5fae\u5371\u97e6\u8fdd\u6845\u56f4\u552f\u60df\u4e3a\u6f4d\u7ef4\u82c7\u840e\u59d4\u4f1f\u4f2a\u5c3e\u7eac\u672a\u851a\u5473\u754f\u80c3\u5582\u9b4f\u4f4d\u6e2d\u8c13\u5c09\u6170\u536b\u502d\u504e\u8bff\u9688\u8473\u8587\u5e0f\u5e37\u5d34\u5d6c\u7325\u732c\u95f1\u6ca9\u6d27\u6da0\u9036\u5a13\u73ae\u97ea\u8ece\u709c\u7168\u71a8\u75ff\u8249\u9c94",wen:"\u761f\u6e29\u868a\u6587\u95fb\u7eb9\u543b\u7a33\u7d0a\u95ee\u520e\u6120\u960c\u6c76\u74ba\u97eb\u6b81\u96ef",weng:"\u55e1\u7fc1\u74ee\u84ca\u8579",wo:"\u631d\u8717\u6da1\u7a9d\u6211\u65a1\u5367\u63e1\u6c83\u83b4\u5e44\u6e25\u674c\u809f\u9f8c",wu:"\u5deb\u545c\u94a8\u4e4c\u6c61\u8bec\u5c4b\u65e0\u829c\u68a7\u543e\u5434\u6bcb\u6b66\u4e94\u6342\u5348\u821e\u4f0d\u4fae\u575e\u620a\u96fe\u6664\u7269\u52ff\u52a1\u609f\u8bef\u5140\u4ef5\u9622\u90ac\u572c\u82b4\u5e91\u6003\u5fe4\u6d6f\u5be4\u8fd5\u59a9\u9a9b\u727e\u7110\u9e49\u9e5c\u8708\u92c8\u9f2f",xi:"\u6614\u7199\u6790\u897f\u7852\u77fd\u6670\u563b\u5438\u9521\u727a\u7a00\u606f\u5e0c\u6089\u819d\u5915\u60dc\u7184\u70ef\u6eaa\u6c50\u7280\u6a84\u88ad\u5e2d\u4e60\u5ab3\u559c\u94e3\u6d17\u7cfb\u9699\u620f\u7ec6\u50d6\u516e\u96b0\u90d7\u831c\u8478\u84f0\u595a\u550f\u5f99\u9969\u960b\u6d60\u6dc5\u5c63\u5b09\u73ba\u6a28\u66e6\u89cb\u6b37\u71b9\u798a\u79a7\u94b8\u7699\u7a78\u8725\u87cb\u823e\u7fb2\u7c9e\u7fd5\u91af\u9f37",xia:"\u778e\u867e\u5323\u971e\u8f96\u6687\u5ce1\u4fa0\u72ed\u4e0b\u53a6\u590f\u5413\u6380\u846d\u55c4\u72ce\u9050\u7455\u7856\u7615\u7f45\u9ee0",xian:"\u9528\u5148\u4ed9\u9c9c\u7ea4\u54b8\u8d24\u8854\u8237\u95f2\u6d8e\u5f26\u5acc\u663e\u9669\u73b0\u732e\u53bf\u817a\u9985\u7fa1\u5baa\u9677\u9650\u7ebf\u51bc\u85d3\u5c98\u7303\u66b9\u5a34\u6c19\u7946\u9e47\u75eb\u86ac\u7b45\u7c7c\u9170\u8df9",xiang:"\u76f8\u53a2\u9576\u9999\u7bb1\u8944\u6e58\u4e61\u7fd4\u7965\u8be6\u60f3\u54cd\u4eab\u9879\u5df7\u6a61\u50cf\u5411\u8c61\u8297\u8459\u9977\u5ea0\u9aa7\u7f03\u87d3\u9c9e\u98e8",xiao:"\u8427\u785d\u9704\u524a\u54ee\u56a3\u9500\u6d88\u5bb5\u6dc6\u6653\u5c0f\u5b5d\u6821\u8096\u5578\u7b11\u6548\u54d3\u54bb\u5d24\u6f47\u900d\u9a81\u7ee1\u67ad\u67b5\u7b71\u7bab\u9b48",xie:"\u6954\u4e9b\u6b47\u874e\u978b\u534f\u631f\u643a\u90aa\u659c\u80c1\u8c10\u5199\u68b0\u5378\u87f9\u61c8\u6cc4\u6cfb\u8c22\u5c51\u5055\u4eb5\u52f0\u71ee\u85a4\u64b7\u5ee8\u7023\u9082\u7ec1\u7f2c\u69ad\u698d\u6b59\u8e9e",xin:"\u85aa\u82af\u950c\u6b23\u8f9b\u65b0\u5ffb\u5fc3\u4fe1\u8845\u56df\u99a8\u8398\u6b46\u94fd\u946b",xing:"\u661f\u8165\u7329\u60fa\u5174\u5211\u578b\u5f62\u90a2\u884c\u9192\u5e78\u674f\u6027\u59d3\u9649\u8347\u8365\u64e4\u60bb\u784e",xiong:"\u5144\u51f6\u80f8\u5308\u6c79\u96c4\u718a\u828e",xiu:"\u4f11\u4fee\u7f9e\u673d\u55c5\u9508\u79c0\u8896\u7ee3\u83a0\u5cab\u9990\u5ea5\u9e3a\u8c85\u9af9",xu:"\u589f\u620c\u9700\u865a\u5618\u987b\u5f90\u8bb8\u84c4\u9157\u53d9\u65ed\u5e8f\u755c\u6064\u7d6e\u5a7f\u7eea\u7eed\u8bb4\u8be9\u5729\u84ff\u6035\u6d2b\u6e86\u987c\u6829\u7166\u7809\u76f1\u80e5\u7cc8\u9191",xuan:"\u8f69\u55a7\u5ba3\u60ac\u65cb\u7384\u9009\u7663\u7729\u7eda\u5107\u8c16\u8431\u63ce\u9994\u6ceb\u6d35\u6e32\u6f29\u7487\u6966\u6684\u70ab\u714a\u78b9\u94c9\u955f\u75c3",xue:"\u9774\u859b\u5b66\u7a74\u96ea\u8840\u5671\u6cf6\u9cd5",xun:"\u52cb\u718f\u5faa\u65ec\u8be2\u5bfb\u9a6f\u5de1\u6b89\u6c5b\u8bad\u8baf\u900a\u8fc5\u5dfd\u57d9\u8340\u85b0\u5ccb\u5f87\u6d54\u66db\u7aa8\u91ba\u9c9f",ya:"\u538b\u62bc\u9e26\u9e2d\u5440\u4e2b\u82bd\u7259\u869c\u5d16\u8859\u6daf\u96c5\u54d1\u4e9a\u8bb6\u4f22\u63e0\u5416\u5c88\u8fd3\u5a05\u740a\u6860\u6c29\u7811\u775a\u75d6",yan:"\u7109\u54bd\u9609\u70df\u6df9\u76d0\u4e25\u7814\u8712\u5ca9\u5ef6\u8a00\u989c\u960e\u708e\u6cbf\u5944\u63a9\u773c\u884d\u6f14\u8273\u5830\u71d5\u538c\u781a\u96c1\u5501\u5f66\u7130\u5bb4\u8c1a\u9a8c\u53a3\u9765\u8d5d\u4fe8\u5043\u5156\u8ba0\u8c33\u90fe\u9122\u82ab\u83f8\u5d26\u6079\u95eb\u960f\u6d07\u6e6e\u6edf\u598d\u5ae3\u7430\u664f\u80ed\u814c\u7131\u7f68\u7b75\u917d\u9b47\u990d\u9f39",yang:"\u6b83\u592e\u9e2f\u79e7\u6768\u626c\u4f6f\u75a1\u7f8a\u6d0b\u9633\u6c27\u4ef0\u75d2\u517b\u6837\u6f3e\u5f89\u600f\u6cf1\u7080\u70ca\u6059\u86d8\u9785",yao:"\u9080\u8170\u5996\u7476\u6447\u5c27\u9065\u7a91\u8c23\u59da\u54ac\u8200\u836f\u8981\u8000\u592d\u723b\u5406\u5d3e\u5fad\u7039\u5e7a\u73e7\u6773\u66dc\u80b4\u9e5e\u7a88\u7e47\u9cd0",ye:"\u6930\u564e\u8036\u7237\u91ce\u51b6\u4e5f\u9875\u6396\u4e1a\u53f6\u66f3\u814b\u591c\u6db2\u8c12\u90ba\u63f6\u9980\u6654\u70e8\u94d8",yi:"\u4e00\u58f9\u533b\u63d6\u94f1\u4f9d\u4f0a\u8863\u9890\u5937\u9057\u79fb\u4eea\u80f0\u7591\u6c82\u5b9c\u59e8\u5f5d\u6905\u8681\u501a\u5df2\u4e59\u77e3\u4ee5\u827a\u6291\u6613\u9091\u5c79\u4ebf\u5f79\u81c6\u9038\u8084\u75ab\u4ea6\u88d4\u610f\u6bc5\u5fc6\u4e49\u76ca\u6ea2\u8be3\u8bae\u8c0a\u8bd1\u5f02\u7ffc\u7fcc\u7ece\u5208\u5293\u4f7e\u8bd2\u572a\u572f\u57f8\u61ff\u82e1\u858f\u5f08\u5955\u6339\u5f0b\u5453\u54a6\u54bf\u566b\u5cc4\u5db7\u7317\u9974\u603f\u6021\u6092\u6f2a\u8fe4\u9a7f\u7f22\u6baa\u8d3b\u65d6\u71a0\u9487\u9552\u9571\u75cd\u7617\u7654\u7fca\u8864\u8734\u8223\u7fbf\u7ff3\u914f\u9edf",yin:"\u8335\u836b\u56e0\u6bb7\u97f3\u9634\u59fb\u541f\u94f6\u6deb\u5bc5\u996e\u5c39\u5f15\u9690\u5370\u80e4\u911e\u5819\u831a\u5591\u72fa\u5924\u6c24\u94df\u763e\u8693\u972a\u9f88",ying:"\u82f1\u6a31\u5a74\u9e70\u5e94\u7f28\u83b9\u8424\u8425\u8367\u8747\u8fce\u8d62\u76c8\u5f71\u9896\u786c\u6620\u5b34\u90e2\u8314\u83ba\u8426\u6484\u5624\u81ba\u6ee2\u6f46\u701b\u745b\u748e\u6979\u9e66\u763f\u988d\u7f42",yo:"\u54df\u5537",yong:"\u62e5\u4f63\u81c3\u75c8\u5eb8\u96cd\u8e0a\u86f9\u548f\u6cf3\u6d8c\u6c38\u607f\u52c7\u7528\u4fd1\u58c5\u5889\u6175\u9095\u955b\u752c\u9cd9\u9954",you:"\u5e7d\u4f18\u60a0\u5fe7\u5c24\u7531\u90ae\u94c0\u72b9\u6cb9\u6e38\u9149\u6709\u53cb\u53f3\u4f51\u91c9\u8bf1\u53c8\u5e7c\u5363\u6538\u4f91\u83b8\u5466\u56ff\u5ba5\u67da\u7337\u7256\u94d5\u75a3\u8763\u9c7f\u9edd\u9f2c",yu:"\u8fc2\u6de4\u4e8e\u76c2\u6986\u865e\u611a\u8206\u4f59\u4fde\u903e\u9c7c\u6109\u6e1d\u6e14\u9685\u4e88\u5a31\u96e8\u4e0e\u5c7f\u79b9\u5b87\u8bed\u7fbd\u7389\u57df\u828b\u90c1\u5401\u9047\u55bb\u5cea\u5fa1\u6108\u6b32\u72f1\u80b2\u8a89\u6d74\u5bd3\u88d5\u9884\u8c6b\u9a6d\u79ba\u6bd3\u4f1b\u4fe3\u8c00\u8c15\u8438\u84e3\u63c4\u5581\u5704\u5709\u5d5b\u72f3\u996b\u5ebe\u9608\u59aa\u59a4\u7ea1\u745c\u6631\u89ce\u8174\u6b24\u65bc\u715c\u71e0\u807f\u94b0\u9e46\u7610\u7600\u7ab3\u8753\u7afd\u8201\u96e9\u9f89",yuan:"\u9e33\u6e0a\u51a4\u5143\u57a3\u8881\u539f\u63f4\u8f95\u56ed\u5458\u5706\u733f\u6e90\u7f18\u8fdc\u82d1\u613f\u6028\u9662\u586c\u6c85\u5a9b\u7457\u6a7c\u7230\u7722\u9e22\u8788\u9f0b",yue:"\u66f0\u7ea6\u8d8a\u8dc3\u94a5\u5cb3\u7ca4\u6708\u60a6\u9605\u9fa0\u6a3e\u5216\u94ba",yun:"\u8018\u4e91\u90e7\u5300\u9668\u5141\u8fd0\u8574\u915d\u6655\u97f5\u5b55\u90d3\u82b8\u72c1\u607d\u7ead\u6b92\u6600\u6c32",za:"\u531d\u7838\u6742\u62f6\u5482",zai:"\u683d\u54c9\u707e\u5bb0\u8f7d\u518d\u5728\u54b1\u5d3d\u753e",zan:"\u6512\u6682\u8d5e\u74d2\u661d\u7c2a\u7ccc\u8db1\u933e",zang:"\u8d43\u810f\u846c\u5958\u6215\u81e7",zao:"\u906d\u7cdf\u51ff\u85fb\u67a3\u65e9\u6fa1\u86a4\u8e81\u566a\u9020\u7682\u7076\u71e5\u5523\u7f2b",ze:"\u8d23\u62e9\u5219\u6cfd\u4ec4\u8d5c\u5567\u8fee\u6603\u7b2e\u7ba6\u8234",zei:"\u8d3c",zen:"\u600e\u8c2e",zeng:"\u589e\u618e\u66fe\u8d60\u7f2f\u7511\u7f7e\u9503",zha:"\u624e\u55b3\u6e23\u672d\u8f67\u94e1\u95f8\u7728\u6805\u69a8\u548b\u4e4d\u70b8\u8bc8\u63f8\u5412\u54a4\u54f3\u600d\u781f\u75c4\u86b1\u9f44",zhai:"\u6458\u658b\u5b85\u7a84\u503a\u5be8\u7826",zhan:"\u77bb\u6be1\u8a79\u7c98\u6cbe\u76cf\u65a9\u8f97\u5d2d\u5c55\u8638\u6808\u5360\u6218\u7ad9\u6e5b\u7efd\u8c35\u640c\u65c3",zhang:"\u6a1f\u7ae0\u5f70\u6f33\u5f20\u638c\u6da8\u6756\u4e08\u5e10\u8d26\u4ed7\u80c0\u7634\u969c\u4ec9\u9123\u5e5b\u5d82\u7350\u5adc\u748b\u87d1",zhao:"\u62db\u662d\u627e\u6cbc\u8d75\u7167\u7f69\u5146\u8087\u53ec\u722a\u8bcf\u68f9\u948a\u7b0a",zhe:"\u906e\u6298\u54f2\u86f0\u8f99\u8005\u9517\u8517\u8fd9\u6d59\u8c2a\u966c\u67d8\u8f84\u78d4\u9e67\u891a\u8707\u8d6d",zhen:"\u73cd\u659f\u771f\u7504\u7827\u81fb\u8d1e\u9488\u4fa6\u6795\u75b9\u8bca\u9707\u632f\u9547\u9635\u7f1c\u6862\u699b\u8f78\u8d48\u80d7\u6715\u796f\u755b\u9e29",zheng:"\u84b8\u6323\u7741\u5f81\u72f0\u4e89\u6014\u6574\u62ef\u6b63\u653f\u5e27\u75c7\u90d1\u8bc1\u8be4\u5ce5\u94b2\u94ee\u7b5d",zhi:"\u829d\u679d\u652f\u5431\u8718\u77e5\u80a2\u8102\u6c41\u4e4b\u7ec7\u804c\u76f4\u690d\u6b96\u6267\u503c\u4f84\u5740\u6307\u6b62\u8dbe\u53ea\u65e8\u7eb8\u5fd7\u631a\u63b7\u81f3\u81f4\u7f6e\u5e1c\u5cd9\u5236\u667a\u79e9\u7a1a\u8d28\u7099\u75d4\u6ede\u6cbb\u7a92\u536e\u965f\u90c5\u57f4\u82b7\u646d\u5e19\u5fee\u5f58\u54ab\u9a98\u6809\u67b3\u6800\u684e\u8f75\u8f7e\u6534\u8d3d\u81a3\u7949\u7957\u9ef9\u96c9\u9e37\u75e3\u86ed\u7d77\u916f\u8dd6\u8e2c\u8e2f\u8c78\u89ef",zhong:"\u4e2d\u76c5\u5fe0\u949f\u8877\u7ec8\u79cd\u80bf\u91cd\u4ef2\u4f17\u51a2\u953a\u87bd\u8202\u822f\u8e35",zhou:"\u821f\u5468\u5dde\u6d32\u8bcc\u7ca5\u8f74\u8098\u5e1a\u5492\u76b1\u5b99\u663c\u9aa4\u5544\u7740\u501c\u8bf9\u836e\u9b3b\u7ea3\u80c4\u78a1\u7c40\u8233\u914e\u9cb7",zhu:"\u73e0\u682a\u86db\u6731\u732a\u8bf8\u8bdb\u9010\u7af9\u70db\u716e\u62c4\u77a9\u5631\u4e3b\u8457\u67f1\u52a9\u86c0\u8d2e\u94f8\u7b51\u4f4f\u6ce8\u795d\u9a7b\u4f2b\u4f8f\u90be\u82ce\u8331\u6d19\u6e1a\u6f74\u9a7a\u677c\u69e0\u6a65\u70b7\u94e2\u75b0\u7603\u86b0\u7afa\u7bb8\u7fe5\u8e85\u9e88",zhua:"\u6293",zhuai:"\u62fd",zhuan:"\u4e13\u7816\u8f6c\u64b0\u8d5a\u7bc6\u629f\u556d\u989b",zhuang:"\u6869\u5e84\u88c5\u5986\u649e\u58ee\u72b6\u4e2c",zhui:"\u690e\u9525\u8ffd\u8d58\u5760\u7f00\u8411\u9a93\u7f12",zhun:"\u8c06\u51c6",zhuo:"\u6349\u62d9\u5353\u684c\u7422\u8301\u914c\u707c\u6d4a\u502c\u8bfc\u5ef4\u855e\u64e2\u555c\u6d5e\u6dbf\u6753\u712f\u799a\u65ab",zi:"\u5179\u54a8\u8d44\u59ff\u6ecb\u6dc4\u5b5c\u7d2b\u4ed4\u7c7d\u6ed3\u5b50\u81ea\u6e0d\u5b57\u8c18\u5d6b\u59ca\u5b73\u7f01\u6893\u8f8e\u8d40\u6063\u7726\u9531\u79ed\u8014\u7b2b\u7ca2\u89dc\u8a3e\u9cbb\u9aed",zong:"\u9b03\u68d5\u8e2a\u5b97\u7efc\u603b\u7eb5\u8159\u7cbd",zou:"\u90b9\u8d70\u594f\u63cd\u9139\u9cb0",zu:"\u79df\u8db3\u5352\u65cf\u7956\u8bc5\u963b\u7ec4\u4fce\u83f9\u5550\u5f82\u9a75\u8e74",zuan:"\u94bb\u7e82\u6525\u7f35",zui:"\u5634\u9189\u6700\u7f6a",zun:"\u5c0a\u9075\u6499\u6a3d\u9cdf",zuo:"\u6628\u5de6\u4f50\u67de\u505a\u4f5c\u5750\u5ea7\u961d\u963c\u80d9\u795a\u9162",cou:"\u85ae\u6971\u8f8f\u8160",nang:"\u652e\u54dd\u56d4\u9995\u66e9",o:"\u5594",dia:"\u55f2",chuai:"\u562c\u81aa\u8e39",cen:"\u5c91\u6d94",diu:"\u94e5",nou:"\u8028",fou:"\u7f36",bia:"\u9adf"};
+        var UnicodeChr =  function(){
+			return '00A4,00A7,00A8,00B0,00B1,00B7,00D7,00E0,00E1,00E8,00E9,00EA,00EC,00ED,00F2,00F3,00F7,00F9,00FA,00FC,0101,0113,011B,012B,014D,016B,01CE,01D0,01D2,01D4,01D6,01D8,01DA,01DC,02C7,02C9,0391,0392,0393,0394,0395,0396,0397,0398,0399,039A,039B,039C,039D,039E,039F,03A0,03A1,03A3,03A4,03A5,03A6,03A7,03A8,03A9,03B1,03B2,03B3,03B4,03B5,03B6,03B7,03B8,03B9,03BA,03BB,03BC,03BD,03BE,03BF,03C0,03C1,03C3,03C4,03C5,03C6,03C7,03C8,03C9,0401,0410,0411,0412,0413,0414,0415,0416,0417,0418,0419,041A,041B,041C,041D,041E,041F,0420,0421,0422,0423,0424,0425,0426,0427,0428,0429,042A,042B,042C,042D,042E,042F,0430,0431,0432,0433,0434,0435,0436,0437,0438,0439,043A,043B,043C,043D,043E,043F,0440,0441,0442,0443,0444,0445,0446,0447,0448,0449,044A,044B,044C,044D,044E,044F,0451,2014,2016,2018,2019,201C,201D,2026,2030,2032,2033,203B,2103,2116,2160,2161,2162,2163,2164,2165,2166,2167,2168,2169,216A,216B,2190,2191,2192,2193,2208,220F,2211,221A,221D,221E,2220,2225,2227,2228,2229,222A,222B,222E,2234,2235,2236,2237,223D,2248,224C,2260,2261,2264,2265,226E,226F,2299,22A5,2312,2460,2461,2462,2463,2464,2465,2466,2467,2468,2469,2474,2475,2476,2477,2478,2479,247A,247B,247C,247D,247E,247F,2480,2481,2482,2483,2484,2485,2486,2487,2488,2489,248A,248B,248C,248D,248E,248F,2490,2491,2492,2493,2494,2495,2496,2497,2498,2499,249A,249B,2500,2501,2502,2503,2504,2505,2506,2507,2508,2509,250A,250B,250C,250D,250E,250F,2510,2511,2512,2513,2514,2515,2516,2517,2518,2519,251A,251B,251C,251D,251E,251F,2520,2521,2522,2523,2524,2525,2526,2527,2528,2529,252A,252B,252C,252D,252E,252F,2530,2531,2532,2533,2534,2535,2536,2537,2538,2539,253A,253B,253C,253D,253E,253F,2540,2541,2542,2543,2544,2545,2546,2547,2548,2549,254A,254B,25A0,25A1,25B2,25B3,25C6,25C7,25CB,25CE,25CF,2605,2606,2640,2642,3000,3001,3002,3003,3005,3008,3009,300A,300B,300C,300D,300E,300F,3010,3011,3013,3014,3015,3016,3017,3041,3042,3043,3044,3045,3046,3047,3048,3049,304A,304B,304C,304D,304E,304F,3050,3051,3052,3053,3054,3055,3056,3057,3058,3059,305A,305B,305C,305D,305E,305F,3060,3061,3062,3063,3064,3065,3066,3067,3068,3069,306A,306B,306C,306D,306E,306F,3070,3071,3072,3073,3074,3075,3076,3077,3078,3079,307A,307B,307C,307D,307E,307F,3080,3081,3082,3083,3084,3085,3086,3087,3088,3089,308A,308B,308C,308D,308E,308F,3090,3091,3092,3093,30A1,30A2,30A3,30A4,30A5,30A6,30A7,30A8,30A9,30AA,30AB,30AC,30AD,30AE,30AF,30B0,30B1,30B2,30B3,30B4,30B5,30B6,30B7,30B8,30B9,30BA,30BB,30BC,30BD,30BE,30BF,30C0,30C1,30C2,30C3,30C4,30C5,30C6,30C7,30C8,30C9,30CA,30CB,30CC,30CD,30CE,30CF,30D0,30D1,30D2,30D3,30D4,30D5,30D6,30D7,30D8,30D9,30DA,30DB,30DC,30DD,30DE,30DF,30E0,30E1,30E2,30E3,30E4,30E5,30E6,30E7,30E8,30E9,30EA,30EB,30EC,30ED,30EE,30EF,30F0,30F1,30F2,30F3,30F4,30F5,30F6,3105,3106,3107,3108,3109,310A,310B,310C,310D,310E,310F,3110,3111,3112,3113,3114,3115,3116,3117,3118,3119,311A,311B,311C,311D,311E,311F,3120,3121,3122,3123,3124,3125,3126,3127,3128,3129,3220,3221,3222,3223,3224,3225,3226,3227,3228,3229,4E00,4E01,4E03,4E07,4E08,4E09,4E0A,4E0B,4E0C,4E0D,4E0E,4E10,4E11,4E13,4E14,4E15,4E16,4E18,4E19,4E1A,4E1B,4E1C,4E1D,4E1E,4E22,4E24,4E25,4E27,4E28,4E2A,4E2B,4E2C,4E2D,4E30,4E32,4E34,4E36,4E38,4E39,4E3A,4E3B,4E3D,4E3E,4E3F,4E43,4E45,4E47,4E48,4E49,4E4B,4E4C,4E4D,4E4E,4E4F,4E50,4E52,4E53,4E54,4E56,4E58,4E59,4E5C,4E5D,4E5E,4E5F,4E60,4E61,4E66,4E69,4E70,4E71,4E73,4E7E,4E86,4E88,4E89,4E8B,4E8C,4E8D,4E8E,4E8F,4E91,4E92,4E93,4E94,4E95,4E98,4E9A,4E9B,4E9F,4EA0,4EA1,4EA2,4EA4,4EA5,4EA6,4EA7,4EA8,4EA9,4EAB,4EAC,4EAD,4EAE,4EB2,4EB3,4EB5,4EBA,4EBB,4EBF,4EC0,4EC1,4EC2,4EC3,4EC4,4EC5,4EC6,4EC7,4EC9,4ECA,4ECB,4ECD,4ECE,4ED1,4ED3,4ED4,4ED5,4ED6,4ED7,4ED8,4ED9,4EDD,4EDE,4EDF,4EE1,4EE3,4EE4,4EE5,4EE8,4EEA,4EEB,4EEC,4EF0,4EF2,4EF3,4EF5,4EF6,4EF7,4EFB,4EFD,4EFF,4F01,4F09,4F0A,4F0D,4F0E,4F0F,4F10,4F11,4F17,4F18,4F19,4F1A,4F1B,4F1E,4F1F,4F20,4F22,4F24,4F25,4F26,4F27,4F2A,4F2B,4F2F,4F30,4F32,4F34,4F36,4F38,4F3A,4F3C,4F3D,4F43,4F46,4F4D,4F4E,4F4F,4F50,4F51,4F53,4F55,4F57,4F58,4F59,4F5A,4F5B,4F5C,4F5D,4F5E,4F5F,4F60,4F63,4F64,4F65,4F67,4F69,4F6C,4F6F,4F70,4F73,4F74,4F76,4F7B,4F7C,4F7E,4F7F,4F83,4F84,4F88,4F89,4F8B,4F8D,4F8F,4F91,4F94,4F97,4F9B,4F9D,4FA0,4FA3,4FA5,4FA6,4FA7,4FA8,4FA9,4FAA,4FAC,4FAE,4FAF,4FB5,4FBF,4FC3,4FC4,4FC5,4FCA,4FCE,4FCF,4FD0,4FD1,4FD7,4FD8,4FDA,4FDC,4FDD,4FDE,4FDF,4FE1,4FE3,4FE6,4FE8,4FE9,4FEA,4FED,4FEE,4FEF,4FF1,4FF3,4FF8,4FFA,4FFE,500C,500D,500F,5012,5014,5018,5019,501A,501C,501F,5021,5025,5026,5028,5029,502A,502C,502D,502E,503A,503C,503E,5043,5047,5048,504C,504E,504F,5055,505A,505C,5065,506C,5076,5077,507B,507E,507F,5080,5085,5088,508D,50A3,50A5,50A7,50A8,50A9,50AC,50B2,50BA,50BB,50CF,50D6,50DA,50E6,50E7,50EC,50ED,50EE,50F3,50F5,50FB,5106,5107,510B,5112,5121,513F,5140,5141,5143,5144,5145,5146,5148,5149,514B,514D,5151,5154,5155,5156,515A,515C,5162,5165,5168,516B,516C,516D,516E,5170,5171,5173,5174,5175,5176,5177,5178,5179,517B,517C,517D,5180,5181,5182,5185,5188,5189,518C,518D,5192,5195,5196,5197,5199,519B,519C,51A0,51A2,51A4,51A5,51AB,51AC,51AF,51B0,51B1,51B2,51B3,51B5,51B6,51B7,51BB,51BC,51BD,51C0,51C4,51C6,51C7,51C9,51CB,51CC,51CF,51D1,51DB,51DD,51E0,51E1,51E4,51EB,51ED,51EF,51F0,51F3,51F5,51F6,51F8,51F9,51FA,51FB,51FC,51FD,51FF,5200,5201,5202,5203,5206,5207,5208,520A,520D,520E,5211,5212,5216,5217,5218,5219,521A,521B,521D,5220,5224,5228,5229,522B,522D,522E,5230,5233,5236,5237,5238,5239,523A,523B,523D,523F,5240,5241,5242,5243,524A,524C,524D,5250,5251,5254,5256,525C,525E,5261,5265,5267,5269,526A,526F,5272,527D,527F,5281,5282,5288,5290,5293,529B,529D,529E,529F,52A0,52A1,52A2,52A3,52A8,52A9,52AA,52AB,52AC,52AD,52B1,52B2,52B3,52BE,52BF,52C3,52C7,52C9,52CB,52D0,52D2,52D6,52D8,52DF,52E4,52F0,52F9,52FA,52FE,52FF,5300,5305,5306,5308,530D,530F,5310,5315,5316,5317,5319,531A,531D,5320,5321,5323,5326,532A,532E,5339,533A,533B,533E,533F,5341,5343,5345,5347,5348,5349,534A,534E,534F,5351,5352,5353,5355,5356,5357,535A,535C,535E,535F,5360,5361,5362,5363,5364,5366,5367,5369,536B,536E,536F,5370,5371,5373,5374,5375,5377,5378,537A,537F,5382,5384,5385,5386,5389,538B,538C,538D,5395,5398,539A,539D,539F,53A2,53A3,53A5,53A6,53A8,53A9,53AE,53B6,53BB,53BF,53C1,53C2,53C8,53C9,53CA,53CB,53CC,53CD,53D1,53D4,53D6,53D7,53D8,53D9,53DB,53DF,53E0,53E3,53E4,53E5,53E6,53E8,53E9,53EA,53EB,53EC,53ED,53EE,53EF,53F0,53F1,53F2,53F3,53F5,53F6,53F7,53F8,53F9,53FB,53FC,53FD,5401,5403,5404,5406,5408,5409,540A,540C,540D,540E,540F,5410,5411,5412,5413,5415,5416,5417,541B,541D,541E,541F,5420,5421,5423,5426,5427,5428,5429,542B,542C,542D,542E,542F,5431,5432,5434,5435,5438,5439,543B,543C,543E,5440,5443,5446,5448,544A,544B,5450,5452,5453,5454,5455,5456,5457,5458,5459,545B,545C,5462,5464,5466,5468,5471,5472,5473,5475,5476,5477,5478,547B,547C,547D,5480,5482,5484,5486,548B,548C,548E,548F,5490,5492,5494,5495,5496,5499,549A,549B,549D,54A3,54A4,54A6,54A7,54A8,54A9,54AA,54AB,54AC,54AD,54AF,54B1,54B3,54B4,54B8,54BB,54BD,54BF,54C0,54C1,54C2,54C4,54C6,54C7,54C8,54C9,54CC,54CD,54CE,54CF,54D0,54D1,54D2,54D3,54D4,54D5,54D7,54D9,54DA,54DC,54DD,54DE,54DF,54E5,54E6,54E7,54E8,54E9,54EA,54ED,54EE,54F2,54F3,54FA,54FC,54FD,54FF,5501,5506,5507,5509,550F,5510,5511,5514,551B,5520,5522,5523,5524,5527,552A,552C,552E,552F,5530,5531,5533,5537,553C,553E,553F,5541,5543,5544,5546,5549,554A,5550,5555,5556,555C,5561,5564,5565,5566,5567,556A,556C,556D,556E,5575,5576,5577,5578,557B,557C,557E,5580,5581,5582,5583,5584,5587,5588,5589,558A,558B,558F,5591,5594,5598,5599,559C,559D,559F,55A7,55B1,55B3,55B5,55B7,55B9,55BB,55BD,55BE,55C4,55C5,55C9,55CC,55CD,55D1,55D2,55D3,55D4,55D6,55DC,55DD,55DF,55E1,55E3,55E4,55E5,55E6,55E8,55EA,55EB,55EC,55EF,55F2,55F3,55F5,55F7,55FD,55FE,5600,5601,5608,5609,560C,560E,560F,5618,561B,561E,561F,5623,5624,5627,562C,562D,5631,5632,5634,5636,5639,563B,563F,564C,564D,564E,5654,5657,5658,5659,565C,5662,5664,5668,5669,566A,566B,566C,5671,5676,567B,567C,5685,5686,568E,568F,5693,56A3,56AF,56B7,56BC,56CA,56D4,56D7,56DA,56DB,56DD,56DE,56DF,56E0,56E1,56E2,56E4,56EB,56ED,56F0,56F1,56F4,56F5,56F9,56FA,56FD,56FE,56FF,5703,5704,5706,5708,5709,570A,571C,571F,5723,5728,5729,572A,572C,572D,572E,572F,5730,5733,5739,573A,573B,573E,5740,5742,5747,574A,574C,574D,574E,574F,5750,5751,5757,575A,575B,575C,575D,575E,575F,5760,5761,5764,5766,5768,5769,576A,576B,576D,576F,5773,5776,5777,577B,577C,5782,5783,5784,5785,5786,578B,578C,5792,5793,579B,57A0,57A1,57A2,57A3,57A4,57A6,57A7,57A9,57AB,57AD,57AE,57B2,57B4,57B8,57C2,57C3,57CB,57CE,57CF,57D2,57D4,57D5,57D8,57D9,57DA,57DD,57DF,57E0,57E4,57ED,57EF,57F4,57F8,57F9,57FA,57FD,5800,5802,5806,5807,580B,580D,5811,5815,5819,581E,5820,5821,5824,582A,5830,5835,5844,584C,584D,5851,5854,5858,585E,5865,586B,586C,587E,5880,5881,5883,5885,5889,5892,5893,5899,589A,589E,589F,58A8,58A9,58BC,58C1,58C5,58D1,58D5,58E4,58EB,58EC,58EE,58F0,58F3,58F6,58F9,5902,5904,5907,590D,590F,5914,5915,5916,5919,591A,591C,591F,5924,5925,5927,5929,592A,592B,592D,592E,592F,5931,5934,5937,5938,5939,593A,593C,5941,5942,5944,5947,5948,5949,594B,594E,594F,5951,5954,5955,5956,5957,5958,595A,5960,5962,5965,5973,5974,5976,5978,5979,597D,5981,5982,5983,5984,5986,5987,5988,598A,598D,5992,5993,5996,5997,5999,599E,59A3,59A4,59A5,59A8,59A9,59AA,59AB,59AE,59AF,59B2,59B9,59BB,59BE,59C6,59CA,59CB,59D0,59D1,59D2,59D3,59D4,59D7,59D8,59DA,59DC,59DD,59E3,59E5,59E8,59EC,59F9,59FB,59FF,5A01,5A03,5A04,5A05,5A06,5A07,5A08,5A09,5A0C,5A11,5A13,5A18,5A1C,5A1F,5A20,5A23,5A25,5A29,5A31,5A32,5A34,5A36,5A3C,5A40,5A46,5A49,5A4A,5A55,5A5A,5A62,5A67,5A6A,5A74,5A75,5A76,5A77,5A7A,5A7F,5A92,5A9A,5A9B,5AAA,5AB2,5AB3,5AB5,5AB8,5ABE,5AC1,5AC2,5AC9,5ACC,5AD2,5AD4,5AD6,5AD8,5ADC,5AE0,5AE1,5AE3,5AE6,5AE9,5AEB,5AF1,5B09,5B16,5B17,5B32,5B34,5B37,5B40,5B50,5B51,5B53,5B54,5B55,5B57,5B58,5B59,5B5A,5B5B,5B5C,5B5D,5B5F,5B62,5B63,5B64,5B65,5B66,5B69,5B6A,5B6C,5B70,5B71,5B73,5B75,5B7A,5B7D,5B80,5B81,5B83,5B84,5B85,5B87,5B88,5B89,5B8B,5B8C,5B8F,5B93,5B95,5B97,5B98,5B99,5B9A,5B9B,5B9C,5B9D,5B9E,5BA0,5BA1,5BA2,5BA3,5BA4,5BA5,5BA6,5BAA,5BAB,5BB0,5BB3,5BB4,5BB5,5BB6,5BB8,5BB9,5BBD,5BBE,5BBF,5BC2,5BC4,5BC5,5BC6,5BC7,5BCC,5BD0,5BD2,5BD3,5BDD,5BDE,5BDF,5BE1,5BE4,5BE5,5BE8,5BEE,5BF0,5BF8,5BF9,5BFA,5BFB,5BFC,5BFF,5C01,5C04,5C06,5C09,5C0A,5C0F,5C11,5C14,5C15,5C16,5C18,5C1A,5C1C,5C1D,5C22,5C24,5C25,5C27,5C2C,5C31,5C34,5C38,5C39,5C3A,5C3B,5C3C,5C3D,5C3E,5C3F,5C40,5C41,5C42,5C45,5C48,5C49,5C4A,5C4B,5C4E,5C4F,5C50,5C51,5C55,5C59,5C5E,5C60,5C61,5C63,5C65,5C66,5C6E,5C6F,5C71,5C79,5C7A,5C7F,5C81,5C82,5C88,5C8C,5C8D,5C90,5C91,5C94,5C96,5C97,5C98,5C99,5C9A,5C9B,5C9C,5CA2,5CA3,5CA9,5CAB,5CAC,5CAD,5CB1,5CB3,5CB5,5CB7,5CB8,5CBD,5CBF,5CC1,5CC4,5CCB,5CD2,5CD9,5CE1,5CE4,5CE5,5CE6,5CE8,5CEA,5CED,5CF0,5CFB,5D02,5D03,5D06,5D07,5D0E,5D14,5D16,5D1B,5D1E,5D24,5D26,5D27,5D29,5D2D,5D2E,5D34,5D3D,5D3E,5D47,5D4A,5D4B,5D4C,5D58,5D5B,5D5D,5D69,5D6B,5D6C,5D6F,5D74,5D82,5D99,5D9D,5DB7,5DC5,5DCD,5DDB,5DDD,5DDE,5DE1,5DE2,5DE5,5DE6,5DE7,5DE8,5DE9,5DEB,5DEE,5DEF,5DF1,5DF2,5DF3,5DF4,5DF7,5DFD,5DFE,5E01,5E02,5E03,5E05,5E06,5E08,5E0C,5E0F,5E10,5E11,5E14,5E15,5E16,5E18,5E19,5E1A,5E1B,5E1C,5E1D,5E26,5E27,5E2D,5E2E,5E31,5E37,5E38,5E3B,5E3C,5E3D,5E42,5E44,5E45,5E4C,5E54,5E55,5E5B,5E5E,5E61,5E62,5E72,5E73,5E74,5E76,5E78,5E7A,5E7B,5E7C,5E7D,5E7F,5E80,5E84,5E86,5E87,5E8A,5E8B,5E8F,5E90,5E91,5E93,5E94,5E95,5E96,5E97,5E99,5E9A,5E9C,5E9E,5E9F,5EA0,5EA5,5EA6,5EA7,5EAD,5EB3,5EB5,5EB6,5EB7,5EB8,5EB9,5EBE,5EC9,5ECA,5ED1,5ED2,5ED3,5ED6,5EDB,5EE8,5EEA,5EF4,5EF6,5EF7,5EFA,5EFE,5EFF,5F00,5F01,5F02,5F03,5F04,5F08,5F0A,5F0B,5F0F,5F11,5F13,5F15,5F17,5F18,5F1B,5F1F,5F20,5F25,5F26,5F27,5F29,5F2A,5F2D,5F2F,5F31,5F39,5F3A,5F3C,5F40,5F50,5F52,5F53,5F55,5F56,5F57,5F58,5F5D,5F61,5F62,5F64,5F66,5F69,5F6A,5F6C,5F6D,5F70,5F71,5F73,5F77,5F79,5F7B,5F7C,5F80,5F81,5F82,5F84,5F85,5F87,5F88,5F89,5F8A,5F8B,5F8C,5F90,5F92,5F95,5F97,5F98,5F99,5F9C,5FA1,5FA8,5FAA,5FAD,5FAE,5FB5,5FB7,5FBC,5FBD,5FC3,5FC4,5FC5,5FC6,5FC9,5FCC,5FCD,5FCF,5FD0,5FD1,5FD2,5FD6,5FD7,5FD8,5FD9,5FDD,5FE0,5FE1,5FE4,5FE7,5FEA,5FEB,5FED,5FEE,5FF1,5FF5,5FF8,5FFB,5FFD,5FFE,5FFF,6000,6001,6002,6003,6004,6005,6006,600A,600D,600E,600F,6012,6014,6015,6016,6019,601B,601C,601D,6020,6021,6025,6026,6027,6028,6029,602A,602B,602F,6035,603B,603C,603F,6041,6042,6043,604B,604D,6050,6052,6055,6059,605A,605D,6062,6063,6064,6067,6068,6069,606A,606B,606C,606D,606F,6070,6073,6076,6078,6079,607A,607B,607C,607D,607F,6083,6084,6089,608C,608D,6092,6094,6096,609A,609B,609D,609F,60A0,60A3,60A6,60A8,60AB,60AC,60AD,60AF,60B1,60B2,60B4,60B8,60BB,60BC,60C5,60C6,60CA,60CB,60D1,60D5,60D8,60DA,60DC,60DD,60DF,60E0,60E6,60E7,60E8,60E9,60EB,60EC,60ED,60EE,60EF,60F0,60F3,60F4,60F6,60F9,60FA,6100,6101,6106,6108,6109,610D,610E,610F,6115,611A,611F,6120,6123,6124,6126,6127,612B,613F,6148,614A,614C,614E,6151,6155,615D,6162,6167,6168,6170,6175,6177,618B,618E,6194,619D,61A7,61A8,61A9,61AC,61B7,61BE,61C2,61C8,61CA,61CB,61D1,61D2,61D4,61E6,61F5,61FF,6206,6208,620A,620B,620C,620D,620E,620F,6210,6211,6212,6215,6216,6217,6218,621A,621B,621F,6221,6222,6224,6225,622A,622C,622E,6233,6234,6237,623D,623E,623F,6240,6241,6243,6247,6248,6249,624B,624C,624D,624E,6251,6252,6253,6254,6258,625B,6263,6266,6267,6269,626A,626B,626C,626D,626E,626F,6270,6273,6276,6279,627C,627E,627F,6280,6284,6289,628A,6291,6292,6293,6295,6296,6297,6298,629A,629B,629F,62A0,62A1,62A2,62A4,62A5,62A8,62AB,62AC,62B1,62B5,62B9,62BB,62BC,62BD,62BF,62C2,62C4,62C5,62C6,62C7,62C8,62C9,62CA,62CC,62CD,62CE,62D0,62D2,62D3,62D4,62D6,62D7,62D8,62D9,62DA,62DB,62DC,62DF,62E2,62E3,62E5,62E6,62E7,62E8,62E9,62EC,62ED,62EE,62EF,62F1,62F3,62F4,62F6,62F7,62FC,62FD,62FE,62FF,6301,6302,6307,6308,6309,630E,6311,6316,631A,631B,631D,631E,631F,6320,6321,6322,6323,6324,6325,6328,632A,632B,632F,6332,6339,633A,633D,6342,6343,6345,6346,6349,634B,634C,634D,634E,634F,6350,6355,635E,635F,6361,6362,6363,6367,6369,636D,636E,6371,6376,6377,637A,637B,6380,6382,6387,6388,6389,638A,638C,638E,638F,6390,6392,6396,6398,63A0,63A2,63A3,63A5,63A7,63A8,63A9,63AA,63AC,63AD,63AE,63B0,63B3,63B4,63B7,63B8,63BA,63BC,63BE,63C4,63C6,63C9,63CD,63CE,63CF,63D0,63D2,63D6,63DE,63E0,63E1,63E3,63E9,63EA,63ED,63F2,63F4,63F6,63F8,63FD,63FF,6400,6401,6402,6405,640B,640C,640F,6410,6413,6414,641B,641C,641E,6420,6421,6426,642A,642C,642D,6434,643A,643D,643F,6441,6444,6445,6446,6447,6448,644A,6452,6454,6458,645E,6467,6469,646D,6478,6479,647A,6482,6484,6485,6487,6491,6492,6495,6496,6499,649E,64A4,64A9,64AC,64AD,64AE,64B0,64B5,64B7,64B8,64BA,64BC,64C0,64C2,64C5,64CD,64CE,64D0,64D2,64D7,64D8,64DE,64E2,64E4,64E6,6500,6509,6512,6518,6525,652B,652E,652F,6534,6535,6536,6538,6539,653B,653E,653F,6545,6548,6549,654C,654F,6551,6555,6556,6559,655B,655D,655E,6562,6563,6566,656B,656C,6570,6572,6574,6577,6587,658B,658C,6590,6591,6593,6597,6599,659B,659C,659F,65A1,65A4,65A5,65A7,65A9,65AB,65AD,65AF,65B0,65B9,65BC,65BD,65C1,65C3,65C4,65C5,65C6,65CB,65CC,65CE,65CF,65D2,65D6,65D7,65E0,65E2,65E5,65E6,65E7,65E8,65E9,65EC,65ED,65EE,65EF,65F0,65F1,65F6,65F7,65FA,6600,6602,6603,6606,660A,660C,660E,660F,6613,6614,6615,6619,661D,661F,6620,6625,6627,6628,662D,662F,6631,6634,6635,6636,663C,663E,6641,6643,664B,664C,664F,6652,6653,6654,6655,6656,6657,665A,665F,6661,6664,6666,6668,666E,666F,6670,6674,6676,6677,667A,667E,6682,6684,6687,668C,6691,6696,6697,669D,66A7,66A8,66AE,66B4,66B9,66BE,66D9,66DB,66DC,66DD,66E6,66E9,66F0,66F2,66F3,66F4,66F7,66F9,66FC,66FE,66FF,6700,6708,6709,670A,670B,670D,6710,6714,6715,6717,671B,671D,671F,6726,6728,672A,672B,672C,672D,672F,6731,6734,6735,673A,673D,6740,6742,6743,6746,6748,6749,674C,674E,674F,6750,6751,6753,6756,675C,675E,675F,6760,6761,6765,6768,6769,676A,676D,676F,6770,6772,6773,6775,6777,677C,677E,677F,6781,6784,6787,6789,678B,6790,6795,6797,6798,679A,679C,679D,679E,67A2,67A3,67A5,67A7,67A8,67AA,67AB,67AD,67AF,67B0,67B3,67B5,67B6,67B7,67B8,67C1,67C3,67C4,67CF,67D0,67D1,67D2,67D3,67D4,67D8,67D9,67DA,67DC,67DD,67DE,67E0,67E2,67E5,67E9,67EC,67EF,67F0,67F1,67F3,67F4,67FD,67FF,6800,6805,6807,6808,6809,680A,680B,680C,680E,680F,6811,6813,6816,6817,681D,6821,6829,682A,6832,6833,6837,6838,6839,683C,683D,683E,6840,6841,6842,6843,6844,6845,6846,6848,6849,684A,684C,684E,6850,6851,6853,6854,6855,6860,6861,6862,6863,6864,6865,6866,6867,6868,6869,686B,6874,6876,6877,6881,6883,6885,6886,688F,6893,6897,68A2,68A6,68A7,68A8,68AD,68AF,68B0,68B3,68B5,68C0,68C2,68C9,68CB,68CD,68D2,68D5,68D8,68DA,68E0,68E3,68EE,68F0,68F1,68F5,68F9,68FA,68FC,6901,6905,690B,690D,690E,6910,6912,691F,6920,6924,692D,6930,6934,6939,693D,693F,6942,6954,6957,695A,695D,695E,6960,6963,6966,696B,696E,6971,6977,6978,6979,697C,6980,6982,6984,6986,6987,6988,6989,698D,6994,6995,6998,699B,699C,69A7,69A8,69AB,69AD,69B1,69B4,69B7,69BB,69C1,69CA,69CC,69CE,69D0,69D4,69DB,69DF,69E0,69ED,69F2,69FD,69FF,6A0A,6A17,6A18,6A1F,6A21,6A28,6A2A,6A2F,6A31,6A35,6A3D,6A3E,6A44,6A47,6A50,6A58,6A59,6A5B,6A61,6A65,6A71,6A79,6A7C,6A80,6A84,6A8E,6A90,6A91,6A97,6AA0,6AA9,6AAB,6AAC,6B20,6B21,6B22,6B23,6B24,6B27,6B32,6B37,6B39,6B3A,6B3E,6B43,6B46,6B47,6B49,6B4C,6B59,6B62,6B63,6B64,6B65,6B66,6B67,6B6A,6B79,6B7B,6B7C,6B81,6B82,6B83,6B84,6B86,6B87,6B89,6B8A,6B8B,6B8D,6B92,6B93,6B96,6B9A,6B9B,6BA1,6BAA,6BB3,6BB4,6BB5,6BB7,6BBF,6BC1,6BC2,6BC5,6BCB,6BCD,6BCF,6BD2,6BD3,6BD4,6BD5,6BD6,6BD7,6BD9,6BDB,6BE1,6BEA,6BEB,6BEF,6BF3,6BF5,6BF9,6BFD,6C05,6C06,6C07,6C0D,6C0F,6C10,6C11,6C13,6C14,6C15,6C16,6C18,6C19,6C1A,6C1B,6C1F,6C21,6C22,6C24,6C26,6C27,6C28,6C29,6C2A,6C2E,6C2F,6C30,6C32,6C34,6C35,6C38,6C3D,6C40,6C41,6C42,6C46,6C47,6C49,6C4A,6C50,6C54,6C55,6C57,6C5B,6C5C,6C5D,6C5E,6C5F,6C60,6C61,6C64,6C68,6C69,6C6A,6C70,6C72,6C74,6C76,6C79,6C7D,6C7E,6C81,6C82,6C83,6C85,6C86,6C88,6C89,6C8C,6C8F,6C90,6C93,6C94,6C99,6C9B,6C9F,6CA1,6CA3,6CA4,6CA5,6CA6,6CA7,6CA9,6CAA,6CAB,6CAD,6CAE,6CB1,6CB2,6CB3,6CB8,6CB9,6CBB,6CBC,6CBD,6CBE,6CBF,6CC4,6CC5,6CC9,6CCA,6CCC,6CD0,6CD3,6CD4,6CD5,6CD6,6CD7,6CDB,6CDE,6CE0,6CE1,6CE2,6CE3,6CE5,6CE8,6CEA,6CEB,6CEE,6CEF,6CF0,6CF1,6CF3,6CF5,6CF6,6CF7,6CF8,6CFA,6CFB,6CFC,6CFD,6CFE,6D01,6D04,6D07,6D0B,6D0C,6D0E,6D12,6D17,6D19,6D1A,6D1B,6D1E,6D25,6D27,6D2A,6D2B,6D2E,6D31,6D32,6D33,6D35,6D39,6D3B,6D3C,6D3D,6D3E,6D41,6D43,6D45,6D46,6D47,6D48,6D4A,6D4B,6D4D,6D4E,6D4F,6D51,6D52,6D53,6D54,6D59,6D5A,6D5C,6D5E,6D60,6D63,6D66,6D69,6D6A,6D6E,6D6F,6D74,6D77,6D78,6D7C,6D82,6D85,6D88,6D89,6D8C,6D8E,6D91,6D93,6D94,6D95,6D9B,6D9D,6D9E,6D9F,6DA0,6DA1,6DA3,6DA4,6DA6,6DA7,6DA8,6DA9,6DAA,6DAB,6DAE,6DAF,6DB2,6DB5,6DB8,6DBF,6DC0,6DC4,6DC5,6DC6,6DC7,6DCB,6DCC,6DD1,6DD6,6DD8,6DD9,6DDD,6DDE,6DE0,6DE1,6DE4,6DE6,6DEB,6DEC,6DEE,6DF1,6DF3,6DF7,6DF9,6DFB,6DFC,6E05,6E0A,6E0C,6E0D,6E0E,6E10,6E11,6E14,6E16,6E17,6E1A,6E1D,6E20,6E21,6E23,6E24,6E25,6E29,6E2B,6E2D,6E2F,6E32,6E34,6E38,6E3A,6E43,6E44,6E4D,6E4E,6E53,6E54,6E56,6E58,6E5B,6E5F,6E6B,6E6E,6E7E,6E7F,6E83,6E85,6E86,6E89,6E8F,6E90,6E98,6E9C,6E9F,6EA2,6EA5,6EA7,6EAA,6EAF,6EB1,6EB2,6EB4,6EB6,6EB7,6EBA,6EBB,6EBD,6EC1,6EC2,6EC7,6ECB,6ECF,6ED1,6ED3,6ED4,6ED5,6ED7,6EDA,6EDE,6EDF,6EE0,6EE1,6EE2,6EE4,6EE5,6EE6,6EE8,6EE9,6EF4,6EF9,6F02,6F06,6F09,6F0F,6F13,6F14,6F15,6F20,6F24,6F29,6F2A,6F2B,6F2D,6F2F,6F31,6F33,6F36,6F3E,6F46,6F47,6F4B,6F4D,6F58,6F5C,6F5E,6F62,6F66,6F6D,6F6E,6F72,6F74,6F78,6F7A,6F7C,6F84,6F88,6F89,6F8C,6F8D,6F8E,6F9C,6FA1,6FA7,6FB3,6FB6,6FB9,6FC0,6FC2,6FC9,6FD1,6FD2,6FDE,6FE0,6FE1,6FEE,6FEF,7011,701A,701B,7023,7035,7039,704C,704F,705E,706B,706C,706D,706F,7070,7075,7076,7078,707C,707E,707F,7080,7085,7089,708A,708E,7092,7094,7095,7096,7099,709C,709D,70AB,70AC,70AD,70AE,70AF,70B1,70B3,70B7,70B8,70B9,70BB,70BC,70BD,70C0,70C1,70C2,70C3,70C8,70CA,70D8,70D9,70DB,70DF,70E4,70E6,70E7,70E8,70E9,70EB,70EC,70ED,70EF,70F7,70F9,70FD,7109,710A,7110,7113,7115,7116,7118,7119,711A,7126,712F,7130,7131,7136,7145,714A,714C,714E,715C,715E,7164,7166,7167,7168,716E,7172,7173,7178,717A,717D,7184,718A,718F,7194,7198,7199,719F,71A0,71A8,71AC,71B3,71B5,71B9,71C3,71CE,71D4,71D5,71E0,71E5,71E7,71EE,71F9,7206,721D,7228,722A,722C,7230,7231,7235,7236,7237,7238,7239,723B,723D,723F,7247,7248,724C,724D,7252,7256,7259,725B,725D,725F,7261,7262,7266,7267,7269,726E,726F,7272,7275,7279,727A,727E,727F,7280,7281,7284,728A,728B,728D,728F,7292,729F,72AC,72AD,72AF,72B0,72B4,72B6,72B7,72B8,72B9,72C1,72C2,72C3,72C4,72C8,72CD,72CE,72D0,72D2,72D7,72D9,72DE,72E0,72E1,72E8,72E9,72EC,72ED,72EE,72EF,72F0,72F1,72F2,72F3,72F4,72F7,72F8,72FA,72FB,72FC,7301,7303,730A,730E,7313,7315,7316,7317,731B,731C,731D,731E,7321,7322,7325,7329,732A,732B,732C,732E,7331,7334,7337,7338,7339,733E,733F,734D,7350,7352,7357,7360,736C,736D,736F,737E,7384,7387,7389,738B,738E,7391,7396,739B,739F,73A2,73A9,73AB,73AE,73AF,73B0,73B2,73B3,73B7,73BA,73BB,73C0,73C2,73C8,73C9,73CA,73CD,73CF,73D0,73D1,73D9,73DE,73E0,73E5,73E7,73E9,73ED,73F2,7403,7405,7406,7409,740A,740F,7410,741A,741B,7422,7425,7426,7428,742A,742C,742E,7430,7433,7434,7435,7436,743C,7441,7455,7457,7459,745A,745B,745C,745E,745F,746D,7470,7476,7477,747E,7480,7481,7483,7487,748B,748E,7490,749C,749E,74A7,74A8,74A9,74BA,74D2,74DC,74DE,74E0,74E2,74E3,74E4,74E6,74EE,74EF,74F4,74F6,74F7,74FF,7504,750D,750F,7511,7513,7518,7519,751A,751C,751F,7525,7528,7529,752B,752C,752D,752F,7530,7531,7532,7533,7535,7537,7538,753A,753B,753E,7540,7545,7548,754B,754C,754E,754F,7554,7559,755A,755B,755C,7565,7566,756A,7572,7574,7578,7579,757F,7583,7586,758B,758F,7591,7592,7594,7596,7597,7599,759A,759D,759F,75A0,75A1,75A3,75A4,75A5,75AB,75AC,75AE,75AF,75B0,75B1,75B2,75B3,75B4,75B5,75B8,75B9,75BC,75BD,75BE,75C2,75C3,75C4,75C5,75C7,75C8,75C9,75CA,75CD,75D2,75D4,75D5,75D6,75D8,75DB,75DE,75E2,75E3,75E4,75E6,75E7,75E8,75EA,75EB,75F0,75F1,75F4,75F9,75FC,75FF,7600,7601,7603,7605,760A,760C,7610,7615,7617,7618,7619,761B,761F,7620,7622,7624,7625,7626,7629,762A,762B,762D,7630,7633,7634,7635,7638,763C,763E,763F,7640,7643,764C,764D,7654,7656,765C,765E,7663,766B,766F,7678,767B,767D,767E,7682,7684,7686,7687,7688,768B,768E,7691,7693,7696,7699,76A4,76AE,76B1,76B2,76B4,76BF,76C2,76C5,76C6,76C8,76CA,76CD,76CE,76CF,76D0,76D1,76D2,76D4,76D6,76D7,76D8,76DB,76DF,76E5,76EE,76EF,76F1,76F2,76F4,76F8,76F9,76FC,76FE,7701,7704,7707,7708,7709,770B,770D,7719,771A,771F,7720,7722,7726,7728,7729,772D,772F,7735,7736,7737,7738,773A,773C,7740,7741,7743,7747,7750,7751,775A,775B,7761,7762,7763,7765,7766,7768,776B,776C,7779,777D,777E,777F,7780,7784,7785,778C,778D,778E,7791,7792,779F,77A0,77A2,77A5,77A7,77A9,77AA,77AC,77B0,77B3,77B5,77BB,77BD,77BF,77CD,77D7,77DB,77DC,77E2,77E3,77E5,77E7,77E9,77EB,77EC,77ED,77EE,77F3,77F6,77F8,77FD,77FE,77FF,7800,7801,7802,7809,780C,780D,7811,7812,7814,7816,7817,7818,781A,781C,781D,781F,7823,7825,7826,7827,7829,782C,782D,7830,7834,7837,7838,7839,783A,783B,783C,783E,7840,7845,7847,784C,784E,7850,7852,7855,7856,7857,785D,786A,786B,786C,786D,786E,7877,787C,7887,7889,788C,788D,788E,7891,7893,7897,7898,789A,789B,789C,789F,78A1,78A3,78A5,78A7,78B0,78B1,78B2,78B3,78B4,78B9,78BE,78C1,78C5,78C9,78CA,78CB,78D0,78D4,78D5,78D9,78E8,78EC,78F2,78F4,78F7,78FA,7901,7905,7913,791E,7924,7934,793A,793B,793C,793E,7940,7941,7946,7948,7949,7953,7956,7957,795A,795B,795C,795D,795E,795F,7960,7962,7965,7967,7968,796D,796F,7977,7978,797A,7980,7981,7984,7985,798A,798F,799A,79A7,79B3,79B9,79BA,79BB,79BD,79BE,79C0,79C1,79C3,79C6,79C9,79CB,79CD,79D1,79D2,79D5,79D8,79DF,79E3,79E4,79E6,79E7,79E9,79EB,79ED,79EF,79F0,79F8,79FB,79FD,7A00,7A02,7A03,7A06,7A0B,7A0D,7A0E,7A14,7A17,7A1A,7A1E,7A20,7A23,7A33,7A37,7A39,7A3B,7A3C,7A3D,7A3F,7A46,7A51,7A57,7A70,7A74,7A76,7A77,7A78,7A79,7A7A,7A7F,7A80,7A81,7A83,7A84,7A86,7A88,7A8D,7A91,7A92,7A95,7A96,7A97,7A98,7A9C,7A9D,7A9F,7AA0,7AA5,7AA6,7AA8,7AAC,7AAD,7AB3,7ABF,7ACB,7AD6,7AD9,7ADE,7ADF,7AE0,7AE3,7AE5,7AE6,7AED,7AEF,7AF9,7AFA,7AFD,7AFF,7B03,7B04,7B06,7B08,7B0A,7B0B,7B0F,7B11,7B14,7B15,7B19,7B1B,7B1E,7B20,7B24,7B25,7B26,7B28,7B2A,7B2B,7B2C,7B2E,7B31,7B33,7B38,7B3A,7B3C,7B3E,7B45,7B47,7B49,7B4B,7B4C,7B4F,7B50,7B51,7B52,7B54,7B56,7B58,7B5A,7B5B,7B5D,7B60,7B62,7B6E,7B71,7B72,7B75,7B77,7B79,7B7B,7B7E,7B80,7B85,7B8D,7B90,7B94,7B95,7B97,7B9C,7B9D,7BA1,7BA2,7BA6,7BA7,7BA8,7BA9,7BAA,7BAB,7BAC,7BAD,7BB1,7BB4,7BB8,7BC1,7BC6,7BC7,7BCC,7BD1,7BD3,7BD9,7BDA,7BDD,7BE1,7BE5,7BE6,7BEA,7BEE,7BF1,7BF7,7BFC,7BFE,7C07,7C0B,7C0C,7C0F,7C16,7C1F,7C26,7C27,7C2A,7C38,7C3F,7C40,7C41,7C4D,7C73,7C74,7C7B,7C7C,7C7D,7C89,7C91,7C92,7C95,7C97,7C98,7C9C,7C9D,7C9E,7C9F,7CA2,7CA4,7CA5,7CAA,7CAE,7CB1,7CB2,7CB3,7CB9,7CBC,7CBD,7CBE,7CC1,7CC5,7CC7,7CC8,7CCA,7CCC,7CCD,7CD5,7CD6,7CD7,7CD9,7CDC,7CDF,7CE0,7CE8,7CEF,7CF8,7CFB,7D0A,7D20,7D22,7D27,7D2B,7D2F,7D6E,7D77,7DA6,7DAE,7E3B,7E41,7E47,7E82,7E9B,7E9F,7EA0,7EA1,7EA2,7EA3,7EA4,7EA5,7EA6,7EA7,7EA8,7EA9,7EAA,7EAB,7EAC,7EAD,7EAF,7EB0,7EB1,7EB2,7EB3,7EB5,7EB6,7EB7,7EB8,7EB9,7EBA,7EBD,7EBE,7EBF,7EC0,7EC1,7EC2,7EC3,7EC4,7EC5,7EC6,7EC7,7EC8,7EC9,7ECA,7ECB,7ECC,7ECD,7ECE,7ECF,7ED0,7ED1,7ED2,7ED3,7ED4,7ED5,7ED7,7ED8,7ED9,7EDA,7EDB,7EDC,7EDD,7EDE,7EDF,7EE0,7EE1,7EE2,7EE3,7EE5,7EE6,7EE7,7EE8,7EE9,7EEA,7EEB,7EED,7EEE,7EEF,7EF0,7EF1,7EF2,7EF3,7EF4,7EF5,7EF6,7EF7,7EF8,7EFA,7EFB,7EFC,7EFD,7EFE,7EFF,7F00,7F01,7F02,7F03,7F04,7F05,7F06,7F07,7F08,7F09,7F0B,7F0C,7F0D,7F0E,7F0F,7F11,7F12,7F13,7F14,7F15,7F16,7F17,7F18,7F19,7F1A,7F1B,7F1C,7F1D,7F1F,7F20,7F21,7F22,7F23,7F24,7F25,7F26,7F27,7F28,7F29,7F2A,7F2B,7F2C,7F2D,7F2E,7F2F,7F30,7F31,7F32,7F33,7F34,7F35,7F36,7F38,7F3A,7F42,7F44,7F45,7F50,7F51,7F54,7F55,7F57,7F58,7F5A,7F5F,7F61,7F62,7F68,7F69,7F6A,7F6E,7F71,7F72,7F74,7F79,7F7E,7F81,7F8A,7F8C,7F8E,7F94,7F9A,7F9D,7F9E,7F9F,7FA1,7FA4,7FA7,7FAF,7FB0,7FB2,7FB8,7FB9,7FBC,7FBD,7FBF,7FC1,7FC5,7FCA,7FCC,7FCE,7FD4,7FD5,7FD8,7FDF,7FE0,7FE1,7FE5,7FE6,7FE9,7FEE,7FF0,7FF1,7FF3,7FFB,7FFC,8000,8001,8003,8004,8005,8006,800B,800C,800D,8010,8012,8014,8015,8016,8017,8018,8019,801C,8020,8022,8025,8026,8027,8028,8029,802A,8031,8033,8035,8036,8037,8038,803B,803D,803F,8042,8043,8046,804A,804B,804C,804D,8052,8054,8058,805A,8069,806A,8071,807F,8080,8083,8084,8086,8087,8089,808B,808C,8093,8096,8098,809A,809B,809C,809D,809F,80A0,80A1,80A2,80A4,80A5,80A9,80AA,80AB,80AD,80AE,80AF,80B1,80B2,80B4,80B7,80BA,80BC,80BD,80BE,80BF,80C0,80C1,80C2,80C3,80C4,80C6,80CC,80CD,80CE,80D6,80D7,80D9,80DA,80DB,80DC,80DD,80DE,80E1,80E4,80E5,80E7,80E8,80E9,80EA,80EB,80EC,80ED,80EF,80F0,80F1,80F2,80F3,80F4,80F6,80F8,80FA,80FC,80FD,8102,8106,8109,810A,810D,810E,810F,8110,8111,8112,8113,8114,8116,8118,811A,811E,812C,812F,8131,8132,8136,8138,813E,8146,8148,814A,814B,814C,8150,8151,8153,8154,8155,8159,815A,8160,8165,8167,8169,816D,816E,8170,8171,8174,8179,817A,817B,817C,817D,817E,817F,8180,8182,8188,818A,818F,8191,8198,819B,819C,819D,81A3,81A6,81A8,81AA,81B3,81BA,81BB,81C0,81C1,81C2,81C3,81C6,81CA,81CC,81E3,81E7,81EA,81EC,81ED,81F3,81F4,81FB,81FC,81FE,8200,8201,8202,8204,8205,8206,820C,820D,8210,8212,8214,821B,821C,821E,821F,8221,8222,8223,8228,822A,822B,822C,822D,822F,8230,8231,8233,8234,8235,8236,8237,8238,8239,823B,823E,8244,8247,8249,824B,824F,8258,825A,825F,8268,826E,826F,8270,8272,8273,8274,8279,827A,827D,827E,827F,8282,8284,8288,828A,828B,828D,828E,828F,8291,8292,8297,8298,8299,829C,829D,829F,82A1,82A4,82A5,82A6,82A8,82A9,82AA,82AB,82AC,82AD,82AE,82AF,82B0,82B1,82B3,82B4,82B7,82B8,82B9,82BD,82BE,82C1,82C4,82C7,82C8,82CA,82CB,82CC,82CD,82CE,82CF,82D1,82D2,82D3,82D4,82D5,82D7,82D8,82DB,82DC,82DE,82DF,82E0,82E1,82E3,82E4,82E5,82E6,82EB,82EF,82F1,82F4,82F7,82F9,82FB,8301,8302,8303,8304,8305,8306,8307,8308,8309,830C,830E,830F,8311,8314,8315,8317,831A,831B,831C,8327,8328,832B,832C,832D,832F,8331,8333,8334,8335,8336,8338,8339,833A,833C,8340,8343,8346,8347,8349,834F,8350,8351,8352,8354,835A,835B,835C,835E,835F,8360,8361,8363,8364,8365,8366,8367,8368,8369,836A,836B,836C,836D,836E,836F,8377,8378,837B,837C,837D,8385,8386,8389,838E,8392,8393,8398,839B,839C,839E,83A0,83A8,83A9,83AA,83AB,83B0,83B1,83B2,83B3,83B4,83B6,83B7,83B8,83B9,83BA,83BC,83BD,83C0,83C1,83C5,83C7,83CA,83CC,83CF,83D4,83D6,83D8,83DC,83DD,83DF,83E0,83E1,83E5,83E9,83EA,83F0,83F1,83F2,83F8,83F9,83FD,8401,8403,8404,8406,840B,840C,840D,840E,840F,8411,8418,841C,841D,8424,8425,8426,8427,8428,8431,8438,843C,843D,8446,8451,8457,8459,845A,845B,845C,8461,8463,8469,846B,846C,846D,8471,8473,8475,8476,8478,847A,8482,8487,8488,8489,848B,848C,848E,8497,8499,849C,84A1,84AF,84B2,84B4,84B8,84B9,84BA,84BD,84BF,84C1,84C4,84C9,84CA,84CD,84D0,84D1,84D3,84D6,84DD,84DF,84E0,84E3,84E5,84E6,84EC,84F0,84FC,84FF,850C,8511,8513,8517,851A,851F,8521,852B,852C,8537,8538,8539,853A,853B,853C,853D,8543,8548,8549,854A,8556,8559,855E,8564,8568,8572,8574,8579,857A,857B,857E,8584,8585,8587,858F,859B,859C,85A4,85A8,85AA,85AE,85AF,85B0,85B7,85B9,85C1,85C9,85CF,85D0,85D3,85D5,85DC,85E4,85E9,85FB,85FF,8605,8611,8616,8627,8629,8638,863C,864D,864E,864F,8650,8651,8654,865A,865E,8662,866B,866C,866E,8671,8679,867A,867B,867C,867D,867E,867F,8680,8681,8682,868A,868B,868C,868D,8693,8695,869C,869D,86A3,86A4,86A7,86A8,86A9,86AA,86AC,86AF,86B0,86B1,86B4,86B5,86B6,86BA,86C0,86C4,86C6,86C7,86C9,86CA,86CB,86CE,86CF,86D0,86D1,86D4,86D8,86D9,86DB,86DE,86DF,86E4,86E9,86ED,86EE,86F0,86F1,86F2,86F3,86F4,86F8,86F9,86FE,8700,8702,8703,8707,8708,8709,870A,870D,8712,8713,8715,8717,8718,871A,871C,871E,8721,8722,8723,8725,8729,872E,8731,8734,8737,873B,873E,873F,8747,8748,8749,874C,874E,8753,8757,8759,8760,8763,8764,8765,876E,8770,8774,8776,877B,877C,877D,877E,8782,8783,8785,8788,878B,878D,8793,8797,879F,87A8,87AB,87AC,87AD,87AF,87B3,87B5,87BA,87BD,87C0,87C6,87CA,87CB,87D1,87D2,87D3,87DB,87E0,87E5,87EA,87EE,87F9,87FE,8803,880A,8813,8815,8816,881B,8821,8822,8832,8839,883C,8840,8844,8845,884C,884D,8854,8857,8859,8861,8862,8863,8864,8865,8868,8869,886B,886C,886E,8870,8872,8877,887D,887E,887F,8881,8882,8884,8885,8888,888B,888D,8892,8896,889C,88A2,88A4,88AB,88AD,88B1,88B7,88BC,88C1,88C2,88C5,88C6,88C9,88CE,88D2,88D4,88D5,88D8,88D9,88DF,88E2,88E3,88E4,88E5,88E8,88F0,88F1,88F3,88F4,88F8,88F9,88FC,88FE,8902,890A,8910,8912,8913,8919,891A,891B,8921,8925,892A,892B,8930,8934,8936,8941,8944,895E,895F,8966,897B,897F,8981,8983,8986,89C1,89C2,89C4,89C5,89C6,89C7,89C8,89C9,89CA,89CB,89CC,89CE,89CF,89D0,89D1,89D2,89D6,89DA,89DC,89DE,89E3,89E5,89E6,89EB,89EF,89F3,8A00,8A07,8A3E,8A48,8A79,8A89,8A8A,8A93,8B07,8B26,8B66,8B6C,8BA0,8BA1,8BA2,8BA3,8BA4,8BA5,8BA6,8BA7,8BA8,8BA9,8BAA,8BAB,8BAD,8BAE,8BAF,8BB0,8BB2,8BB3,8BB4,8BB5,8BB6,8BB7,8BB8,8BB9,8BBA,8BBC,8BBD,8BBE,8BBF,8BC0,8BC1,8BC2,8BC3,8BC4,8BC5,8BC6,8BC8,8BC9,8BCA,8BCB,8BCC,8BCD,8BCE,8BCF,8BD1,8BD2,8BD3,8BD4,8BD5,8BD6,8BD7,8BD8,8BD9,8BDA,8BDB,8BDC,8BDD,8BDE,8BDF,8BE0,8BE1,8BE2,8BE3,8BE4,8BE5,8BE6,8BE7,8BE8,8BE9,8BEB,8BEC,8BED,8BEE,8BEF,8BF0,8BF1,8BF2,8BF3,8BF4,8BF5,8BF6,8BF7,8BF8,8BF9,8BFA,8BFB,8BFC,8BFD,8BFE,8BFF,8C00,8C01,8C02,8C03,8C04,8C05,8C06,8C07,8C08,8C0A,8C0B,8C0C,8C0D,8C0E,8C0F,8C10,8C11,8C12,8C13,8C14,8C15,8C16,8C17,8C18,8C19,8C1A,8C1B,8C1C,8C1D,8C1F,8C20,8C21,8C22,8C23,8C24,8C25,8C26,8C27,8C28,8C29,8C2A,8C2B,8C2C,8C2D,8C2E,8C2F,8C30,8C31,8C32,8C33,8C34,8C35,8C36,8C37,8C41,8C46,8C47,8C49,8C4C,8C55,8C5A,8C61,8C62,8C6A,8C6B,8C73,8C78,8C79,8C7A,8C82,8C85,8C89,8C8A,8C8C,8C94,8C98,8D1D,8D1E,8D1F,8D21,8D22,8D23,8D24,8D25,8D26,8D27,8D28,8D29,8D2A,8D2B,8D2C,8D2D,8D2E,8D2F,8D30,8D31,8D32,8D33,8D34,8D35,8D36,8D37,8D38,8D39,8D3A,8D3B,8D3C,8D3D,8D3E,8D3F,8D40,8D41,8D42,8D43,8D44,8D45,8D46,8D47,8D48,8D49,8D4A,8D4B,8D4C,8D4D,8D4E,8D4F,8D50,8D53,8D54,8D55,8D56,8D58,8D59,8D5A,8D5B,8D5C,8D5D,8D5E,8D60,8D61,8D62,8D63,8D64,8D66,8D67,8D6B,8D6D,8D70,8D73,8D74,8D75,8D76,8D77,8D81,8D84,8D85,8D8A,8D8B,8D91,8D94,8D9F,8DA3,8DB1,8DB3,8DB4,8DB5,8DB8,8DBA,8DBC,8DBE,8DBF,8DC3,8DC4,8DC6,8DCB,8DCC,8DCE,8DCF,8DD1,8DD6,8DD7,8DDA,8DDB,8DDD,8DDE,8DDF,8DE3,8DE4,8DE8,8DEA,8DEB,8DEC,8DEF,8DF3,8DF5,8DF7,8DF8,8DF9,8DFA,8DFB,8DFD,8E05,8E09,8E0A,8E0C,8E0F,8E14,8E1D,8E1E,8E1F,8E22,8E23,8E29,8E2A,8E2C,8E2E,8E2F,8E31,8E35,8E39,8E3A,8E3D,8E40,8E41,8E42,8E44,8E47,8E48,8E49,8E4A,8E4B,8E51,8E52,8E59,8E66,8E69,8E6C,8E6D,8E6F,8E70,8E72,8E74,8E76,8E7C,8E7F,8E81,8E85,8E87,8E8F,8E90,8E94,8E9C,8E9E,8EAB,8EAC,8EAF,8EB2,8EBA,8ECE,8F66,8F67,8F68,8F69,8F6B,8F6C,8F6D,8F6E,8F6F,8F70,8F71,8F72,8F73,8F74,8F75,8F76,8F77,8F78,8F79,8F7A,8F7B,8F7C,8F7D,8F7E,8F7F,8F81,8F82,8F83,8F84,8F85,8F86,8F87,8F88,8F89,8F8A,8F8B,8F8D,8F8E,8F8F,8F90,8F91,8F93,8F94,8F95,8F96,8F97,8F98,8F99,8F9A,8F9B,8F9C,8F9E,8F9F,8FA3,8FA8,8FA9,8FAB,8FB0,8FB1,8FB6,8FB9,8FBD,8FBE,8FC1,8FC2,8FC4,8FC5,8FC7,8FC8,8FCE,8FD0,8FD1,8FD3,8FD4,8FD5,8FD8,8FD9,8FDB,8FDC,8FDD,8FDE,8FDF,8FE2,8FE4,8FE5,8FE6,8FE8,8FE9,8FEA,8FEB,8FED,8FEE,8FF0,8FF3,8FF7,8FF8,8FF9,8FFD,9000,9001,9002,9003,9004,9005,9006,9009,900A,900B,900D,900F,9010,9011,9012,9014,9016,9017,901A,901B,901D,901E,901F,9020,9021,9022,9026,902D,902E,902F,9035,9036,9038,903B,903C,903E,9041,9042,9044,9047,904D,904F,9050,9051,9052,9053,9057,9058,905B,9062,9063,9065,9068,906D,906E,9074,9075,907D,907F,9080,9082,9083,9088,908B,9091,9093,9095,9097,9099,909B,909D,90A1,90A2,90A3,90A6,90AA,90AC,90AE,90AF,90B0,90B1,90B3,90B4,90B5,90B6,90B8,90B9,90BA,90BB,90BE,90C1,90C4,90C5,90C7,90CA,90CE,90CF,90D0,90D1,90D3,90D7,90DB,90DC,90DD,90E1,90E2,90E6,90E7,90E8,90EB,90ED,90EF,90F4,90F8,90FD,90FE,9102,9104,9119,911E,9122,9123,912F,9131,9139,9143,9146,9149,914A,914B,914C,914D,914E,914F,9150,9152,9157,915A,915D,915E,9161,9162,9163,9164,9165,9169,916A,916C,916E,916F,9170,9171,9172,9174,9175,9176,9177,9178,9179,917D,917E,917F,9185,9187,9189,918B,918C,918D,9190,9191,9192,919A,919B,91A2,91A3,91AA,91AD,91AE,91AF,91B4,91B5,91BA,91C7,91C9,91CA,91CC,91CD,91CE,91CF,91D1,91DC,9274,928E,92AE,92C8,933E,936A,938F,93CA,93D6,943E,946B,9485,9486,9487,9488,9489,948A,948B,948C,948D,948E,948F,9490,9492,9493,9494,9495,9497,9499,949A,949B,949C,949D,949E,949F,94A0,94A1,94A2,94A3,94A4,94A5,94A6,94A7,94A8,94A9,94AA,94AB,94AC,94AD,94AE,94AF,94B0,94B1,94B2,94B3,94B4,94B5,94B6,94B7,94B8,94B9,94BA,94BB,94BC,94BD,94BE,94BF,94C0,94C1,94C2,94C3,94C4,94C5,94C6,94C8,94C9,94CA,94CB,94CC,94CD,94CE,94D0,94D1,94D2,94D5,94D6,94D7,94D8,94D9,94DB,94DC,94DD,94DE,94DF,94E0,94E1,94E2,94E3,94E4,94E5,94E7,94E8,94E9,94EA,94EB,94EC,94ED,94EE,94EF,94F0,94F1,94F2,94F3,94F4,94F5,94F6,94F7,94F8,94F9,94FA,94FC,94FD,94FE,94FF,9500,9501,9502,9503,9504,9505,9506,9507,9508,9509,950A,950B,950C,950D,950E,950F,9510,9511,9512,9513,9514,9515,9516,9517,9518,9519,951A,951B,951D,951E,951F,9521,9522,9523,9524,9525,9526,9528,9529,952A,952B,952C,952D,952E,952F,9530,9531,9532,9534,9535,9536,9537,9538,9539,953A,953B,953C,953E,953F,9540,9541,9542,9544,9545,9546,9547,9549,954A,954C,954D,954E,954F,9550,9551,9552,9553,9554,9556,9557,9558,9559,955B,955C,955D,955E,955F,9561,9562,9563,9564,9565,9566,9567,9568,9569,956A,956B,956C,956D,956F,9570,9571,9572,9573,9576,957F,95E8,95E9,95EA,95EB,95ED,95EE,95EF,95F0,95F1,95F2,95F3,95F4,95F5,95F6,95F7,95F8,95F9,95FA,95FB,95FC,95FD,95FE,9600,9601,9602,9603,9604,9605,9606,9608,9609,960A,960B,960C,960D,960E,960F,9610,9611,9612,9614,9615,9616,9617,9619,961A,961C,961D,961F,9621,9622,962A,962E,9631,9632,9633,9634,9635,9636,963B,963C,963D,963F,9640,9642,9644,9645,9646,9647,9648,9649,964B,964C,964D,9650,9654,9655,965B,965F,9661,9662,9664,9667,9668,9669,966A,966C,9672,9674,9675,9676,9677,9685,9686,9688,968B,968D,968F,9690,9694,9697,9698,9699,969C,96A7,96B0,96B3,96B6,96B9,96BC,96BD,96BE,96C0,96C1,96C4,96C5,96C6,96C7,96C9,96CC,96CD,96CE,96CF,96D2,96D5,96E0,96E8,96E9,96EA,96EF,96F3,96F6,96F7,96F9,96FE,9700,9701,9704,9706,9707,9708,9709,970D,970E,970F,9713,9716,971C,971E,972A,972D,9730,9732,9738,9739,973E,9752,9753,9756,9759,975B,975E,9760,9761,9762,9765,9769,9773,9774,9776,977C,9785,978B,978D,9791,9792,9794,9798,97A0,97A3,97AB,97AD,97AF,97B2,97B4,97E6,97E7,97E9,97EA,97EB,97EC,97ED,97F3,97F5,97F6,9875,9876,9877,9878,9879,987A,987B,987C,987D,987E,987F,9880,9881,9882,9883,9884,9885,9886,9887,9888,9889,988A,988C,988D,988F,9890,9891,9893,9894,9896,9897,9898,989A,989B,989C,989D,989E,989F,98A0,98A1,98A2,98A4,98A5,98A6,98A7,98CE,98D1,98D2,98D3,98D5,98D8,98D9,98DA,98DE,98DF,98E7,98E8,990D,9910,992E,9954,9955,9963,9965,9967,9968,9969,996A,996B,996C,996D,996E,996F,9970,9971,9972,9974,9975,9976,9977,997A,997C,997D,997F,9980,9981,9984,9985,9986,9987,9988,998A,998B,998D,998F,9990,9991,9992,9993,9994,9995,9996,9997,9998,9999,99A5,99A8,9A6C,9A6D,9A6E,9A6F,9A70,9A71,9A73,9A74,9A75,9A76,9A77,9A78,9A79,9A7A,9A7B,9A7C,9A7D,9A7E,9A7F,9A80,9A81,9A82,9A84,9A85,9A86,9A87,9A88,9A8A,9A8B,9A8C,9A8F,9A90,9A91,9A92,9A93,9A96,9A97,9A98,9A9A,9A9B,9A9C,9A9D,9A9E,9A9F,9AA0,9AA1,9AA2,9AA3,9AA4,9AA5,9AA7,9AA8,9AB0,9AB1,9AB6,9AB7,9AB8,9ABA,9ABC,9AC0,9AC1,9AC2,9AC5,9ACB,9ACC,9AD1,9AD3,9AD8,9ADF,9AE1,9AE6,9AEB,9AED,9AEF,9AF9,9AFB,9B03,9B08,9B0F,9B13,9B1F,9B23,9B2F,9B32,9B3B,9B3C,9B41,9B42,9B43,9B44,9B45,9B47,9B48,9B49,9B4D,9B4F,9B51,9B54,9C7C,9C7F,9C81,9C82,9C85,9C86,9C87,9C88,9C8B,9C8D,9C8E,9C90,9C91,9C92,9C94,9C95,9C9A,9C9B,9C9C,9C9E,9C9F,9CA0,9CA1,9CA2,9CA3,9CA4,9CA5,9CA6,9CA7,9CA8,9CA9,9CAB,9CAD,9CAE,9CB0,9CB1,9CB2,9CB3,9CB4,9CB5,9CB6,9CB7,9CB8,9CBA,9CBB,9CBC,9CBD,9CC3,9CC4,9CC5,9CC6,9CC7,9CCA,9CCB,9CCC,9CCD,9CCE,9CCF,9CD0,9CD3,9CD4,9CD5,9CD6,9CD7,9CD8,9CD9,9CDC,9CDD,9CDE,9CDF,9CE2,9E1F,9E20,9E21,9E22,9E23,9E25,9E26,9E28,9E29,9E2A,9E2B,9E2C,9E2D,9E2F,9E31,9E32,9E33,9E35,9E36,9E37,9E38,9E39,9E3A,9E3D,9E3E,9E3F,9E41,9E42,9E43,9E44,9E45,9E46,9E47,9E48,9E49,9E4A,9E4B,9E4C,9E4E,9E4F,9E51,9E55,9E57,9E58,9E5A,9E5B,9E5C,9E5E,9E63,9E64,9E66,9E67,9E68,9E69,9E6A,9E6B,9E6C,9E6D,9E70,9E71,9E73,9E7E,9E7F,9E82,9E87,9E88,9E8B,9E92,9E93,9E9D,9E9F,9EA6,9EB4,9EB8,9EBB,9EBD,9EBE,9EC4,9EC9,9ECD,9ECE,9ECF,9ED1,9ED4,9ED8,9EDB,9EDC,9EDD,9EDF,9EE0,9EE2,9EE5,9EE7,9EE9,9EEA,9EEF,9EF9,9EFB,9EFC,9EFE,9F0B,9F0D,9F0E,9F10,9F13,9F17,9F19,9F20,9F22,9F2C,9F2F,9F37,9F39,9F3B,9F3D,9F3E,9F44,9F50,9F51,9F7F,9F80,9F83,9F84,9F85,9F86,9F87,9F88,9F89,9F8A,9F8B,9F8C,9F99,9F9A,9F9B,9F9F,9FA0,FF01,FF02,FF03,FF04,FF05,FF06,FF07,FF08,FF09,FF0A,FF0B,FF0C,FF0D,FF0E,FF0F,FF10,FF11,FF12,FF13,FF14,FF15,FF16,FF17,FF18,FF19,FF1A,FF1B,FF1C,FF1D,FF1E,FF1F,FF20,FF21,FF22,FF23,FF24,FF25,FF26,FF27,FF28,FF29,FF2A,FF2B,FF2C,FF2D,FF2E,FF2F,FF30,FF31,FF32,FF33,FF34,FF35,FF36,FF37,FF38,FF39,FF3A,FF3B,FF3C,FF3D,FF3E,FF3F,FF40,FF41,FF42,FF43,FF44,FF45,FF46,FF47,FF48,FF49,FF4A,FF4B,FF4C,FF4D,FF4E,FF4F,FF50,FF51,FF52,FF53,FF54,FF55,FF56,FF57,FF58,FF59,FF5A,FF5B,FF5C,FF5D,FF5E,FFE0,FFE1,FFE3,FFE5';
+		}
+		 var AnsicodeChr =function(){
+			return 'A1E8,A1EC,A1A7,A1E3,A1C0,A1A4,A1C1,A8A4,A8A2,A8A8,A8A6,A8BA,A8AC,A8AA,A8B0,A8AE,A1C2,A8B4,A8B2,A8B9,A8A1,A8A5,A8A7,A8A9,A8AD,A8B1,A8A3,A8AB,A8AF,A8B3,A8B5,A8B6,A8B7,A8B8,A1A6,A1A5,A6A1,A6A2,A6A3,A6A4,A6A5,A6A6,A6A7,A6A8,A6A9,A6AA,A6AB,A6AC,A6AD,A6AE,A6AF,A6B0,A6B1,A6B2,A6B3,A6B4,A6B5,A6B6,A6B7,A6B8,A6C1,A6C2,A6C3,A6C4,A6C5,A6C6,A6C7,A6C8,A6C9,A6CA,A6CB,A6CC,A6CD,A6CE,A6CF,A6D0,A6D1,A6D2,A6D3,A6D4,A6D5,A6D6,A6D7,A6D8,A7A7,A7A1,A7A2,A7A3,A7A4,A7A5,A7A6,A7A8,A7A9,A7AA,A7AB,A7AC,A7AD,A7AE,A7AF,A7B0,A7B1,A7B2,A7B3,A7B4,A7B5,A7B6,A7B7,A7B8,A7B9,A7BA,A7BB,A7BC,A7BD,A7BE,A7BF,A7C0,A7C1,A7D1,A7D2,A7D3,A7D4,A7D5,A7D6,A7D8,A7D9,A7DA,A7DB,A7DC,A7DD,A7DE,A7DF,A7E0,A7E1,A7E2,A7E3,A7E4,A7E5,A7E6,A7E7,A7E8,A7E9,A7EA,A7EB,A7EC,A7ED,A7EE,A7EF,A7F0,A7F1,A7D7,A1AA,A1AC,A1AE,A1AF,A1B0,A1B1,A1AD,A1EB,A1E4,A1E5,A1F9,A1E6,A1ED,A2F1,A2F2,A2F3,A2F4,A2F5,A2F6,A2F7,A2F8,A2F9,A2FA,A2FB,A2FC,A1FB,A1FC,A1FA,A1FD,A1CA,A1C7,A1C6,A1CC,A1D8,A1DE,A1CF,A1CE,A1C4,A1C5,A1C9,A1C8,A1D2,A1D3,A1E0,A1DF,A1C3,A1CB,A1D7,A1D6,A1D5,A1D9,A1D4,A1DC,A1DD,A1DA,A1DB,A1D1,A1CD,A1D0,A2D9,A2DA,A2DB,A2DC,A2DD,A2DE,A2DF,A2E0,A2E1,A2E2,A2C5,A2C6,A2C7,A2C8,A2C9,A2CA,A2CB,A2CC,A2CD,A2CE,A2CF,A2D0,A2D1,A2D2,A2D3,A2D4,A2D5,A2D6,A2D7,A2D8,A2B1,A2B2,A2B3,A2B4,A2B5,A2B6,A2B7,A2B8,A2B9,A2BA,A2BB,A2BC,A2BD,A2BE,A2BF,A2C0,A2C1,A2C2,A2C3,A2C4,A9A4,A9A5,A9A6,A9A7,A9A8,A9A9,A9AA,A9AB,A9AC,A9AD,A9AE,A9AF,A9B0,A9B1,A9B2,A9B3,A9B4,A9B5,A9B6,A9B7,A9B8,A9B9,A9BA,A9BB,A9BC,A9BD,A9BE,A9BF,A9C0,A9C1,A9C2,A9C3,A9C4,A9C5,A9C6,A9C7,A9C8,A9C9,A9CA,A9CB,A9CC,A9CD,A9CE,A9CF,A9D0,A9D1,A9D2,A9D3,A9D4,A9D5,A9D6,A9D7,A9D8,A9D9,A9DA,A9DB,A9DC,A9DD,A9DE,A9DF,A9E0,A9E1,A9E2,A9E3,A9E4,A9E5,A9E6,A9E7,A9E8,A9E9,A9EA,A9EB,A9EC,A9ED,A9EE,A9EF,A1F6,A1F5,A1F8,A1F7,A1F4,A1F3,A1F0,A1F2,A1F1,A1EF,A1EE,A1E2,A1E1,A1A1,A1A2,A1A3,A1A8,A1A9,A1B4,A1B5,A1B6,A1B7,A1B8,A1B9,A1BA,A1BB,A1BE,A1BF,A1FE,A1B2,A1B3,A1BC,A1BD,A4A1,A4A2,A4A3,A4A4,A4A5,A4A6,A4A7,A4A8,A4A9,A4AA,A4AB,A4AC,A4AD,A4AE,A4AF,A4B0,A4B1,A4B2,A4B3,A4B4,A4B5,A4B6,A4B7,A4B8,A4B9,A4BA,A4BB,A4BC,A4BD,A4BE,A4BF,A4C0,A4C1,A4C2,A4C3,A4C4,A4C5,A4C6,A4C7,A4C8,A4C9,A4CA,A4CB,A4CC,A4CD,A4CE,A4CF,A4D0,A4D1,A4D2,A4D3,A4D4,A4D5,A4D6,A4D7,A4D8,A4D9,A4DA,A4DB,A4DC,A4DD,A4DE,A4DF,A4E0,A4E1,A4E2,A4E3,A4E4,A4E5,A4E6,A4E7,A4E8,A4E9,A4EA,A4EB,A4EC,A4ED,A4EE,A4EF,A4F0,A4F1,A4F2,A4F3,A5A1,A5A2,A5A3,A5A4,A5A5,A5A6,A5A7,A5A8,A5A9,A5AA,A5AB,A5AC,A5AD,A5AE,A5AF,A5B0,A5B1,A5B2,A5B3,A5B4,A5B5,A5B6,A5B7,A5B8,A5B9,A5BA,A5BB,A5BC,A5BD,A5BE,A5BF,A5C0,A5C1,A5C2,A5C3,A5C4,A5C5,A5C6,A5C7,A5C8,A5C9,A5CA,A5CB,A5CC,A5CD,A5CE,A5CF,A5D0,A5D1,A5D2,A5D3,A5D4,A5D5,A5D6,A5D7,A5D8,A5D9,A5DA,A5DB,A5DC,A5DD,A5DE,A5DF,A5E0,A5E1,A5E2,A5E3,A5E4,A5E5,A5E6,A5E7,A5E8,A5E9,A5EA,A5EB,A5EC,A5ED,A5EE,A5EF,A5F0,A5F1,A5F2,A5F3,A5F4,A5F5,A5F6,A8C5,A8C6,A8C7,A8C8,A8C9,A8CA,A8CB,A8CC,A8CD,A8CE,A8CF,A8D0,A8D1,A8D2,A8D3,A8D4,A8D5,A8D6,A8D7,A8D8,A8D9,A8DA,A8DB,A8DC,A8DD,A8DE,A8DF,A8E0,A8E1,A8E2,A8E3,A8E4,A8E5,A8E6,A8E7,A8E8,A8E9,A2E5,A2E6,A2E7,A2E8,A2E9,A2EA,A2EB,A2EC,A2ED,A2EE,D2BB,B6A1,C6DF,CDF2,D5C9,C8FD,C9CF,CFC2,D8A2,B2BB,D3EB,D8A4,B3F3,D7A8,C7D2,D8A7,CAC0,C7F0,B1FB,D2B5,B4D4,B6AB,CBBF,D8A9,B6AA,C1BD,D1CF,C9A5,D8AD,B8F6,D1BE,E3DC,D6D0,B7E1,B4AE,C1D9,D8BC,CDE8,B5A4,CEAA,D6F7,C0F6,BED9,D8AF,C4CB,BEC3,D8B1,C3B4,D2E5,D6AE,CEDA,D5A7,BAF5,B7A6,C0D6,C6B9,C5D2,C7C7,B9D4,B3CB,D2D2,D8BF,BEC5,C6F2,D2B2,CFB0,CFE7,CAE9,D8C0,C2F2,C2D2,C8E9,C7AC,C1CB,D3E8,D5F9,CAC2,B6FE,D8A1,D3DA,BFF7,D4C6,BBA5,D8C1,CEE5,BEAE,D8A8,D1C7,D0A9,D8BD,D9EF,CDF6,BFBA,BDBB,BAA5,D2E0,B2FA,BAE0,C4B6,CFED,BEA9,CDA4,C1C1,C7D7,D9F1,D9F4,C8CB,D8E9,D2DA,CAB2,C8CA,D8EC,D8EA,D8C6,BDF6,C6CD,B3F0,D8EB,BDF1,BDE9,C8D4,B4D3,C2D8,B2D6,D7D0,CACB,CBFB,D5CC,B8B6,CFC9,D9DA,D8F0,C7AA,D8EE,B4FA,C1EE,D2D4,D8ED,D2C7,D8EF,C3C7,D1F6,D6D9,D8F2,D8F5,BCFE,BCDB,C8CE,B7DD,B7C2,C6F3,D8F8,D2C1,CEE9,BCBF,B7FC,B7A5,D0DD,D6DA,D3C5,BBEF,BBE1,D8F1,C9A1,CEB0,B4AB,D8F3,C9CB,D8F6,C2D7,D8F7,CEB1,D8F9,B2AE,B9C0,D9A3,B0E9,C1E6,C9EC,CBC5,CBC6,D9A4,B5E8,B5AB,CEBB,B5CD,D7A1,D7F4,D3D3,CCE5,BACE,D9A2,D9DC,D3E0,D8FD,B7F0,D7F7,D8FE,D8FA,D9A1,C4E3,D3B6,D8F4,D9DD,D8FB,C5E5,C0D0,D1F0,B0DB,BCD1,D9A6,D9A5,D9AC,D9AE,D9AB,CAB9,D9A9,D6B6,B3DE,D9A8,C0FD,CACC,D9AA,D9A7,D9B0,B6B1,B9A9,D2C0,CFC0,C2C2,BDC4,D5EC,B2E0,C7C8,BFEB,D9AD,D9AF,CEEA,BAEE,C7D6,B1E3,B4D9,B6ED,D9B4,BFA1,D9DE,C7CE,C0FE,D9B8,CBD7,B7FD,D9B5,D9B7,B1A3,D3E1,D9B9,D0C5,D9B6,D9B1,D9B2,C1A9,D9B3,BCF3,D0DE,B8A9,BEE3,D9BD,D9BA,B0B3,D9C2,D9C4,B1B6,D9BF,B5B9,BEF3,CCC8,BAF2,D2D0,D9C3,BDE8,B3AB,D9C5,BEEB,D9C6,D9BB,C4DF,D9BE,D9C1,D9C0,D5AE,D6B5,C7E3,D9C8,BCD9,D9CA,D9BC,D9CB,C6AB,D9C9,D7F6,CDA3,BDA1,D9CC,C5BC,CDB5,D9CD,D9C7,B3A5,BFFE,B8B5,C0FC,B0F8,B4F6,D9CE,D9CF,B4A2,D9D0,B4DF,B0C1,D9D1,C9B5,CFF1,D9D2,C1C5,D9D6,C9AE,D9D5,D9D4,D9D7,CBDB,BDA9,C6A7,D9D3,D9D8,D9D9,C8E5,C0DC,B6F9,D8A3,D4CA,D4AA,D0D6,B3E4,D5D7,CFC8,B9E2,BFCB,C3E2,B6D2,CDC3,D9EE,D9F0,B5B3,B6B5,BEA4,C8EB,C8AB,B0CB,B9AB,C1F9,D9E2,C0BC,B9B2,B9D8,D0CB,B1F8,C6E4,BEDF,B5E4,D7C8,D1F8,BCE6,CADE,BCBD,D9E6,D8E7,C4DA,B8D4,C8BD,B2E1,D4D9,C3B0,C3E1,DAA2,C8DF,D0B4,BEFC,C5A9,B9DA,DAA3,D4A9,DAA4,D9FB,B6AC,B7EB,B1F9,D9FC,B3E5,BEF6,BFF6,D2B1,C0E4,B6B3,D9FE,D9FD,BEBB,C6E0,D7BC,DAA1,C1B9,B5F2,C1E8,BCF5,B4D5,C1DD,C4FD,BCB8,B7B2,B7EF,D9EC,C6BE,BFAD,BBCB,B5CA,DBC9,D0D7,CDB9,B0BC,B3F6,BBF7,DBCA,BAAF,D4E4,B5B6,B5F3,D8D6,C8D0,B7D6,C7D0,D8D7,BFAF,DBBB,D8D8,D0CC,BBAE,EBBE,C1D0,C1F5,D4F2,B8D5,B4B4,B3F5,C9BE,C5D0,C5D9,C0FB,B1F0,D8D9,B9CE,B5BD,D8DA,D6C6,CBA2,C8AF,C9B2,B4CC,BFCC,B9F4,D8DB,D8DC,B6E7,BCC1,CCEA,CFF7,D8DD,C7B0,B9D0,BDA3,CCDE,C6CA,D8E0,D8DE,D8DF,B0FE,BEE7,CAA3,BCF4,B8B1,B8EE,D8E2,BDCB,D8E4,D8E3,C5FC,D8E5,D8E6,C1A6,C8B0,B0EC,B9A6,BCD3,CEF1,DBBD,C1D3,B6AF,D6FA,C5AC,BDD9,DBBE,DBBF,C0F8,BEA2,C0CD,DBC0,CAC6,B2AA,D3C2,C3E3,D1AB,DBC2,C0D5,DBC3,BFB1,C4BC,C7DA,DBC4,D9E8,C9D7,B9B4,CEF0,D4C8,B0FC,B4D2,D0D9,D9E9,DECB,D9EB,D8B0,BBAF,B1B1,B3D7,D8CE,D4D1,BDB3,BFEF,CFBB,D8D0,B7CB,D8D1,C6A5,C7F8,D2BD,D8D2,C4E4,CAAE,C7A7,D8A6,C9FD,CEE7,BBDC,B0EB,BBAA,D0AD,B1B0,D7E4,D7BF,B5A5,C2F4,C4CF,B2A9,B2B7,B1E5,DFB2,D5BC,BFA8,C2AC,D8D5,C2B1,D8D4,CED4,DAE0,CEC0,D8B4,C3AE,D3A1,CEA3,BCB4,C8B4,C2D1,BEED,D0B6,DAE1,C7E4,B3A7,B6F2,CCFC,C0FA,C0F7,D1B9,D1E1,D8C7,B2DE,C0E5,BAF1,D8C8,D4AD,CFE1,D8C9,D8CA,CFC3,B3F8,BEC7,D8CB,DBCC,C8A5,CFD8,C8FE,B2CE,D3D6,B2E6,BCB0,D3D1,CBAB,B7B4,B7A2,CAE5,C8A1,CADC,B1E4,D0F0,C5D1,DBC5,B5FE,BFDA,B9C5,BEE4,C1ED,DFB6,DFB5,D6BB,BDD0,D5D9,B0C8,B6A3,BFC9,CCA8,DFB3,CAB7,D3D2,D8CF,D2B6,BAC5,CBBE,CCBE,DFB7,B5F0,DFB4,D3F5,B3D4,B8F7,DFBA,BACF,BCAA,B5F5,CDAC,C3FB,BAF3,C0F4,CDC2,CFF2,DFB8,CFC5,C2C0,DFB9,C2F0,BEFD,C1DF,CDCC,D2F7,B7CD,DFC1,DFC4,B7F1,B0C9,B6D6,B7D4,BAAC,CCFD,BFD4,CBB1,C6F4,D6A8,DFC5,CEE2,B3B3,CEFC,B4B5,CEC7,BAF0,CEE1,D1BD,DFC0,B4F4,B3CA,B8E6,DFBB,C4C5,DFBC,DFBD,DFBE,C5BB,DFBF,DFC2,D4B1,DFC3,C7BA,CED8,C4D8,DFCA,DFCF,D6DC,DFC9,DFDA,CEB6,BAC7,DFCE,DFC8,C5DE,C9EB,BAF4,C3FC,BED7,DFC6,DFCD,C5D8,D5A6,BACD,BECC,D3BD,B8C0,D6E4,DFC7,B9BE,BFA7,C1FC,DFCB,DFCC,DFD0,DFDB,DFE5,DFD7,DFD6,D7C9,DFE3,DFE4,E5EB,D2A7,DFD2,BFA9,D4DB,BFC8,DFD4,CFCC,DFDD,D1CA,DFDE,B0A7,C6B7,DFD3,BAE5,B6DF,CDDB,B9FE,D4D5,DFDF,CFEC,B0A5,DFE7,DFD1,D1C6,DFD5,DFD8,DFD9,DFDC,BBA9,DFE0,DFE1,DFE2,DFE6,DFE8,D3B4,B8E7,C5B6,DFEA,C9DA,C1A8,C4C4,BFDE,CFF8,D5DC,DFEE,B2B8,BADF,DFEC,DBC1,D1E4,CBF4,B4BD,B0A6,DFF1,CCC6,DFF2,DFED,DFE9,DFEB,DFEF,DFF0,BBBD,DFF3,DFF4,BBA3,CADB,CEA8,E0A7,B3AA,E0A6,E0A1,DFFE,CDD9,DFFC,DFFA,BFD0,D7C4,C9CC,DFF8,B0A1,DFFD,DFFB,E0A2,E0A8,B7C8,C6A1,C9B6,C0B2,DFF5,C5BE,D8C4,DFF9,C4F6,E0A3,E0A4,E0A5,D0A5,E0B4,CCE4,E0B1,BFA6,E0AF,CEB9,E0AB,C9C6,C0AE,E0AE,BAED,BAB0,E0A9,DFF6,E0B3,E0B8,B4AD,E0B9,CFB2,BAC8,E0B0,D0FA,E0AC,D4FB,DFF7,C5E7,E0AD,D3F7,E0B6,E0B7,E0C4,D0E1,E0BC,E0C9,E0CA,E0BE,E0AA,C9A4,E0C1,E0B2,CAC8,E0C3,E0B5,CECB,CBC3,E0CD,E0C6,E0C2,E0CB,E0BA,E0BF,E0C0,E0C5,E0C7,E0C8,E0CC,E0BB,CBD4,E0D5,E0D6,E0D2,E0D0,BCCE,E0D1,B8C2,D8C5,D0EA,C2EF,E0CF,E0BD,E0D4,E0D3,E0D7,E0DC,E0D8,D6F6,B3B0,D7EC,CBBB,E0DA,CEFB,BAD9,E0E1,E0DD,D2AD,E0E2,E0DB,E0D9,E0DF,E0E0,E0DE,E0E4,C6F7,D8AC,D4EB,E0E6,CAC9,E0E5,B8C1,E0E7,E0E8,E0E9,E0E3,BABF,CCE7,E0EA,CFF9,E0EB,C8C2,BDC0,C4D2,E0EC,E0ED,C7F4,CBC4,E0EE,BBD8,D8B6,D2F2,E0EF,CDC5,B6DA,E0F1,D4B0,C0A7,B4D1,CEA7,E0F0,E0F2,B9CC,B9FA,CDBC,E0F3,C6D4,E0F4,D4B2,C8A6,E0F6,E0F5,E0F7,CDC1,CAA5,D4DA,DBD7,DBD9,DBD8,B9E7,DBDC,DBDD,B5D8,DBDA,DBDB,B3A1,DBDF,BBF8,D6B7,DBE0,BEF9,B7BB,DBD0,CCAE,BFB2,BBB5,D7F8,BFD3,BFE9,BCE1,CCB3,DBDE,B0D3,CEEB,B7D8,D7B9,C6C2,C0A4,CCB9,DBE7,DBE1,C6BA,DBE3,DBE8,C5F7,DBEA,DBE9,BFC0,DBE6,DBE5,B4B9,C0AC,C2A2,DBE2,DBE4,D0CD,DBED,C0DD,DBF2,B6E2,DBF3,DBD2,B9B8,D4AB,DBEC,BFD1,DBF0,DBD1,B5E6,DBEB,BFE5,DBEE,DBF1,DBF9,B9A1,B0A3,C2F1,B3C7,DBEF,DBF8,C6D2,DBF4,DBF5,DBF7,DBF6,DBFE,D3F2,B2BA,DBFD,DCA4,DBFB,DBFA,DBFC,C5E0,BBF9,DCA3,DCA5,CCC3,B6D1,DDC0,DCA1,DCA2,C7B5,B6E9,DCA7,DCA6,DCA9,B1A4,B5CC,BFB0,D1DF,B6C2,DCA8,CBFA,EBF3,CBDC,CBFE,CCC1,C8FB,DCAA,CCEE,DCAB,DBD3,DCAF,DCAC,BEB3,CAFB,DCAD,C9CA,C4B9,C7BD,DCAE,D4F6,D0E6,C4AB,B6D5,DBD4,B1DA,DBD5,DBD6,BABE,C8C0,CABF,C8C9,D7B3,C9F9,BFC7,BAF8,D2BC,E2BA,B4A6,B1B8,B8B4,CFC4,D9E7,CFA6,CDE2,D9ED,B6E0,D2B9,B9BB,E2B9,E2B7,B4F3,CCEC,CCAB,B7F2,D8B2,D1EB,BABB,CAA7,CDB7,D2C4,BFE4,BCD0,B6E1,DEC5,DEC6,DBBC,D1D9,C6E6,C4CE,B7EE,B7DC,BFFC,D7E0,C6F5,B1BC,DEC8,BDB1,CCD7,DECA,DEC9,B5EC,C9DD,B0C2,C5AE,C5AB,C4CC,BCE9,CBFD,BAC3,E5F9,C8E7,E5FA,CDFD,D7B1,B8BE,C2E8,C8D1,E5FB,B6CA,BCCB,D1FD,E6A1,C3EE,E6A4,E5FE,E6A5,CDD7,B7C1,E5FC,E5FD,E6A3,C4DD,E6A8,E6A7,C3C3,C6DE,E6AA,C4B7,E6A2,CABC,BDE3,B9C3,E6A6,D0D5,CEAF,E6A9,E6B0,D2A6,BDAA,E6AD,E6AF,C0D1,D2CC,BCA7,E6B1,D2F6,D7CB,CDFE,CDDE,C2A6,E6AB,E6AC,BDBF,E6AE,E6B3,E6B2,E6B6,E6B8,C4EF,C4C8,BEEA,C9EF,E6B7,B6F0,C3E4,D3E9,E6B4,E6B5,C8A2,E6BD,E6B9,C6C5,CDF1,E6BB,E6BC,BBE9,E6BE,E6BA,C0B7,D3A4,E6BF,C9F4,E6C3,E6C4,D0F6,C3BD,C3C4,E6C2,E6C1,E6C7,CFB1,EBF4,E6CA,E6C5,BCDE,C9A9,BCB5,CFD3,E6C8,E6C9,E6CE,E6D0,E6D1,E6CB,B5D5,E6CC,E6CF,C4DB,E6C6,E6CD,E6D2,E6D4,E6D3,E6D5,D9F8,E6D6,E6D7,D7D3,E6DD,E6DE,BFD7,D4D0,D7D6,B4E6,CBEF,E6DA,D8C3,D7CE,D0A2,C3CF,E6DF,BCBE,B9C2,E6DB,D1A7,BAA2,C2CF,D8AB,CAEB,E5EE,E6DC,B7F5,C8E6,C4F5,E5B2,C4FE,CBFC,E5B3,D5AC,D3EE,CAD8,B0B2,CBCE,CDEA,BAEA,E5B5,E5B4,D7DA,B9D9,D6E6,B6A8,CDF0,D2CB,B1A6,CAB5,B3E8,C9F3,BFCD,D0FB,CAD2,E5B6,BBC2,CFDC,B9AC,D4D7,BAA6,D1E7,CFFC,BCD2,E5B7,C8DD,BFED,B1F6,CBDE,BCC5,BCC4,D2FA,C3DC,BFDC,B8BB,C3C2,BAAE,D4A2,C7DE,C4AF,B2EC,B9D1,E5BB,C1C8,D5AF,E5BC,E5BE,B4E7,B6D4,CBC2,D1B0,B5BC,CAD9,B7E2,C9E4,BDAB,CEBE,D7F0,D0A1,C9D9,B6FB,E6D8,BCE2,B3BE,C9D0,E6D9,B3A2,DECC,D3C8,DECD,D2A2,DECE,BECD,DECF,CAAC,D2FC,B3DF,E5EA,C4E1,BEA1,CEB2,C4F2,BED6,C6A8,B2E3,BED3,C7FC,CCEB,BDEC,CEDD,CABA,C6C1,E5EC,D0BC,D5B9,E5ED,CAF4,CDC0,C2C5,E5EF,C2C4,E5F0,E5F8,CDCD,C9BD,D2D9,E1A8,D3EC,CBEA,C6F1,E1AC,E1A7,E1A9,E1AA,E1AF,B2ED,E1AB,B8DA,E1AD,E1AE,E1B0,B5BA,E1B1,E1B3,E1B8,D1D2,E1B6,E1B5,C1EB,E1B7,D4C0,E1B2,E1BA,B0B6,E1B4,BFF9,E1B9,E1BB,E1BE,E1BC,D6C5,CFBF,E1BD,E1BF,C2CD,B6EB,D3F8,C7CD,B7E5,BEFE,E1C0,E1C1,E1C7,B3E7,C6E9,B4DE,D1C2,E1C8,E1C6,E1C5,E1C3,E1C2,B1C0,D5B8,E1C4,E1CB,E1CC,E1CA,EFFA,E1D3,E1D2,C7B6,E1C9,E1CE,E1D0,E1D4,E1D1,E1CD,E1CF,E1D5,E1D6,E1D7,E1D8,E1DA,E1DB,CEA1,E7DD,B4A8,D6DD,D1B2,B3B2,B9A4,D7F3,C7C9,BEDE,B9AE,CED7,B2EE,DBCF,BCBA,D2D1,CBC8,B0CD,CFEF,D9E3,BDED,B1D2,CAD0,B2BC,CBA7,B7AB,CAA6,CFA3,E0F8,D5CA,E0FB,E0FA,C5C1,CCFB,C1B1,E0F9,D6E3,B2AF,D6C4,B5DB,B4F8,D6A1,CFAF,B0EF,E0FC,E1A1,B3A3,E0FD,E0FE,C3B1,C3DD,E1A2,B7F9,BBCF,E1A3,C4BB,E1A4,E1A5,E1A6,B4B1,B8C9,C6BD,C4EA,B2A2,D0D2,E7DB,BBC3,D3D7,D3C4,B9E3,E2CF,D7AF,C7EC,B1D3,B4B2,E2D1,D0F2,C2AE,E2D0,BFE2,D3A6,B5D7,E2D2,B5EA,C3ED,B8FD,B8AE,C5D3,B7CF,E2D4,E2D3,B6C8,D7F9,CDA5,E2D8,E2D6,CAFC,BFB5,D3B9,E2D5,E2D7,C1AE,C0C8,E2DB,E2DA,C0AA,C1CE,E2DC,E2DD,E2DE,DBC8,D1D3,CDA2,BDA8,DEC3,D8A5,BFAA,DBCD,D2EC,C6FA,C5AA,DEC4,B1D7,DFAE,CABD,DFB1,B9AD,D2FD,B8A5,BAEB,B3DA,B5DC,D5C5,C3D6,CFD2,BBA1,E5F3,E5F2,E5F4,CDE4,C8F5,B5AF,C7BF,E5F6,ECB0,E5E6,B9E9,B5B1,C2BC,E5E8,E5E7,E5E9,D2CD,E1EA,D0CE,CDAE,D1E5,B2CA,B1EB,B1F2,C5ED,D5C3,D3B0,E1DC,E1DD,D2DB,B3B9,B1CB,CDF9,D5F7,E1DE,BEB6,B4FD,E1DF,BADC,E1E0,BBB2,C2C9,E1E1,D0EC,CDBD,E1E2,B5C3,C5C7,E1E3,E1E4,D3F9,E1E5,D1AD,E1E6,CEA2,E1E7,B5C2,E1E8,BBD5,D0C4,E2E0,B1D8,D2E4,E2E1,BCC9,C8CC,E2E3,ECFE,ECFD,DFAF,E2E2,D6BE,CDFC,C3A6,E3C3,D6D2,E2E7,E2E8,D3C7,E2EC,BFEC,E2ED,E2E5,B3C0,C4EE,E2EE,D0C3,BAF6,E2E9,B7DE,BBB3,CCAC,CBCB,E2E4,E2E6,E2EA,E2EB,E2F7,E2F4,D4F5,E2F3,C5AD,D5FA,C5C2,B2C0,E2EF,E2F2,C1AF,CBBC,B5A1,E2F9,BCB1,E2F1,D0D4,D4B9,E2F5,B9D6,E2F6,C7D3,E2F0,D7DC,EDA1,E2F8,EDA5,E2FE,CAD1,C1B5,BBD0,BFD6,BAE3,CBA1,EDA6,EDA3,EDA2,BBD6,EDA7,D0F4,EDA4,BADE,B6F7,E3A1,B6B2,CCF1,B9A7,CFA2,C7A1,BFD2,B6F1,E2FA,E2FB,E2FD,E2FC,C4D5,E3A2,D3C1,E3A7,C7C4,CFA4,E3A9,BAB7,E3A8,BBDA,E3A3,E3A4,E3AA,E3A6,CEF2,D3C6,BBBC,D4C3,C4FA,EDA8,D0FC,E3A5,C3F5,E3AD,B1AF,E3B2,BCC2,E3AC,B5BF,C7E9,E3B0,BEAA,CDEF,BBF3,CCE8,E3AF,E3B1,CFA7,E3AE,CEA9,BBDD,B5EB,BEE5,B2D2,B3CD,B1B9,E3AB,B2D1,B5AC,B9DF,B6E8,CFEB,E3B7,BBCC,C8C7,D0CA,E3B8,B3EE,EDA9,D3FA,D3E4,EDAA,E3B9,D2E2,E3B5,D3DE,B8D0,E3B3,E3B6,B7DF,E3B4,C0A2,E3BA,D4B8,B4C8,E3BB,BBC5,C9F7,C9E5,C4BD,EDAB,C2FD,BBDB,BFAE,CEBF,E3BC,BFB6,B1EF,D4F7,E3BE,EDAD,E3BF,BAA9,EDAC,E3BD,E3C0,BAB6,B6AE,D0B8,B0C3,EDAE,EDAF,C0C1,E3C1,C5B3,E3C2,DCB2,EDB0,B8EA,CEEC,EAA7,D0E7,CAF9,C8D6,CFB7,B3C9,CED2,BDE4,E3DE,BBF2,EAA8,D5BD,C6DD,EAA9,EAAA,EAAC,EAAB,EAAE,EAAD,BDD8,EAAF,C2BE,B4C1,B4F7,BBA7,ECE6,ECE5,B7BF,CBF9,B1E2,ECE7,C9C8,ECE8,ECE9,CAD6,DED0,B2C5,D4FA,C6CB,B0C7,B4F2,C8D3,CDD0,BFB8,BFDB,C7A4,D6B4,C0A9,DED1,C9A8,D1EF,C5A4,B0E7,B3B6,C8C5,B0E2,B7F6,C5FA,B6F3,D5D2,B3D0,BCBC,B3AD,BEF1,B0D1,D2D6,CAE3,D7A5,CDB6,B6B6,BFB9,D5DB,B8A7,C5D7,DED2,BFD9,C2D5,C7C0,BBA4,B1A8,C5EA,C5FB,CCA7,B1A7,B5D6,C4A8,DED3,D1BA,B3E9,C3F2,B7F7,D6F4,B5A3,B2F0,C4B4,C4E9,C0AD,DED4,B0E8,C5C4,C1E0,B9D5,BEDC,CDD8,B0CE,CDCF,DED6,BED0,D7BE,DED5,D5D0,B0DD,C4E2,C2A3,BCF0,D3B5,C0B9,C5A1,B2A6,D4F1,C0A8,CAC3,DED7,D5FC,B9B0,C8AD,CBA9,DED9,BFBD,C6B4,D7A7,CAB0,C4C3,B3D6,B9D2,D6B8,EAFC,B0B4,BFE6,CCF4,CDDA,D6BF,C2CE,CECE,CCA2,D0AE,C4D3,B5B2,DED8,D5F5,BCB7,BBD3,B0A4,C5B2,B4EC,D5F1,EAFD,DEDA,CDA6,CDEC,CEE6,DEDC,CDB1,C0A6,D7BD,DEDB,B0C6,BAB4,C9D3,C4F3,BEE8,B2B6,C0CC,CBF0,BCF1,BBBB,B5B7,C5F5,DEE6,DEE3,BEDD,DEDF,B4B7,BDDD,DEE0,C4ED,CFC6,B5E0,B6DE,CADA,B5F4,DEE5,D5C6,DEE1,CCCD,C6FE,C5C5,D2B4,BEF2,C2D3,CCBD,B3B8,BDD3,BFD8,CDC6,D1DA,B4EB,DEE4,DEDD,DEE7,EAFE,C2B0,DEE2,D6C0,B5A7,B2F4,DEE8,DEF2,DEED,DEF1,C8E0,D7E1,DEEF,C3E8,CCE1,B2E5,D2BE,DEEE,DEEB,CED5,B4A7,BFAB,BEBE,BDD2,DEE9,D4AE,DEDE,DEEA,C0BF,DEEC,B2F3,B8E9,C2A7,BDC1,DEF5,DEF8,B2AB,B4A4,B4EA,C9A6,DEF6,CBD1,B8E3,DEF7,DEFA,DEF9,CCC2,B0E1,B4EE,E5BA,D0AF,B2EB,EBA1,DEF4,C9E3,DEF3,B0DA,D2A1,B1F7,CCAF,DEF0,CBA4,D5AA,DEFB,B4DD,C4A6,DEFD,C3FE,C4A1,DFA1,C1CC,DEFC,BEEF,C6B2,B3C5,C8F6,CBBA,DEFE,DFA4,D7B2,B3B7,C1C3,C7CB,B2A5,B4E9,D7AB,C4EC,DFA2,DFA3,DFA5,BAB3,DFA6,C0DE,C9C3,B2D9,C7E6,DFA7,C7DC,DFA8,EBA2,CBD3,DFAA,DFA9,B2C1,C5CA,DFAB,D4DC,C8C1,DFAC,BEF0,DFAD,D6A7,EAB7,EBB6,CAD5,D8FC,B8C4,B9A5,B7C5,D5FE,B9CA,D0A7,F4CD,B5D0,C3F4,BEC8,EBB7,B0BD,BDCC,C1B2,B1D6,B3A8,B8D2,C9A2,B6D8,EBB8,BEB4,CAFD,C7C3,D5FB,B7F3,CEC4,D5AB,B1F3,ECB3,B0DF,ECB5,B6B7,C1CF,F5FA,D0B1,D5E5,CED3,BDEF,B3E2,B8AB,D5B6,EDBD,B6CF,CBB9,D0C2,B7BD,ECB6,CAA9,C5D4,ECB9,ECB8,C2C3,ECB7,D0FD,ECBA,ECBB,D7E5,ECBC,ECBD,C6EC,CEDE,BCC8,C8D5,B5A9,BEC9,D6BC,D4E7,D1AE,D0F1,EAB8,EAB9,EABA,BAB5,CAB1,BFF5,CDFA,EAC0,B0BA,EABE,C0A5,EABB,B2FD,C3F7,BBE8,D2D7,CEF4,EABF,EABC,EAC3,D0C7,D3B3,B4BA,C3C1,D7F2,D5D1,CAC7,EAC5,EAC4,EAC7,EAC6,D6E7,CFD4,EACB,BBCE,BDFA,C9CE,EACC,C9B9,CFFE,EACA,D4CE,EACD,EACF,CDED,EAC9,EACE,CEEE,BBDE,B3BF,C6D5,BEB0,CEFA,C7E7,BEA7,EAD0,D6C7,C1C0,D4DD,EAD1,CFBE,EAD2,CAEE,C5AF,B0B5,EAD4,EAD3,F4DF,C4BA,B1A9,E5DF,EAD5,CAEF,EAD6,EAD7,C6D8,EAD8,EAD9,D4BB,C7FA,D2B7,B8FC,EAC2,B2DC,C2FC,D4F8,CCE6,D7EE,D4C2,D3D0,EBC3,C5F3,B7FE,EBD4,CBB7,EBDE,C0CA,CDFB,B3AF,C6DA,EBFC,C4BE,CEB4,C4A9,B1BE,D4FD,CAF5,D6EC,C6D3,B6E4,BBFA,D0E0,C9B1,D4D3,C8A8,B8CB,E8BE,C9BC,E8BB,C0EE,D0D3,B2C4,B4E5,E8BC,D5C8,B6C5,E8BD,CAF8,B8DC,CCF5,C0B4,D1EE,E8BF,E8C2,BABC,B1AD,BDDC,EABD,E8C3,E8C6,E8CB,E8CC,CBC9,B0E5,BCAB,B9B9,E8C1,CDF7,E8CA,CEF6,D5ED,C1D6,E8C4,C3B6,B9FB,D6A6,E8C8,CAE0,D4E6,E8C0,E8C5,E8C7,C7B9,B7E3,E8C9,BFDD,E8D2,E8D7,E8D5,BCDC,BCCF,E8DB,E8DE,E8DA,B1FA,B0D8,C4B3,B8CC,C6E2,C8BE,C8E1,E8CF,E8D4,E8D6,B9F1,E8D8,D7F5,C4FB,E8DC,B2E9,E8D1,BCED,BFC2,E8CD,D6F9,C1F8,B2F1,E8DF,CAC1,E8D9,D5A4,B1EA,D5BB,E8CE,E8D0,B6B0,E8D3,E8DD,C0B8,CAF7,CBA8,C6DC,C0F5,E8E9,D0A3,E8F2,D6EA,E8E0,E8E1,D1F9,BACB,B8F9,B8F1,D4D4,E8EF,E8EE,E8EC,B9F0,CCD2,E8E6,CEA6,BFF2,B0B8,E8F1,E8F0,D7C0,E8E4,CDA9,C9A3,BBB8,BDDB,E8EA,E8E2,E8E3,E8E5,B5B5,E8E7,C7C5,E8EB,E8ED,BDB0,D7AE,E8F8,E8F5,CDB0,E8F6,C1BA,E8E8,C3B7,B0F0,E8F4,E8F7,B9A3,C9D2,C3CE,CEE0,C0E6,CBF3,CCDD,D0B5,CAE1,E8F3,BCEC,E8F9,C3DE,C6E5,B9F7,B0F4,D7D8,BCAC,C5EF,CCC4,E9A6,C9AD,E9A2,C0E2,BFC3,E8FE,B9D7,E8FB,E9A4,D2CE,E9A3,D6B2,D7B5,E9A7,BDB7,E8FC,E8FD,E9A1,CDD6,D2AC,E9B2,E9A9,B4AA,B4BB,E9AB,D0A8,E9A5,B3FE,E9AC,C0E3,E9AA,E9B9,E9B8,E9AE,E8FA,E9A8,BFAC,E9B1,E9BA,C2A5,E9AF,B8C5,E9AD,D3DC,E9B4,E9B5,E9B7,E9C7,C0C6,E9C5,E9B0,E9BB,B0F1,E9BC,D5A5,E9BE,E9BF,E9C1,C1F1,C8B6,E9BD,E9C2,E9C3,E9B3,E9B6,BBB1,E9C0,BCF7,E9C4,E9C6,E9CA,E9CE,B2DB,E9C8,B7AE,E9CB,E9CC,D5C1,C4A3,E9D8,BAE1,E9C9,D3A3,E9D4,E9D7,E9D0,E9CF,C7C1,E9D2,E9D9,B3C8,E9D3,CFF0,E9CD,B3F7,E9D6,E9DA,CCB4,CFAD,E9D5,E9DC,E9DB,E9DE,E9D1,E9DD,E9DF,C3CA,C7B7,B4CE,BBB6,D0C0,ECA3,C5B7,D3FB,ECA4,ECA5,C6DB,BFEE,ECA6,ECA7,D0AA,C7B8,B8E8,ECA8,D6B9,D5FD,B4CB,B2BD,CEE4,C6E7,CDE1,B4F5,CBC0,BCDF,E9E2,E9E3,D1EA,E9E5,B4F9,E9E4,D1B3,CAE2,B2D0,E9E8,E9E6,E9E7,D6B3,E9E9,E9EA,E9EB,E9EC,ECAF,C5B9,B6CE,D2F3,B5EE,BBD9,ECB1,D2E3,CEE3,C4B8,C3BF,B6BE,D8B9,B1C8,B1CF,B1D1,C5FE,B1D0,C3AB,D5B1,EBA4,BAC1,CCBA,EBA5,EBA7,EBA8,EBA6,EBA9,EBAB,EBAA,EBAC,CACF,D8B5,C3F1,C3A5,C6F8,EBAD,C4CA,EBAE,EBAF,EBB0,B7D5,B7FA,EBB1,C7E2,EBB3,BAA4,D1F5,B0B1,EBB2,EBB4,B5AA,C2C8,C7E8,EBB5,CBAE,E3DF,D3C0,D9DB,CDA1,D6AD,C7F3,D9E0,BBE3,BABA,E3E2,CFAB,E3E0,C9C7,BAB9,D1B4,E3E1,C8EA,B9AF,BDAD,B3D8,CEDB,CCC0,E3E8,E3E9,CDF4,CCAD,BCB3,E3EA,E3EB,D0DA,C6FB,B7DA,C7DF,D2CA,CED6,E3E4,E3EC,C9F2,B3C1,E3E7,C6E3,E3E5,EDB3,E3E6,C9B3,C5E6,B9B5,C3BB,E3E3,C5BD,C1A4,C2D9,B2D7,E3ED,BBA6,C4AD,E3F0,BEDA,E3FB,E3F5,BAD3,B7D0,D3CD,D6CE,D5D3,B9C1,D5B4,D1D8,D0B9,C7F6,C8AA,B2B4,C3DA,E3EE,E3FC,E3EF,B7A8,E3F7,E3F4,B7BA,C5A2,E3F6,C5DD,B2A8,C6FC,C4E0,D7A2,C0E1,E3F9,E3FA,E3FD,CCA9,E3F3,D3BE,B1C3,EDB4,E3F1,E3F2,E3F8,D0BA,C6C3,D4F3,E3FE,BDE0,E4A7,E4A6,D1F3,E4A3,E4A9,C8F7,CFB4,E4A8,E4AE,C2E5,B6B4,BDF2,E4A2,BAE9,E4AA,E4AC,B6FD,D6DE,E4B2,E4AD,E4A1,BBEE,CDDD,C7A2,C5C9,C1F7,E4A4,C7B3,BDAC,BDBD,E4A5,D7C7,B2E2,E4AB,BCC3,E4AF,BBEB,E4B0,C5A8,E4B1,D5E3,BFA3,E4BA,E4B7,E4BB,E4BD,C6D6,BAC6,C0CB,B8A1,E4B4,D4A1,BAA3,BDFE,E4BC,CDBF,C4F9,CFFB,C9E6,D3BF,CFD1,E4B3,E4B8,E4B9,CCE9,CCCE,C0D4,E4B5,C1B0,E4B6,CED0,BBC1,B5D3,C8F3,BDA7,D5C7,C9AC,B8A2,E4CA,E4CC,D1C4,D2BA,BAAD,BAD4,E4C3,B5ED,D7CD,E4C0,CFFD,E4BF,C1DC,CCCA,CAE7,C4D7,CCD4,E4C8,E4C7,E4C1,E4C4,B5AD,D3D9,E4C6,D2F9,B4E3,BBB4,C9EE,B4BE,BBEC,D1CD,CCED,EDB5,C7E5,D4A8,E4CB,D7D5,E4C2,BDA5,E4C5,D3E6,E4C9,C9F8,E4BE,D3E5,C7FE,B6C9,D4FC,B2B3,E4D7,CEC2,E4CD,CEBC,B8DB,E4D6,BFCA,D3CE,C3EC,C5C8,E4D8,CDC4,E4CF,E4D4,E4D5,BAFE,CFE6,D5BF,E4D2,E4D0,E4CE,CDE5,CAAA,C0A3,BDA6,E4D3,B8C8,E4E7,D4B4,E4DB,C1EF,E4E9,D2E7,E4DF,E4E0,CFAA,CBDD,E4DA,E4D1,E4E5,C8DC,E4E3,C4E7,E4E2,E4E1,B3FC,E4E8,B5E1,D7CC,E4E6,BBAC,D7D2,CCCF,EBF8,E4E4,B9F6,D6CD,E4D9,E4DC,C2FA,E4DE,C2CB,C0C4,C2D0,B1F5,CCB2,B5CE,E4EF,C6AF,C6E1,E4F5,C2A9,C0EC,D1DD,E4EE,C4AE,E4ED,E4F6,E4F4,C2FE,E4DD,E4F0,CAFE,D5C4,E4F1,D1FA,E4EB,E4EC,E4F2,CEAB,C5CB,C7B1,C2BA,E4EA,C1CA,CCB6,B3B1,E4FB,E4F3,E4FA,E4FD,E4FC,B3CE,B3BA,E4F7,E4F9,E4F8,C5EC,C0BD,D4E8,E5A2,B0C4,E5A4,E5A3,BCA4,E5A5,E5A1,E4FE,B1F4,E5A8,E5A9,E5A6,E5A7,E5AA,C6D9,E5AB,E5AD,E5AC,E5AF,E5AE,B9E0,E5B0,E5B1,BBF0,ECE1,C3F0,B5C6,BBD2,C1E9,D4EE,BEC4,D7C6,D4D6,B2D3,ECBE,EAC1,C2AF,B4B6,D1D7,B3B4,C8B2,BFBB,ECC0,D6CB,ECBF,ECC1,ECC5,BEE6,CCBF,C5DA,BEBC,ECC6,B1FE,ECC4,D5A8,B5E3,ECC2,C1B6,B3E3,ECC3,CBB8,C0C3,CCFE,C1D2,ECC8,BAE6,C0D3,D6F2,D1CC,BFBE,B7B3,C9D5,ECC7,BBE2,CCCC,BDFD,C8C8,CFA9,CDE9,C5EB,B7E9,D1C9,BAB8,ECC9,ECCA,BBC0,ECCB,ECE2,B1BA,B7D9,BDB9,ECCC,D1E6,ECCD,C8BB,ECD1,ECD3,BBCD,BCE5,ECCF,C9B7,C3BA,ECE3,D5D5,ECD0,D6F3,ECD2,ECCE,ECD4,ECD5,C9BF,CFA8,D0DC,D1AC,C8DB,ECD6,CEF5,CAEC,ECDA,ECD9,B0BE,ECD7,ECD8,ECE4,C8BC,C1C7,ECDC,D1E0,ECDB,D4EF,ECDD,DBC6,ECDE,B1AC,ECDF,ECE0,D7A6,C5C0,EBBC,B0AE,BEF4,B8B8,D2AF,B0D6,B5F9,D8B3,CBAC,E3DD,C6AC,B0E6,C5C6,EBB9,EBBA,EBBB,D1C0,C5A3,EAF2,C4B2,C4B5,C0CE,EAF3,C4C1,CEEF,EAF0,EAF4,C9FC,C7A3,CCD8,CEFE,EAF5,EAF6,CFAC,C0E7,EAF7,B6BF,EAF8,EAF9,EAFA,EAFB,EAF1,C8AE,E1EB,B7B8,E1EC,E1ED,D7B4,E1EE,E1EF,D3CC,E1F1,BFF1,E1F0,B5D2,B1B7,E1F3,E1F2,BAFC,E1F4,B9B7,BED1,C4FC,BADD,BDC6,E1F5,E1F7,B6C0,CFC1,CAA8,E1F6,D5F8,D3FC,E1F8,E1FC,E1F9,E1FA,C0EA,E1FE,E2A1,C0C7,E1FB,E1FD,E2A5,C1D4,E2A3,E2A8,B2FE,E2A2,C3CD,B2C2,E2A7,E2A6,E2A4,E2A9,E2AB,D0C9,D6ED,C3A8,E2AC,CFD7,E2AE,BAEF,E9E0,E2AD,E2AA,BBAB,D4B3,E2B0,E2AF,E9E1,E2B1,E2B2,E2B3,CCA1,E2B4,E2B5,D0FE,C2CA,D3F1,CDF5,E7E0,E7E1,BEC1,C2EA,E7E4,E7E3,CDE6,C3B5,E7E2,BBB7,CFD6,C1E1,E7E9,E7E8,E7F4,B2A3,E7EA,E7E6,E7EC,E7EB,C9BA,D5E4,E7E5,B7A9,E7E7,E7EE,E7F3,D6E9,E7ED,E7F2,E7F1,B0E0,E7F5,C7F2,C0C5,C0ED,C1F0,E7F0,E7F6,CBF6,E8A2,E8A1,D7C1,E7FA,E7F9,E7FB,E7F7,E7FE,E7FD,E7FC,C1D5,C7D9,C5FD,C5C3,C7ED,E8A3,E8A6,E8A5,E8A7,BAF7,E7F8,E8A4,C8F0,C9AA,E8A9,B9E5,D1FE,E8A8,E8AA,E8AD,E8AE,C1A7,E8AF,E8B0,E8AC,E8B4,E8AB,E8B1,E8B5,E8B2,E8B3,E8B7,E8B6,B9CF,F0AC,F0AD,C6B0,B0EA,C8BF,CDDF,CECD,EAB1,EAB2,C6BF,B4C9,EAB3,D5E7,DDF9,EAB4,EAB5,EAB6,B8CA,DFB0,C9F5,CCF0,C9FA,C9FB,D3C3,CBA6,B8A6,F0AE,B1C2,E5B8,CCEF,D3C9,BCD7,C9EA,B5E7,C4D0,B5E9,EEAE,BBAD,E7DE,EEAF,B3A9,EEB2,EEB1,BDE7,EEB0,CEB7,C5CF,C1F4,DBCE,EEB3,D0F3,C2D4,C6E8,B7AC,EEB4,B3EB,BBFB,EEB5,E7DC,EEB6,BDAE,F1E2,CAE8,D2C9,F0DA,F0DB,F0DC,C1C6,B8ED,BECE,F0DE,C5B1,F0DD,D1F1,F0E0,B0CC,BDEA,D2DF,F0DF,B4AF,B7E8,F0E6,F0E5,C6A3,F0E1,F0E2,B4C3,F0E3,D5EE,CCDB,BED2,BCB2,F0E8,F0E7,F0E4,B2A1,D6A2,D3B8,BEB7,C8AC,F0EA,D1F7,D6CC,BADB,F0E9,B6BB,CDB4,C6A6,C1A1,F0EB,F0EE,F0ED,F0F0,F0EC,BBBE,F0EF,CCB5,F0F2,B3D5,B1D4,F0F3,F0F4,F0F6,B4E1,F0F1,F0F7,F0FA,F0F8,F0F5,F0FD,F0F9,F0FC,F0FE,F1A1,CEC1,F1A4,F1A3,C1F6,F0FB,CADD,B4F1,B1F1,CCB1,F1A6,F1A7,F1AC,D5CE,F1A9,C8B3,F1A2,F1AB,F1A8,F1A5,F1AA,B0A9,F1AD,F1AF,F1B1,F1B0,F1AE,D1A2,F1B2,F1B3,B9EF,B5C7,B0D7,B0D9,D4ED,B5C4,BDD4,BBCA,F0A7,B8DE,F0A8,B0A8,F0A9,CDEE,F0AA,F0AB,C6A4,D6E5,F1E4,F1E5,C3F3,D3DB,D6D1,C5E8,D3AF,D2E6,EEC1,B0BB,D5B5,D1CE,BCE0,BAD0,BFF8,B8C7,B5C1,C5CC,CAA2,C3CB,EEC2,C4BF,B6A2,EDEC,C3A4,D6B1,CFE0,EDEF,C5CE,B6DC,CAA1,EDED,EDF0,EDF1,C3BC,BFB4,EDEE,EDF4,EDF2,D5E6,C3DF,EDF3,EDF6,D5A3,D1A3,EDF5,C3D0,EDF7,BFF4,BEEC,EDF8,CCF7,D1DB,D7C5,D5F6,EDFC,EDFB,EDF9,EDFA,EDFD,BEA6,CBAF,EEA1,B6BD,EEA2,C4C0,EDFE,BDDE,B2C7,B6C3,EEA5,D8BA,EEA3,EEA6,C3E9,B3F2,EEA7,EEA4,CFB9,EEA8,C2F7,EEA9,EEAA,DEAB,C6B3,C7C6,D6F5,B5C9,CBB2,EEAB,CDAB,EEAC,D5B0,EEAD,F6C4,DBC7,B4A3,C3AC,F1E6,CAB8,D2D3,D6AA,EFF2,BED8,BDC3,EFF3,B6CC,B0AB,CAAF,EDB6,EDB7,CEF9,B7AF,BFF3,EDB8,C2EB,C9B0,EDB9,C6F6,BFB3,EDBC,C5F8,D1D0,D7A9,EDBA,EDBB,D1E2,EDBF,EDC0,EDC4,EDC8,EDC6,EDCE,D5E8,EDC9,EDC7,EDBE,C5E9,C6C6,C9E9,D4D2,EDC1,EDC2,EDC3,EDC5,C0F9,B4A1,B9E8,EDD0,EDD1,EDCA,EDCF,CEF8,CBB6,EDCC,EDCD,CFF5,EDD2,C1F2,D3B2,EDCB,C8B7,BCEF,C5F0,EDD6,B5EF,C2B5,B0AD,CBE9,B1AE,EDD4,CDEB,B5E2,EDD5,EDD3,EDD7,B5FA,EDD8,EDD9,EDDC,B1CC,C5F6,BCEE,EDDA,CCBC,B2EA,EDDB,C4EB,B4C5,B0F5,EDDF,C0DA,B4E8,C5CD,EDDD,BFC4,EDDE,C4A5,EDE0,EDE1,EDE3,C1D7,BBC7,BDB8,EDE2,EDE4,EDE6,EDE5,EDE7,CABE,ECEA,C0F1,C9E7,ECEB,C6EE,ECEC,C6ED,ECED,ECF0,D7E6,ECF3,ECF1,ECEE,ECEF,D7A3,C9F1,CBEE,ECF4,ECF2,CFE9,ECF6,C6B1,BCC0,ECF5,B5BB,BBF6,ECF7,D9F7,BDFB,C2BB,ECF8,ECF9,B8A3,ECFA,ECFB,ECFC,D3ED,D8AE,C0EB,C7DD,BACC,D0E3,CBBD,CDBA,B8D1,B1FC,C7EF,D6D6,BFC6,C3EB,EFF5,C3D8,D7E2,EFF7,B3D3,C7D8,D1ED,D6C8,EFF8,EFF6,BBFD,B3C6,BDD5,D2C6,BBE0,CFA1,EFFC,EFFB,EFF9,B3CC,C9D4,CBB0,EFFE,B0DE,D6C9,EFFD,B3ED,F6D5,CEC8,F0A2,F0A1,B5BE,BCDA,BBFC,B8E5,C4C2,F0A3,CBEB,F0A6,D1A8,BEBF,C7EE,F1B6,F1B7,BFD5,B4A9,F1B8,CDBB,C7D4,D5AD,F1B9,F1BA,C7CF,D2A4,D6CF,F1BB,BDD1,B4B0,BEBD,B4DC,CED1,BFDF,F1BD,BFFA,F1BC,F1BF,F1BE,F1C0,F1C1,C1FE,C1A2,CAFA,D5BE,BEBA,BEB9,D5C2,BFA2,CDAF,F1B5,BDDF,B6CB,D6F1,F3C3,F3C4,B8CD,F3C6,F3C7,B0CA,F3C5,F3C9,CBF1,F3CB,D0A6,B1CA,F3C8,F3CF,B5D1,F3D7,F3D2,F3D4,F3D3,B7FB,B1BF,F3CE,F3CA,B5DA,F3D0,F3D1,F3D5,F3CD,BCE3,C1FD,F3D6,F3DA,F3CC,B5C8,BDEE,F3DC,B7A4,BFF0,D6FE,CDB2,B4F0,B2DF,F3D8,F3D9,C9B8,F3DD,F3DE,F3E1,F3DF,F3E3,F3E2,F3DB,BFEA,B3EF,F3E0,C7A9,BCF2,F3EB,B9BF,F3E4,B2AD,BBFE,CBE3,F3ED,F3E9,B9DC,F3EE,F3E5,F3E6,F3EA,C2E1,F3EC,F3EF,F3E8,BCFD,CFE4,F3F0,F3E7,F3F2,D7AD,C6AA,F3F3,F3F1,C2A8,B8DD,F3F5,F3F4,B4DB,F3F6,F3F7,F3F8,C0BA,C0E9,C5F1,F3FB,F3FA,B4D8,F3FE,F3F9,F3FC,F3FD,F4A1,F4A3,BBC9,F4A2,F4A4,B2BE,F4A6,F4A5,BCAE,C3D7,D9E1,C0E0,F4CC,D7D1,B7DB,F4CE,C1A3,C6C9,B4D6,D5B3,F4D0,F4CF,F4D1,CBDA,F4D2,D4C1,D6E0,B7E0,C1B8,C1BB,F4D3,BEAC,B4E2,F4D4,F4D5,BEAB,F4D6,F4DB,F4D7,F4DA,BAFD,F4D8,F4D9,B8E2,CCC7,F4DC,B2DA,C3D3,D4E3,BFB7,F4DD,C5B4,F4E9,CFB5,CEC9,CBD8,CBF7,BDF4,D7CF,C0DB,D0F5,F4EA,F4EB,F4EC,F7E3,B7B1,F4ED,D7EB,F4EE,E6F9,BEC0,E6FA,BAEC,E6FB,CFCB,E6FC,D4BC,BCB6,E6FD,E6FE,BCCD,C8D2,CEB3,E7A1,B4BF,E7A2,C9B4,B8D9,C4C9,D7DD,C2DA,B7D7,D6BD,CEC6,B7C4,C5A6,E7A3,CFDF,E7A4,E7A5,E7A6,C1B7,D7E9,C9F0,CFB8,D6AF,D6D5,E7A7,B0ED,E7A8,E7A9,C9DC,D2EF,BEAD,E7AA,B0F3,C8DE,BDE1,E7AB,C8C6,E7AC,BBE6,B8F8,D1A4,E7AD,C2E7,BEF8,BDCA,CDB3,E7AE,E7AF,BEEE,D0E5,CBE7,CCD0,BCCC,E7B0,BCA8,D0F7,E7B1,D0F8,E7B2,E7B3,B4C2,E7B4,E7B5,C9FE,CEAC,C3E0,E7B7,B1C1,B3F1,E7B8,E7B9,D7DB,D5C0,E7BA,C2CC,D7BA,E7BB,E7BC,E7BD,BCEA,C3E5,C0C2,E7BE,E7BF,BCA9,E7C0,E7C1,E7B6,B6D0,E7C2,E7C3,E7C4,BBBA,B5DE,C2C6,B1E0,E7C5,D4B5,E7C6,B8BF,E7C8,E7C7,B7EC,E7C9,B2F8,E7CA,E7CB,E7CC,E7CD,E7CE,E7CF,E7D0,D3A7,CBF5,E7D1,E7D2,E7D3,E7D4,C9C9,E7D5,E7D6,E7D7,E7D8,E7D9,BDC9,E7DA,F3BE,B8D7,C8B1,F3BF,F3C0,F3C1,B9DE,CDF8,D8E8,BAB1,C2DE,EEB7,B7A3,EEB9,EEB8,B0D5,EEBB,D5D6,D7EF,D6C3,EEBD,CAF0,EEBC,EEBE,EEC0,EEBF,D1F2,C7BC,C3C0,B8E1,C1E7,F4C6,D0DF,F4C7,CFDB,C8BA,F4C8,F4C9,F4CA,F4CB,D9FA,B8FE,E5F1,D3F0,F4E0,CECC,B3E1,F1B4,D2EE,F4E1,CFE8,F4E2,C7CC,B5D4,B4E4,F4E4,F4E3,F4E5,F4E6,F4E7,BAB2,B0BF,F4E8,B7AD,D2ED,D2AB,C0CF,BFBC,EBA3,D5DF,EAC8,F1F3,B6F8,CBA3,C4CD,F1E7,F1E8,B8FB,F1E9,BAC4,D4C5,B0D2,F1EA,F1EB,F1EC,F1ED,F1EE,F1EF,F1F1,F1F0,C5D5,F1F2,B6FA,F1F4,D2AE,DEC7,CBCA,B3DC,B5A2,B9A2,C4F4,F1F5,F1F6,C1C4,C1FB,D6B0,F1F7,F1F8,C1AA,C6B8,BEDB,F1F9,B4CF,F1FA,EDB2,EDB1,CBE0,D2DE,CBC1,D5D8,C8E2,C0DF,BCA1,EBC1,D0A4,D6E2,B6C7,B8D8,EBC0,B8CE,EBBF,B3A6,B9C9,D6AB,B7F4,B7CA,BCE7,B7BE,EBC6,EBC7,B0B9,BFCF,EBC5,D3FD,EBC8,EBC9,B7CE,EBC2,EBC4,C9F6,D6D7,D5CD,D0B2,EBCF,CEB8,EBD0,B5A8,B1B3,EBD2,CCA5,C5D6,EBD3,EBD1,C5DF,EBCE,CAA4,EBD5,B0FB,BAFA,D8B7,F1E3,EBCA,EBCB,EBCC,EBCD,EBD6,E6C0,EBD9,BFE8,D2C8,EBD7,EBDC,B8EC,EBD8,BDBA,D0D8,B0B7,EBDD,C4DC,D6AC,B4E0,C2F6,BCB9,EBDA,EBDB,D4E0,C6EA,C4D4,EBDF,C5A7,D9F5,B2B1,EBE4,BDC5,EBE2,EBE3,B8AC,CDD1,EBE5,EBE1,C1B3,C6A2,CCF3,EBE6,C0B0,D2B8,EBE7,B8AF,B8AD,EBE8,C7BB,CDF3,EBEA,EBEB,EBED,D0C8,EBF2,EBEE,EBF1,C8F9,D1FC,EBEC,EBE9,B8B9,CFD9,C4E5,EBEF,EBF0,CCDA,CDC8,B0F2,EBF6,EBF5,B2B2,B8E0,EBF7,B1EC,CCC5,C4A4,CFA5,EBF9,ECA2,C5F2,EBFA,C9C5,E2DF,EBFE,CDCE,ECA1,B1DB,D3B7,D2DC,EBFD,EBFB,B3BC,EAB0,D7D4,F4AB,B3F4,D6C1,D6C2,D5E9,BECA,F4A7,D2A8,F4A8,F4A9,F4AA,BECB,D3DF,C9E0,C9E1,F3C2,CAE6,CCF2,E2B6,CBB4,CEE8,D6DB,F4AD,F4AE,F4AF,F4B2,BABD,F4B3,B0E3,F4B0,F4B1,BDA2,B2D5,F4B6,F4B7,B6E6,B2B0,CFCF,F4B4,B4AC,F4B5,F4B8,F4B9,CDA7,F4BA,F4BB,F4BC,CBD2,F4BD,F4BE,F4BF,F4DE,C1BC,BCE8,C9AB,D1DE,E5F5,DCB3,D2D5,DCB4,B0AC,DCB5,BDDA,DCB9,D8C2,DCB7,D3F3,C9D6,DCBA,DCB6,DCBB,C3A2,DCBC,DCC5,DCBD,CEDF,D6A5,DCCF,DCCD,DCD2,BDE6,C2AB,DCB8,DCCB,DCCE,DCBE,B7D2,B0C5,DCC7,D0BE,DCC1,BBA8,B7BC,DCCC,DCC6,DCBF,C7DB,D1BF,DCC0,DCCA,DCD0,CEAD,DCC2,DCC3,DCC8,DCC9,B2D4,DCD1,CBD5,D4B7,DCDB,DCDF,CCA6,DCE6,C3E7,DCDC,BFC1,DCD9,B0FA,B9B6,DCE5,DCD3,DCC4,DCD6,C8F4,BFE0,C9BB,B1BD,D3A2,DCDA,DCD5,C6BB,DCDE,D7C2,C3AF,B7B6,C7D1,C3A9,DCE2,DCD8,DCEB,DCD4,DCDD,BEA5,DCD7,DCE0,DCE3,DCE4,DCF8,DCE1,DDA2,DCE7,BCEB,B4C4,C3A3,B2E7,DCFA,DCF2,DCEF,DCFC,DCEE,D2F0,B2E8,C8D7,C8E3,DCFB,DCED,DCF7,DCF5,BEA3,DCF4,B2DD,DCF3,BCF6,DCE8,BBC4,C0F3,BCD4,DCE9,DCEA,DCF1,DCF6,DCF9,B5B4,C8D9,BBE7,DCFE,DCFD,D3AB,DDA1,DDA3,DDA5,D2F1,DDA4,DDA6,DDA7,D2A9,BAC9,DDA9,DDB6,DDB1,DDB4,DDB0,C6CE,C0F2,C9AF,DCEC,DDAE,DDB7,DCF0,DDAF,DDB8,DDAC,DDB9,DDB3,DDAD,C4AA,DDA8,C0B3,C1AB,DDAA,DDAB,DDB2,BBF1,DDB5,D3A8,DDBA,DDBB,C3A7,DDD2,DDBC,DDD1,B9BD,BED5,BEFA,BACA,DDCA,DDC5,DDBF,B2CB,DDC3,DDCB,B2A4,DDD5,DDBE,C6D0,DDD0,DDD4,C1E2,B7C6,DDCE,DDCF,DDC4,DDBD,DDCD,CCD1,DDC9,DDC2,C3C8,C6BC,CEAE,DDCC,DDC8,DDC1,DDC6,C2DC,D3A9,D3AA,DDD3,CFF4,C8F8,DDE6,DDC7,DDE0,C2E4,DDE1,DDD7,D6F8,DDD9,DDD8,B8F0,DDD6,C6CF,B6AD,DDE2,BAF9,D4E1,DDE7,B4D0,DDDA,BFFB,DDE3,DDDF,DDDD,B5D9,DDDB,DDDC,DDDE,BDAF,DDE4,DDE5,DDF5,C3C9,CBE2,DDF2,D8E1,C6D1,DDF4,D5F4,DDF3,DDF0,DDEC,DDEF,DDE8,D0EE,C8D8,DDEE,DDE9,DDEA,CBF2,DDED,B1CD,C0B6,BCBB,DDF1,DDF7,DDF6,DDEB,C5EE,DDFB,DEA4,DEA3,DDF8,C3EF,C2FB,D5E1,CEB5,DDFD,B2CC,C4E8,CADF,C7BE,DDFA,DDFC,DDFE,DEA2,B0AA,B1CE,DEAC,DEA6,BDB6,C8EF,DEA1,DEA5,DEA9,DEA8,DEA7,DEAD,D4CC,DEB3,DEAA,DEAE,C0D9,B1A1,DEB6,DEB1,DEB2,D1A6,DEB5,DEAF,DEB0,D0BD,DEB4,CAED,DEB9,DEB8,DEB7,DEBB,BDE5,B2D8,C3EA,DEBA,C5BA,DEBC,CCD9,B7AA,D4E5,DEBD,DEBF,C4A2,DEC1,DEBE,DEC0,D5BA,DEC2,F2AE,BBA2,C2B2,C5B0,C2C7,F2AF,D0E9,D3DD,EBBD,B3E6,F2B0,F2B1,CAAD,BAE7,F2B3,F2B5,F2B4,CBE4,CFBA,F2B2,CAB4,D2CF,C2EC,CEC3,F2B8,B0F6,F2B7,F2BE,B2CF,D1C1,F2BA,F2BC,D4E9,F2BB,F2B6,F2BF,F2BD,F2B9,F2C7,F2C4,F2C6,F2CA,F2C2,F2C0,F2C5,D6FB,F2C1,C7F9,C9DF,F2C8,B9C6,B5B0,F2C3,F2C9,F2D0,F2D6,BBD7,F2D5,CDDC,D6EB,F2D2,F2D4,B8F2,F2CB,F2CE,C2F9,D5DD,F2CC,F2CD,F2CF,F2D3,F2D9,D3BC,B6EA,CAF1,B7E4,F2D7,F2D8,F2DA,F2DD,F2DB,F2DC,D1D1,F2D1,CDC9,CECF,D6A9,F2E3,C3DB,F2E0,C0AF,F2EC,F2DE,F2E1,F2E8,F2E2,F2E7,F2E6,F2E9,F2DF,F2E4,F2EA,D3AC,F2E5,B2F5,F2F2,D0AB,F2F5,BBC8,F2F9,F2F0,F2F6,F2F8,F2FA,F2F3,F2F1,BAFB,B5FB,F2EF,F2F7,F2ED,F2EE,F2EB,F3A6,F3A3,F3A2,F2F4,C8DA,F2FB,F3A5,C3F8,F2FD,F3A7,F3A9,F3A4,F2FC,F3AB,F3AA,C2DD,F3AE,F3B0,F3A1,F3B1,F3AC,F3AF,F2FE,F3AD,F3B2,F3B4,F3A8,F3B3,F3B5,D0B7,F3B8,D9F9,F3B9,F3B7,C8E4,F3B6,F3BA,F3BB,B4C0,EEC3,F3BC,F3BD,D1AA,F4AC,D0C6,D0D0,D1DC,CFCE,BDD6,D1C3,BAE2,E1E9,D2C2,F1C2,B2B9,B1ED,F1C3,C9C0,B3C4,D9F2,CBA5,F1C4,D6D4,F1C5,F4C0,F1C6,D4AC,F1C7,B0C0,F4C1,F4C2,B4FC,C5DB,CCBB,D0E4,CDE0,F1C8,D9F3,B1BB,CFAE,B8A4,F1CA,F1CB,B2C3,C1D1,D7B0,F1C9,F1CC,F1CE,D9F6,D2E1,D4A3,F4C3,C8B9,F4C4,F1CD,F1CF,BFE3,F1D0,F1D4,F1D6,F1D1,C9D1,C5E1,C2E3,B9FC,F1D3,F1D5,B9D3,F1DB,BAD6,B0FD,F1D9,F1D8,F1D2,F1DA,F1D7,C8EC,CDCA,F1DD,E5BD,F1DC,F1DE,F1DF,CFE5,F4C5,BDF3,F1E0,F1E1,CEF7,D2AA,F1FB,B8B2,BCFB,B9DB,B9E6,C3D9,CAD3,EAE8,C0C0,BEF5,EAE9,EAEA,EAEB,EAEC,EAED,EAEE,EAEF,BDC7,F5FB,F5FD,F5FE,F5FC,BDE2,F6A1,B4A5,F6A2,F6A3,ECB2,D1D4,D9EA,F6A4,EEBA,D5B2,D3FE,CCDC,CAC4,E5C0,F6A5,BEAF,C6A9,DAA5,BCC6,B6A9,B8BC,C8CF,BCA5,DAA6,DAA7,CCD6,C8C3,DAA8,C6FD,D1B5,D2E9,D1B6,BCC7,BDB2,BBE4,DAA9,DAAA,D1C8,DAAB,D0ED,B6EF,C2DB,CBCF,B7ED,C9E8,B7C3,BEF7,D6A4,DAAC,DAAD,C6C0,D7E7,CAB6,D5A9,CBDF,D5EF,DAAE,D6DF,B4CA,DAB0,DAAF,D2EB,DAB1,DAB2,DAB3,CAD4,DAB4,CAAB,DAB5,DAB6,B3CF,D6EF,DAB7,BBB0,B5AE,DAB8,DAB9,B9EE,D1AF,D2E8,DABA,B8C3,CFEA,B2EF,DABB,DABC,BDEB,CEDC,D3EF,DABD,CEF3,DABE,D3D5,BBE5,DABF,CBB5,CBD0,DAC0,C7EB,D6EE,DAC1,C5B5,B6C1,DAC2,B7CC,BFCE,DAC3,DAC4,CBAD,DAC5,B5F7,DAC6,C1C2,D7BB,DAC7,CCB8,D2EA,C4B1,DAC8,B5FD,BBD1,DAC9,D0B3,DACA,DACB,CEBD,DACC,DACD,DACE,B2F7,DAD1,DACF,D1E8,DAD0,C3D5,DAD2,DAD3,DAD4,DAD5,D0BB,D2A5,B0F9,DAD6,C7AB,DAD7,BDF7,C3A1,DAD8,DAD9,C3FD,CCB7,DADA,DADB,C0BE,C6D7,DADC,DADD,C7B4,DADE,DADF,B9C8,BBED,B6B9,F4F8,F4F9,CDE3,F5B9,EBE0,CFF3,BBBF,BAC0,D4A5,E1D9,F5F4,B1AA,B2F2,F5F5,F5F7,BAD1,F5F6,C3B2,F5F9,F5F8,B1B4,D5EA,B8BA,B9B1,B2C6,D4F0,CFCD,B0DC,D5CB,BBF5,D6CA,B7B7,CCB0,C6B6,B1E1,B9BA,D6FC,B9E1,B7A1,BCFA,EADA,EADB,CCF9,B9F3,EADC,B4FB,C3B3,B7D1,BAD8,EADD,D4F4,EADE,BCD6,BBDF,EADF,C1DE,C2B8,D4DF,D7CA,EAE0,EAE1,EAE4,EAE2,EAE3,C9DE,B8B3,B6C4,EAE5,CAEA,C9CD,B4CD,E2D9,C5E2,EAE6,C0B5,D7B8,EAE7,D7AC,C8FC,D8D3,D8CD,D4DE,D4F9,C9C4,D3AE,B8D3,B3E0,C9E2,F4F6,BAD5,F4F7,D7DF,F4F1,B8B0,D5D4,B8CF,C6F0,B3C3,F4F2,B3AC,D4BD,C7F7,F4F4,F4F3,CCCB,C8A4,F4F5,D7E3,C5BF,F5C0,F5BB,F5C3,F5C2,D6BA,F5C1,D4BE,F5C4,F5CC,B0CF,B5F8,F5C9,F5CA,C5DC,F5C5,F5C6,F5C7,F5CB,BEE0,F5C8,B8FA,F5D0,F5D3,BFE7,B9F2,F5BC,F5CD,C2B7,CCF8,BCF9,F5CE,F5CF,F5D1,B6E5,F5D2,F5D5,F5BD,F5D4,D3BB,B3EC,CCA4,F5D6,F5D7,BEE1,F5D8,CCDF,F5DB,B2C8,D7D9,F5D9,F5DA,F5DC,F5E2,F5E0,F5DF,F5DD,F5E1,F5DE,F5E4,F5E5,CCE3,E5BF,B5B8,F5E3,F5E8,CCA3,F5E6,F5E7,F5BE,B1C4,F5BF,B5C5,B2E4,F5EC,F5E9,B6D7,F5ED,F5EA,F5EB,B4DA,D4EA,F5EE,B3F9,F5EF,F5F1,F5F0,F5F2,F5F3,C9ED,B9AA,C7FB,B6E3,CCC9,EAA6,B3B5,D4FE,B9EC,D0F9,E9ED,D7AA,E9EE,C2D6,C8ED,BAE4,E9EF,E9F0,E9F1,D6E1,E9F2,E9F3,E9F5,E9F4,E9F6,E9F7,C7E1,E9F8,D4D8,E9F9,BDCE,E9FA,E9FB,BDCF,E9FC,B8A8,C1BE,E9FD,B1B2,BBD4,B9F5,E9FE,EAA1,EAA2,EAA3,B7F8,BCAD,CAE4,E0CE,D4AF,CFBD,D5B7,EAA4,D5DE,EAA5,D0C1,B9BC,B4C7,B1D9,C0B1,B1E6,B1E7,B1E8,B3BD,C8E8,E5C1,B1DF,C1C9,B4EF,C7A8,D3D8,C6F9,D1B8,B9FD,C2F5,D3AD,D4CB,BDFC,E5C2,B7B5,E5C3,BBB9,D5E2,BDF8,D4B6,CEA5,C1AC,B3D9,CCF6,E5C6,E5C4,E5C8,E5CA,E5C7,B5CF,C6C8,B5FC,E5C5,CAF6,E5C9,C3D4,B1C5,BCA3,D7B7,CDCB,CBCD,CACA,CCD3,E5CC,E5CB,C4E6,D1A1,D1B7,E5CD,E5D0,CDB8,D6F0,E5CF,B5DD,CDBE,E5D1,B6BA,CDA8,B9E4,CAC5,B3D1,CBD9,D4EC,E5D2,B7EA,E5CE,E5D5,B4FE,E5D6,E5D3,E5D4,D2DD,C2DF,B1C6,D3E2,B6DD,CBEC,E5D7,D3F6,B1E9,B6F4,E5DA,E5D8,E5D9,B5C0,D2C5,E5DC,E5DE,E5DD,C7B2,D2A3,E5DB,D4E2,D5DA,E5E0,D7F1,E5E1,B1DC,D1FB,E5E2,E5E4,E5E3,E5E5,D2D8,B5CB,E7DF,DAF5,DAF8,DAF6,DAF7,DAFA,D0CF,C4C7,B0EE,D0B0,DAF9,D3CA,BAAA,DBA2,C7F1,DAFC,DAFB,C9DB,DAFD,DBA1,D7DE,DAFE,C1DA,DBA5,D3F4,DBA7,DBA4,DBA8,BDBC,C0C9,DBA3,DBA6,D6A3,DBA9,DBAD,DBAE,DBAC,BAC2,BFA4,DBAB,DBAA,D4C7,B2BF,DBAF,B9F9,DBB0,B3BB,B5A6,B6BC,DBB1,B6F5,DBB2,B1C9,DBB4,DBB3,DBB5,DBB7,DBB6,DBB8,DBB9,DBBA,D3CF,F4FA,C7F5,D7C3,C5E4,F4FC,F4FD,F4FB,BEC6,D0EF,B7D3,D4CD,CCAA,F5A2,F5A1,BAA8,F4FE,CBD6,F5A4,C0D2,B3EA,CDAA,F5A5,F5A3,BDB4,F5A8,F5A9,BDCD,C3B8,BFE1,CBE1,F5AA,F5A6,F5A7,C4F0,F5AC,B4BC,D7ED,B4D7,F5AB,F5AE,F5AD,F5AF,D0D1,C3D1,C8A9,F5B0,F5B1,F5B2,F5B3,F5B4,F5B5,F5B7,F5B6,F5B8,B2C9,D3D4,CACD,C0EF,D6D8,D2B0,C1BF,BDF0,B8AA,BCF8,F6C6,F6C7,F6C8,F6C9,F6CA,F6CC,F6CB,F7E9,F6CD,F6CE,EEC4,EEC5,EEC6,D5EB,B6A4,EEC8,EEC7,EEC9,EECA,C7A5,EECB,EECC,B7B0,B5F6,EECD,EECF,EECE,B8C6,EED0,EED1,EED2,B6DB,B3AE,D6D3,C4C6,B1B5,B8D6,EED3,EED4,D4BF,C7D5,BEFB,CED9,B9B3,EED6,EED5,EED8,EED7,C5A5,EED9,EEDA,C7AE,EEDB,C7AF,EEDC,B2A7,EEDD,EEDE,EEDF,EEE0,EEE1,D7EA,EEE2,EEE3,BCD8,EEE4,D3CB,CCFA,B2AC,C1E5,EEE5,C7A6,C3AD,EEE6,EEE7,EEE8,EEE9,EEEA,EEEB,EEEC,EEED,EEEE,EEEF,EEF0,EEF1,EEF2,EEF4,EEF3,EEF5,CDAD,C2C1,EEF6,EEF7,EEF8,D5A1,EEF9,CFB3,EEFA,EEFB,EEFC,EEFD,EFA1,EEFE,EFA2,B8F5,C3FA,EFA3,EFA4,BDC2,D2BF,B2F9,EFA5,EFA6,EFA7,D2F8,EFA8,D6FD,EFA9,C6CC,EFAA,EFAB,C1B4,EFAC,CFFA,CBF8,EFAE,EFAD,B3FA,B9F8,EFAF,EFB0,D0E2,EFB1,EFB2,B7E6,D0BF,EFB3,EFB4,EFB5,C8F1,CCE0,EFB6,EFB7,EFB8,EFB9,EFBA,D5E0,EFBB,B4ED,C3AA,EFBC,EFBD,EFBE,EFBF,CEFD,EFC0,C2E0,B4B8,D7B6,BDF5,CFC7,EFC3,EFC1,EFC2,EFC4,B6A7,BCFC,BEE2,C3CC,EFC5,EFC6,EFC7,EFCF,EFC8,EFC9,EFCA,C7C2,EFF1,B6CD,EFCB,EFCC,EFCD,B6C6,C3BE,EFCE,EFD0,EFD1,EFD2,D5F2,EFD3,C4F7,EFD4,C4F8,EFD5,EFD6,B8E4,B0F7,EFD7,EFD8,EFD9,EFDA,EFDB,EFDC,EFDD,EFDE,BEB5,EFE1,EFDF,EFE0,EFE2,EFE3,C1CD,EFE4,EFE5,EFE6,EFE7,EFE8,EFE9,EFEA,EFEB,EFEC,C0D8,EFED,C1AD,EFEE,EFEF,EFF0,CFE2,B3A4,C3C5,E3C5,C9C1,E3C6,B1D5,CECA,B4B3,C8F2,E3C7,CFD0,E3C8,BCE4,E3C9,E3CA,C3C6,D5A2,C4D6,B9EB,CEC5,E3CB,C3F6,E3CC,B7A7,B8F3,BAD2,E3CD,E3CE,D4C4,E3CF,E3D0,D1CB,E3D1,E3D2,E3D3,E3D4,D1D6,E3D5,B2FB,C0BB,E3D6,C0AB,E3D7,E3D8,E3D9,E3DA,E3DB,B8B7,DAE2,B6D3,DAE4,DAE3,DAE6,C8EE,DAE5,B7C0,D1F4,D2F5,D5F3,BDD7,D7E8,DAE8,DAE7,B0A2,CDD3,DAE9,B8BD,BCCA,C2BD,C2A4,B3C2,DAEA,C2AA,C4B0,BDB5,CFDE,DAEB,C9C2,B1DD,DAEC,B6B8,D4BA,B3FD,DAED,D4C9,CFD5,C5E3,DAEE,DAEF,DAF0,C1EA,CCD5,CFDD,D3E7,C2A1,DAF1,CBE5,DAF2,CBE6,D2FE,B8F4,DAF3,B0AF,CFB6,D5CF,CBED,DAF4,E3C4,C1A5,F6BF,F6C0,F6C1,C4D1,C8B8,D1E3,D0DB,D1C5,BCAF,B9CD,EFF4,B4C6,D3BA,F6C2,B3FB,F6C3,B5F1,F6C5,D3EA,F6A7,D1A9,F6A9,F6A8,C1E3,C0D7,B1A2,CEED,D0E8,F6AB,CFF6,F6AA,D5F0,F6AC,C3B9,BBF4,F6AE,F6AD,C4DE,C1D8,CBAA,CFBC,F6AF,F6B0,F6B1,C2B6,B0D4,C5F9,F6B2,C7E0,F6A6,BEB8,BEB2,B5E5,B7C7,BFBF,C3D2,C3E6,D8CC,B8EF,BDF9,D1A5,B0D0,F7B0,F7B1,D0AC,B0B0,F7B2,F7B3,F7B4,C7CA,BECF,F7B7,F7B6,B1DE,F7B5,F7B8,F7B9,CEA4,C8CD,BAAB,E8B8,E8B9,E8BA,BEC2,D2F4,D4CF,C9D8,D2B3,B6A5,C7EA,F1FC,CFEE,CBB3,D0EB,E7EF,CDE7,B9CB,B6D9,F1FD,B0E4,CBCC,F1FE,D4A4,C2AD,C1EC,C6C4,BEB1,F2A1,BCD5,F2A2,F2A3,F2A4,D2C3,C6B5,CDC7,F2A5,D3B1,BFC5,CCE2,F2A6,F2A7,D1D5,B6EE,F2A8,F2A9,B5DF,F2AA,F2AB,B2FC,F2AC,F2AD,C8A7,B7E7,ECA9,ECAA,ECAB,ECAC,C6AE,ECAD,ECAE,B7C9,CAB3,E2B8,F7CF,F7D0,B2CD,F7D1,F7D3,F7D2,E2BB,BCA2,E2BC,E2BD,E2BE,E2BF,E2C0,E2C1,B7B9,D2FB,BDA4,CACE,B1A5,CBC7,E2C2,B6FC,C8C4,E2C3,BDC8,B1FD,E2C4,B6F6,E2C5,C4D9,E2C6,CFDA,B9DD,E2C7,C0A1,E2C8,B2F6,E2C9,C1F3,E2CA,E2CB,C2F8,E2CC,E2CD,E2CE,CAD7,D8B8,D9E5,CFE3,F0A5,DCB0,C2ED,D4A6,CDD4,D1B1,B3DB,C7FD,B2B5,C2BF,E6E0,CABB,E6E1,E6E2,BED4,E6E3,D7A4,CDD5,E6E5,BCDD,E6E4,E6E6,E6E7,C2EE,BDBE,E6E8,C2E6,BAA7,E6E9,E6EA,B3D2,D1E9,BFA5,E6EB,C6EF,E6EC,E6ED,E6EE,C6AD,E6EF,C9A7,E6F0,E6F1,E6F2,E5B9,E6F3,E6F4,C2E2,E6F5,E6F6,D6E8,E6F7,E6F8,B9C7,F7BB,F7BA,F7BE,F7BC,BAA1,F7BF,F7C0,F7C2,F7C1,F7C4,F7C3,F7C5,F7C6,F7C7,CBE8,B8DF,F7D4,F7D5,F7D6,F7D8,F7DA,F7D7,F7DB,F7D9,D7D7,F7DC,F7DD,F7DE,F7DF,F7E0,DBCB,D8AA,E5F7,B9ED,BFFD,BBEA,F7C9,C6C7,F7C8,F7CA,F7CC,F7CB,F7CD,CEBA,F7CE,C4A7,D3E3,F6CF,C2B3,F6D0,F6D1,F6D2,F6D3,F6D4,F6D6,B1AB,F6D7,F6D8,F6D9,F6DA,F6DB,F6DC,F6DD,F6DE,CFCA,F6DF,F6E0,F6E1,F6E2,F6E3,F6E4,C0F0,F6E5,F6E6,F6E7,F6E8,F6E9,F6EA,F6EB,F6EC,F6ED,F6EE,F6EF,F6F0,F6F1,F6F2,F6F3,F6F4,BEA8,F6F5,F6F6,F6F7,F6F8,C8FA,F6F9,F6FA,F6FB,F6FC,F6FD,F6FE,F7A1,F7A2,F7A3,F7A4,F7A5,F7A6,F7A7,F7A8,B1EE,F7A9,F7AA,F7AB,F7AC,F7AD,C1DB,F7AE,F7AF,C4F1,F0AF,BCA6,F0B0,C3F9,C5B8,D1BB,F0B1,F0B2,F0B3,F0B4,F0B5,D1BC,D1EC,F0B7,F0B6,D4A7,CDD2,F0B8,F0BA,F0B9,F0BB,F0BC,B8EB,F0BD,BAE8,F0BE,F0BF,BEE9,F0C0,B6EC,F0C1,F0C2,F0C3,F0C4,C8B5,F0C5,F0C6,F0C7,C5F4,F0C8,F0C9,F0CA,F7BD,F0CB,F0CC,F0CD,F0CE,F0CF,BAD7,F0D0,F0D1,F0D2,F0D3,F0D4,F0D5,F0D6,F0D8,D3A5,F0D7,F0D9,F5BA,C2B9,F7E4,F7E5,F7E6,F7E7,F7E8,C2B4,F7EA,F7EB,C2F3,F4F0,F4EF,C2E9,F7E1,F7E2,BBC6,D9E4,CAF2,C0E8,F0A4,BADA,C7AD,C4AC,F7EC,F7ED,F7EE,F7F0,F7EF,F7F1,F7F4,F7F3,F7F2,F7F5,F7F6,EDE9,EDEA,EDEB,F6BC,F6BD,F6BE,B6A6,D8BE,B9C4,D8BB,DCB1,CAF3,F7F7,F7F8,F7F9,F7FB,F7FA,B1C7,F7FC,F7FD,F7FE,C6EB,ECB4,B3DD,F6B3,F6B4,C1E4,F6B5,F6B6,F6B7,F6B8,F6B9,F6BA,C8A3,F6BB,C1FA,B9A8,EDE8,B9EA,D9DF,A3A1,A3A2,A3A3,A1E7,A3A5,A3A6,A3A7,A3A8,A3A9,A3AA,A3AB,A3AC,A3AD,A3AE,A3AF,A3B0,A3B1,A3B2,A3B3,A3B4,A3B5,A3B6,A3B7,A3B8,A3B9,A3BA,A3BB,A3BC,A3BD,A3BE,A3BF,A3C0,A3C1,A3C2,A3C3,A3C4,A3C5,A3C6,A3C7,A3C8,A3C9,A3CA,A3CB,A3CC,A3CD,A3CE,A3CF,A3D0,A3D1,A3D2,A3D3,A3D4,A3D5,A3D6,A3D7,A3D8,A3D9,A3DA,A3DB,A3DC,A3DD,A3DE,A3DF,A3E0,A3E1,A3E2,A3E3,A3E4,A3E5,A3E6,A3E7,A3E8,A3E9,A3EA,A3EB,A3EC,A3ED,A3EE,A3EF,A3F0,A3F1,A3F2,A3F3,A3F4,A3F5,A3F6,A3F7,A3F8,A3F9,A3FA,A3FB,A3FC,A3FD,A1AB,A1E9,A1EA,A3FE,A3A4';
+		}
+		
+		var arraySearch = function (f,e){
+			for(var g in d){
+				if(d[g].indexOf(f)!=-1){
+					return firstUpperCase(g);
+					break;
+				 }
+			}
+			return false;
+		}
+		
+		var firstUpperCase = function(e){
+			if(e.length>0){
+				var g=e.substr(0,1).toUpperCase();
+				var f=e.substr(1,e.length);
+				return g+f;
+			}
+		}
+		
+		
+		var ansi = function(c){
+			return UnicodeToAnsi(c.charCodeAt(0));
+		}
+		
+		var UnicodeToAnsi = function(chrCode)
+		{
+		
+	        var chrHex=chrCode.toString(16);
+	        chrHex="000"+chrHex.toUpperCase();
+	        chrHex=chrHex.substr(chrHex.length-4);
+	        var i=UnicodeChr().indexOf(chrHex);       
+	        if(i!=-1)
+	        {
+	            chrHex=AnsicodeChr().substr(i,4);
+	        }
+	        return parseInt(chrHex,16);
+		}
+		
+	
+
+   		var getPY = function(ch){     
+         if(ch !='')  {                    
+             var code = ansi(ch);                   
+             var py = '';            
+             if(code==61884){
+             	py="D";
+             }
+             else if(code==61112){
+             	py="G";
+             } 
+              else if(code==60120){
+             	py="X";
+             } 
+             else if(code==59556){
+             	py="Y";
+             } 
+              else if(code==57805){
+             	py="W";
+             } 
+             else if(code>=45217 && code<=45252) {  
+                 py = "A"  
+             } else if(code>=45253 && code<=45760) {   
+                 py = "B"  
+             } else if(code>=45761 && code<=46317) {   
+                 py = "C"  
+             } else if((code>=46318 && code<=46825) || (code == 61884)) {   
+                 py = "D"  
+             } else if(code>=46826 && code<=47009) {   
+                 py = "E"  
+             } else if(code>=47010 && code<=47296) {   
+                 py = "F"  
+             } else if((code>=47297 && code<=47613) || (code == 63193)) {       
+                 py = "G"  
+             } else if(code>=47614 && code<=48118) {   
+                 py = "H"  
+             } else if(code>=48119 && code<=49061) {   
+                 py = "J"  
+             } else if(code>=49062 && code<=49323) {   
+                 py = "K"  
+             } else if(code>=49324 && code<=49895) {   
+                 py = "L"  
+             } else if(code>=49896 && code<=50370) {   
+                 py = "M"  
+             } else if(code>=50371 && code<=50613) {   
+                 py = "N"  
+             } else if(code>=50614 && code<=50621) {   
+                 py = "O"  
+             } else if(code>=50622 && code<=50905) {   
+                 py = "P"  
+             } else if(code>=50906 && code<=51386) {   
+                 py = "Q"  
+             } else if(code>=51387 && code<=51445) {   
+                 py = "R"  
+             } else if(code>=51446 && code<=52217) {   
+                 py = "S"  
+             } else if(code>=52218 && code<=52697) {   
+                 py = "T"  
+             } else if((code>=52698 && code<=52979)||(code==57805)) {   
+                 py = "W"  
+             } else if(code>=52980 && code<=53688) { 
+                 py = "X"               
+             } else if((code>=53689 && code<=54480) || (code==59556)) {   
+                 py = "Y"  
+             } else if(code>=54481 && code<=62289 && code!=61112 && code!=60120 && code!=61884 && code!=59556 && code!=57805) {   
+                 py = "Z"  
+             }           
+              else {   
+                 py =ch;
+             }              
+             return py;   
+	        }else{
+	             return '';
+	        }   
+ 		} 
+		 return {
+		 	getPY_Header:function(str){
+				var py_str='';
+				 for ( var i=0; i <  str.length ; i++)
+				 {
+				  py_str +=getPY(str.substr(i,1));
+				 }
+				 return py_str;
+			},
+			getPY_All:function (str){
+				 var py_str='';
+				 var strLen=str.length;
+				 var reg=new RegExp("[a-zA-Z0-9\-]");
+				 
+				 for(var i=0;i<strLen;i++){
+				 	var m=str.substr(i,1);
+				    var g=arraySearch(m,d);
+				    if(reg.test(m)){
+				    	py_str+=m;
+				    }else{
+				    	if(g!==false){
+				    		py_str+=g;
+				    	}
+				    }
+				  }
+				  py_str = py_str.replace('\\g','-');
+				  while(py_str.indexOf("--")>0){
+				  	py_str=py_str.replace("--","-")
+				  	}
+				 return py_str;
+			}
+		 
+		 };
+ 
+	
+	}();	
+		
+		
+		
+		
+
+
+	
+	
+		
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+ 
+ 
+ 
+ 
+ 
+			
\ No newline at end of file
diff --git a/src/main/webapp/static/global/scripts/jeesite.js b/src/main/webapp/static/global/scripts/jeesite.js
index edbd203f4..ec325ae7b 100644
--- a/src/main/webapp/static/global/scripts/jeesite.js
+++ b/src/main/webapp/static/global/scripts/jeesite.js
@@ -325,13 +325,13 @@ function filterActionInit() {
 
 function fiterPanleShow() {
 	$("#filter-btn").find("i").removeClass("fa-angle-double-down").addClass("fa-angle-double-up");
-	$(".btn-search").addClass("hide");
+	//$(".btn-search").addClass("hide");
 	$(".filter-action-select-panle").removeClass("hide");
 }
 
 function fiterPanleHide() {
 	$("#filter-btn").find("i").removeClass("fa-angle-double-up").addClass("fa-angle-double-down");
-	$(".btn-search").removeClass("hide");
+	//$(".btn-search").removeClass("hide");
 	$(".filter-action-select-panle").addClass("hide");
 }
 
diff --git a/src/main/webapp/static/layouts/layout/css/layout.css b/src/main/webapp/static/layouts/layout/css/layout.css
index c0d6adf9b..0a0395899 100644
--- a/src/main/webapp/static/layouts/layout/css/layout.css
+++ b/src/main/webapp/static/layouts/layout/css/layout.css
@@ -945,7 +945,7 @@
  background:0 0;
  margin:0;
  padding:0;
- margin-top:1px!important
+ margin-top:2px!important
 }
 .page-sidebar .page-sidebar-menu .sub-menu li>a,.page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .page-sidebar-menu .sub-menu li>a {
  display:block;
@@ -968,7 +968,8 @@
 .page-sidebar .page-sidebar-menu .sub-menu li>.sub-menu>li>.sub-menu,.page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .page-sidebar-menu .sub-menu li>.sub-menu>li>.sub-menu {
  margin:0
 }
-.page-sidebar .page-sidebar-menu .sub-menu li>.sub-menu>li>.sub-menu>li>a,.page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .page-sidebar-menu .sub-menu li>.sub-menu>li>.sub-menu>li>a {
+.page-sidebar .page-sidebar-menu .sub-menu li>.sub-menu>li>.sub-menu>li>a,.page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .page-sidebar-menu .sub-menu li>.su
+b-menu>li>.sub-menu>li>a {
  padding-left:80px
 }
 .page-sidebar .page-sidebar-menu .sub-menu.always-open,.page-sidebar .page-sidebar-menu li.active>.sub-menu,.page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .page-sidebar-menu .sub-menu.always-open,.page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .page-sidebar-menu li.active>.sub-menu {
@@ -989,7 +990,7 @@
  padding-bottom:8px
 }
 .page-sidebar .page-sidebar-menu.page-sidebar-menu-light>li .sub-menu li:first-child,.page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .page-sidebar-menu.page-sidebar-menu-light>li .sub-menu li:first-child {
- margin-top:0!important
+
 }
 .page-sidebar-reversed .page-sidebar .page-sidebar-menu.page-sidebar-menu-light>li>a,.page-sidebar-reversed .page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .page-sidebar-menu.page-sidebar-menu-light>li>a {
  padding-left:15px;
diff --git a/src/main/webapp/static/layouts/layout/css/themes/default.css b/src/main/webapp/static/layouts/layout/css/themes/default.css
index 1409b9100..cb143bfb1 100644
--- a/src/main/webapp/static/layouts/layout/css/themes/default.css
+++ b/src/main/webapp/static/layouts/layout/css/themes/default.css
@@ -260,8 +260,9 @@
     /* All links */ }
     .page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .page-sidebar-menu > li > a,
     .page-sidebar .page-sidebar-menu > li > a {
-      border-top: 1px solid #484848;
-      color: #d9d9d9; }
+        color: #fff;
+	    border-top: 1px solid #484848 !important;
+       }
       .page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .page-sidebar-menu > li > a > i,
       .page-sidebar .page-sidebar-menu > li > a > i {
         color: #888888; }
@@ -324,7 +325,7 @@
     .page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .page-sidebar-menu li > a > .arrow:before, .page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .page-sidebar-menu li > a > .arrow.open:before,
     .page-sidebar .page-sidebar-menu li > a > .arrow:before,
     .page-sidebar .page-sidebar-menu li > a > .arrow.open:before {
-      color: #777777; }
+      color: #fff; }
     .page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .page-sidebar-menu li:hover > a > .arrow:before, .page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .page-sidebar-menu li:hover > a > .arrow.open:before,
     .page-sidebar .page-sidebar-menu li:hover > a > .arrow:before,
     .page-sidebar .page-sidebar-menu li:hover > a > .arrow.open:before {
@@ -350,7 +351,7 @@
       .page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .page-sidebar-menu .sub-menu > li > a > .arrow:before, .page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .page-sidebar-menu .sub-menu > li > a > .arrow.open:before,
       .page-sidebar .page-sidebar-menu .sub-menu > li > a > .arrow:before,
       .page-sidebar .page-sidebar-menu .sub-menu > li > a > .arrow.open:before {
-        color: #777777; }
+        color: #fff; }
     .page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .page-sidebar-menu .sub-menu > li:hover > a, .page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .page-sidebar-menu .sub-menu > li.open > a, .page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .page-sidebar-menu .sub-menu > li.active > a,
     .page-sidebar .page-sidebar-menu .sub-menu > li:hover > a,
     .page-sidebar .page-sidebar-menu .sub-menu > li.open > a,
@@ -376,18 +377,20 @@
     .page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .page-sidebar-menu.page-sidebar-menu-light > li:hover > a, .page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .page-sidebar-menu.page-sidebar-menu-light > li.open > a,
     .page-sidebar .page-sidebar-menu.page-sidebar-menu-light > li:hover > a,
     .page-sidebar .page-sidebar-menu.page-sidebar-menu-light > li.open > a {
-      background: #424242; }
+      background: #303030; }
     .page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .page-sidebar-menu.page-sidebar-menu-light > li.active > a, .page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .page-sidebar-menu.page-sidebar-menu-light > li.active.open > a,
-    .page-sidebar .page-sidebar-menu.page-sidebar-menu-light > li.active > a,
-    .page-sidebar .page-sidebar-menu.page-sidebar-menu-light > li.active.open > a {
-      background: #474747;
+    .page-sidebar .page-sidebar-menu.page-sidebar-menu-light > li.active > a {
+   	 background: #303030;
       border-left: 4px solid #d64635;
-      color: #f1f1f1; }
+      color: #f1f1f1;
+    }
+    .page-sidebar .page-sidebar-menu.page-sidebar-menu-light > li.active.open > a {
+      background: #303030;}
       .page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .page-sidebar-menu.page-sidebar-menu-light > li.active > a:hover, .page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .page-sidebar-menu.page-sidebar-menu-light > li.active.open > a:hover,
       .page-sidebar .page-sidebar-menu.page-sidebar-menu-light > li.active > a:hover,
       .page-sidebar .page-sidebar-menu.page-sidebar-menu-light > li.active.open > a:hover {
         border-left: 4px solid #d64635;
-        background: #424242; }
+        background: #303030; }
       .page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .page-sidebar-menu.page-sidebar-menu-light > li.active > a > i, .page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .page-sidebar-menu.page-sidebar-menu-light > li.active.open > a > i,
       .page-sidebar .page-sidebar-menu.page-sidebar-menu-light > li.active > a > i,
       .page-sidebar .page-sidebar-menu.page-sidebar-menu-light > li.active.open > a > i {
@@ -405,7 +408,8 @@
       .page-sidebar .page-sidebar-menu.page-sidebar-menu-light > li .sub-menu > li:hover > a,
       .page-sidebar .page-sidebar-menu.page-sidebar-menu-light > li .sub-menu > li.open > a,
       .page-sidebar .page-sidebar-menu.page-sidebar-menu-light > li .sub-menu > li.active > a {
-        background: #474747 !important; }
+        color: #ffffff !important;
+		background: #575757 !important; }
   .page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .sidebar-toggler,
   .page-sidebar .sidebar-toggler {
     background: #303030; }
@@ -432,10 +436,10 @@
   .page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .sidebar-search .input-group,
   .page-sidebar .sidebar-search .input-group {
     border-bottom: 1px solid #484848; }
-    .page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .sidebar-search .input-group .form-control,
+    .page-sidebar-closed.pagek-sidebar-fixed .page-sidebar:hover .sidebar-search .input-group .form-control,
     .page-sidebar .sidebar-search .input-group .form-control {
       background-color: #3d3d3d;
-      color: #5c5c5c; }
+      color: #fffdfd; }
       .page-sidebar-closed.page-sidebar-fixed .page-sidebar:hover .sidebar-search .input-group .form-control::-moz-placeholder,
       .page-sidebar .sidebar-search .input-group .form-control::-moz-placeholder {
         color: #5c5c5c;
diff --git a/src/main/webapp/static/layouts/layout/scripts/layout.js b/src/main/webapp/static/layouts/layout/scripts/layout.js
index 10c0a9a5f..dc9f60fc5 100644
--- a/src/main/webapp/static/layouts/layout/scripts/layout.js
+++ b/src/main/webapp/static/layouts/layout/scripts/layout.js
@@ -175,7 +175,7 @@ var Layout = function () {
                                 'scrollTo': (the.position()).top
                             });
                         } else {
-                            App.scrollTo(the, slideOffeset);
+                            //App.scrollTo();
                         }
                     }
                     handleSidebarAndContentHeight();
@@ -190,7 +190,7 @@ var Layout = function () {
                                 'scrollTo': (the.position()).top
                             });
                         } else {
-                            App.scrollTo(the, slideOffeset);
+                            //App.scrollTo(the, slideOffeset);
                         }
                     }
                     handleSidebarAndContentHeight();
diff --git a/src/main/webapp/static/pages/scripts/home.js b/src/main/webapp/static/pages/scripts/home.js
index 0829511b4..bc9097d97 100644
--- a/src/main/webapp/static/pages/scripts/home.js
+++ b/src/main/webapp/static/pages/scripts/home.js
@@ -39,6 +39,31 @@ var home = function () {
 			}
 			
 			
+			//点击顶部菜单，默认展开左侧菜单，如果左侧菜单已有被选中的则忽视
+			var left_menu_lis = $(menuId).find("li");
+			if(!(left_menu_lis.hasClass("active") ||
+					left_menu_lis.hasClass("open"))) {
+				 var $li1 = $(menuId).find("li:first");
+				 var $li2 = $(menuId).find("li:first").find("li:first");
+				
+				 var hasSubMenu1 =  $li1.children().hasClass('sub-menu');
+				 if(hasSubMenu1) {
+					 $li1.addClass('open');
+					 $li1.find('> a > .arrow').addClass('open');
+					 $li1.find('> .sub-menu').slideDown();
+
+					 var hasSubMenu2 =  $li2.children().hasClass('sub-menu');
+					 if(hasSubMenu2) {
+						 $li2.addClass('open');
+						 $li2.find('> a > .arrow').addClass('open');
+						 $li2.find('> .sub-menu').slideDown();
+						 
+					 }
+				 }
+				 
+			}
+			
+
 		})