20190630线上升级sql内容，以及0508-0610的升级sql记录

不能修改不能删除不能无效

.classpath

@@ -28,9 +28,134 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="lib" path="lib/jersey-client-2.23.1.jar">
 		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/jersey-common-2.23.1.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/jersey-entity-filtering-2.23.1.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/jersey-guava-2.23.1.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/jersey-media-json-jackson-2.23.1.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/jersey-media-multipart-2.23.1.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/javax.annotation-api-1.2.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/javax.inject-2.4.0-b34.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/javax.servlet-api-3.1.0.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/javax.ws.rs-api-2.0.1.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/hk2-api-2.4.0-b34.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/hk2-locator-2.4.0-b34.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/hk2-utils-2.4.0-b34.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/jna-4.1.0.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/jna-platform-4.1.0.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/mchange-commons-java-0.2.11.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/mimepull-1.9.6.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/jackson-annotations-2.5.4.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/jackson-core-2.5.4.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/jackson-databind-2.5.4.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/jackson-jaxrs-base-2.5.4.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/jackson-jaxrs-json-provider-2.5.4.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/jackson-module-jaxb-annotations-2.5.4.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/java-ipv6-0.16.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/jave-1.0.2.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>

.externalToolBuilders/org.eclipse.m2e.core.maven2Builder.launch

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="org.eclipse.m2e.core.maven2Builder"/>
+<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>

.externalToolBuilders/org.eclipse.wst.validation.validationbuilder.launch

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="org.eclipse.wst.validation.validationbuilder"/>
+<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>

.gitignore

@@ -1 +1,2 @@
 /target
+/.settings

.project

@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>gwall</name>
+	<name>ntc_mesalab</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -36,12 +31,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>com.genuitec.eclipse.springframework.springbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>com.genuitec.eclipse.springframework.springbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -54,6 +49,6 @@
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
-		<nature>org.zeroturnaround.eclipse.jrebelNature</nature>
 	</natures>
 </projectDescription>
+ 

.settings/org.eclipse.core.resources.prefs

@@ -7,8 +7,5 @@ encoding//src/main/resources/matt.properties=UTF-8
 encoding//src/main/resources/nis.properties=UTF-8
 encoding//src/main/resources/table.properties=UTF-8
 encoding//src/main/webapp/WEB-INF/include/header.jsp=UTF-8
-encoding//src/main/webapp/WEB-INF/tlds/fns.tld=UTF-8
 encoding//src/main/webapp/WEB-INF/views/letter/process/errorView.jsp=UTF-8
-encoding//src/main/webapp/static/common/jeesite.css=UTF-8
 encoding//src/test/java=UTF-8
-encoding/<project>=UTF-8

.settings/org.eclipse.jdt.core.prefs

@@ -1,13 +1,13 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8

.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -2,8 +2,8 @@
 <faceted-project>
   <fixed facet="wst.jsdt.web"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
-  <installed facet="java" version="1.7"/>
   <installed facet="jst.web" version="3.0"/>
   <installed facet="jst.jaxrs" version="1.1"/>
   <installed facet="maven" version="1.0"/>
+  <installed facet="java" version="1.8"/>
 </faceted-project>

.settings/org.eclipse.wst.xsl.core.prefs

@@ -0,0 +1,11 @@
+CHECK_CALL_TEMPLATES=2
+CHECK_XPATHS=2
+CIRCULAR_REF=2
+DUPLICATE_PARAMETER=2
+EMPTY_PARAM=1
+MISSING_INCLUDE=2
+MISSING_PARAM=1
+NAME_ATTRIBUTE_EMPTY=2
+NAME_ATTRIBUTE_MISSING=2
+TEMPLATE_CONFLICT=2
+eclipse.preferences.version=1

.tern-project

@@ -0,0 +1,3 @@
+{
+  
+}

README.md

@@ -1 +1,7 @@
-gk for web 
+630上线内容版本：
+
+1、统计整合为一个模块儿
+
+2、object-list-group HTTP和代理
+
+3、代理新功能；

pom.xml

@@ -14,9 +14,9 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>war</packaging>
-	<name>gwall</name>
+	<name>ntc</name>
 	<groupId>com.nis.springmvc</groupId>
-	<artifactId>gwall</artifactId>
+	<artifactId>ntc</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<!-- 仓库地址构建 -->
 	<repositories>
@@ -30,11 +30,16 @@
 		<repository>
 			<id>nexus</id>
 			<name>Team Nexus Repository</name>
-			<url>http://10.0.6.30:8044/content/groups/public</url>
+			<url>http://mvnrepository.com/tags/maven</url>
 		</repository>
+		
 		<!-- <repository> <id>nexus</id> <name>Team Nexus Repository</name> <url>http://json-lib.sourceforge.net/</url> 
 			</repository> -->
-
+		<!--
+		<repository>
+			<id>localRepository</id>
+			<url>file:C:/Users/dell/.m2/repository</url>
+		</repository> -->
 	</repositories>
 
 	<build>
@@ -189,6 +194,12 @@
 			<groupId>com.mangofactory</groupId>
 			<artifactId>swagger-springmvc</artifactId>
 			<version>1.0.2</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>guava</artifactId>
+					<groupId>com.google.guava</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 
@@ -376,6 +387,12 @@
 			<groupId>com.jolbox</groupId>
 			<artifactId>bonecp</artifactId>
 			<version>0.8.0.RELEASE</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>guava</artifactId>
+					<groupId>com.google.guava</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>
@@ -494,6 +511,12 @@
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-frontend-jaxws</artifactId>
 			<version>3.1.4</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>asm</artifactId>
+					<groupId>org.ow2.asm</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>
@@ -567,6 +590,30 @@
 			<artifactId>hive-jdbc</artifactId>
 			<version>2.1.0</version>			
 			<exclusions>
+				<exclusion>
+					<groupId>com.sun.jersey</groupId>
+					<artifactId>jersey-core</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.sun.jersey</groupId>
+					<artifactId>jersey-client</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.sun.jersey</groupId>
+					<artifactId>jersey-core</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.sun.jersey</groupId>
+					<artifactId>jersey-json</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.sun.jersey</groupId>
+					<artifactId>jersey-guice</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.sun.jersey</groupId>
+					<artifactId>jersey-server</artifactId>
+				</exclusion>
 				<exclusion>
 					<groupId>org.apache.logging.log4j</groupId>
 					<artifactId>log4j-1.2-api</artifactId>
@@ -591,12 +638,28 @@
 					<groupId>org.mortbay.jetty</groupId>
 					<artifactId>jsp-2.1</artifactId>
 				</exclusion>
+				<exclusion>
+					<artifactId>asm</artifactId>
+					<groupId>asm</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>asm-tree</artifactId>
+					<groupId>asm</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>asm-commons</artifactId>
+					<groupId>asm</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>guava</artifactId>
+					<groupId>com.google.guava</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpcore</artifactId>
-			<version>4.4</version>
+			<version>4.4.10</version>
 		</dependency>
 		<dependency>
 			<groupId>jdk.tools</groupId>
@@ -608,9 +671,66 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
-			<version>4.4</version>
+			<version>4.5.6</version>
+		</dependency>
+		<!-- <dependency>
+			<groupId>javax.ws.rs</groupId>
+			<artifactId>javax.ws.rs-api</artifactId>
+			<version>2.0.1</version>
+		</dependency> -->
+		<dependency>
+			<groupId>cglib</groupId>
+			<artifactId>cglib</artifactId>
+			<version>3.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>18.0</version>
+		</dependency>
+		
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>2.8.0</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.google.code.gson</groupId>
+					<artifactId>gson-parent</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+		    <groupId>org.crazycake</groupId>
+		    <artifactId>shiro-redis</artifactId>
+		    <version>3.2.1</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.glassfish.jersey.connectors</groupId>
+		    <artifactId>jersey-apache-connector</artifactId>
+		    <version>2.23.1</version>
+		</dependency>
+		<!-- quartz  -->
+		<dependency>
+	         <groupId>org.quartz-scheduler</groupId>
+	         <artifactId>quartz</artifactId>
+	         <version>2.2.1</version>
+	    </dependency>
+	    <dependency>
+            <groupId>org.quartz-scheduler</groupId>
+            <artifactId>quartz-jobs</artifactId>
+            <version>2.2.1</version>
+        </dependency>
+        
+		<dependency>
+		    <groupId>com.alibaba</groupId>
+		    <artifactId>druid</artifactId>
+		    <version>1.1.10</version>
+		</dependency>
+		<dependency>
+		    <groupId>com.alibaba</groupId>
+		    <artifactId>fastjson</artifactId>
+		    <version>1.2.57</version>
 		</dependency>
 	</dependencies>
-
-
 </project>

sqlupdate/update_video_spell_error.sql

@@ -0,0 +1,2 @@
+update function_region_dict t set t.config_region_value=insert(t.config_region_value,POSITION('vedio' in t.config_region_value),5,'video') where t.config_region_value like '%vedio%';
+update sys_menu s set s.`code`=insert(s.`code`,POSITION('vedio' in s.`code`),5,'video') where s.`code` like '%vedio%';

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

@@ -46,6 +46,10 @@ public abstract class BaseEntity<T> implements Serializable {
 	 * 当前实体分页对象
 	 */
 	protected Page<T> page;
+	/**
+	 * 日志分页对象
+	 */
+	protected PageLog<T> pageLog;
 	
 	/**
 	 * 自定义SQL（SQL标识，SQL内容）
@@ -58,6 +62,14 @@ public abstract class BaseEntity<T> implements Serializable {
 	 */
 	protected boolean isNewRecord = false;
 	
+	
+	/**
+	 * 筛选搜索框展开状态
+	 */
+	protected boolean isFilterAction = false;
+	
+	
+
 	public BaseEntity() {
 		
 	}
@@ -102,6 +114,19 @@ public abstract class BaseEntity<T> implements Serializable {
 		this.page = page;
 		return page;
 	}
+	@JsonIgnore
+	@XmlTransient
+	public PageLog<T> getPageLog() {
+		if (pageLog == null){
+			pageLog = new PageLog<T>();
+		}
+		return pageLog;
+	}
+	
+	public PageLog<T> setPageLog(PageLog<T> pageLog) {
+		this.pageLog = pageLog;
+		return pageLog;
+	}
 
 	@JsonIgnore
 	@XmlTransient
@@ -164,5 +189,15 @@ public abstract class BaseEntity<T> implements Serializable {
     }
 
     
+	public void setIsFilterAction(boolean isFilterAction) {
+		this.isFilterAction = isFilterAction;
+	}
+	
+	@JsonIgnore
+	public boolean getIsFilterAction() {
+        return isFilterAction;
+    }
+    
+	
 	
 }

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

@@ -0,0 +1,162 @@
+package com.nis.domain;
+
+import com.nis.domain.configuration.BaseCfg;
+
+public class FunctionRegionDict extends BaseCfg<FunctionRegionDict> {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 8813625022212298550L;
+	private Integer dictId;
+	private Integer functionId;
+	private Integer configRegionCode;
+	private String configRegionValue;
+	private String configDistrict;
+	private String configDesc;
+	private Integer isMaat;
+	private Integer regionType;
+	private String configMultiKeywords;
+	private String configHex;
+	private String configExprType;
+	private String configMatchMethod;
+	private String configServiceType;
+	private String configIpPortShow;
+	private String configIpType;
+	private String configIpPattern;
+	private String configPortPattern;
+	private String configDirection;
+	private String configProtocol;
+	private Integer configRegionSort;
+	private Integer isImport;
+	
+	public Integer getIsImport() {
+		return isImport;
+	}
+	public void setIsImport(Integer isImport) {
+		this.isImport = isImport;
+	}
+	
+	public Integer getConfigRegionSort() {
+		return configRegionSort;
+	}
+	public void setConfigRegionSort(Integer configRegionSort) {
+		this.configRegionSort = configRegionSort;
+	}
+	public String getConfigIpPortShow() {
+		return configIpPortShow;
+	}
+	public void setConfigIpPortShow(String configIpPortShow) {
+		this.configIpPortShow = configIpPortShow;
+	}
+	public String getConfigIpType() {
+		return configIpType;
+	}
+	public void setConfigIpType(String configIpType) {
+		this.configIpType = configIpType;
+	}
+	public String getConfigIpPattern() {
+		return configIpPattern;
+	}
+	public void setConfigIpPattern(String configIpPattern) {
+		this.configIpPattern = configIpPattern;
+	}
+	public String getConfigPortPattern() {
+		return configPortPattern;
+	}
+	public void setConfigPortPattern(String configPortPattern) {
+		this.configPortPattern = configPortPattern;
+	}
+	public String getConfigDirection() {
+		return configDirection;
+	}
+	public void setConfigDirection(String configDirection) {
+		this.configDirection = configDirection;
+	}
+	public String getConfigProtocol() {
+		return configProtocol;
+	}
+	public void setConfigProtocol(String configProtocol) {
+		this.configProtocol = configProtocol;
+	}
+	public String getConfigServiceType() {
+		return configServiceType;
+	}
+	public void setConfigServiceType(String configServiceType) {
+		this.configServiceType = configServiceType;
+	}
+	public Integer getDictId() {
+		return dictId;
+	}
+	public void setDictId(Integer dictId) {
+		this.dictId = dictId;
+	}
+	public Integer getFunctionId() {
+		return functionId;
+	}
+	public void setFunctionId(Integer functionId) {
+		this.functionId = functionId;
+	}
+	public Integer getConfigRegionCode() {
+		return configRegionCode;
+	}
+	public void setConfigRegionCode(Integer configRegionCode) {
+		this.configRegionCode = configRegionCode;
+	}
+	public String getConfigRegionValue() {
+		return configRegionValue;
+	}
+	public void setConfigRegionValue(String configRegionValue) {
+		this.configRegionValue = configRegionValue;
+	}
+	public String getConfigDistrict() {
+		return configDistrict;
+	}
+	public void setConfigDistrict(String configDistrict) {
+		this.configDistrict = configDistrict;
+	}
+	public String getConfigDesc() {
+		return configDesc;
+	}
+	public void setConfigDesc(String configDesc) {
+		this.configDesc = configDesc;
+	}
+	public Integer getIsMaat() {
+		return isMaat;
+	}
+	public void setIsMaat(Integer isMaat) {
+		this.isMaat = isMaat;
+	}
+	public Integer getRegionType() {
+		return regionType;
+	}
+	public void setRegionType(Integer regionType) {
+		this.regionType = regionType;
+	}
+	public String getConfigMultiKeywords() {
+		return configMultiKeywords;
+	}
+	public void setConfigMultiKeywords(String configMultiKeywords) {
+		this.configMultiKeywords = configMultiKeywords;
+	}
+	public String getConfigHex() {
+		return configHex;
+	}
+	public void setConfigHex(String configHex) {
+		this.configHex = configHex;
+	}
+	public String getConfigExprType() {
+		return configExprType;
+	}
+	public void setConfigExprType(String configExprType) {
+		this.configExprType = configExprType;
+	}
+	public String getConfigMatchMethod() {
+		return configMatchMethod;
+	}
+	public void setConfigMatchMethod(String configMatchMethod) {
+		this.configMatchMethod = configMatchMethod;
+	}
+	
+
+}

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

@@ -0,0 +1,99 @@
+package com.nis.domain;
+
+import com.nis.domain.configuration.BaseCfg;
+
+public class FunctionServiceDict extends BaseCfg<FunctionServiceDict> {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1453401375628742549L;
+	private Integer dictId;
+	private Integer functionId;
+	private Integer protocolId;
+	private Integer action;
+	private Integer serviceId;
+	private String serviceName;
+	private String serviceDesc;
+	private String actionCode;
+	private String regionCode;
+	private String configDoLog;
+	
+	private Integer isImport;
+	
+	public String getConfigDoLog() {
+		return configDoLog;
+	}
+	public void setConfigDoLog(String configDoLog) {
+		this.configDoLog = configDoLog;
+	}
+	public Integer getIsImport() {
+		return isImport;
+	}
+	public void setIsImport(Integer isImport) {
+		this.isImport = isImport;
+	}
+	
+	public String getRegionCode() {
+		return regionCode;
+	}
+	public void setRegionCode(String regionCode) {
+		this.regionCode = regionCode;
+	}
+	public Integer getDictId() {
+		return dictId;
+	}
+	public void setDictId(Integer dictId) {
+		this.dictId = dictId;
+	}
+	public Integer getFunctionId() {
+		return functionId;
+	}
+	public void setFunctionId(Integer functionId) {
+		this.functionId = functionId;
+	}
+	public Integer getProtocolId() {
+		return protocolId;
+	}
+	public void setProtocolId(Integer protocolId) {
+		this.protocolId = protocolId;
+	}
+	public Integer getAction() {
+		return action;
+	}
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	public Integer getServiceId() {
+		return serviceId;
+	}
+	public void setServiceId(Integer serviceId) {
+		this.serviceId = serviceId;
+	}
+	public String getServiceName() {
+		return serviceName;
+	}
+	public void setServiceName(String serviceName) {
+		this.serviceName = serviceName;
+	}
+	public String getServiceDesc() {
+		return serviceDesc;
+	}
+	public void setServiceDesc(String serviceDesc) {
+		this.serviceDesc = serviceDesc;
+	}
+	public Integer getIsValid() {
+		return isValid;
+	}
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	
+	public String getActionCode() {
+		return actionCode;
+	}
+	public void setActionCode(String actionCode) {
+		this.actionCode = actionCode;
+	}
+	
+}

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

@@ -0,0 +1,63 @@
+/**
+ * 
+ */
+package com.nis.domain;
+
+import java.io.Serializable;
+
+/**
+ * @ClassName:ImportErrorInfo
+ * @Description:TODO(这里用一句话描述这个类的作用)
+ * @author (zdx)
+ * @date 2018年4月25日 上午10:39:47
+ * @version V1.0
+ */
+public class ImportErrorInfo implements Serializable{
+	private static final long serialVersionUID = -8044793465646498657L;
+	private String rowNum;
+	private String fieldName;
+	private String errorMessage;
+	
+	public ImportErrorInfo() {
+		super();
+		// TODO Auto-generated constructor stub
+	}
+	
+	/**
+	 * @param rowNum 行号
+	 * @param fieldName 属性名称
+	 * @param errorMessage 错误信息
+	 */
+	public ImportErrorInfo(String rowNum, String fieldName, String errorMessage) {
+		super();
+		this.rowNum = rowNum;
+		this.fieldName = fieldName;
+		this.errorMessage = errorMessage;
+	}
+
+
+	public String getRowNum() {
+		return rowNum;
+	}
+	public void setRowNum(String rowNum) {
+		this.rowNum = rowNum;
+	}
+	public String getFieldName() {
+		return fieldName;
+	}
+	public void setFieldName(String fieldName) {
+		this.fieldName = fieldName;
+	}
+	public String getErrorMessage() {
+		return errorMessage;
+	}
+	public void setErrorMessage(String errorMessage) {
+		this.errorMessage = errorMessage;
+	}
+	@Override
+	public String toString() {
+		return "ImportErrorInfo [rowNum=" + rowNum + ", fieldName=" + fieldName
+				+ ", errorMessage=" + errorMessage + "]";
+	}
+	
+}

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

@@ -0,0 +1,31 @@
+package com.nis.domain;
+
+/**
+ * Created by dell on 2018-8-30.
+ */
+public class Nets {
+
+    private String StartIP;
+    private String EndIP;
+    private String NetMask;
+    public String getStartIP() {
+        return StartIP;
+    }
+    public void setStartIP(String startIP) {
+        StartIP = startIP;
+    }
+    public String getEndIP() {
+        return EndIP;
+    }
+    public void setEndIP(String endIP) {
+        EndIP = endIP;
+    }
+    public String getNetMask() {
+        return NetMask;
+    }
+    public void setNetMask(String netMask) {
+        NetMask = netMask;
+    }
+
+
+}

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

@@ -3,6 +3,10 @@
  */
 package com.nis.domain;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -13,16 +17,12 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.mapping.ResultMap;
-import org.apache.ibatis.mapping.ResultMapping;
-import org.apache.ibatis.session.SqlSessionFactory;
+import org.springframework.web.servlet.support.RequestContext;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.nis.util.Configurations;
 import com.nis.util.Constants;
 import com.nis.util.CookieUtil;
-import com.nis.util.StringUtil;
-import com.nis.web.service.SpringContextHolder;
 
 /**
  * 分页类
@@ -52,20 +52,23 @@ public class Page<T> {
 	
 	private String orderBy = ""; // 标准查询有效， 实例： updatedate desc, name asc
 	
-	private String fields ="";//制定资源的字段
+	private String fields;//制定资源的字段
 	
 	private String where;
-
+	private String alias;
 	private String funcName = "page"; // 设置点击页码调用的js函数名称，默认为page，在一页有多个分页对象时使用。
 	
 	private String funcParam = ""; // 函数的附加参数，第三个参数值。
 	
 	private String message = ""; // 设置提示消息，显示在“共n条”之后
 
-	public Page() {
-		this.pageSize = pageSize;
-	}
+	private RequestContext requestContext;
 	
+	private int maxExportSize=Constants.MAX_EXPORT_SIZE;
+	
+	public Page() {
+		this.pageSize = -1;
+	}
 	
 	/**
 	 * 构造方法
@@ -73,29 +76,44 @@ public class Page<T> {
 	 * @param response 用于设置 Cookie，记住页码
 	 */
 	public Page(HttpServletRequest request, HttpServletResponse response){
-		
-		//this(request, response,Integer.valueOf(Configurations.getIntProperty("page.pageSize", 30)));
-		
+		this(request, response, Integer.valueOf(Configurations.getIntProperty("page.pageSize", 30)));
 	}
-	/**
-	 * 构造方法
-	 * @param request 传递 repage 参数，来记住页码
-	 * @param response 用于设置 Cookie，记住页码
-	 * 
-	 */
-	public Page(HttpServletRequest request, HttpServletResponse response,Class clazz){
-		
-		this(request, response,clazz.getSimpleName(),Integer.valueOf(Configurations.getIntProperty("page.pageSize", 30)));
-		
-	}
-	public Page(HttpServletRequest request, HttpServletResponse response,int defaultPageSize){
-		
-		this(request, response,"",Integer.valueOf(Configurations.getIntProperty("page.pageSize", 30)));
+	public Page(HttpServletRequest request, HttpServletResponse response,String alias){
 		
+		this(request, response, Integer.valueOf(Configurations.getIntProperty("page.pageSize", 30)),alias);
 	}
 	
-	public Page(HttpServletRequest request, HttpServletResponse response,String className, int defaultPageSize){
+	public Page(HttpServletRequest request, HttpServletResponse response, int defaultPageSize,String alias){
+		this.setAlias(alias);
+		this.initPage(request, response, defaultPageSize);
+	}
+	public Page(HttpServletRequest request, HttpServletResponse response, int defaultPageSize){
+		this.initPage(request, response, defaultPageSize);
+	}
+	//更换中文提示
+	public void zhcnPageInfo(HttpServletRequest request){
+		
+		
+		/*try {
+			
+			
+			if(CookieUtil.getValue(request, "Language")!=null&&CookieUtil.getValue(request, "Language").equalsIgnoreCase("zh_cn")){
+					prevPage="上一页";
+					nextPage="下一页";
+					currentPage="当前";
+					TotalCount="共";
+					pageEn="页";
+					countPage="条";
+				}
+			} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}*/
+	}
+	private void initPage(HttpServletRequest request, HttpServletResponse response, int defaultPageSize){
 		try {
+			
+			this.requestContext = new RequestContext(request);
+
 			// 设置页码参数（传递repage参数，来记住页码）
 			String no = request.getParameter("pageNo");
 			if (StringUtils.isNotBlank(no)) {
@@ -111,7 +129,13 @@ public class Page<T> {
 			}
 			
 			// 设置页面大小参数（传递repage参数，来记住页码大小）
-			String size = request.getParameter("pageSize");
+			String size = "";
+			if(defaultPageSize==-1){
+				size = "-1";
+			}else{
+				size = request.getParameter("pageSize");
+				
+			}
 			if (StringUtils.isNotBlank(size)) {
 				
 				if (StringUtils.isNumeric(size) || size.equals("-1")){
@@ -126,30 +150,25 @@ public class Page<T> {
 			} else {
 				this.pageSize = defaultPageSize;
 			}
-			//超出每页最大显示条数，取限制的最大条数
-			if(this.pageSize > Constants.MAX_PAGE_SIZE){
-				this.pageSize = Constants.MAX_PAGE_SIZE;
-			}
 			
 			String fields = request.getParameter("fields");
 			if (StringUtils.isNotBlank(fields)){
-				fields=getFiledsSql(className, fields);
 				this.setFields(fields);
 			}
 			
 			// 设置排序参数
 			String orderBy = request.getParameter("orderBy");
 			if (StringUtils.isNotBlank(orderBy)){
-				orderBy=getOrderBySql(className, orderBy);
 				this.setOrderBy(orderBy);
 			}
-			this.count=Integer.valueOf(Configurations.getIntProperty("page.count", -1));
+			
+			this.setWhere(getWhere(request));
+			
 			
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
 	}
-	
 	/**
 	 * 
 	* @Title: getWhere 
@@ -161,14 +180,65 @@ public class Page<T> {
 	* @throws
 	* @date 2016年8月17日 上午9:28:21 
 	* @version V1.0
+	* wx:日期格式的数据用日期格式化函数格式化，带空格的数据加上引号
 	 */
 	private String getWhere(HttpServletRequest request) {
+		String format=Constants.SEARCH_DATEFORMAT;
+		SimpleDateFormat sdf=new SimpleDateFormat(format);
 		Map<String, String[]> requestMap = request.getParameterMap();
 		StringBuilder whereBuilder = new StringBuilder(512);
 		for(String paramName : request.getParameterMap().keySet()) {
-			if (paramName.startsWith("search")) {
-				whereBuilder.append(paramName.substring("search_".length()))
-					.append("=").append(requestMap.get(paramName)[0]).append(" and ");
+			if (requestMap.get(paramName)!=null&&paramName.startsWith("search_")&&StringUtils.isNotBlank(requestMap.get(paramName)[0])) {
+				String clomn=paramName.substring("search_".length());
+				String value=requestMap.get(paramName)[0].trim();
+				boolean isDate=false;
+				try {
+					sdf.parse(value);
+					isDate=true;
+				} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				if(clomn.endsWith("_start")){
+					clomn=clomn.substring(0,clomn.lastIndexOf("_start"));
+					if(StringUtils.isNotBlank(alias)) whereBuilder.append(alias.trim()+".");
+					whereBuilder.append(clomn).append(">=");
+					if(isDate){
+						whereBuilder.append("date_format('")
+						.append(value).append("','%Y-%m-%d %H:%i:%S')");
+					}else if(value.indexOf(" ")>-1){
+						whereBuilder.append("'").append(requestMap.get(paramName)[0]).append("'");
+					}else{
+						whereBuilder.append(requestMap.get(paramName)[0]);
+					}
+					whereBuilder.append(" and ");
+				}else if(clomn.endsWith("_end")){
+					clomn=clomn.substring(0,clomn.lastIndexOf("_end"));
+					if(StringUtils.isNotBlank(alias)) whereBuilder.append(alias.trim()+".");
+					whereBuilder.append(clomn).append("<=");
+					if(isDate){
+						whereBuilder.append("DATE_FORMAT('")
+						.append(value).append("','%Y-%m-%d %H:%i:%S')");
+					}else if(value.indexOf(" ")>-1){
+						whereBuilder.append("'").append(requestMap.get(paramName)[0]).append("'");
+					}else{
+						whereBuilder.append(requestMap.get(paramName)[0]);
+					}
+					whereBuilder.append(" and ");
+				}else{
+					if(StringUtils.isNotBlank(alias)) whereBuilder.append(alias.trim()+".");
+					whereBuilder.append(clomn).append("=");
+					if(isDate){
+						whereBuilder.append("date_format('")
+						.append(value).append("','%Y-%m-%d %H:%i:%S')");
+					}else if(value.indexOf(" ")>-1){
+						whereBuilder.append("'").append(requestMap.get(paramName)[0]).append("'");
+					}else{
+						whereBuilder.append(requestMap.get(paramName)[0]);
+					}
+					whereBuilder.append(" and ");
+				}
+				
 			}
 		}
 		if (whereBuilder.length() > 0) {
@@ -269,12 +339,18 @@ public class Page<T> {
 	@Override
 	public String toString() {
 		
+
+		if(list != null && list.isEmpty()) {
+			return "<div class=\"none-data\"><i class=\"fa fa-warning font-red-flamingo\"></i>&nbsp;&nbsp;"+requestContext.getMessage("noneData")+"</div>";
+		}
+		
+
 		StringBuilder sb = new StringBuilder();
 		
 		if (pageNo == first) {// 如果是首页
-			sb.append("<li class=\"disabled\"><a href=\"javascript:\">&#171; 上一页</a></li>\n");
+			sb.append("<li class=\"disabled\"><a href=\"javascript:\">&#171; "+requestContext.getMessage("previousPage")+"</a></li>\n");
 		} else {
-			sb.append("<li><a href=\"javascript:\" onclick=\""+funcName+"("+prev+","+pageSize+",'"+funcParam+"');\">&#171; 上一页</a></li>\n");
+			sb.append("<li><a href=\"javascript:\" onclick=\""+funcName+"("+prev+","+pageSize+",'"+funcParam+"');\">&#171; "+requestContext.getMessage("previousPage")+"</a></li>\n");
 		}
 
 		int begin = pageNo - (length / 2);
@@ -325,28 +401,103 @@ public class Page<T> {
 		}
 
 		if (pageNo == last) {
-			sb.append("<li class=\"disabled\"><a href=\"javascript:\">下一页 &#187;</a></li>\n");
+			sb.append("<li class=\"disabled\"><a href=\"javascript:\">"+requestContext.getMessage("nextPage")+" &#187;</a></li>\n");
 		} else {
 			sb.append("<li><a href=\"javascript:\" onclick=\""+funcName+"("+next+","+pageSize+",'"+funcParam+"');\">"
-					+ "下一页 &#187;</a></li>\n");
+					+ ""+requestContext.getMessage("nextPage")+" &#187;</a></li>\n");
 		}
 
-		sb.append("<li class=\"disabled controls\"><a href=\"javascript:\">当前 ");
+		sb.append("<li class=\"disabled controls\"><a href=\"javascript:\">"+requestContext.getMessage("current")+" ");
 		sb.append("<input type=\"text\" value=\""+pageNo+"\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)");
 		sb.append(funcName+"(this.value,"+pageSize+",'"+funcParam+"');\" onclick=\"this.select();\"/> / ");
-		sb.append("<input type=\"text\" value=\""+pageSize+"\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)");
-		sb.append(funcName+"("+pageNo+",this.value,'"+funcParam+"');\" onclick=\"this.select();\"/> 条，");
-		sb.append("共 " + count + " 条"+(message!=null?message:"")+"</a></li>\n");
+		/*sb.append(pageNo+" / ");*/
+		/*sb.append("<input type=\"text\" value=\""+last+"\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)");*/
+		sb.append(last+" "+requestContext.getMessage("page")+"，");
+		//sb.append(funcName+"("+pageNo+",this.value,'"+funcParam+"');\" onclick=\"this.select();\"/> "+requestContext.getMessage("page")+"，");
+		sb.append(""+requestContext.getMessage("total")+" <span id='showTotalCount'>" + count + "</span> "+requestContext.getMessage("count")+""+(message!=null?message:"")+"</a></li>\n");
 
 		sb.insert(0,"<ul>\n").append("</ul>\n");
 		
 		sb.append("<div style=\"clear:both;\"></div>");
 
 //		sb.insert(0,"<div class=\"page\">\n").append("</div>\n");
-		
+		Map cancelMap = validateCancelService();
+		if(cancelMap!=null) {
+			String requestName = (String)cancelMap.get("requestName");
+			String indexTable = (String)cancelMap.get("indexTable");
+			sb.append("<input type=\"hidden\" id=\"ifCancelRequestInfo\" requestName=\""+requestName+"\" indexTable=\""+indexTable+"\" \"/>");
+		}
 		return sb.toString();
 	}
 	
+	//判断是否有requestName indexTableName
+	public Map validateCancelService() {
+		Map<String,Object> map = new HashMap<String,Object>();
+		if(list != null && !list.isEmpty()) {
+			Object obj = (Object) list.get(0);
+			  Class<?> clazz = obj.getClass();
+				tab: for (; clazz != Object.class; clazz = clazz.getSuperclass()) {//向上循环  遍历父类
+					Field[] field = clazz.getDeclaredFields();
+					for (Field f : field) {
+						String name = f.getName();
+						if(name!=null&&name.equals("requestName")) {
+							
+							Object v = invokeMethod(obj, name);
+							if(v!=null) {
+								map.put("requestName", v);
+							}
+						}
+						if(name!=null&&name.equals("indexTable")) {
+							
+							Object v = invokeMethod(obj, name);
+							if(v!=null) {
+								map.put("indexTable", v);
+							}
+						}
+						if(map.containsKey("requestName")&&map.containsKey("indexTable")) {
+							break tab;
+						}
+					}
+				}
+		}
+		return map;
+	}
+    /**
+     * 
+     * 执行某个Field的getField方法
+     * 
+     * @param owner 类
+     * @param fieldName 类的属性名称
+     * @param args 参数，默认为null
+     * @return 
+     */
+    private   Object invokeMethod(Object owner, String fieldName)
+    {
+        Class<? extends Object> ownerClass = owner.getClass();
+        
+        //fieldName -> FieldName  
+        String methodName = fieldName.substring(0, 1).toUpperCase()+ fieldName.substring(1);
+        
+        Method method = null;
+       
+     
+    
+        //invoke getMethod
+        try
+        {
+        	method = ownerClass.getMethod("get" + methodName);
+        	if (method!=null) {
+				
+        		return method.invoke(owner);
+			}else {
+				return "";
+			}
+        } 
+        catch (Exception e)
+        {
+            return "";
+        }
+    }
 	/**
 	 * 获取分页HTML代码
 	 * @return
@@ -463,6 +614,9 @@ public class Page<T> {
 	public boolean isLastPage() {
 		return lastPage;
 	}
+	public void setLastPage(boolean lastPage) {
+		this.lastPage = lastPage;
+	}
 	
 
 	/** 
@@ -590,7 +744,13 @@ public class Page<T> {
 	public String getFuncParam() {
 		return funcParam;
 	}
-
+	@JsonIgnore
+	public int getMaxExportSize() {
+		return maxExportSize;
+	}
+	public void setMaxExportSize(int maxExportSize) {
+		this.maxExportSize = maxExportSize;
+	}
 	/**
 	 * 设置分页函数的附加参数
 	 * @return
@@ -643,138 +803,53 @@ public class Page<T> {
 	public int getMaxResults(){
 		return getPageSize();
 	}
+
 	/**
-	 * @Title: getFiledsSql
-	 * @Description: 将fields的属性名称替换为字段名称
-	 * @param @param mapName
-	 * @param @param fileds
-	 * @param @return
-	 * @param @throws Exception
-	 * @return Map 返回类型
-	 * @author （DDM）
-	 * @version V1.0
-	 */
-	@JsonIgnore
-	public String getFiledsSql(String mapName,String fileds) throws Exception{
-			String[] fieldsColoumn=null;
-			String orderByStr="";
-			//所有字段名
-			List<String> columnList=new ArrayList<String>();
-			//所有属性名
-			List<String> propertyList=new ArrayList<String>();
-			//属性名称为key，字段名称为value
-			Map<String, String> columnMap=new HashMap<String, String>();
+	 * alias
+	 * @return  alias
+	*/
 	
-			if(!StringUtil.isBlank(fileds)){
-				//解析Fileds的字段/属性名称
-				fieldsColoumn=fileds.split(",");
-				
-				//从resultMap中获取字段名称和属性名称
-				if(fieldsColoumn != null){
-					SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class);
-					ResultMap map= sqlSessionFactory.getConfiguration().getResultMap(mapName+"Map");
-					List<ResultMapping> mapping= map.getResultMappings();
-					for(ResultMapping mapp:mapping){
-						columnList.add(mapp.getColumn().toLowerCase());
-						propertyList.add(mapp.getProperty());
-						columnMap.put(mapp.getProperty(), mapp.getColumn());
-					}
-				}
-				if(fieldsColoumn != null){
-					fileds="";
-					for (String column : fieldsColoumn) {
-						if(!StringUtil.isBlank(column)){
-							column=column.trim();
-							if(columnList.contains(column.toLowerCase())){
-								fileds+=","+column;
-							}else if(propertyList.contains(column)){
-								fileds+=","+columnMap.get(column).toString();
-							}
-						}
-					}
-					if(!StringUtil.isBlank(fileds)){
-						fileds=fileds.substring(1);
-					}
-					
-				}
-				
-			}
-		return fileds;
+	public String getAlias() {
+		return alias;
 	}
+
 	/**
-	 * @Title: getOrderBySql
-	 * @Description: 将orderBy的属性名称替换为字段名称
-	 * @param @param mapName
-	 * @param @param orderBy
-	 * @param @return
-	 * @param @throws Exception
-	 * @return Map 返回类型
-	 * @author （DDM）
-	 * @version V1.0
+	 * @param alias the alias to set
 	 */
-	@JsonIgnore
-	public static String getOrderBySql(String mapName,String orderBy) throws Exception{
-		String[] orderByColoumn=null;
-		//所有字段名
-		List<String> columnList=new ArrayList<String>();
-		//所有属性名
-		List<String> propertyList=new ArrayList<String>();
-		Map<String, String> columnMap=new HashMap<String, String>();
-		
-		if(!StringUtil.isBlank(orderBy)){
-			//解析orderBy的字段/属性名称
-			orderByColoumn=orderBy.split(",");
-			//从resultMap中获取字段名称和属性名称
-			if(orderByColoumn != null){
-				SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class);
-				ResultMap map= sqlSessionFactory.getConfiguration().getResultMap(mapName+"Map");
-				List<ResultMapping> mapping= map.getResultMappings();
-				for(ResultMapping mapp:mapping){
-					columnList.add(mapp.getColumn().toLowerCase());
-					propertyList.add(mapp.getProperty());
-					columnMap.put(mapp.getProperty(), mapp.getColumn());
-				}
-			}
-			if(orderByColoumn != null){
-				orderBy="";
-				for (String column : orderByColoumn) {
-					if(!StringUtil.isBlank(column)){
-						if(columnList.contains(replaceOrderBy(column))){
-							orderBy+=","+column;
-						}else if(propertyList.contains(replaceOrderBy(column))){
-							//如果是实体类名字则获取对应数据库名字+排序方式
-							orderBy+=","+columnMap.get(replaceOrderBy(column)).toString()
-									+column.replace(replaceOrderBy(column), "");
-						}
-					}
-				}
-				if(!StringUtil.isBlank(orderBy)){
-					orderBy=orderBy.substring(1);
-				}
-			}
-			
-		}
-		return orderBy;
-	}
-	/**
-	 * @Title: replaceOrderBy
-	 * @Description: 去掉orderBy中的desc和asc
-	 * @param @param str
-	 * @param @return
-	 * @return Map 返回类型
-	 * @author （DDM）
-	 * @version V1.0
-	 */
-	public static String replaceOrderBy(String str){
-		if(!StringUtil.isBlank(str)){
-			str=str.trim();
-			str=str.replace(" asc","");
-			str=str.replace(" ASC","");
-			str=str.replace(" DESC","");
-			str=str.replace(" desc","");
-			str=str.trim();
-		}
-		return str;
+	public void setAlias(String alias) {
+		this.alias = alias;
 	}
 
+//	/**
+//	 * 获取 Spring data JPA 分页对象
+//	 */
+//	public Pageable getSpringPage(){
+//		List<Order> orders = new ArrayList<Order>();
+//		if (orderBy!=null){
+//			for (String order : StringUtils.split(orderBy, ",")){
+//				String[] o = StringUtils.split(order, " ");
+//				if (o.length==1){
+//					orders.add(new Order(Direction.ASC, o[0]));
+//				}else if (o.length==2){
+//					if ("DESC".equals(o[1].toUpperCase())){
+//						orders.add(new Order(Direction.DESC, o[0]));
+//					}else{
+//						orders.add(new Order(Direction.ASC, o[0]));
+//					}
+//				}
+//			}
+//		}
+//		return new PageRequest(this.pageNo - 1, this.pageSize, new Sort(orders));
+//	}
+//	
+//	/**
+//	 * 设置 Spring data JPA 分页对象，转换为本系统分页对象
+//	 */
+//	public void setSpringPage(org.springframework.data.domain.Page<T> page){
+//		this.pageNo = page.getNumber();
+//		this.pageSize = page.getSize();
+//		this.count = page.getTotalElements();
+//		this.list = page.getContent();
+//	}
+	
 }

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

@@ -0,0 +1,780 @@
+/**
+ * Copyright &copy; 2012-2014 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
+ */
+package com.nis.domain;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.servlet.support.RequestContext;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.nis.util.Configurations;
+import com.nis.util.Constants;
+import com.nis.util.CookieUtil;
+
+/**
+ * 分页类
+ * @author ThinkGem
+ * @version 2013-7-2
+ * @param <T>
+ */
+public class PageLog<T> {
+	
+	private int pageNo = 1; // 当前页码
+	private int pageSize = Integer.valueOf(Configurations.getIntProperty("page.pageSize", 30)); // 页面大小，设置为“-1”表示不进行分页（分页无效）
+	
+	private long count;// 总记录数，设置为“-1”表示不查询总数
+	private int first;// 首页索引
+	private int last;// 尾页索引
+	private int prev;// 上一页索引
+	private int next;// 下一页索引
+	
+	
+	private boolean firstPage;//是否是第一页
+	private boolean lastPage;//是否是最后一页
+
+	private int length = 8;// 显示页面长度
+	private int slider = 1;// 前后显示页面长度
+	
+	private List<T> list = new ArrayList<T>();
+	
+	private String orderBy = ""; // 标准查询有效， 实例： updatedate desc, name asc
+	
+	private String fields;//制定资源的字段
+	
+	private String where;
+	private String alias;
+	private String funcName = "page"; // 设置点击页码调用的js函数名称，默认为page，在一页有多个分页对象时使用。
+	
+	private String funcParam = ""; // 函数的附加参数，第三个参数值。
+	
+	private String message = ""; // 设置提示消息，显示在“共n条”之后
+
+	private RequestContext requestContext;
+	
+	private int maxExportSize=Constants.MAX_EXPORT_SIZE;
+	
+	public PageLog() {
+		this.pageSize = -1;
+	}
+	
+	/**
+	 * 构造方法
+	 * @param request 传递 repage 参数，来记住页码
+	 * @param response 用于设置 Cookie，记住页码
+	 */
+	public PageLog(HttpServletRequest request, HttpServletResponse response){
+		this(request, response, Integer.valueOf(Configurations.getIntProperty("page.pageSize", 30)));
+	}
+	public PageLog(HttpServletRequest request, HttpServletResponse response,String alias){
+		
+		this(request, response, Integer.valueOf(Configurations.getIntProperty("page.pageSize", 30)),alias);
+	}
+	
+	public PageLog(HttpServletRequest request, HttpServletResponse response, int defaultPageSize,String alias){
+		this.setAlias(alias);
+		this.initPage(request, response, defaultPageSize);
+	}
+	public PageLog(HttpServletRequest request, HttpServletResponse response, int defaultPageSize){
+		this.initPage(request, response, defaultPageSize);
+	}
+	private void initPage(HttpServletRequest request, HttpServletResponse response, int defaultPageSize){
+		try {
+			
+			this.requestContext = new RequestContext(request);
+
+			// 设置页码参数（传递repage参数，来记住页码）
+			String no = request.getParameter("pageNo");
+			if (StringUtils.isNotBlank(no)) {
+				if (StringUtils.isNumeric(no)){
+					CookieUtil.addCookie(response, "pageNo", no);
+					this.setPageNo(Integer.parseInt(no));
+				}else if (request.getParameter("repage")!=null){
+					no =  CookieUtil.getValue(request, "pageNo");
+					if (StringUtils.isNumeric(no)){
+						this.setPageNo(Integer.parseInt(no));
+					}
+				}
+			}
+			
+			// 设置页面大小参数（传递repage参数，来记住页码大小）
+			String size = "";
+			if(defaultPageSize==-1){
+				size = "-1";
+			}else{
+				size = request.getParameter("pageSize");
+				
+			}
+			if (StringUtils.isNotBlank(size)) {
+				
+				if (StringUtils.isNumeric(size) || size.equals("-1")){
+					CookieUtil.addCookie(response, "pageSize", size);
+					this.setPageSize(Integer.parseInt(size));
+				} else if (request.getParameter("repage")!=null){
+					size =  CookieUtil.getValue(request, "pageSize");
+					if (StringUtils.isNumeric(size)){
+						this.setPageSize(Integer.parseInt(size));
+					}
+				} 
+			} else {
+				this.pageSize = defaultPageSize;
+			}
+			
+			String fields = request.getParameter("fields");
+			if (StringUtils.isNotBlank(fields)){
+				this.setFields(fields);
+			}
+			
+			// 设置排序参数
+			String orderBy = request.getParameter("orderBy");
+			if (StringUtils.isNotBlank(orderBy)){
+				this.setOrderBy(orderBy);
+			}
+			
+			this.setWhere(getWhere(request));
+			
+			
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+	/**
+	 * 
+	* @Title: getWhere 
+	* @Description: TODO(抽取where查询条件) 
+	* @param @param request
+	* @param @return    入参
+	* @return String    返回类型
+	* @author （darnell） 
+	* @throws
+	* @date 2016年8月17日 上午9:28:21 
+	* @version V1.0
+	* wx:日期格式的数据用日期格式化函数格式化，带空格的数据加上引号
+	 */
+	private String getWhere(HttpServletRequest request) {
+		String format=Constants.SEARCH_DATEFORMAT;
+		SimpleDateFormat sdf=new SimpleDateFormat(format);
+		Map<String, String[]> requestMap = request.getParameterMap();
+		StringBuilder whereBuilder = new StringBuilder(512);
+		for(String paramName : request.getParameterMap().keySet()) {
+			if (requestMap.get(paramName)!=null&&paramName.startsWith("search_")&&StringUtils.isNotBlank(requestMap.get(paramName)[0])) {
+				String clomn=paramName.substring("search_".length());
+				String value=requestMap.get(paramName)[0].trim();
+				boolean isDate=false;
+				try {
+					sdf.parse(value);
+					isDate=true;
+				} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				if(clomn.endsWith("_start")){
+					clomn=clomn.substring(0,clomn.lastIndexOf("_start"));
+					if(StringUtils.isNotBlank(alias)) whereBuilder.append(alias.trim()+".");
+					whereBuilder.append(clomn).append(">=");
+					if(isDate){
+						whereBuilder.append("date_format('")
+						.append(value).append("','%Y-%m-%d %H:%i:%S')");
+					}else if(value.indexOf(" ")>-1){
+						whereBuilder.append("'").append(requestMap.get(paramName)[0]).append("'");
+					}else{
+						whereBuilder.append(requestMap.get(paramName)[0]);
+					}
+					whereBuilder.append(" and ");
+				}else if(clomn.endsWith("_end")){
+					clomn=clomn.substring(0,clomn.lastIndexOf("_end"));
+					if(StringUtils.isNotBlank(alias)) whereBuilder.append(alias.trim()+".");
+					whereBuilder.append(clomn).append("<=");
+					if(isDate){
+						whereBuilder.append("DATE_FORMAT('")
+						.append(value).append("','%Y-%m-%d %H:%i:%S')");
+					}else if(value.indexOf(" ")>-1){
+						whereBuilder.append("'").append(requestMap.get(paramName)[0]).append("'");
+					}else{
+						whereBuilder.append(requestMap.get(paramName)[0]);
+					}
+					whereBuilder.append(" and ");
+				}else{
+					if(StringUtils.isNotBlank(alias)) whereBuilder.append(alias.trim()+".");
+					whereBuilder.append(clomn).append("=");
+					if(isDate){
+						whereBuilder.append("date_format('")
+						.append(value).append("','%Y-%m-%d %H:%i:%S')");
+					}else if(value.indexOf(" ")>-1){
+						whereBuilder.append("'").append(requestMap.get(paramName)[0]).append("'");
+					}else{
+						whereBuilder.append(requestMap.get(paramName)[0]);
+					}
+					whereBuilder.append(" and ");
+				}
+				
+			}
+		}
+		if (whereBuilder.length() > 0) {
+			whereBuilder.delete(whereBuilder.lastIndexOf(" and "), whereBuilder.length());
+		}
+		return whereBuilder.toString();
+	}
+	
+	
+	/**
+	 * 构造方法
+	 * @param pageNo 当前页码
+	 * @param pageSize 分页大小
+	 */
+	public PageLog(int pageNo, int pageSize) {
+		this(pageNo, pageSize, 0);
+	}
+	
+	/**
+	 * 构造方法
+	 * @param pageNo 当前页码
+	 * @param pageSize 分页大小
+	 * @param count 数据条数
+	 */
+	public PageLog(int pageNo, int pageSize, long count) {
+		this(pageNo, pageSize, count, new ArrayList<T>());
+	}
+	
+	/**
+	 * 构造方法
+	 * @param pageNo 当前页码
+	 * @param pageSize 分页大小
+	 * @param count 数据条数
+	 * @param list 本页数据对象列表
+	 */
+	public PageLog(int pageNo, int pageSize, long count, List<T> list) {
+		this.setCount(count);
+		this.setPageNo(pageNo);
+		this.pageSize = pageSize;
+		this.list = list;
+	}
+	
+	/**
+	 * 初始化参数
+	 */
+	public void initialize(){
+				
+		//1
+		this.first = 1;
+		// 控制接口是否启用count last
+		if (this.count!=0 && this.last!=0) {
+			//this.last = (int)(count / (this.pageSize < 1 ? 20 : this.pageSize) + first - 1);
+			
+			/*if (this.count % this.pageSize != 0 || this.last == 0) {
+				this.last++;
+			}*/
+
+			if (this.last < this.first) {
+				this.last = this.first;
+			}
+			
+			if (this.pageNo <= 1) {
+				this.pageNo = this.first;
+				this.firstPage=true;
+			}
+
+			if (this.pageNo >= this.last) {
+				this.pageNo = this.last;
+				this.lastPage=true;
+			}
+
+			if (this.pageNo < this.last - 1) {
+				this.next = this.pageNo + 1;
+			} else {
+				this.next = this.last;
+			}
+
+			if (this.pageNo > 1) {
+				this.prev = this.pageNo - 1;
+			} else {
+				this.prev = this.first;
+			}
+			
+			//2
+			if (this.pageNo < this.first) {// 如果当前页小于首页
+				this.pageNo = this.first;
+			}
+
+			if (this.pageNo > this.last) {// 如果当前页大于尾页
+				this.pageNo = this.last;
+			}
+		}else {
+		//首页
+		if (this.pageNo <= 1) {
+			this.pageNo = this.first;
+			this.firstPage=true;
+		}
+
+		//最后一页
+		if(list.size()<this.pageSize){
+			this.lastPage=true;
+		}
+
+		//下一页
+		if (list.size() >= this.pageSize) {
+			this.next = this.pageNo + 1;
+		} 
+//		上一页
+		if (pageNo > 1) {
+			this.prev = this.pageNo - 1;
+		} else {
+			this.prev = this.first;
+		}
+		
+		//2
+		if (this.pageNo < this.first) {// 如果当前页小于首页
+			this.pageNo = this.first;
+		}
+	}
+		
+	}
+	
+	/**
+	 * 默认输出当前分页标签 
+	 * <div class="page">${page}</div>
+	 */
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		// 控制接口返回count last 切换分页
+		if (this.count!=0) {
+			if(list != null && list.isEmpty()) {
+				return "<div class=\"none-data\"><i class=\"fa fa-warning font-red-flamingo\"></i>&nbsp;&nbsp;"+requestContext.getMessage("noneData")+"</div>";
+			}
+			if (pageNo == first) {// 如果是首页
+				sb.append("<li class=\"disabled\"><a href=\"javascript:\">&#171; "+requestContext.getMessage("previousPage")+"</a></li>\n");
+			} else {
+				sb.append("<li><a href=\"javascript:\" onclick=\""+funcName+"("+prev+","+pageSize+",'"+funcParam+"');\">&#171; "+requestContext.getMessage("previousPage")+"</a></li>\n");
+			}
+
+			int begin = pageNo - (length / 2);
+
+			if (begin < first) {
+				begin = first;
+			}
+
+			int end = begin + length - 1;
+
+			if (end >= last) {
+				end = last;
+				begin = end - length + 1;
+				if (begin < first) {
+					begin = first;
+				}
+			}
+
+			if (begin > first) {
+				int i = 0;
+				for (i = first; i < first + slider && i < begin; i++) {
+					sb.append("<li><a href=\"javascript:\" onclick=\""+funcName+"("+i+","+pageSize+",'"+funcParam+"');\">"
+							+ (i + 1 - first) + "</a></li>\n");
+				}
+				if (i < begin) {
+					sb.append("<li class=\"disabled\"><a href=\"javascript:\">...</a></li>\n");
+				}
+			}
+
+			for (int i = begin; i <= end; i++) {
+				if (i == pageNo) {
+					sb.append("<li class=\"active\"><a href=\"javascript:\">" + (i + 1 - first)
+							+ "</a></li>\n");
+				} else {
+					sb.append("<li><a href=\"javascript:\" onclick=\""+funcName+"("+i+","+pageSize+",'"+funcParam+"');\">"
+							+ (i + 1 - first) + "</a></li>\n");
+				}
+			}
+
+			if (last - end > slider) {
+				sb.append("<li class=\"disabled\"><a href=\"javascript:\">...</a></li>\n");
+				end = last - slider;
+			}
+
+			for (int i = end + 1; i <= last; i++) {
+				sb.append("<li><a href=\"javascript:\" onclick=\""+funcName+"("+i+","+pageSize+",'"+funcParam+"');\">"
+						+ (i + 1 - first) + "</a></li>\n");
+			}
+
+			if (pageNo == last) {
+				sb.append("<li class=\"disabled\"><a href=\"javascript:\">"+requestContext.getMessage("nextPage")+" &#187;</a></li>\n");
+			} else {
+				sb.append("<li><a href=\"javascript:\" onclick=\""+funcName+"("+next+","+pageSize+",'"+funcParam+"');\">"
+						+ ""+requestContext.getMessage("nextPage")+" &#187;</a></li>\n");
+			}
+
+			sb.append("<li class=\"disabled controls\"><a href=\"javascript:\">"+requestContext.getMessage("current")+" ");
+			sb.append("<input type=\"text\" value=\""+pageNo+"\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)");
+			sb.append(funcName+"(this.value,"+pageSize+",'"+funcParam+"');\" onclick=\"this.select();\"/> / ");
+			/*sb.append(pageNo+" / ");*/
+			sb.append(last+" "+requestContext.getMessage("page")+"，");
+			/*sb.append("<input type=\"text\" value=\""+last+"\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)");
+			sb.append(funcName+"("+pageNo+",this.value,'"+funcParam+"');\" onclick=\"this.select();\"/> "+requestContext.getMessage("page")+"，");*/
+			sb.append(""+requestContext.getMessage("total")+" <span id='showTotalCount'>" + count + "</span> "+requestContext.getMessage("count")+""+(message!=null?message:"")+"</a></li>\n");
+
+			sb.insert(0,"<ul>\n").append("</ul>\n");
+			
+			sb.append("<div style=\"clear:both;\"></div>");
+
+//			sb.insert(0,"<div class=\"page\">\n").append("</div>\n");
+			
+		}else {
+		
+		if(list != null && list.isEmpty()&&pageNo<=1) {
+			return "<div class=\"none-data\"><i class=\"fa fa-warning font-red-flamingo\"></i>&nbsp;&nbsp;"+requestContext.getMessage("noneData")+"</div>";
+		}
+		
+
+		
+		sb.append("<li><a href=\"javascript:\" onclick=\""+funcName+"("+first+","+pageSize+",'"+funcParam+"');\">"+requestContext.getMessage("firstPage")+"</a></li>\n");
+		if (pageNo == first) {// 如果是首页
+			sb.append("<li class=\"disabled\"><a href=\"javascript:\">&#171; "+requestContext.getMessage("previousPage")+"</a></li>\n");
+		} else {
+			sb.append("<li><a href=\"javascript:\" onclick=\""+funcName+"("+prev+","+pageSize+",'"+funcParam+"');\">&#171; "+requestContext.getMessage("previousPage")+"</a></li>\n");
+		}
+
+		sb.append("<li class=\"disabled\"><a href=\"javascript:\">"+pageNo+"</a></li>\n");
+		
+//		最后一页 未铺满 集合不为空
+		if (list != null && !list.isEmpty()&&list.size()<pageSize) {
+			sb.append("<li class=\"disabled\"><a href=\"javascript:\">"+requestContext.getMessage("nextPage")+" &#187;</a></li>\n");
+		}else if(pageNo>1&&list.isEmpty()){
+			sb.append("<li class=\"disabled\"><a href=\"javascript:\">"+requestContext.getMessage("nextPage")+" &#187;</a></li>\n");
+		}else {
+			sb.append("<li><a href=\"javascript:\" onclick=\""+funcName+"("+next+","+pageSize+",'"+funcParam+"');\">"
+					+ ""+requestContext.getMessage("nextPage")+" &#187;</a></li>\n");
+		}
+
+
+		sb.insert(0,"<ul>\n").append("</ul>\n");
+		
+		sb.append("<div style=\"clear:both;\"></div>");
+		}
+		return sb.toString();
+	}
+	
+	/**
+	 * 获取分页HTML代码
+	 * @return
+	 */
+	@JsonIgnore
+	public String getHtml(){
+		return toString();
+	}
+	
+
+	/**
+	 * 获取设置总数
+	 * @return
+	 */
+	public long getCount() {
+		return count;
+	}
+
+	/**
+	 * 设置数据总数
+	 * @param count
+	 */
+	public void setLast(Integer last) {
+		this.last = last;
+	}
+	/**
+	 * 设置数据总数
+	 * @param count
+	 */
+	public void setCount(long count) {
+		this.count = count;
+		if (pageSize >= count){
+			pageNo = 1;
+		}
+	}
+	
+	/**
+	 * 获取当前页码
+	 * @return
+	 */
+	public int getPageNo() {
+		return pageNo;
+	}
+	
+	/**
+	 * 设置当前页码
+	 * @param pageNo
+	 */
+	public void setPageNo(int pageNo) {
+		this.pageNo = pageNo;
+	}
+	
+	/**
+	 * 获取页面大小
+	 * @return
+	 */
+	public int getPageSize() {
+		return pageSize;
+	}
+
+	/**
+	 * 设置页面大小（最大500）
+	 * @param pageSize
+	 */
+	public void setPageSize(int pageSize) {
+		if (pageSize == -1 || pageSize > 0 ) {
+			this.pageSize = pageSize;
+		} else {
+			this.pageSize = Integer.valueOf(Configurations.getIntProperty("page.pageSize", 30));
+		}
+	}
+
+	/**
+	 * 首页索引
+	 * @return
+	 */
+	@JsonIgnore
+	public int getFirst() {
+		return first;
+	}
+
+	/**
+	 * 尾页索引
+	 * @return
+	 */
+	public int getLast() {
+		return last;
+	}
+	/**
+	 * 获取页面总数
+	 * @return getLast();
+	 */
+	@JsonIgnore
+	public int getTotalPage() {
+		return getLast();
+	}
+	/**
+	 * 是否为第一页
+	 * @return
+	 */
+	@JsonIgnore
+	public boolean isFirstPage() {
+		return firstPage;
+	}
+
+	/**
+	 * 是否为最后一页
+	 * @return
+	 */
+	@JsonIgnore
+	public boolean isLastPage() {
+		return lastPage;
+	}
+	
+
+	/** 
+	* @return where 
+	*/
+	@JsonIgnore
+	public String getWhere() {
+		return where;
+	}
+
+	/** 
+	* @param where 要设置的 where 
+	*/
+	public void setWhere(String where) {
+		this.where = where;
+	}
+	
+	/**
+	 * 上一页索引值
+	 * @return
+	 */
+	@JsonIgnore
+	public int getPrev() {
+		if (isFirstPage()) {
+			return pageNo;
+		} else {
+			return pageNo - 1;
+		}
+	}
+
+	/**
+	 * 下一页索引值
+	 * @return
+	 */
+	@JsonIgnore
+	public int getNext() {
+		if (isLastPage()) {
+			return pageNo;
+		} else {
+			return pageNo + 1;
+		}
+	}
+	
+	/**
+	 * 获取本页数据对象列表
+	 * @return List<T>
+	 */
+	public List<T> getList() {
+		return list;
+	}
+
+	/**
+	 * 设置本页数据对象列表
+	 * @param list
+	 */
+	public PageLog<T> setList(List<T> list) {
+		this.list = list;
+		initialize();
+		return this;
+	}
+
+	/**
+	 * 获取查询排序字符串
+	 * @return
+	 */
+	@JsonIgnore
+	public String getOrderBy() {
+		// SQL过滤，防止注入 
+		String reg = "(?:')|(?:--)|(/\\*(?:.|[\\n\\r])*?\\*/)|"
+					+ "(\\b(select|update|and|or|delete|insert|trancate|char|into|substr|ascii|declare|exec|count|master|into|drop|execute)\\b)";
+		Pattern sqlPattern = Pattern.compile(reg, Pattern.CASE_INSENSITIVE);
+		if (sqlPattern.matcher(orderBy).find()) {
+			return "";
+		}
+		return orderBy;
+	}
+
+	/**
+	 * 设置查询排序，标准查询有效， 实例： updatedate desc, name asc
+	 */
+	public void setOrderBy(String orderBy) {
+		this.orderBy = orderBy;
+	}
+	
+	
+
+	/** 
+	* @return fields  字段属性查询，拼接用,分隔
+	*/
+	@JsonIgnore
+	public String getFields() {
+		return fields;
+	}
+
+	/** 
+	* @param fields 要设置的 fields 
+	*/
+	public void setFields(String fields) {
+		this.fields = fields;
+	}
+
+	/**
+	 * 获取点击页码调用的js函数名称
+	 * function ${page.funcName}(pageNo){location="${ctx}/list-${category.id}${urlSuffix}?pageNo="+i;}
+	 * @return
+	 */
+	@JsonIgnore
+	public String getFuncName() {
+		return funcName;
+	}
+
+	/**
+	 * 设置点击页码调用的js函数名称，默认为page，在一页有多个分页对象时使用。
+	 * @param funcName 默认为page
+	 */
+	public void setFuncName(String funcName) {
+		this.funcName = funcName;
+	}
+
+	/**
+	 * 获取分页函数的附加参数
+	 * @return
+	 */
+	@JsonIgnore
+	public String getFuncParam() {
+		return funcParam;
+	}
+	@JsonIgnore
+	public int getMaxExportSize() {
+		return maxExportSize;
+	}
+	public void setMaxExportSize(int maxExportSize) {
+		this.maxExportSize = maxExportSize;
+	}
+	/**
+	 * 设置分页函数的附加参数
+	 * @return
+	 */
+	public void setFuncParam(String funcParam) {
+		this.funcParam = funcParam;
+	}
+
+	/**
+	 * 设置提示消息，显示在“共n条”之后
+	 * @param message
+	 */
+	public void setMessage(String message) {
+		this.message = message;
+	}
+	
+	/**
+	 * 分页是否有效
+	 * @return this.pageSize==-1
+	 */
+	@JsonIgnore
+	public boolean isDisabled() {
+		return this.pageSize==-1;
+	}
+	
+	/**
+	 * 是否进行总数统计
+	 * @return this.count==-1
+	 */
+	@JsonIgnore
+	public boolean isNotCount() {
+		return this.count==-1;
+	}
+	
+	/**
+	 * 获取 Hibernate FirstResult
+	 */
+	@JsonIgnore
+	public int getFirstResult(){
+		int firstResult = (getPageNo() - 1) * getPageSize();
+		if (firstResult >= getCount()) {
+			firstResult = 0;
+		}
+		return firstResult;
+	}
+	/**
+	 * 获取 Hibernate MaxResults
+	 */
+	@JsonIgnore
+	public int getMaxResults(){
+		return getPageSize();
+	}
+
+	/**
+	 * alias
+	 * @return  alias
+	*/
+	
+	public String getAlias() {
+		return alias;
+	}
+
+	/**
+	 * @param alias the alias to set
+	 */
+	public void setAlias(String alias) {
+		this.alias = alias;
+	}
+
+}

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

@@ -0,0 +1,132 @@
+/**
+ *@Title: RestfulResult.java
+ *@Package com.nis.domain 
+ *@Description TODO
+ *@author dell
+ *@date 2018年6月8日 下午3:22:26
+ *@version  版本号
+ */
+package com.nis.domain;
+
+import org.apache.commons.lang.StringUtils;
+
+import net.sf.json.JSONObject;
+
+/**
+ * @ClassName: RestfulResult.java 
+ * @Description: TODO
+ * @author (dell)
+ * @date 2018年6月8日 下午3:22:26
+ * @version V1.0
+ */
+public class RestfulResult {
+	protected Integer status=0;
+	protected Integer businessCode=0;
+	protected String reason="";
+	protected String msg="";
+	private String traceCode="";
+	protected String fromuri="";
+	public RestfulResult(){
+		
+	}
+	public RestfulResult(String content){
+		try{
+			if(StringUtils.isNotBlank(content)){
+				JSONObject resObject = JSONObject.fromObject(content) ;
+				this.status=resObject.getInt("status");
+				this.businessCode=resObject.getInt("businessCode");
+				this.reason=resObject.getString("reason");
+				this.msg=resObject.getString("msg");
+				this.traceCode=resObject.getString("traceCode");
+				this.fromuri=resObject.getString("fromuri");
+			}
+		}catch (Exception e) {
+			// TODO: handle exception
+		}
+	}
+	/**
+	 * status
+	 * @return  status
+	*/
+	
+	public Integer getStatus() {
+		return status;
+	}
+	/**
+	 * @param status the status to set
+	 */
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+	/**
+	 * businessCode
+	 * @return  businessCode
+	*/
+	
+	public Integer getBusinessCode() {
+		return businessCode;
+	}
+	/**
+	 * @param businessCode the businessCode to set
+	 */
+	public void setBusinessCode(Integer businessCode) {
+		this.businessCode = businessCode;
+	}
+	/**
+	 * reason
+	 * @return  reason
+	*/
+	
+	public String getReason() {
+		return reason;
+	}
+	/**
+	 * @param reason the reason to set
+	 */
+	public void setReason(String reason) {
+		this.reason = reason;
+	}
+	/**
+	 * msg
+	 * @return  msg
+	*/
+	
+	public String getMsg() {
+		return msg;
+	}
+	/**
+	 * @param msg the msg to set
+	 */
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+	/**
+	 * traceCode
+	 * @return  traceCode
+	*/
+	
+	public String getTraceCode() {
+		return traceCode;
+	}
+	/**
+	 * @param traceCode the traceCode to set
+	 */
+	public void setTraceCode(String traceCode) {
+		this.traceCode = traceCode;
+	}
+	/**
+	 * fromuri
+	 * @return  fromuri
+	*/
+	
+	public String getFromuri() {
+		return fromuri;
+	}
+	/**
+	 * @param fromuri the fromuri to set
+	 */
+	public void setFromuri(String fromuri) {
+		this.fromuri = fromuri;
+	}
+	
+}

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

@@ -0,0 +1,56 @@
+package com.nis.domain;
+
+import com.nis.domain.configuration.BaseCfg;
+
+/**
+ * 定时任务信息 schedule_info
+ * @author ThinkPad
+ *
+ */
+public class ScheduleCfg extends BaseCfg<ScheduleCfg>{
+	private static final long serialVersionUID = 7151915080876949497L;
+	
+	private String name;//定时任务名称，预留
+	private String cronValid;//生效cron表达式
+	private String cronInvalid;//失效cron表达式
+	private String whereStr;//动态where 条件
+	private int delFlag;
+	private int type;
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getCronValid() {
+		return cronValid;
+	}
+	public void setCronValid(String cronValid) {
+		this.cronValid = cronValid;
+	}
+	public String getCronInvalid() {
+		return cronInvalid;
+	}
+	public void setCronInvalid(String cronInvalid) {
+		this.cronInvalid = cronInvalid;
+	}
+	public String getWhereStr() {
+		return whereStr;
+	}
+	public void setWhereStr(String whereStr) {
+		this.whereStr = whereStr;
+	}
+	public int getType() {
+		return type;
+	}
+	public void setType(int type) {
+		this.type = type;
+	}
+	public int getDelFlag() {
+		return delFlag;
+	}
+	public void setDelFlag(int delFlag) {
+		this.delFlag = delFlag;
+	}
+	
+}

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

@@ -0,0 +1,66 @@
+package com.nis.domain;
+
+import java.util.Date;
+
+import com.nis.domain.configuration.BaseCfg;
+
+/**
+ *  定时任务执行信息 schedule_exce_log/schedule_exce_new
+ *    `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键自增',
+  `schedule_id` bigint(20) NOT NULL COMMENT 'schedule_info 表的主键',
+  `exce_time` datetime DEFAULT NULL COMMENT '最新执行时间',
+  `issue_status` int(255) DEFAULT NULL COMMENT '下发状态：1：生效，0：失效',
+  `issue_result` int(255) DEFAULT NULL COMMENT '下发结果：1：成功，0：失败',
+  `error_info` varchar(255) DEFAULT NULL COMMENT '下发失败原因',
+  `compile_id` bigint(20) DEFAULT NULL COMMENT '编译id',
+ * @author fang
+ *
+ */
+public class ScheduleExceInfo extends BaseCfg<ScheduleExceInfo>{
+	private static final long serialVersionUID = 7151915080876949497L;
+	
+	private Long scheduleId;//定时器id
+	private Date exceTime;//下发时间
+	private Integer issueStatus;//下发 的状态
+	private Integer issueResult;//下发结果
+	private String errorInfo;//动态where 条件
+	private Integer isIssue;//是否需要下发配置，1：需要，0：不需要
+	
+	public Long getScheduleId() {
+		return scheduleId;
+	}
+	public void setScheduleId(Long scheduleId) {
+		this.scheduleId = scheduleId;
+	}
+	public Date getExceTime() {
+		return exceTime;
+	}
+	public void setExceTime(Date exceTime) {
+		this.exceTime = exceTime;
+	}
+	public Integer getIssueStatus() {
+		return issueStatus;
+	}
+	public void setIssueStatus(Integer issueStatus) {
+		this.issueStatus = issueStatus;
+	}
+	public Integer getIssueResult() {
+		return issueResult;
+	}
+	public void setIssueResult(Integer issueResult) {
+		this.issueResult = issueResult;
+	}
+	public String getErrorInfo() {
+		return errorInfo;
+	}
+	public void setErrorInfo(String errorInfo) {
+		this.errorInfo = errorInfo;
+	}
+	public Integer getIsIssue() {
+		return isIssue;
+	}
+	public void setIsIssue(Integer isIssue) {
+		this.isIssue = isIssue;
+	}
+
+}

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

@@ -0,0 +1,83 @@
+package com.nis.domain;
+
+import java.text.SimpleDateFormat;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class ServiceConfigInfo {
+	
+	private Long id;
+	private String tableName;//配置表名
+	private String tableDesc;//表描述
+	private Integer tableType;//表类型  1:ip类配置表;2:字符串类配置表;3:数值类配置表;4:增强字符串配置表;
+	private String maatTable;//maat中对应的表名
+	private Integer serviceId;//业务id,对应SystemServiceInfo.serviceId
+	private Integer isValid;//有效标识  0:无效;1:有效;
+	private Integer isInitianlize;//有效标识  0:无效;1:有效;
+	
+	
+	public Integer getIsInitianlize() {
+		return isInitianlize;
+	}
+	public void setIsInitianlize(Integer isInitianlize) {
+		this.isInitianlize = isInitianlize;
+	}
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public String getTableName() {
+		return tableName;
+	}
+	public void setTableName(String tableName) {
+		this.tableName = tableName;
+	}
+	public String getTableDesc() {
+		return tableDesc;
+	}
+	public void setTableDesc(String tableDesc) {
+		this.tableDesc = tableDesc;
+	}
+	public Integer getTableType() {
+		return tableType;
+	}
+	public void setTableType(Integer tableType) {
+		this.tableType = tableType;
+	}
+	public String getMaatTable() {
+		return maatTable;
+	}
+	public void setMaatTable(String maatTable) {
+		this.maatTable = maatTable;
+	}
+	public Integer getServiceId() {
+		return serviceId;
+	}
+	public void setServiceId(Integer serviceId) {
+		this.serviceId = serviceId;
+	}
+	public Integer getIsValid() {
+		return isValid;
+	}
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	
+	@Override
+	public String toString() {
+		return this.toJson();
+	}
+	
+	public String toJson() {
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+		try {
+			return mapper.writeValueAsString(this);
+		} catch (JsonProcessingException e) {
+			return e.getMessage();
+		}
+	}
+}

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

@@ -3,7 +3,7 @@ package com.nis.domain;
 import java.io.Serializable;
 
 
-public class SysDataDictionaryItem implements Serializable {
+public class SysDataDictionaryItem  extends BaseEntity<SysDataDictionaryItem>  implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private Long id;
 	private String itemCode;

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

@@ -34,6 +34,19 @@ public class SysLog extends BaseEntity<SysLog>{
     
     private Long consumerTime;//消费时间
     
+    private Integer functionId;//功能菜单id
+    private String compileIds;//配置编译id
+    private String cfgIds;//界面配置id
+    private Integer compileId;//配置编译id
+    private Integer cfgId;//界面配置id
+    private String methodName;//功能方法名称
+    private Integer auditState;//审核状态
+    private Integer action;//GK动作
+    private String operation;//操作说明
+    private String functionName;//功能名称
+    private Integer isValid;//配置有效状态
+    
+    
     public Long getConsumerTime() {
 		return consumerTime;
 	}
@@ -155,7 +168,95 @@ public class SysLog extends BaseEntity<SysLog>{
 		this.createBy = createBy;
 	}
     
-    /**
+    public Integer getFunctionId() {
+		return functionId;
+	}
+
+	public void setFunctionId(Integer functionId) {
+		this.functionId = functionId;
+	}
+
+	public Integer getCompileId() {
+		return compileId;
+	}
+
+	public void setCompileId(Integer compileId) {
+		this.compileId = compileId;
+	}
+
+	public String getMethodName() {
+		return methodName;
+	}
+
+	public void setMethodName(String methodName) {
+		this.methodName = methodName;
+	}
+
+	public Integer getAuditState() {
+		return auditState;
+	}
+
+	public void setAuditState(Integer auditState) {
+		this.auditState = auditState;
+	}
+
+	public Integer getAction() {
+		return action;
+	}
+
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+
+	public String getCompileIds() {
+		return compileIds;
+	}
+
+	public void setCompileIds(String compileIds) {
+		this.compileIds = compileIds;
+	}
+
+	public String getCfgIds() {
+		return cfgIds;
+	}
+
+	public void setCfgIds(String cfgIds) {
+		this.cfgIds = cfgIds;
+	}
+
+	public Integer getCfgId() {
+		return cfgId;
+	}
+
+	public void setCfgId(Integer cfgId) {
+		this.cfgId = cfgId;
+	}
+
+	public String getOperation() {
+		return operation;
+	}
+
+	public void setOperation(String operation) {
+		this.operation = operation;
+	}
+
+	public String getFunctionName() {
+		return functionName;
+	}
+
+	public void setFunctionName(String functionName) {
+		this.functionName = functionName;
+	}
+
+	public Integer getIsValid() {
+		return isValid;
+	}
+
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+
+	/**
 	 * 设置请求参数
 	 * @param paramMap
 	 */

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

@@ -51,6 +51,9 @@ public class SysMenu extends BaseEntity<SysMenu>{
     
     private String menuBg;
     
+    private Integer isTop;
+    private Integer functionId;
+    
     private List<SysMenu> children = new ArrayList<SysMenu>();
     
     public SysMenu(){
@@ -260,4 +263,22 @@ public class SysMenu extends BaseEntity<SysMenu>{
 		this.code = code;
 	}
 
+	public Integer getIsTop() {
+		return isTop;
+	}
+
+	public void setIsTop(Integer isTop) {
+		this.isTop = isTop;
+	}
+
+	public Integer getFunctionId() {
+		return functionId;
+	}
+
+	public void setFunctionId(Integer functionId) {
+		this.functionId = functionId;
+	}
+
+	
+	
 }

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

@@ -45,7 +45,11 @@ public class SysRole extends BaseEntity<SysRole>{
 
     private Date createTime;
     
- // 数据范围（1：所有数据；2：所在国家中心及以下数据；3：所在国家中心数据；4：所在省中心及以下数据；5：所在省中心数据；8：所在部门及以下数据；9：所在部门数据）
+ /**
+  *  数据范围（1：所有数据；2：所在国家中心及以下数据；3：所在国家中心数据；4：所在省中心及以下数据；5：所在省中心数据；
+  *  6：所在部门及以下数据；7：所在部门数据,8:配置员，9：审核员，10：审计员）
+  */
+    
  	public static final Integer DATA_SCOPE_ALL = 1;
  	public static final Integer DATA_SCOPE_COMPANY_AND_CHILD = 2;
  	public static final Integer DATA_SCOPE_COMPANY = 3;
@@ -53,6 +57,9 @@ public class SysRole extends BaseEntity<SysRole>{
  	public static final Integer DATA_SCOPE_OFFICE = 5;
  	public static final Integer DATA_SCOPE_ENTITY_AND_CHILD = 6;
  	public static final Integer DATA_SCOPE_ENTITY = 7;
+ 	public static final Integer DATA_SCOPE_CREATOR = 8;
+ 	public static final Integer DATA_SCOPE_AUDITOR = 9;
+ 	public static final Integer DATA_SCOPE_SHOWER = 10;
 
 
 

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

@@ -167,7 +167,7 @@ public class SysUser extends BaseEntity<SysUser> {
 	}
 	
 	public static boolean isAdmin(String loginId){
-		return loginId != null && "admin".equals(loginId);
+		return loginId != null && "ceiec".equals(loginId);
 	}
 	
 	

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

@@ -0,0 +1,92 @@
+package com.nis.domain;
+
+import java.util.Date;
+
+import javax.xml.bind.annotation.XmlTransient;
+
+import org.apache.poi.ss.formula.functions.T;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+public class SysUserWarn {
+	
+	private  String serviceId; //业务Id
+	private  String serviceDesc;//业务描述
+	private  Integer interfaceCfgTotal;//界面配置数量
+	
+	private  Integer systemCfgTotal;//服务端配置数量
+	
+	private  Date time;//时间
+	private  String remark;//备注
+	
+	private  Integer id;//serviceID
+	private  String tableName;//表名
+	/**
+	 * 当前实体分页对象
+	 */
+	protected Page<SysUserWarn> page;
+	
+	public String getServiceId() {
+		return serviceId;
+	}
+	public void setServiceId(String serviceId) {
+		this.serviceId = serviceId;
+	}
+	public String getServiceDesc() {
+		return serviceDesc;
+	}
+	public void setServiceDesc(String serviceDesc) {
+		this.serviceDesc = serviceDesc;
+	}
+	public Integer getInterfaceCfgTotal() {
+		return interfaceCfgTotal;
+	}
+	public void setInterfaceCfgTotal(Integer interfaceCfgTotal) {
+		this.interfaceCfgTotal = interfaceCfgTotal;
+	}
+	public Integer getSystemCfgTotal() {
+		return systemCfgTotal;
+	}
+	public void setSystemCfgTotal(Integer systemCfgTotal) {
+		this.systemCfgTotal = systemCfgTotal;
+	}
+	public Date getTime() {
+		return time;
+	}
+	public void setTime(Date time) {
+		this.time = time;
+	}
+	public String getRemark() {
+		return remark;
+	}
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public String getTableName() {
+		return tableName;
+	}
+	public void setTableName(String tableName) {
+		this.tableName = tableName;
+	}
+	@JsonIgnore
+	@XmlTransient
+	public Page<SysUserWarn> getPage() {
+		if (page == null){
+			page = new Page<SysUserWarn>();
+		}
+		return page;
+	}
+	
+	public Page<SysUserWarn> setPage(Page<SysUserWarn> page) {
+		this.page = page;
+		return page;
+	}
+	
+	
+}

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

@@ -0,0 +1,46 @@
+package com.nis.domain;
+
+import java.util.List;
+import java.util.Map;
+
+public class SysUserWarnData {
+	
+	private  Map<String,List<String>>  effective;
+	private  Integer effectiveCount;
+	private  Map<String,List<String>>  obsolete;
+	private  Integer obsoleteCount;
+	
+	
+	public Map<String, List<String>> getEffective() {
+		return effective;
+	}
+	public void setEffective(Map<String, List<String>> effective) {
+		this.effective = effective;
+	}
+	public Integer getEffectiveCount() {
+		return effectiveCount;
+	}
+	public void setEffectiveCount(Integer effectiveCount) {
+		this.effectiveCount = effectiveCount;
+	}
+	public Map<String, List<String>> getObsolete() {
+		return obsolete;
+	}
+	public void setObsolete(Map<String, List<String>> obsolete) {
+		this.obsolete = obsolete;
+	}
+	public Integer getObsoleteCount() {
+		return obsoleteCount;
+	}
+	public void setObsoleteCount(Integer obsoleteCount) {
+		this.obsoleteCount = obsoleteCount;
+	}
+	@Override
+	public String toString() {
+		return "SysUserWarnData [effective=" + effective + ", effectiveCount=" + effectiveCount + ", obsolete="
+				+ obsolete + ", obsoleteCount=" + obsoleteCount + "]";
+	}
+	
+	
+	
+}

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

@@ -0,0 +1,67 @@
+package com.nis.domain;
+
+public class SysUserWarnRecvData {
+	private Integer status;
+	private Integer businessCode;
+	private String reason;
+	private String msg;
+	private String fromuri;
+	private String logSource;
+	private String traceCode;
+	private SysUserWarnData  data;
+	
+	
+	public Integer getStatus() {
+		return status;
+	}
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+	public Integer getBusinessCode() {
+		return businessCode;
+	}
+	public void setBusinessCode(Integer businessCode) {
+		this.businessCode = businessCode;
+	}
+	public String getReason() {
+		return reason;
+	}
+	public void setReason(String reason) {
+		this.reason = reason;
+	}
+	public String getMsg() {
+		return msg;
+	}
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+	public String getFromuri() {
+		return fromuri;
+	}
+	public void setFromuri(String fromuri) {
+		this.fromuri = fromuri;
+	}
+	public String getLogSource() {
+		return logSource;
+	}
+	public void setLogSource(String logSource) {
+		this.logSource = logSource;
+	}
+	public String getTraceCode() {
+		return traceCode;
+	}
+	public void setTraceCode(String traceCode) {
+		this.traceCode = traceCode;
+	}
+	public SysUserWarnData getData() {
+		return data;
+	}
+	public void setData(SysUserWarnData data) {
+		this.data = data;
+	}
+	
+	
+
+	
+	
+}

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

@@ -0,0 +1,125 @@
+package com.nis.domain;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+@Deprecated
+public class SystemServiceInfo extends BaseEntity<SystemServiceInfo> {
+	
+	private static final long serialVersionUID = -8919580011013718190L;
+
+	private Integer serviceId;//业务id
+	private String serviceName;//业务名称
+	private String serviceDesc;//业务描述
+	private Integer action;//业务动作  1:阻断;2:监测;5:FD白名单;6:监测白名单;7:FD监测白名单;8:灰名单;
+	private Integer isValid;//有效标识  0:无效;1:有效;
+	private Integer serviceType;//业务类型  1:常规(单域)业务配置;2:多域业务配置;3.特定服务配置;
+	private SysUser creator;
+	private Date createTime;
+	private SysUser editor;
+	private Date editTime;
+	private List<ServiceConfigInfo> serviceConfigInfoList;//业务配置表
+	private Integer isInitianlize;//是否是初始化数据
+	
+	
+	public Integer getIsInitianlize() {
+		return isInitianlize;
+	}
+	public void setIsInitianlize(Integer isInitianlize) {
+		this.isInitianlize = isInitianlize;
+	}
+	public Integer getServiceId() {
+		return serviceId;
+	}
+	public void setServiceId(Integer serviceId) {
+		this.serviceId = serviceId;
+	}
+	public String getServiceName() {
+		return serviceName;
+	}
+	public void setServiceName(String serviceName) {
+		this.serviceName = serviceName;
+	}
+	public String getServiceDesc() {
+		return serviceDesc;
+	}
+	public void setServiceDesc(String serviceDesc) {
+		this.serviceDesc = serviceDesc;
+	}
+	public Integer getAction() {
+		return action;
+	}
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	public Integer getIsValid() {
+		return isValid;
+	}
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	public Integer getServiceType() {
+		return serviceType;
+	}
+	public void setServiceType(Integer serviceType) {
+		this.serviceType = serviceType;
+	}
+	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 List<ServiceConfigInfo> getServiceConfigInfoList() {
+		return serviceConfigInfoList;
+	}
+	public void setServiceConfigInfoList(List<ServiceConfigInfo> serviceConfigInfoList) {
+		this.serviceConfigInfoList = serviceConfigInfoList;
+	}
+	
+	@Override
+	public String toString() {
+		return this.toJson();
+	}
+	
+	public String toJson() {
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+		try {
+			return mapper.writeValueAsString(this);
+		} catch (JsonProcessingException e) {
+			return e.getMessage();
+		}
+	}
+	
+	private Integer serviceIdPre;//辅助用，用来存放serviceId前四位以获得最新serviceId
+	
+	public Integer getServiceIdPre() {
+		return serviceIdPre;
+	}
+	public void setServiceIdPre(Integer serviceIdPre) {
+		this.serviceIdPre = serviceIdPre;
+	}
+}

src/main/java/com/nis/domain/basics/AsnGroupInfo.java

@@ -0,0 +1,153 @@
+package com.nis.domain.basics;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.nis.domain.configuration.BaseCfg;
+import com.nis.util.excel.ExcelField;
+
+/**
+ * @ClassName: AsnGroupInfo.java 
+ * @Description: ASN分组
+ * @version V1.0
+ */
+public class AsnGroupInfo extends BaseCfg<AsnGroupInfo> implements Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7931466570918016654L;
+	private Integer groupId;
+	private Long issuedIPs;
+	@ExcelField(title="cfg_id",sort=301)
+	private Integer compileId;
+	@ExcelField(title="asn_name",sort=302)
+	private String organization;
+	@ExcelField(title="country_code",sort=303)
+	private String country;
+	@ExcelField(title="details",sort=304)
+	private String detail;
+	private Integer isValid;
+	@ExcelField(title="ASN",sort=305)
+	private Long asnId;
+	
+	private Integer isUsed;
+	private Integer regionId;
+	
+	
+	public Integer getIsUsed() {
+		return isUsed;
+	}
+	public void setIsUsed(Integer isUsed) {
+		this.isUsed = isUsed;
+	}
+	public Long getIssuedIPs() {
+		return issuedIPs;
+	}
+
+	public void setIssuedIPs(Long issuedIPs) {
+		this.issuedIPs = issuedIPs;
+	}
+
+	public Integer getCompileId() {
+		return compileId;
+	}
+
+	public void setCompileId(Integer compileId) {
+		this.compileId = compileId;
+	}
+
+	public Integer getGroupId() {
+		return groupId;
+	}
+
+	public void setGroupId(Integer groupId) {
+		this.groupId = groupId;
+	}
+
+	public String getOrganization() {
+		return organization;
+	}
+
+	public void setOrganization(String organization) {
+		this.organization = organization;
+	}
+
+	public String getCountry() {
+		return country;
+	}
+
+	public void setCountry(String country) {
+		this.country = country;
+	}
+
+	public String getDetail() {
+		return detail;
+	}
+
+	public void setDetail(String detail) {
+		this.detail = detail;
+	}
+
+	public Integer getIsValid() {
+		return isValid;
+	}
+
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Long getCreatorId() {
+		return creatorId;
+	}
+
+	public void setCreatorId(Long creatorId) {
+		this.creatorId = creatorId;
+	}
+
+	public Date getEditTime() {
+		return editTime;
+	}
+
+	public void setEditTime(Date editTime) {
+		this.editTime = editTime;
+	}
+
+	public Long getEditorId() {
+		return editorId;
+	}
+
+	public void setEditorId(Long editorId) {
+		this.editorId = editorId;
+	}
+
+	public Long getAsnId() {
+		return asnId;
+	}
+
+	public void setAsnId(Long asnId) {
+		this.asnId = asnId;
+	}
+	
+	
+	public Integer getRegionId() {
+		return regionId;
+	}
+	public void setRegionId(Integer regionId) {
+		this.regionId = regionId;
+	}
+
+	@Override
+	public String toString() {
+		// TODO Auto-generated method stub
+		return super.toString();
+	}
+	
+}

src/main/java/com/nis/domain/basics/AsnIpCfg.java

@@ -0,0 +1,210 @@
+package com.nis.domain.basics;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+import com.nis.domain.configuration.BaseCfg;
+import com.nis.util.excel.ExcelField;
+
+public class AsnIpCfg extends BaseCfg<AsnIpCfg> {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 398247881810945300L;
+	private static final String tableName="asn_ip_cfg";
+	@Expose
+	private Integer regionId;
+	@Expose
+	private String ratelimit;
+	@Expose
+	@ExcelField(title="ip_type",dictType="IP_TYPE",sort=6)
+	@SerializedName("ipType")
+	private Integer ipType;
+	private Integer srcIpPattern; 
+	@ExcelField(title="dest_ip_pattern",dictType="IP_PATTERN",sort=8)
+	private Integer destIpPattern; 
+	private String srcIpAddress; 
+	@ExcelField(title="ip",sort=7)
+	private String destIpAddress; 
+	private Integer srcPortPattern; 
+	private Integer destPortPattern; 
+	private String srcPort; 
+	private String destPort; 
+	//@ExcelField(title="group",sort=2)
+	private String asnIpGroupName;//asn组名
+	private Integer asnIpGroup;//asn组号
+	/**
+	 * 方向
+	 */
+	@Expose
+	@SerializedName("direction")
+	private Integer direction ;
+	/**
+	 * 方向
+	 */
+	@Expose
+	@SerializedName("protocol")
+	private Integer protocol ;
+	private Integer protocolId;
+	
+	@ExcelField(title="organization",sort=2)
+	private String organization;
+	@ExcelField(title="country",sort=3)
+	private String country;
+	@ExcelField(title="detail",sort=3)
+	private String detail;
+	private String userregion1;
+	
+	
+	public String getUserregion1() {
+		return userregion1;
+	}
+	public void setUserregion1(String userregion1) {
+		this.userregion1 = userregion1;
+	}
+	public String getOrganization() {
+		return organization;
+	}
+	public void setOrganization(String organization) {
+		this.organization = organization;
+	}
+	public String getCountry() {
+		return country;
+	}
+	public void setCountry(String country) {
+		this.country = country;
+	}
+	public String getDetail() {
+		return detail;
+	}
+	public void setDetail(String detail) {
+		this.detail = detail;
+	}
+	
+	public Integer getIsValid() {
+		return isValid;
+	}
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	
+	public Integer getProtocolId() {
+		return protocolId;
+	}
+	public void setProtocolId(Integer protocolId) {
+		this.protocolId = protocolId;
+	}
+	
+	public String getAsnIpGroupName() {
+		return asnIpGroupName;
+	}
+	public void setAsnIpGroupName(String asnIpGroupName) {
+		this.asnIpGroupName = asnIpGroupName;
+	}
+	public Integer getAsnIpGroup() {
+		return asnIpGroup;
+	}
+	public void setAsnIpGroup(Integer asnIpGroup) {
+		this.asnIpGroup = asnIpGroup;
+	}
+	public String getRatelimit() {
+		return ratelimit;
+	}
+	public void setRatelimit(String ratelimit) {
+		this.ratelimit = ratelimit;
+	}
+	public Integer getIpType() {
+		return ipType;
+	}
+	public void setIpType(Integer ipType) {
+		this.ipType = ipType;
+	}
+	
+	public Integer getSrcIpPattern() {
+		return srcIpPattern;
+	}
+	public void setSrcIpPattern(Integer srcIpPattern) {
+		this.srcIpPattern = srcIpPattern;
+	}
+	public Integer getDestIpPattern() {
+		return destIpPattern;
+	}
+	public void setDestIpPattern(Integer destIpPattern) {
+		this.destIpPattern = destIpPattern;
+	}
+	public Integer getSrcPortPattern() {
+		return srcPortPattern;
+	}
+	public void setSrcPortPattern(Integer srcPortPattern) {
+		this.srcPortPattern = srcPortPattern;
+	}
+	public Integer getDestPortPattern() {
+		return destPortPattern;
+	}
+	public void setDestPortPattern(Integer destPortPattern) {
+		this.destPortPattern = destPortPattern;
+	}
+	public String getSrcIpAddress() {
+		return srcIpAddress;
+	}
+	public void setSrcIpAddress(String srcIpAddress) {
+		this.srcIpAddress = srcIpAddress;
+	}
+	public String getDestIpAddress() {
+		return destIpAddress;
+	}
+	public void setDestIpAddress(String destIpAddress) {
+		this.destIpAddress = destIpAddress;
+	}
+	public String getSrcPort() {
+		return srcPort;
+	}
+	public void setSrcPort(String srcPort) {
+		this.srcPort = srcPort;
+	}
+	public String getDestPort() {
+		return destPort;
+	}
+	public void setDestPort(String destPort) {
+		this.destPort = destPort;
+	}
+	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 static String getTablename() {
+		return tableName;
+	}
+	public Integer getRegionId() {
+		return regionId;
+	}
+	public void setRegionId(Integer regionId) {
+		this.regionId = regionId;
+	}
+	@Override
+	public String toString() {
+		return "AsnIpCfg [regionId=" + regionId + ", ratelimit=" + ratelimit + ", ipType=" + ipType + ", srcIpPattern="
+				+ srcIpPattern + ", destIpPattern="+ destIpPattern+ ", srcIpAddress=" + srcIpAddress + ", destIpAddress=" 
+				+ destIpAddress + ", srcPortPattern="+ srcPortPattern+", destPortPattern="+ destPortPattern + ", srcPort=" 
+				+ srcPort + ", destPort=" + destPort + ", asnIpGroupName=" + asnIpGroupName
+				+ ", asnIpGroup=" + asnIpGroup + ", direction=" + direction + ", protocol=" + protocol + ", protocolId="
+				+ protocolId + ", compileId=" + compileId + ", isValid=" + isValid + ", userRegion1=" + userRegion1
+				+ ", userRegion2=" + userRegion2 + ", userRegion3=" + userRegion3 + ", userRegion4=" + userRegion4
+				+ ", userRegion5=" + userRegion5 + ", cfgId=" + cfgId + ", cfgDesc=" + cfgDesc + ", action=" + action
+				+ ", isValid=" + isValid + ", isAudit=" + isAudit + ", creatorId=" + creatorId + ", createTime="
+				+ createTime + ", editorId=" + editorId + ", editTime=" + editTime + ", auditorId=" + auditorId
+				+ ", auditTime=" + auditTime + ", serviceId=" + serviceId + ", requestId=" + requestId
+				+ ", cancelRequestId=" + cancelRequestId + ", requestName=" + requestName + ", isAreaEffective="
+				+ isAreaEffective + ", classify=" + classify + ", attribute=" + attribute + ", lable=" + lable
+				+ ", cfgType=" + cfgType + ", functionId=" + functionId + ", doLog=" + doLog + "]";
+	}
+	
+}

src/main/java/com/nis/domain/basics/CommonGroupInfo.java

@@ -0,0 +1,74 @@
+package com.nis.domain.basics;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.nis.domain.configuration.BaseCfg;
+import com.nis.util.excel.ExcelField;
+
+/**
+ * 公共分组实体
+ */
+public class CommonGroupInfo extends BaseCfg<CommonGroupInfo> implements Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7931466570918016654L;
+	
+	private Integer groupId;
+	
+	@ExcelField(title="group_name",sort=1)
+	private String groupName;
+	
+	@ExcelField(title="group_type",dictType="GROUP_TYPE",sort=2)
+	private Integer groupType;
+	
+	private Integer serviceGroupId;
+	
+	@ExcelField(title="desc",sort=4)
+	private String description;
+	
+	public Integer getServiceGroupId() {
+		return serviceGroupId;
+	}
+	public void setServiceGroupId(Integer serviceGroupId) {
+		this.serviceGroupId = serviceGroupId;
+	}
+	public Integer getGroupId() {
+		return groupId;
+	}
+	public void setGroupId(Integer groupId) {
+		this.groupId = groupId;
+	}
+	public String getGroupName() {
+		return groupName;
+	}
+	public void setGroupName(String groupName) {
+		this.groupName = groupName;
+	}
+	public Date getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	public Date getEditTime() {
+		return editTime;
+	}
+	public void setEditTime(Date editTime) {
+		this.editTime = editTime;
+	}
+	public Integer getGroupType() {
+		return groupType;
+	}
+	public void setGroupType(Integer groupType) {
+		this.groupType = groupType;
+	}
+	public String getDescription() {
+		return description;
+	}
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	
+}

src/main/java/com/nis/domain/basics/DomainCommCfg.java

@@ -0,0 +1,67 @@
+package com.nis.domain.basics;
+
+import com.nis.domain.configuration.BaseStringCfg;
+import com.nis.util.excel.ExcelField;
+
+public class DomainCommCfg extends BaseStringCfg<DomainCommCfg>{
+
+	private static final long serialVersionUID = 5117517145731135023L;
+	private static final String tableName="domain_comm_cfg";
+
+    @ExcelField(title="key_word",sort=3)
+    protected String cfgKeywords;
+
+    protected Integer isHexbin;
+    
+    protected String ratelimit;
+    
+    @ExcelField(title="group_name",sort=2)
+    protected String  groupName;//公共组名称
+    
+    @ExcelField(title="expression_type",dictType="EXPRESSION_TYPE",sort=18)
+	protected Integer exprType;
+    
+	@ExcelField(title="match_method",dictType="MATCH_METHOD",sort=20)
+	protected Integer matchMethod;
+
+    public String getCfgKeywords() {
+        return cfgKeywords;
+    }
+    public void setCfgKeywords(String cfgKeywords) {
+        this.cfgKeywords = cfgKeywords;
+    }
+    public Integer getIsHexbin() {
+        return isHexbin;
+    }
+    public void setIsHexbin(Integer isHexbin) {
+        this.isHexbin = isHexbin;
+    }
+    public String getRatelimit() {
+        return ratelimit;
+    }
+    public void setRatelimit(String ratelimit) {
+        this.ratelimit = ratelimit;
+    }
+    public static String getTablename() {
+        return tableName;
+    }
+    public String getGroupName() {
+        return groupName;
+    }
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+	public Integer getMatchMethod() {
+		return matchMethod;
+	}
+	public void setMatchMethod(Integer matchMethod) {
+		this.matchMethod = matchMethod;
+	}
+	public Integer getExprType() {
+		return exprType;
+	}
+	public void setExprType(Integer exprType) {
+		this.exprType = exprType;
+	}
+
+}

src/main/java/com/nis/domain/basics/IpCommCfg.java

@@ -0,0 +1,312 @@
+package com.nis.domain.basics;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+import com.nis.domain.configuration.BaseCfg;
+import com.nis.util.excel.ExcelField;
+
+public class IpCommCfg extends BaseCfg<IpCommCfg> {
+
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 4218856118489784060L;
+
+    /**
+     * 创建一个新的实例 BaseIpCfg.
+     *
+     */
+    public IpCommCfg() {
+        super();
+        // TODO Auto-generated constructor stub
+    }
+    private static final String indexTable="ip_comm_cfg";
+    /**
+     * ip类型
+     */
+    @Expose
+    @SerializedName("ipType")
+    @ExcelField(title="ip_type",dictType="IP_TYPE",sort=50)
+    protected Integer ipType;
+    @ExcelField(title="src_ip_pattern",dictType="IP_PATTERN",sort=51)
+    protected Integer srcIpPattern;
+    @ExcelField(title="client_ip",sort=52)
+    protected String srcIpAddress;
+    @ExcelField(title="dest_ip_pattern",dictType="IP_PATTERN",sort=53)
+    protected Integer destIpPattern;
+    @ExcelField(title="server_ip",sort=54)
+    protected String destIpAddress;
+    @ExcelField(title="src_port_pattern",dictType="PORT_PATTERN",sort=54)
+    protected Integer srcPortPattern;
+    @ExcelField(title="dest_port_pattern",dictType="PORT_PATTERN",sort=56)
+    protected Integer destPortPattern;
+    @ExcelField(title="client_port",sort=55)
+    protected String srcPort;
+    @ExcelField(title="server_port",sort=57)
+    protected String destPort;
+    protected Integer dnsStrategyId;
+    @ExcelField(title="ir_type",dictType="IR_TYPE",sort=58)
+    protected Integer irType;
+    @ExcelField(title="group_name",sort=45)
+    protected String groupName;
+    //	@ExcelField(title="log_total",sort=42)
+    private Long totalLogs;
+    private Integer regionId;
+    private Integer groupId;
+
+    public Integer getRegionId() {
+        return regionId;
+    }
+    public void setRegionId(Integer regionId) {
+        this.regionId = regionId;
+    }
+    public Integer getGroupId() {
+        return groupId;
+    }
+    public void setGroupId(Integer groupId) {
+        this.groupId = groupId;
+    }
+    public Long getTotalLogs() {
+        return totalLogs;
+    }
+    public void setTotalLogs(Long totalLogs) {
+        this.totalLogs = totalLogs;
+    }
+    /**
+     * irType
+     * @return  irType
+     */
+
+    public Integer getIrType() {
+        return irType;
+    }
+    /**
+     * @param irType the irType to set
+     */
+    public void setIrType(Integer irType) {
+        this.irType = irType;
+    }
+    /**
+     * groupName
+     * @return  groupName
+     */
+
+    public String getGroupName() {
+        return groupName;
+    }
+    /**
+     * @param groupName the groupName to set
+     */
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+    /**
+     * 方向
+     */
+    @Expose
+    @SerializedName("direction")
+    @ExcelField(title="direction",dictType="DIRECTION",sort=58)
+    protected Integer direction ;
+    /**
+     * 协议
+     */
+    @Expose
+    @SerializedName("protocol")
+    @ExcelField(title="protocol",dictType="PROTOCOL",sort=59)
+    protected Integer protocol ;
+    /**
+     * 协议ID
+     */
+    @Expose
+    @SerializedName("protocolId")
+    protected Integer protocolId ;
+    /**
+     * 限速比例
+     */
+    protected String ratelimit ;
+
+    /**
+     * ratelimit
+     * @return  ratelimit
+     */
+
+    public String getRatelimit() {
+        return ratelimit;
+    }
+    /**
+     * @param ratelimit the ratelimit to set
+     */
+    public void setRatelimit(String ratelimit) {
+        this.ratelimit = ratelimit;
+    }
+    /**
+     * ipType
+     * @return  ipType
+     */
+
+    public Integer getIpType() {
+        return ipType;
+    }
+    /**
+     * @param ipType the ipType to set
+     */
+    public void setIpType(Integer ipType) {
+        this.ipType = ipType;
+    }
+
+    /**
+     * direction
+     * @return  direction
+     */
+
+    public Integer getDirection() {
+        return direction;
+    }
+    /**
+     * @param direction the direction to set
+     */
+    public void setDirection(Integer direction) {
+        this.direction = direction;
+    }
+    /**
+     * protocol
+     * @return  protocol
+     */
+
+    public Integer getProtocol() {
+        return protocol;
+    }
+    /**
+     * @param protocol the protocol to set
+     */
+    public void setProtocol(Integer protocol) {
+        this.protocol = protocol;
+    }
+    /**
+     * protocolId
+     * @return  protocolId
+     */
+
+    public Integer getProtocolId() {
+        return protocolId;
+    }
+    /**
+     * @param protocolId the protocolId to set
+     */
+    public void setProtocolId(Integer protocolId) {
+        this.protocolId = protocolId;
+    }
+
+
+    public Integer getSrcIpPattern() {
+        return srcIpPattern;
+    }
+    public void setSrcIpPattern(Integer srcIpPattern) {
+        this.srcIpPattern = srcIpPattern;
+    }
+    public Integer getDestIpPattern() {
+        return destIpPattern;
+    }
+    public void setDestIpPattern(Integer destIpPattern) {
+        this.destIpPattern = destIpPattern;
+    }
+    public Integer getSrcPortPattern() {
+        return srcPortPattern;
+    }
+    public void setSrcPortPattern(Integer srcPortPattern) {
+        this.srcPortPattern = srcPortPattern;
+    }
+    public Integer getDestPortPattern() {
+        return destPortPattern;
+    }
+    public void setDestPortPattern(Integer destPortPattern) {
+        this.destPortPattern = destPortPattern;
+    }
+    /**
+     * srcIpAddress
+     * @return  srcIpAddress
+     */
+
+    public String getSrcIpAddress() {
+        return srcIpAddress;
+    }
+    /**
+     * @param srcIpAddress the srcIpAddress to set
+     */
+    public void setSrcIpAddress(String srcIpAddress) {
+        this.srcIpAddress = srcIpAddress;
+    }
+    /**
+     * destIpAddress
+     * @return  destIpAddress
+     */
+
+    public String getDestIpAddress() {
+        return destIpAddress;
+    }
+    /**
+     * @param destIpAddress the destIpAddress to set
+     */
+    public void setDestIpAddress(String destIpAddress) {
+        this.destIpAddress = destIpAddress;
+    }
+    /**
+     * srcPort
+     * @return  srcPort
+     */
+
+    public String getSrcPort() {
+        return srcPort;
+    }
+    /**
+     * @param srcPort the srcPort to set
+     */
+    public void setSrcPort(String srcPort) {
+        this.srcPort = srcPort;
+    }
+    /**
+     * destPort
+     * @return  destPort
+     */
+
+    public String getDestPort() {
+        return destPort;
+    }
+    /**
+     * @param destPort the destPort to set
+     */
+    public void setDestPort(String destPort) {
+        this.destPort = destPort;
+    }
+
+    /**
+     * dnsStrategyId
+     * @return  dnsStrategyId
+     */
+
+    public Integer getDnsStrategyId() {
+        return dnsStrategyId;
+    }
+    /**
+     * @param dnsStrategyId the dnsStrategyId to set
+     */
+    public void setDnsStrategyId(Integer dnsStrategyId) {
+        this.dnsStrategyId = dnsStrategyId;
+    }
+    @Override
+    public void initDefaultValue(){
+        super.initDefaultValue();
+        this.direction = 0;
+    }
+
+    public static String getIndexTable() {
+        return indexTable;
+    }
+    public Integer getIndex() {
+        return index;
+    }
+    public void setIndex(Integer index) {
+        this.index = index;
+    }
+}

src/main/java/com/nis/domain/basics/IpReuseIpCfg.java

@@ -0,0 +1,37 @@
+/**
+ *@Title: DnsIpConfig.java
+ *@Package com.nis.domain.restful 
+ *@Description 欺骗IP实体类
+ *@author dell
+ *@date 2018年2月5日 下午2:57:17
+ *@version  版本号
+ */
+package com.nis.domain.basics;
+
+import java.util.Date;
+
+import com.google.gson.annotations.Expose;
+import com.nis.domain.BaseEntity;
+import com.nis.domain.SysUser;
+import com.nis.domain.configuration.BaseIpCfg;
+import com.nis.util.excel.ExcelField;
+
+/**
+ * @ClassName: DnsIpConfig.java 
+ * @author (dell)
+ * @date 2018年2月5日 下午2:57:17
+ * @version V1.0
+ */
+public class IpReuseIpCfg extends BaseIpCfg {
+
+	private static final long serialVersionUID = 5956694477140186483L;
+	private String tableName="user_ip_cfg";
+	
+	public String getTableName() {
+		return tableName;
+	}
+	public void setTableName(String tableName) {
+		this.tableName = tableName;
+	}
+	
+}

src/main/java/com/nis/domain/basics/PolicyGroupInfo.java

@@ -0,0 +1,85 @@
+package com.nis.domain.basics;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.nis.domain.configuration.BaseCfg;
+import com.nis.domain.configuration.CfgIndexInfo;
+import com.nis.util.excel.ExcelField;
+
+/**
+ * @ClassName: PolicyGroupInfo.java 
+ * @Description: 策略分组
+ * @version V1.0
+ */
+public class PolicyGroupInfo extends BaseCfg<PolicyGroupInfo> implements Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7931466570918016654L;
+	
+	private Integer groupId;
+	@ExcelField(title="group_name",sort=1)
+	private String groupName;
+	@ExcelField(title="group_type",dictType="GROUP_TYPE",sort=2)
+	private Integer groupType;
+	private Integer serviceGroupId;
+	@ExcelField(title="desc",sort=4)
+	private String description;
+	private Long asnNo;
+	
+	public Integer getServiceGroupId() {
+		return serviceGroupId;
+	}
+	public void setServiceGroupId(Integer serviceGroupId) {
+		this.serviceGroupId = serviceGroupId;
+	}
+	public Integer getGroupId() {
+		return groupId;
+	}
+	public void setGroupId(Integer groupId) {
+		this.groupId = groupId;
+	}
+	public String getGroupName() {
+		return groupName;
+	}
+	public void setGroupName(String groupName) {
+		this.groupName = groupName;
+	}
+	public Date getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	public Date getEditTime() {
+		return editTime;
+	}
+	public void setEditTime(Date editTime) {
+		this.editTime = editTime;
+	}
+	public Integer getGroupType() {
+		return groupType;
+	}
+	public void setGroupType(Integer groupType) {
+		this.groupType = groupType;
+	}
+	public String getDescription() {
+		return description;
+	}
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	public Long getAsnNo() {
+		return asnNo;
+	}
+	public void setAsnNo(Long asnNo) {
+		this.asnNo = asnNo;
+	}
+	@Override
+	public String toString() {
+		// TODO Auto-generated method stub
+		return super.toString();
+	}
+	
+}

src/main/java/com/nis/domain/basics/ProtectionListInfo.java

@@ -0,0 +1,57 @@
+package com.nis.domain.basics;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.nis.domain.configuration.BaseCfg;
+
+public class ProtectionListInfo extends BaseCfg<ProtectionListInfo> implements Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3781310894175345207L;
+	private Integer proId;
+	private String keyword;
+	private String targetType;
+	private String description;
+	
+	
+	public Integer getProId() {
+		return proId;
+	}
+	public void setProId(Integer proId) {
+		this.proId = proId;
+	}
+	public String getKeyword() {
+		return keyword;
+	}
+	public void setKeyword(String keyword) {
+		this.keyword = keyword;
+	}
+	public String getTargetType() {
+		return targetType;
+	}
+	public void setTargetType(String targetType) {
+		this.targetType = targetType;
+	}
+	public Date getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	public Date getEditTime() {
+		return editTime;
+	}
+	public void setEditTime(Date editTime) {
+		this.editTime = editTime;
+	}
+	public String getDescription() {
+		return description;
+	}
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	
+}

src/main/java/com/nis/domain/basics/ScriberIdCommCfg.java

@@ -0,0 +1,67 @@
+package com.nis.domain.basics;
+
+import com.nis.domain.configuration.BaseStringCfg;
+import com.nis.util.excel.ExcelField;
+
+public class ScriberIdCommCfg extends BaseStringCfg<ScriberIdCommCfg>{
+
+	private static final long serialVersionUID = 5117517145731135023L;
+	private static final String tableName="scriberid_comm_cfg";
+
+    @ExcelField(title="key_word",sort=3)
+    protected String cfgKeywords;
+
+    protected Integer isHexbin;
+    
+    protected String ratelimit;
+    
+    @ExcelField(title="group_name",sort=2)
+    protected String  groupName;//公共组名称
+    
+    @ExcelField(title="expression_type",dictType="EXPRESSION_TYPE",sort=18)
+	protected Integer exprType;
+    
+	@ExcelField(title="match_method",dictType="MATCH_METHOD",sort=20)
+	protected Integer matchMethod;
+
+    public String getCfgKeywords() {
+        return cfgKeywords;
+    }
+    public void setCfgKeywords(String cfgKeywords) {
+        this.cfgKeywords = cfgKeywords;
+    }
+    public Integer getIsHexbin() {
+        return isHexbin;
+    }
+    public void setIsHexbin(Integer isHexbin) {
+        this.isHexbin = isHexbin;
+    }
+    public String getRatelimit() {
+        return ratelimit;
+    }
+    public void setRatelimit(String ratelimit) {
+        this.ratelimit = ratelimit;
+    }
+    public static String getTablename() {
+        return tableName;
+    }
+    public String getGroupName() {
+        return groupName;
+    }
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+	public Integer getMatchMethod() {
+		return matchMethod;
+	}
+	public void setMatchMethod(Integer matchMethod) {
+		this.matchMethod = matchMethod;
+	}
+	public Integer getExprType() {
+		return exprType;
+	}
+	public void setExprType(Integer exprType) {
+		this.exprType = exprType;
+	}
+
+}

src/main/java/com/nis/domain/basics/ServiceDictInfo.java

@@ -0,0 +1,306 @@
+package com.nis.domain.basics;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.nis.domain.BaseEntity;
+import com.nis.domain.SysMenu;
+import com.nis.domain.SysUser;
+import com.nis.util.Configurations;
+import com.nis.util.StringUtil;
+import com.nis.util.excel.ExcelField;
+/**
+ * 业务辅助表-业务字典信息表
+ * @author zsl
+ *
+ */
+public class ServiceDictInfo extends BaseEntity<ServiceDictInfo>{
+
+	private static final long serialVersionUID = 4680466118906894338L;
+	
+	private Integer serviceDictId; //service_dict_id	字典ID	int	N	主键，自增
+	@ExcelField(title="item_type",dictType="SERVICE_DICT_ITM_TYPE",sort=3)
+	private Integer itemType; //item_type	数据类型	int	N	1：分类  2：性质  3：标签
+	private String itemCode; //item_code编码	varchar(64)	N
+	@ExcelField(title="config_content",sort=1)
+	private String itemValue; //item_value	编码对应值	varchar2(64)	N	
+	@ExcelField(title="desc",sort=2)
+	private String itemDesc; //item_desc	描述信息	varcahr2(128)	Y	
+	private ServiceDictInfo parent; //parent_id	父ID	number(9)	N	无父属性，默认填0
+	@ExcelField(title="is_leaf",dictType="INT_YES_NO",sort=4)
+	private Integer isLeaf; //is_leaf	是否叶子节点	int	N	0-否 1-是；只有一级填0；
+	private Integer isValid; //is_valid	有效标志	int	N	1-有效 0-无效
+	
+	private SysUser serviceDictCreator; //creator_id	创建人员	int	N	取自sys_user.id
+	@ExcelField(title="create_time",sort=6)
+	private Date createTime; //create_time	配置时间	date	N	
+	
+	private SysUser serviceDictEditor; //editor_id	修改人员	int	Y	取自sys_user.id
+	@ExcelField(title="edit_time",sort=8)
+	private Date editTime; //edit_time	修改时间	date	Y	
+	private Integer levelNo; //层级
+	private List<ServiceDictInfo> childrenList = new ArrayList<ServiceDictInfo>();//子列表
+    private Date beginDate;		// 开始日期
+	private Date endDate;		// 结束日期
+	
+	private Date editBeginDate;		// 修改开始日期
+	private Date editEndDate;		// 修改结束日期
+	
+	private String showSequence;  //显示序号
+	@ExcelField(title="creator",sort=5)
+	private String creatorName;
+	@ExcelField(title="editor",sort=7)
+	private String editorName;
+	
+	
+	private String pNames;//父节点名称
+	/**
+	 * 封装参数数据类型,
+	 * 
+	 */
+	private List<Integer> conditionType;
+	
+	
+	
+	public String getCreatorName() {
+		return creatorName;
+	}
+	public void setCreatorName(String creatorName) {
+		this.creatorName = creatorName;
+	}
+	public String getEditorName() {
+		return editorName;
+	}
+	public void setEditorName(String editorName) {
+		this.editorName = editorName;
+	}
+	@JsonIgnore
+	public String getpNames() {
+		return pNames;
+	}
+	public void setpNames(String pNames) {
+		this.pNames = pNames;
+	}
+	public Integer getServiceDictId() {
+		return serviceDictId;
+	}
+	public void setServiceDictId(Integer serviceDictId) {
+		this.serviceDictId = serviceDictId;
+	}
+	public Integer getItemType() {
+		return itemType;
+	}
+	public void setItemType(Integer itemType) {
+		this.itemType = itemType;
+	}
+	public String getItemCode() {
+		return itemCode;
+	}
+	public void setItemCode(String itemCode) {
+		this.itemCode = itemCode;
+	}
+	public Integer getLevelNo() {
+		return levelNo;
+	}
+	public void setLevelNo(Integer levelNo) {
+		this.levelNo = levelNo;
+	}
+	public String getItemValue() {
+		return itemValue;
+	}
+	public void setItemValue(String itemValue) {
+		this.itemValue = itemValue;
+	}
+	public String getItemDesc() {
+		return itemDesc;
+	}
+	public void setItemDesc(String itemDesc) {
+		this.itemDesc = itemDesc;
+	}
+	@JsonBackReference
+	public ServiceDictInfo getParent() {
+		return parent;
+	}
+	public void setParent(ServiceDictInfo parent) {
+		this.parent = parent;
+	}
+	public Integer getIsLeaf() {
+		return isLeaf;
+	}
+	public void setIsLeaf(Integer isLeaf) {
+		this.isLeaf = isLeaf;
+	}
+	public Integer getIsValid() {
+		return isValid;
+	}
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+
+	public SysUser getServiceDictCreator() {
+		return serviceDictCreator;
+	}
+	public void setServiceDictCreator(SysUser serviceDictCreator) {
+		this.serviceDictCreator = serviceDictCreator;
+	}
+	public Date getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	public SysUser getServiceDictEditor() {
+		return serviceDictEditor;
+	}
+	public void setServiceDictEditor(SysUser serviceDictEditor) {
+		this.serviceDictEditor = serviceDictEditor;
+	}
+	public Date getEditTime() {
+		return editTime;
+	}
+	public void setEditTime(Date editTime) {
+		this.editTime = editTime;
+	}
+	public List<ServiceDictInfo> getChildrenList() {
+		return childrenList;
+	}
+	public void setChildrenList(List<ServiceDictInfo> childrenList) {
+		this.childrenList = childrenList;
+	}
+	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 String getShowSequence() {
+		return showSequence;
+	}
+	public void setShowSequence(String showSequence) {
+		this.showSequence = showSequence;
+	}
+	public List<Integer> getConditionType() {
+		return conditionType;
+	}
+	public void setConditionType(List<Integer> conditionType) {
+		this.conditionType = conditionType;
+	}
+	@JsonIgnore
+	public static void sortList(List<ServiceDictInfo> list, List<ServiceDictInfo> sourcelist, Integer parentId, boolean cascade){
+		for (int i=0; i<sourcelist.size(); i++){
+			ServiceDictInfo serviceDictInfo = sourcelist.get(i);
+			//System.out.println(serviceDictInfo.getServiceDictId()+">>>>>"+serviceDictInfo.getParent().getServiceDictId());
+			if (serviceDictInfo.getParent()!=null && serviceDictInfo.getParent().getServiceDictId()!=null
+					&& serviceDictInfo.getParent().getServiceDictId().equals(parentId)){
+				list.add(serviceDictInfo);
+				if (cascade){
+					// 判断是否还有子节点, 有则继续获取子节点
+					for (int j=0; j<sourcelist.size(); j++){
+						ServiceDictInfo child = sourcelist.get(j);
+						if (child.getParent()!=null && child.getParent().getServiceDictId()!=null
+								&& child.getParent().getServiceDictId().equals(serviceDictInfo.getServiceDictId())){
+							sortList(list, sourcelist, serviceDictInfo.getServiceDictId(), true);
+							break;
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	@JsonIgnore
+	public static void checkList(List<ServiceDictInfo> list,List<ServiceDictInfo> parentList, List<ServiceDictInfo> sourcelist, boolean cascade){
+		for(ServiceDictInfo serviceUp:parentList){
+			list.add(serviceUp);
+			//判断是否有子节点，有则继续获取子节点 
+			sortList(list, sourcelist, serviceUp.getServiceDictId(), true);
+		}
+		
+	}
+	
+	
+	//顶层的数量
+	
+	public static Integer topCount(List<ServiceDictInfo> list,Integer parentId){
+		Integer count = 0;
+		List<ServiceDictInfo> listTemp = new ArrayList<ServiceDictInfo>();
+		for(ServiceDictInfo serviceDictInfo:list){
+			if(serviceDictInfo.getParent()!=null&&serviceDictInfo.getParent().getServiceDictId()!=null&&serviceDictInfo.getParent().getServiceDictId().equals(parentId)){
+				listTemp.add(serviceDictInfo);
+			}
+		}
+		
+		return listTemp.size();
+	}
+	
+	//处理下级序号
+	public static void addChildrenSeq(List<ServiceDictInfo> list,Integer parentId){
+		    int countNo = 1;
+			for(int i=0; i<list.size(); i++){
+				ServiceDictInfo serviceDictInfo = list.get(i);
+				if(serviceDictInfo.getParent()!=null && serviceDictInfo.getParent().getServiceDictId()!=null
+						&& serviceDictInfo.getParent().getServiceDictId().equals(parentId)){
+					//找出该父类
+					for(ServiceDictInfo se:list){
+						if(se.getServiceDictId().equals(parentId)){
+							serviceDictInfo.setShowSequence(se.getShowSequence()+Configurations.getStringProperty("childrenMark", ".")+countNo);
+							countNo++;
+						}
+					}
+					//继续获取子节点
+					for (int j=0; j<list.size(); j++){
+						ServiceDictInfo child = list.get(j);
+						if (child.getParent()!=null && child.getParent().getServiceDictId()!=null
+								&& child.getParent().getServiceDictId().equals(serviceDictInfo.getServiceDictId())){
+							addChildrenSeq(list, serviceDictInfo.getServiceDictId());
+							break;
+						}
+					}
+				}
+				
+			}
+		
+		
+		
+	}
+	//获取所有父节点
+	@JsonIgnore
+	public static String getPNames(List<ServiceDictInfo> list,Integer pid,String pNames) {
+		String pName="";
+		for (ServiceDictInfo serviceDictInfo : list) {
+			if(pid.equals(serviceDictInfo.getServiceDictId())){
+				pid=serviceDictInfo.getParent().getServiceDictId();
+				pName=serviceDictInfo.getItemValue();
+				pNames="/"+pName+pNames;
+			}
+		}
+		if(pid==0){
+			if(!StringUtil.isEmpty(pNames)) pNames=pNames.substring(1);
+			return pNames;
+		}else{
+			return getPNames(list, pid, pNames);
+		}
+	}
+	
+}

src/main/java/com/nis/domain/basics/SysDictInfo.java

@@ -0,0 +1,227 @@
+package com.nis.domain.basics;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.nis.domain.BaseEntity;
+import com.nis.domain.SysUser;
+import com.nis.util.Configurations;
+/**
+ * 业务辅助表-系统字典信息表
+ * @author zsl
+ *
+ */
+public class SysDictInfo extends BaseEntity<SysDictInfo>{
+
+	private static final long serialVersionUID = 893702645278342859L;
+	
+	private Integer sysDictId; //service_dict_id	字典ID	int	N	主键，自增
+	private Integer itemType; //item_type	数据类型	int	N	1：分类  2：性质  3：标签
+	private String itemCode; //item_code编码	varchar	N	
+	private String itemValue; //item_value	编码对应值	varchar2(64)	N	
+	private String itemDesc; //item_desc	描述信息	varcahr2(128)	Y	
+	private SysDictInfo parent; //parent_id	父ID	number(9)	N	无父属性，默认填0
+	private Integer isLeaf; //is_leaf	是否叶子节点	int	N	0-否 1-是；只有一级填0；
+	private Integer isValid; //is_valid	有效标志	int	N	1-有效 0-无效
+	private SysUser sysDictCreator; //creator_id	创建人员	int	N	取自sys_user.id
+	private Date createTime; //create_time	配置时间	date	N	
+	private SysUser sysDictEditor; //editor_id	修改人员	int	Y	取自sys_user.id
+	private Date editTime; //edit_time	修改时间	date	Y	
+	private Integer levelNo; //层级
+	private Integer isInitianlize; //是否为初始化数据 0：否  1：是  
+	private List<ServiceDictInfo> ChildrenList = new ArrayList<ServiceDictInfo>();//字列表
+	
+    private Date beginDate;		// 开始日期
+	private Date endDate;		// 结束日期
+	
+	private Date editBeginDate;		// 修改开始日期
+	private Date editEndDate;		// 修改结束日期
+	
+	private String showSequence; //显示序号
+
+	/**
+	 * 封装参数数据类型,
+	 * 
+	 */
+	private List<Integer> conditionType;
+	                                                                             
+
+	public Integer getSysDictId() {
+		return sysDictId;
+	}
+	public void setSysDictId(Integer sysDictId) {
+		this.sysDictId = sysDictId;
+	}
+	public Integer getItemType() {
+		return itemType;
+	}
+	public void setItemType(Integer itemType) {
+		this.itemType = itemType;
+	}
+	public String getItemCode() {
+		return itemCode;
+	}
+	public void setItemCode(String itemCode) {
+		this.itemCode = itemCode;
+	}
+	public String getItemValue() {
+		return itemValue;
+	}
+	public void setItemValue(String itemValue) {
+		this.itemValue = itemValue;
+	}
+	public String getItemDesc() {
+		return itemDesc;
+	}
+	public void setItemDesc(String itemDesc) {
+		this.itemDesc = itemDesc;
+	}
+	public SysDictInfo getParent() {
+		return parent;
+	}
+	public void setParent(SysDictInfo parent) {
+		this.parent = parent;
+	}
+	public Integer getIsLeaf() {
+		return isLeaf;
+	}
+	public void setIsLeaf(Integer isLeaf) {
+		this.isLeaf = isLeaf;
+	}
+	public Integer getIsValid() {
+		return isValid;
+	}
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	public SysUser getSysDictCreator() {
+		return sysDictCreator;
+	}
+	public void setSysDictCreator(SysUser sysDictCreator) {
+		this.sysDictCreator = sysDictCreator;
+	}
+	public Date getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	public SysUser getSysDictEditor() {
+		return sysDictEditor;
+	}
+	public void setSysDictEditor(SysUser sysDictEditor) {
+		this.sysDictEditor = sysDictEditor;
+	}
+	public Date getEditTime() {
+		return editTime;
+	}
+	public void setEditTime(Date editTime) {
+		this.editTime = editTime;
+	}
+	public List<ServiceDictInfo> getChildrenList() {
+		return ChildrenList;
+	}
+	public void setChildrenList(List<ServiceDictInfo> childrenList) {
+		ChildrenList = childrenList;
+	}
+	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 Integer getLevelNo() {
+		return levelNo;
+	}
+	public void setLevelNo(Integer levelNo) {
+		this.levelNo = levelNo;
+	}
+	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 void setShowSequence(String showSequence) {
+		this.showSequence = showSequence;
+	}
+	public String getShowSequence() {
+		return showSequence;
+	}
+	public List<Integer> getConditionType() {
+		return conditionType;
+	}
+	public void setConditionType(List<Integer> conditionType) {
+		this.conditionType = conditionType;
+	}
+	public Integer getIsInitianlize() {
+		return isInitianlize;
+	}
+	public void setIsInitianlize(Integer isInitianlize) {
+		this.isInitianlize = isInitianlize;
+	}
+	@JsonIgnore
+	public static void sortList(List<SysDictInfo> list, List<SysDictInfo> sourcelist, Integer parentId, boolean cascade){
+		for (int i=0; i<sourcelist.size(); i++){
+			SysDictInfo sysDictInfo = sourcelist.get(i);
+			if (sysDictInfo.getParent()!=null && sysDictInfo.getParent().getSysDictId()!=null
+					&& sysDictInfo.getParent().getSysDictId().equals(parentId)){
+				list.add(sysDictInfo);
+				if (cascade){
+					// 判断是否还有子节点, 有则继续获取子节点
+					for (int j=0; j<sourcelist.size(); j++){
+						SysDictInfo child = sourcelist.get(j);
+						if (child.getParent()!=null && child.getParent().getSysDictId()!=null
+								&& child.getParent().getSysDictId().equals(sysDictInfo.getSysDictId())){
+							sortList(list, sourcelist, sysDictInfo.getSysDictId(), true);
+							break;
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	//处理下级序号
+	public static void addChildrenSeq(List<SysDictInfo> list,Integer parentId){
+		    int countNo = 1;
+			for(int i=0; i<list.size(); i++){
+				SysDictInfo sysDictInfo = list.get(i);
+				if(sysDictInfo.getParent()!=null && sysDictInfo.getParent().getSysDictId()!=null
+						&& sysDictInfo.getParent().getSysDictId().equals(parentId)){
+					//找出该父类
+					for(SysDictInfo se:list){
+						if(se.getSysDictId()==parentId){
+							sysDictInfo.setShowSequence(se.getShowSequence()+Configurations.getStringProperty("childrenMark", ".")+countNo);
+							countNo++;
+						}
+					}
+					//继续获取子节点
+					for (int j=0; j<list.size(); j++){
+						SysDictInfo child = list.get(j);
+						if (child.getParent()!=null && child.getParent().getSysDictId()!=null
+								&& child.getParent().getSysDictId().equals(sysDictInfo.getSysDictId())){
+							addChildrenSeq(list, sysDictInfo.getSysDictId());
+							break;
+						}
+					}
+				}
+				
+			}
+	
+	}
+}

src/main/java/com/nis/domain/basics/UrlCommCfg.java

@@ -0,0 +1,66 @@
+package com.nis.domain.basics;
+
+import com.nis.domain.configuration.BaseStringCfg;
+import com.nis.util.excel.ExcelField;
+
+public class UrlCommCfg extends BaseStringCfg<UrlCommCfg>{
+
+    private static final long serialVersionUID = 398247881810945300L;
+    private static final String tableName="url_comm_cfg";
+
+    @ExcelField(title="key_word",sort=3)
+    protected String  cfgKeywords;//url关键字配置
+
+    protected Integer  isHexbin;//是否大小写敏感
+    protected String  ratelimit;//限速比例,0到1之间
+    @ExcelField(title="group_name",sort=2)
+    protected String  groupName;//公共组名称
+    
+    @ExcelField(title="expression_type",dictType="EXPRESSION_TYPE",sort=18)
+	protected Integer exprType;
+    
+	@ExcelField(title="match_method",dictType="MATCH_METHOD",sort=20)
+	protected Integer matchMethod;
+
+    public String getCfgKeywords() {
+        return cfgKeywords;
+    }
+    public void setCfgKeywords(String cfgKeywords) {
+        this.cfgKeywords = cfgKeywords;
+    }
+    public Integer getIsHexbin() {
+        return isHexbin;
+    }
+    public void setIsHexbin(Integer isHexbin) {
+        this.isHexbin = isHexbin;
+    }
+    public String getRatelimit() {
+        return ratelimit;
+    }
+    public void setRatelimit(String ratelimit) {
+        this.ratelimit = ratelimit;
+    }
+    public static String getTablename() {
+        return tableName;
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+	public Integer getMatchMethod() {
+		return matchMethod;
+	}
+	public void setMatchMethod(Integer matchMethod) {
+		this.matchMethod = matchMethod;
+	}
+	public Integer getExprType() {
+		return exprType;
+	}
+	public void setExprType(Integer exprType) {
+		this.exprType = exprType;
+	}
+
+}

src/main/java/com/nis/domain/basics/Varibles.java

@@ -0,0 +1,26 @@
+package com.nis.domain.basics;
+
+import java.io.Serializable;
+
+public class Varibles implements Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -5747624301389103730L;
+	private String variableName;
+	private Long value;
+	public String getVariableName() {
+		return variableName;
+	}
+	public void setVariableName(String variableName) {
+		this.variableName = variableName;
+	}
+	public Long getValue() {
+		return value;
+	}
+	public void setValue(Long value) {
+		this.value = value;
+	}
+	
+}

src/main/java/com/nis/domain/callback/InlineIp.java

@@ -0,0 +1,330 @@
+/**
+ *@Title: InlineIp.java
+ *@Package com.nis.domain.callback 
+ *@Description TODO
+ *@author dell
+ *@date 2018年6月5日 上午9:08:34
+ *@version  版本号
+ */
+package com.nis.domain.callback;
+
+import java.util.Date;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+import com.nis.util.StringUtils;
+import com.nis.web.service.SpringContextHolder;
+import com.nis.web.service.basics.SysDictInfoService;
+
+/**
+ * @ClassName: InlineIp.java 
+ * @Description: TODO
+ * @author (dell)
+ * @date 2018年6月5日 上午9:08:34
+ * @version V1.0
+ */
+public class InlineIp {
+	@Expose
+	private Integer id;
+	@Expose
+	private Integer cfgId;
+	@Expose
+	private Integer action;
+	@Expose
+	private Integer service;
+	@Expose
+	private Integer addrType;
+	@Expose
+	private String srcIp;
+	@Expose
+	private String maskSrcIp;
+	@Expose
+	private String srcPort;
+	@Expose
+	private String maskSrcPort;
+	@Expose
+	private String dstIp;
+	@Expose
+	private String maskDstIp;
+	@Expose
+	private String dstPort;
+	@Expose
+	private String maskDstPort;
+	@Expose
+	private Integer protocol;
+	@Expose
+	private Integer direction;
+	@Expose
+	private Integer isValid;
+	@Expose
+	private Date opTime;
+	@Expose
+	private Integer policyGroup;
+	@Expose
+	private String userRegion;//用于存储协议跟流量阀值
+	@Expose
+	@SerializedName("effectiveRange")
+	private String areaEffectiveIds ;
+	
+	public String getUserRegion() {
+		return userRegion;
+	}
+	public void setUserRegion(String userRegion) {
+		this.userRegion = userRegion;
+	}
+	/**
+	 * action
+	 * @return  action
+	*/
+	
+	public Integer getAction() {
+		return action;
+	}
+	/**
+	 * @param action the action to set
+	 */
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	/**
+	 * addrType
+	 * @return  addrType
+	*/
+	
+	public Integer getAddrType() {
+		return addrType;
+	}
+	/**
+	 * @param addrType the addrType to set
+	 */
+	public void setAddrType(Integer addrType) {
+		this.addrType = addrType;
+	}
+	/**
+	 * srcIp
+	 * @return  srcIp
+	*/
+	
+	public String getSrcIp() {
+		return srcIp;
+	}
+	/**
+	 * @param srcIp the srcIp to set
+	 */
+	public void setSrcIp(String srcIp) {
+		this.srcIp = srcIp;
+	}
+	/**
+	 * maskSrcIp
+	 * @return  maskSrcIp
+	*/
+	
+	public String getMaskSrcIp() {
+		return maskSrcIp;
+	}
+	/**
+	 * @param maskSrcIp the maskSrcIp to set
+	 */
+	public void setMaskSrcIp(String maskSrcIp) {
+		this.maskSrcIp = maskSrcIp;
+	}
+	/**
+	 * srcPort
+	 * @return  srcPort
+	*/
+	
+	public String getSrcPort() {
+		return srcPort;
+	}
+	/**
+	 * @param srcPort the srcPort to set
+	 */
+	public void setSrcPort(String srcPort) {
+		this.srcPort = srcPort;
+	}
+	/**
+	 * maskSrcPort
+	 * @return  maskSrcPort
+	*/
+	
+	public String getMaskSrcPort() {
+		return maskSrcPort;
+	}
+	/**
+	 * @param maskSrcPort the maskSrcPort to set
+	 */
+	public void setMaskSrcPort(String maskSrcPort) {
+		this.maskSrcPort = maskSrcPort;
+	}
+	/**
+	 * dstIp
+	 * @return  dstIp
+	*/
+	
+	public String getDstIp() {
+		return dstIp;
+	}
+	/**
+	 * @param dstIp the dstIp to set
+	 */
+	public void setDstIp(String dstIp) {
+		this.dstIp = dstIp;
+	}
+	/**
+	 * maskDstIp
+	 * @return  maskDstIp
+	*/
+	
+	public String getMaskDstIp() {
+		return maskDstIp;
+	}
+	/**
+	 * @param maskDstIp the maskDstIp to set
+	 */
+	public void setMaskDstIp(String maskDstIp) {
+		this.maskDstIp = maskDstIp;
+	}
+	/**
+	 * dstPort
+	 * @return  dstPort
+	*/
+	
+	public String getDstPort() {
+		return dstPort;
+	}
+	/**
+	 * @param dstPort the dstPort to set
+	 */
+	public void setDstPort(String dstPort) {
+		this.dstPort = dstPort;
+	}
+	/**
+	 * maskDstPort
+	 * @return  maskDstPort
+	*/
+	
+	public String getMaskDstPort() {
+		return maskDstPort;
+	}
+	/**
+	 * @param maskDstPort the maskDstPort to set
+	 */
+	public void setMaskDstPort(String maskDstPort) {
+		this.maskDstPort = maskDstPort;
+	}
+	/**
+	 * protocol
+	 * @return  protocol
+	*/
+	
+	public Integer getProtocol() {
+		return protocol;
+	}
+	/**
+	 * @param protocol the protocol to set
+	 */
+	public void setProtocol(Integer protocol) {
+		this.protocol = protocol;
+	}
+	/**
+	 * direction
+	 * @return  direction
+	*/
+	
+	public Integer getDirection() {
+		return direction;
+	}
+	/**
+	 * @param direction the direction to set
+	 */
+	public void setDirection(Integer direction) {
+		this.direction = direction;
+	}
+	/**
+	 * isValid
+	 * @return  isValid
+	*/
+	
+	public Integer getIsValid() {
+		return isValid;
+	}
+	/**
+	 * @param isValid the isValid to set
+	 */
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	/**
+	 * opTime
+	 * @return  opTime
+	*/
+	
+	public Date getOpTime() {
+		return opTime;
+	}
+	/**
+	 * @param opTime the opTime to set
+	 */
+	public void setOpTime(Date opTime) {
+		this.opTime = opTime;
+	}
+	/**
+	 * cfgId
+	 * @return  cfgId
+	*/
+	
+	public Integer getCfgId() {
+		return cfgId;
+	}
+	/**
+	 * @param cfgId the cfgId to set
+	 */
+	public void setCfgId(Integer cfgId) {
+		this.cfgId = cfgId;
+	}
+	/**
+	 * service
+	 * @return  service
+	*/
+	
+	public Integer getService() {
+		return service;
+	}
+	/**
+	 * @param service the service to set
+	 */
+	public void setService(Integer service) {
+		this.service = service;
+	}
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public Integer getPolicyGroup() {
+		return policyGroup;
+	}
+	public void setPolicyGroup(Integer policyGroup) {
+		this.policyGroup = policyGroup;
+	}
+	public String getAreaEffectiveIds() {
+		return areaEffectiveIds;
+	}
+	/**
+	 * areaEffectiveIds 
+	 * areaEffectiveIds=7242:5,7212:4,7122:3
+	 * 接口要求格式为：72425,72124,71223
+	 * @param areaEffectiveIds
+	 */
+	public void setAreaEffectiveIds(String areaEffectiveIds) {
+		if(StringUtils.isEmpty(areaEffectiveIds)){
+			areaEffectiveIds="0";
+		}else {
+			// 组织区域、运营商配置下发格式
+			SysDictInfoService service = SpringContextHolder.getBean(SysDictInfoService.class);
+			areaEffectiveIds = service.setEffectiveRange(areaEffectiveIds);
+		}
+		this.areaEffectiveIds = areaEffectiveIds;
+	}
+}

src/main/java/com/nis/domain/callback/IpAddrPool.java

@@ -0,0 +1,38 @@
+package com.nis.domain.callback;
+
+import com.google.gson.annotations.Expose;
+
+public class IpAddrPool extends InlineIp{
+	
+	@Expose
+	private Integer regionId;
+	@Expose
+	private Long groupId;
+	@Expose
+	private Long addrPoolId;
+
+	public Integer getRegionId() {
+		return regionId;
+	}
+
+	public void setRegionId(Integer regionId) {
+		this.regionId = regionId;
+	}
+
+	public Long getGroupId() {
+		return groupId;
+	}
+
+	public void setGroupId(Long groupId) {
+		this.groupId = groupId;
+	}
+
+	public Long getAddrPoolId() {
+		return addrPoolId;
+	}
+
+	public void setAddrPoolId(Long addrPoolId) {
+		this.addrPoolId = addrPoolId;
+	}
+
+}

src/main/java/com/nis/domain/callback/NtcDnsResStrategy.java

@@ -0,0 +1,213 @@
+package com.nis.domain.callback;
+
+import java.util.Date;
+
+import com.google.gson.annotations.Expose;
+public class NtcDnsResStrategy {
+	@Expose
+	private Long id; //compileId
+	@Expose
+	private Integer cfgId; //compileId
+	@Expose
+	private Long reqStrateId;
+	@Expose
+	private String strateName;
+	@Expose
+	private Integer action;
+	@Expose
+	private Integer service;
+	@Expose
+	private Integer isValid;
+	@Expose
+	private Date opTime;
+	@Expose
+	private Integer resGroup1Id;
+	@Expose
+	private Integer resGroup1Num;
+	@Expose
+	private Integer resGroup2Id;
+	@Expose
+	private Integer resGroup2Num;
+	@Expose
+	private Integer resGroup3Id;
+	@Expose
+	private Integer resGroup3Num;
+	@Expose
+	private Integer resGroup4Id;
+	@Expose
+	private Integer resGroup4Num;
+	@Expose
+	private Integer resGroup5Id;
+	@Expose
+	private Integer resGroup5Num;
+	@Expose
+	private Integer minTtl;
+	@Expose
+	private Integer maxTtl;
+	
+
+	/**
+	 * action
+	 * @return  action
+	*/
+	
+	public Integer getAction() {
+		return action;
+	}
+	/**
+	 * @param action the action to set
+	 */
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	/**
+	 * isValid
+	 * @return  isValid
+	*/
+	
+	public Integer getIsValid() {
+		return isValid;
+	}
+	/**
+	 * @param isValid the isValid to set
+	 */
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	/**
+	 * opTime
+	 * @return  opTime
+	*/
+	
+	public Date getOpTime() {
+		return opTime;
+	}
+	/**
+	 * @param opTime the opTime to set
+	 */
+	public void setOpTime(Date opTime) {
+		this.opTime = opTime;
+	}
+	public Long getReqStrateId() {
+		return reqStrateId;
+	}
+	public void setReqStrateId(Long reqStrateId) {
+		this.reqStrateId = reqStrateId;
+	}
+	
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public String getStrateName() {
+		return strateName;
+	}
+	public void setStrateName(String strateName) {
+		this.strateName = strateName;
+	}
+	/**
+	 * service
+	 * @return  service
+	*/
+	
+	public Integer getService() {
+		return service;
+	}
+	/**
+	 * @param service the service to set
+	 */
+	public void setService(Integer service) {
+		this.service = service;
+	}
+	public Integer getResGroup1Id() {
+		return resGroup1Id;
+	}
+	public void setResGroup1Id(Integer resGroup1Id) {
+		this.resGroup1Id = resGroup1Id;
+	}
+	public Integer getResGroup1Num() {
+		return resGroup1Num;
+	}
+	public void setResGroup1Num(Integer resGroup1Num) {
+		this.resGroup1Num = resGroup1Num;
+	}
+	public Integer getResGroup2Id() {
+		return resGroup2Id;
+	}
+	public void setResGroup2Id(Integer resGroup2Id) {
+		this.resGroup2Id = resGroup2Id;
+	}
+	public Integer getResGroup2Num() {
+		return resGroup2Num;
+	}
+	public void setResGroup2Num(Integer resGroup2Num) {
+		this.resGroup2Num = resGroup2Num;
+	}
+	public Integer getResGroup3Id() {
+		return resGroup3Id;
+	}
+	public void setResGroup3Id(Integer resGroup3Id) {
+		this.resGroup3Id = resGroup3Id;
+	}
+	public Integer getResGroup3Num() {
+		return resGroup3Num;
+	}
+	public void setResGroup3Num(Integer resGroup3Num) {
+		this.resGroup3Num = resGroup3Num;
+	}
+	public Integer getResGroup4Id() {
+		return resGroup4Id;
+	}
+	public void setResGroup4Id(Integer resGroup4Id) {
+		this.resGroup4Id = resGroup4Id;
+	}
+	public Integer getResGroup4Num() {
+		return resGroup4Num;
+	}
+	public void setResGroup4Num(Integer resGroup4Num) {
+		this.resGroup4Num = resGroup4Num;
+	}
+	public Integer getResGroup5Id() {
+		return resGroup5Id;
+	}
+	public void setResGroup5Id(Integer resGroup5Id) {
+		this.resGroup5Id = resGroup5Id;
+	}
+	public Integer getResGroup5Num() {
+		return resGroup5Num;
+	}
+	public void setResGroup5Num(Integer resGroup5Num) {
+		this.resGroup5Num = resGroup5Num;
+	}
+	public Integer getMinTtl() {
+		return minTtl;
+	}
+	public void setMinTtl(Integer minTtl) {
+		this.minTtl = minTtl;
+	}
+	public Integer getMaxTtl() {
+		return maxTtl;
+	}
+	public void setMaxTtl(Integer maxTtl) {
+		this.maxTtl = maxTtl;
+	}
+	public Integer getCfgId() {
+		return cfgId;
+	}
+	public void setCfgId(Integer cfgId) {
+		this.cfgId = cfgId;
+	}
+	public void init() {
+		resGroup2Id=0; 
+		resGroup2Num=0;
+		resGroup3Id=0;
+		resGroup3Num=0;
+		resGroup4Id=0;
+		resGroup4Num=0;
+		resGroup5Id=0;
+		resGroup5Num=0;
+
+	}
+}

src/main/java/com/nis/domain/callback/ProxyFileHijackCfg.java

@@ -0,0 +1,54 @@
+package com.nis.domain.callback;
+
+import com.nis.domain.configuration.BaseCfg;
+import com.nis.util.excel.ExcelField;
+
+/**
+ * http代理劫持文件
+ * @author lenovo
+ * 
+ */
+public class ProxyFileHijackCfg extends BaseCfg<ProxyFileHijackCfg>{
+
+	private static final long serialVersionUID = -4600604393808056286L;
+	public String indexTable = "pxy_profile_hijack_files";//对应表名
+	@ExcelField(title="profile_name",sort=1)
+	private String profileName;//名称，辅助记忆
+	@ExcelField(title="content_type",sort=3)
+	private String contentType;//填充HTTP content-type，如“video/mp4” （exe、apk）
+	@ExcelField(title="hijack_file_strategy",sort=2)
+	private String path;//储存路径
+	@ExcelField(title="content_name",sort=4)
+	private String contentName;//内容格式
+		
+	public String getContentName() {
+		return contentName;
+	}
+	public void setContentName(String contentName) {
+		this.contentName = contentName;
+	}	
+	public String getIndexTable() {
+		return indexTable;
+	}
+	public void setIndexTable(String indexTable) {
+		this.indexTable = indexTable;
+	}
+	public String getProfileName() {
+		return profileName;
+	}
+	public void setProfileName(String profileName) {
+		this.profileName = profileName;
+	}
+	public String getContentType() {
+		return contentType;
+	}
+	public void setContentType(String contentType) {
+		this.contentType = contentType;
+	}
+	public String getPath() {
+		return path;
+	}
+	public void setPath(String path) {
+		this.path = path;
+	}
+}

src/main/java/com/nis/domain/callback/ProxyFileHijackCfgAudit.java

@@ -0,0 +1,114 @@
+package com.nis.domain.callback;
+
+import java.util.Date;
+
+import com.google.gson.annotations.Expose;
+
+public class ProxyFileHijackCfgAudit {
+	
+	@Expose
+	private Long id; //compileId
+	@Expose
+	private Integer cfgId; //compileId
+	@Expose
+	private Integer profileId;//compileId
+	@Expose
+	private Integer action;
+	@Expose
+	private Integer service;
+	@Expose
+	private Integer isValid;
+	@Expose
+	private Date opTime;
+	@Expose
+	private String profileName;
+	@Expose
+	private String contentType;
+	@Expose
+	private String path;
+	@Expose
+	private String contentName;
+	@Expose
+	private Long opUser;
+	
+	public Long getOpUser() {
+		return opUser;
+	}
+	public void setOpUser(Long opUser) {
+		this.opUser = opUser;
+	}
+	
+	public String getContentName() {
+		return contentName;
+	}
+
+	public void setContentName(String contentName) {
+		this.contentName = contentName;
+	}
+
+	public String getPath() {
+		return path;
+	}
+
+	public void setPath(String path) {
+		this.path = path;
+	}
+
+	public Long getId() {
+		return id;
+	}
+	
+	public Integer getProfileId() {
+		return profileId;
+	}
+
+	public void setProfileId(Integer profileId) {
+		this.profileId = profileId;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public Integer getCfgId() {
+		return cfgId;
+	}
+	public void setCfgId(Integer cfgId) {
+		this.cfgId = cfgId;
+	}
+	public Integer getAction() {
+		return action;
+	}
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	public Integer getService() {
+		return service;
+	}
+	public void setService(Integer service) {
+		this.service = service;
+	}
+	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 String getProfileName() {
+		return profileName;
+	}
+	public void setProfileName(String profileName) {
+		this.profileName = profileName;
+	}
+	public String getContentType() {
+		return contentType;
+	}
+	public void setContentType(String contentType) {
+		this.contentType = contentType;
+	}
+}

src/main/java/com/nis/domain/callback/ProxyFileInsertScriptCfg.java

@@ -0,0 +1,40 @@
+package com.nis.domain.callback;
+
+import com.nis.domain.configuration.BaseCfg;
+import com.nis.util.excel.ExcelField;
+
+public class ProxyFileInsertScriptCfg extends BaseCfg<ProxyFileInsertScriptCfg>{
+	
+	private static final long serialVersionUID = 4705202662940705064L;
+	public String indexTable = "pxy_profile_insert_scripts";//对应表名
+	@ExcelField(title="script_name",sort=1)
+	private String cfgDesc;//名称，辅助记忆
+	@ExcelField(title="script_format",sort=3)
+	private String format;//css/js
+	@ExcelField(title="script_file",sort=2)
+	private String path;//储存路径	
+	public String getIndexTable() {
+		return indexTable;
+	}
+	public void setIndexTable(String indexTable) {
+		this.indexTable = indexTable;
+	}
+	public String getCfgDesc() {
+		return cfgDesc;
+	}
+	public void setCfgDesc(String cfgDesc) {
+		this.cfgDesc = cfgDesc;
+	}
+	public String getFormat() {
+		return format;
+	}
+	public void setFormat(String format) {
+		this.format = format;
+	}
+	public String getPath() {
+		return path;
+	}
+	public void setPath(String path) {
+		this.path = path;
+	}
+}

src/main/java/com/nis/domain/callback/ProxyFileInsertScriptCfgAudit.java

@@ -0,0 +1,99 @@
+package com.nis.domain.callback;
+
+import java.util.Date;
+
+import com.google.gson.annotations.Expose;
+
+public class ProxyFileInsertScriptCfgAudit {
+	@Expose
+	private Long id; //compileId
+	@Expose
+	private Integer cfgId; //compileId
+	@Expose
+	private Integer profileId;//compileId
+	@Expose
+	private Integer action;
+	@Expose
+	private Integer service;
+	@Expose
+	private Integer isValid;
+	@Expose
+	private Date opTime;
+	@Expose
+	private String profileName;
+	@Expose
+	private String format;
+	@Expose
+	private String path;
+	@Expose
+	private Long opUser;
+	
+	public Long getOpUser() {
+		return opUser;
+	}
+	public void setOpUser(Long opUser) {
+		this.opUser = opUser;
+	}
+	
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public Integer getCfgId() {
+		return cfgId;
+	}
+	public void setCfgId(Integer cfgId) {
+		this.cfgId = cfgId;
+	}
+	public Integer getProfileId() {
+		return profileId;
+	}
+	public void setProfileId(Integer profileId) {
+		this.profileId = profileId;
+	}
+	public Integer getAction() {
+		return action;
+	}
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	public Integer getService() {
+		return service;
+	}
+	public void setService(Integer service) {
+		this.service = service;
+	}
+	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 String getProfileName() {
+		return profileName;
+	}
+	public void setProfileName(String profileName) {
+		this.profileName = profileName;
+	}
+	public String getFormat() {
+		return format;
+	}
+	public void setFormat(String format) {
+		this.format = format;
+	}
+	public String getPath() {
+		return path;
+	}
+	public void setPath(String path) {
+		this.path = path;
+	}
+	
+}

src/main/java/com/nis/domain/callback/ProxyFileResponsePageCfg.java

@@ -0,0 +1,67 @@
+package com.nis.domain.callback;
+
+import com.nis.domain.configuration.BaseCfg;
+import com.nis.util.excel.ExcelField;
+/**
+ * http代理文件策略
+ * @author nanfang
+ * 
+ */
+public class ProxyFileResponsePageCfg extends BaseCfg<ProxyFileResponsePageCfg> {
+	
+	private static final long serialVersionUID = -1989406217948847813L;
+	public final static String TABLE_NAME = "pxy_profile_response_pages";//对应表名
+	private String indexTable = "pxy_profile_response_pages";
+	@ExcelField(title="file_desc",sort=1)
+	private String fileDesc;//文件描述
+	@ExcelField(title="response_file",sort=2)
+	private String url;//文件保存的url
+	@ExcelField(title="format",sort=3)
+	private String contentType;//内容类型，如text/html，取字典表contentType
+	private String md5;//文件md5值
+	private Long contentLength;//文件长度	
+
+	public String getIndexTable() {
+		return indexTable;
+	}
+
+	public void setIndexTable(String indexTable) {
+		this.indexTable = indexTable;
+	}
+
+	public ProxyFileResponsePageCfg() {
+		super();
+	}
+	
+	public String getFileDesc() {
+		return fileDesc;
+	}
+	public void setFileDesc(String fileDesc) {
+		this.fileDesc = fileDesc;
+	}
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
+	public String getContentType() {
+		return contentType;
+	}
+	public void setContentType(String contentType) {
+		this.contentType = contentType;
+	}
+	public Long getContentLength() {
+		return contentLength;
+	}
+	public void setContentLength(Long contentLength) {
+		this.contentLength = contentLength;
+	}
+	public String getMd5() {
+		return md5;
+	}
+	public void setMd5(String md5) {
+		this.md5 = md5;
+	}
+	
+}

src/main/java/com/nis/domain/callback/ProxyFileResponsePageCfgAudit.java

@@ -0,0 +1,106 @@
+package com.nis.domain.callback;
+
+import java.util.Date;
+
+import com.google.gson.annotations.Expose;
+
+public class ProxyFileResponsePageCfgAudit {
+	@Expose
+	private Long id; //compileId
+	@Expose
+	private Integer cfgId; //compileId
+	@Expose
+	private Integer action;
+	@Expose
+	private Integer service;
+	@Expose
+	private Integer isValid;
+	@Expose
+	private Date opTime;
+	@Expose
+	private String format;
+	@Expose
+	private Long contentLength;
+	@Expose
+	private String path;
+	@Expose
+	private Long profileId;
+	@Expose
+	private String profileName;
+	@Expose
+	private Long opUser;
+	
+	public Long getOpUser() {
+		return opUser;
+	}
+	public void setOpUser(Long opUser) {
+		this.opUser = opUser;
+	}
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public Integer getCfgId() {
+		return cfgId;
+	}
+	public void setCfgId(Integer cfgId) {
+		this.cfgId = cfgId;
+	}
+	public Integer getAction() {
+		return action;
+	}
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	public Integer getService() {
+		return service;
+	}
+	public void setService(Integer service) {
+		this.service = service;
+	}
+	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 String getFormat() {
+		return format;
+	}
+	public void setFormat(String format) {
+		this.format = format;
+	}
+	public Long getContentLength() {
+		return contentLength;
+	}
+	public void setContentLength(Long contentLength) {
+		this.contentLength = contentLength;
+	}
+	public String getPath() {
+		return path;
+	}
+	public void setPath(String path) {
+		this.path = path;
+	}
+	public Long getProfileId() {
+		return profileId;
+	}
+	public void setProfileId(Long profileId) {
+		this.profileId = profileId;
+	}
+	public String getProfileName() {
+		return profileName;
+	}
+	public void setProfileName(String profileName) {
+		this.profileName = profileName;
+	}
+	
+}

src/main/java/com/nis/domain/callback/ProxyFileStrategyCfg.java

@@ -0,0 +1,62 @@
+package com.nis.domain.callback;
+
+import com.nis.domain.configuration.BaseCfg;
+/**
+ * http代理文件策略
+ * @author nanfang
+ * 
+ */
+public class ProxyFileStrategyCfg extends BaseCfg<ProxyFileStrategyCfg> {
+	private static final long serialVersionUID = 4283944377949702481L;
+	public final static String TABLE_NAME = "PROXY_FILE_STRATEGY_CFG";//对应表名
+	private String indexTable = "proxy_file_strategy_cfg";
+	private String fileDesc;//文件描述
+	private String url;//文件保存的url
+	private String contentType;//内容类型，如text/html，取字典表contentType
+	private String md5;//文件md5值
+	private Long contentLength;//文件长度
+	
+	public String getIndexTable() {
+		return indexTable;
+	}
+
+	public void setIndexTable(String indexTable) {
+		this.indexTable = indexTable;
+	}
+
+	public ProxyFileStrategyCfg() {
+		super();
+	}
+	
+	public String getFileDesc() {
+		return fileDesc;
+	}
+	public void setFileDesc(String fileDesc) {
+		this.fileDesc = fileDesc;
+	}
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
+	public String getContentType() {
+		return contentType;
+	}
+	public void setContentType(String contentType) {
+		this.contentType = contentType;
+	}
+	public Long getContentLength() {
+		return contentLength;
+	}
+	public void setContentLength(Long contentLength) {
+		this.contentLength = contentLength;
+	}
+	public String getMd5() {
+		return md5;
+	}
+	public void setMd5(String md5) {
+		this.md5 = md5;
+	}
+	
+}

src/main/java/com/nis/domain/callback/ProxyFileStrategyCfgAudit.java

@@ -0,0 +1,106 @@
+package com.nis.domain.callback;
+
+import java.util.Date;
+
+import com.google.gson.annotations.Expose;
+
+public class ProxyFileStrategyCfgAudit {
+	@Expose
+	private Long id; //compileId
+	@Expose
+	private Integer cfgId; //compileId
+	@Expose
+	private Integer action;
+	@Expose
+	private Integer service;
+	@Expose
+	private Integer isValid;
+	@Expose
+	private Date opTime;
+	@Expose
+	private String contentType;
+	@Expose
+	private Long contentLength;
+	@Expose
+	private String filePath;
+	@Expose
+	private Long fileId;
+	@Expose
+	private String fileDesc;
+	@Expose
+	private Long opUser;
+	
+	public Long getOpUser() {
+		return opUser;
+	}
+	public void setOpUser(Long opUser) {
+		this.opUser = opUser;
+	}
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public Integer getCfgId() {
+		return cfgId;
+	}
+	public void setCfgId(Integer cfgId) {
+		this.cfgId = cfgId;
+	}
+	public Integer getAction() {
+		return action;
+	}
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	public Integer getService() {
+		return service;
+	}
+	public void setService(Integer service) {
+		this.service = service;
+	}
+	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 String getContentType() {
+		return contentType;
+	}
+	public void setContentType(String contentType) {
+		this.contentType = contentType;
+	}
+	public Long getContentLength() {
+		return contentLength;
+	}
+	public void setContentLength(Long contentLength) {
+		this.contentLength = contentLength;
+	}
+	public String getFilePath() {
+		return filePath;
+	}
+	public void setFilePath(String filePath) {
+		this.filePath = filePath;
+	}
+	public Long getFileId() {
+		return fileId;
+	}
+	public void setFileId(Long fileId) {
+		this.fileId = fileId;
+	}
+	public String getFileDesc() {
+		return fileDesc;
+	}
+	public void setFileDesc(String fileDesc) {
+		this.fileDesc = fileDesc;
+	}
+	
+}

src/main/java/com/nis/domain/callback/ProxyFileTrafficMirrorCfg.java

@@ -0,0 +1,45 @@
+package com.nis.domain.callback;
+
+
+import java.util.Arrays;
+
+import com.nis.domain.configuration.BaseCfg;
+import com.nis.util.excel.ExcelField;
+
+import antlr.collections.List;
+
+public class ProxyFileTrafficMirrorCfg extends BaseCfg<ProxyFileTrafficMirrorCfg>{
+	
+	private static final long serialVersionUID = -5895958073449509268L;
+	public  String indexTable = "pxy_profile_traffic_mirror";//对应表名
+	@ExcelField(title="address_name",sort=1)
+	private String cfgDesc;//名称，辅助记忆
+	@ExcelField(title="mirror_addr_list",sort=3)
+	private String addrList;//目标表示列表
+	@ExcelField(title="mirror_addr_type",sort=2)
+	private String addrType;//目标表示类型
+	public String getIndexTable() {
+		return indexTable;
+	}
+	public void setIndexTable(String indexTable) {
+		this.indexTable = indexTable;
+	}
+	public String getCfgDesc() {
+		return cfgDesc;
+	}
+	public void setCfgDesc(String cfgDesc) {
+		this.cfgDesc = cfgDesc;
+	}
+	public String getAddrList() {
+		return addrList;
+	}
+	public void setAddrList(String addrList) {
+		this.addrList = addrList;
+	}
+	public String getAddrType() {
+		return addrType;
+	}
+	public void setAddrType(String addrType) {
+		this.addrType = addrType;
+	}	
+}

src/main/java/com/nis/domain/callback/ProxyFileTrafficMirrorCfgAudit.java

@@ -0,0 +1,106 @@
+package com.nis.domain.callback;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import com.google.gson.annotations.Expose;
+
+public class ProxyFileTrafficMirrorCfgAudit {
+	@Expose
+	private Long id; //compileId
+	@Expose
+	private Integer cfgId; //compileId
+	@Expose
+	private Integer profileId;//compileId
+	@Expose
+	private Integer action;
+	@Expose
+	private Integer service;
+	@Expose
+	private Integer isValid;
+	@Expose
+	private Date opTime;
+	@Expose
+	private String profileName;
+	@Expose
+	private String addrList;
+	@Expose
+	private String addrContent;
+	@Expose
+	private String addrType;
+	@Expose
+	private Long opUser;
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public Integer getCfgId() {
+		return cfgId;
+	}
+	public void setCfgId(Integer cfgId) {
+		this.cfgId = cfgId;
+	}
+	public Integer getProfileId() {
+		return profileId;
+	}
+	public void setProfileId(Integer profileId) {
+		this.profileId = profileId;
+	}
+	public Integer getAction() {
+		return action;
+	}
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	public Integer getService() {
+		return service;
+	}
+	public void setService(Integer service) {
+		this.service = service;
+	}
+	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 String getProfileName() {
+		return profileName;
+	}
+	public void setProfileName(String profileName) {
+		this.profileName = profileName;
+	}	
+	public String getAddrList() {
+		return addrList;
+	}
+	public void setAddrList(String addrList) {
+		this.addrList = addrList;
+	}
+	public String getAddrContent() {
+		return addrContent;
+	}
+	public void setAddrContent(String addrContent) {
+		this.addrContent = addrContent;
+	}
+	public String getAddrType() {
+		return addrType;
+	}
+	public void setAddrType(String addrType) {
+		this.addrType = addrType;
+	}
+	public Long getOpUser() {
+		return opUser;
+	}
+	public void setOpUser(Long opUser) {
+		this.opUser = opUser;
+	}	
+}

src/main/java/com/nis/domain/callback/ProxyObjKeyring.java

@@ -0,0 +1,156 @@
+package com.nis.domain.callback;
+
+import java.util.Date;
+
+import com.google.gson.annotations.Expose;
+public class ProxyObjKeyring {
+	@Expose
+	private Long id; //compileId
+	@Expose
+	private Integer cfgId; //compileId
+	@Expose
+	private Integer keyringId;
+	@Expose
+	private Integer action;
+	@Expose
+	private Integer service;
+	@Expose
+	private Integer isValid;
+	@Expose
+	private Date opTime;
+	@Expose
+	private String keyringName;
+	@Expose
+	private String keyringType;
+	@Expose
+	private String privateKeyFile;
+	@Expose
+	private String publicKeyFile;
+	@Expose
+	private Integer expireAfter;
+	@Expose
+	private String publicKeyAlgo;
+	@Expose
+	private String crl;
+	
+	
+	
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public void setCfgId(Integer cfgId) {
+		this.cfgId = cfgId;
+	}
+	public Integer getCfgId() {
+		return cfgId;
+	}
+	public void setKeyringId(Integer keyringId) {
+		this.keyringId = keyringId;
+	}
+	public Integer getKeyringId() {
+		return keyringId;
+	}
+
+	public String getKeyringName() {
+		return keyringName;
+	}
+	public void setKeyringName(String keyringName) {
+		this.keyringName = keyringName;
+	}
+	public String getKeyringType() {
+		return keyringType;
+	}
+	public void setKeyringType(String keyringType) {
+		this.keyringType = keyringType;
+	}
+	public String getPrivateKeyFile() {
+		return privateKeyFile;
+	}
+	public void setPrivateKeyFile(String privateKeyFile) {
+		this.privateKeyFile = privateKeyFile;
+	}
+	public String getPublicKeyFile() {
+		return publicKeyFile;
+	}
+	public void setPublicKeyFile(String publicKeyFile) {
+		this.publicKeyFile = publicKeyFile;
+	}
+	public Integer getExpireAfter() {
+		return expireAfter;
+	}
+	public void setExpireAfter(Integer expireAfter) {
+		this.expireAfter = expireAfter;
+	}
+	public String getPublicKeyAlgo() {
+		return publicKeyAlgo;
+	}
+	public void setPublicKeyAlgo(String publicKeyAlgo) {
+		this.publicKeyAlgo = publicKeyAlgo;
+	}
+	public String getCrl() {
+		return crl;
+	}
+	public void setCrl(String crl) {
+		this.crl = crl;
+	}
+	/**
+	 * action
+	 * @return  action
+	*/
+	
+	public Integer getAction() {
+		return action;
+	}
+	/**
+	 * @param action the action to set
+	 */
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	/**
+	 * isValid
+	 * @return  isValid
+	*/
+	
+	public Integer getIsValid() {
+		return isValid;
+	}
+	/**
+	 * @param isValid the isValid to set
+	 */
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	/**
+	 * opTime
+	 * @return  opTime
+	*/
+	
+	public Date getOpTime() {
+		return opTime;
+	}
+	/**
+	 * @param opTime the opTime to set
+	 */
+	public void setOpTime(Date opTime) {
+		this.opTime = opTime;
+	}
+	
+	/**
+	 * service
+	 * @return  service
+	*/
+	
+	public Integer getService() {
+		return service;
+	}
+	/**
+	 * @param service the service to set
+	 */
+	public void setService(Integer service) {
+		this.service = service;
+	}
+}

src/main/java/com/nis/domain/callback/ProxyObjTrustedCa.java

@@ -0,0 +1,133 @@
+package com.nis.domain.callback;
+
+import java.util.Date;
+
+import com.google.gson.annotations.Expose;
+import com.nis.web.service.BaseService;
+public class ProxyObjTrustedCa {
+	@Expose
+	private Long id; //compileId
+	@Expose
+	private Integer cfgId; //compileId
+	@Expose
+	private Integer certId; //compileId
+	@Expose
+	private Integer action;
+	@Expose
+	private Integer service;
+	@Expose
+	private Integer isValid;
+	@Expose
+	private Date opTime;
+	@Expose
+	private String certFile;
+	@Expose
+	private String certName;
+	@Expose
+	private Integer crlId; //crlId compileId crl使用
+	@Expose
+	private String crlFile;//crlFile crl使用
+	
+	public String getCrlFile() {
+		return crlFile;
+	}
+	public void setCrlFile(String crlFile) {
+		this.crlFile = crlFile;
+	}
+	public Integer getCrlId() {
+		return crlId;
+	}
+	public void setCrlId(Integer crlId) {
+		this.crlId = crlId;
+	}
+	
+	
+	public Integer getCertId() {
+		return certId;
+	}
+	public void setCertId(Integer certId) {
+		this.certId = certId;
+	}
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public void setCfgId(Integer cfgId) {
+		this.cfgId = cfgId;
+	}
+	public Integer getCfgId() {
+		return cfgId;
+	}
+	
+	public String getCertName() {
+		return certName;
+	}
+	public void setCertName(String certName) {
+		this.certName = certName;
+	}
+	public String getCertFile() {
+		return certFile;
+	}
+	public void setCertFile(String certFile) {
+		this.certFile = certFile;
+	}
+	/**
+	 * action
+	 * @return  action
+	*/
+	
+	public Integer getAction() {
+		return action;
+	}
+	/**
+	 * @param action the action to set
+	 */
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	/**
+	 * isValid
+	 * @return  isValid
+	*/
+	
+	public Integer getIsValid() {
+		return isValid;
+	}
+	/**
+	 * @param isValid the isValid to set
+	 */
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	/**
+	 * opTime
+	 * @return  opTime
+	*/
+	
+	public Date getOpTime() {
+		return opTime;
+	}
+	/**
+	 * @param opTime the opTime to set
+	 */
+	public void setOpTime(Date opTime) {
+		this.opTime = opTime;
+	}
+	
+	/**
+	 * service
+	 * @return  service
+	*/
+	
+	public Integer getService() {
+		return service;
+	}
+	/**
+	 * @param service the service to set
+	 */
+	public void setService(Integer service) {
+		this.service = service;
+	}
+}

src/main/java/com/nis/domain/callback/ProxyObjTrustedCaCrl.java

@@ -0,0 +1,115 @@
+package com.nis.domain.callback;
+
+import java.util.Date;
+
+import com.google.gson.annotations.Expose;
+public class ProxyObjTrustedCaCrl {
+	@Expose
+	private Long id; //compileId
+	@Expose
+	private Integer cfgId; //compileId
+	@Expose
+	private Long certId; //cert compileId
+	@Expose
+	private Integer crlId; //cert compileId
+	@Expose
+	private Integer action;
+	@Expose
+	private Integer service;
+	@Expose
+	private Integer isValid;
+	@Expose
+	private Date opTime;
+	@Expose
+	private String crlFile;
+	
+	public String getCrlFile() {
+		return crlFile;
+	}
+	public void setCrlFile(String crlFile) {
+		this.crlFile = crlFile;
+	}
+	public Integer getCrlId() {
+		return crlId;
+	}
+	public void setCrlId(Integer crlId) {
+		this.crlId = crlId;
+	}
+	
+	public Long getCertId() {
+		return certId;
+	}
+	public void setCertId(Long certId) {
+		this.certId = certId;
+	}
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public void setCfgId(Integer cfgId) {
+		this.cfgId = cfgId;
+	}
+	public Integer getCfgId() {
+		return cfgId;
+	}
+	
+	/**
+	 * action
+	 * @return  action
+	*/
+	
+	public Integer getAction() {
+		return action;
+	}
+	/**
+	 * @param action the action to set
+	 */
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	/**
+	 * isValid
+	 * @return  isValid
+	*/
+	
+	public Integer getIsValid() {
+		return isValid;
+	}
+	/**
+	 * @param isValid the isValid to set
+	 */
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	/**
+	 * opTime
+	 * @return  opTime
+	*/
+	
+	public Date getOpTime() {
+		return opTime;
+	}
+	/**
+	 * @param opTime the opTime to set
+	 */
+	public void setOpTime(Date opTime) {
+		this.opTime = opTime;
+	}
+	
+	/**
+	 * service
+	 * @return  service
+	*/
+	
+	public Integer getService() {
+		return service;
+	}
+	/**
+	 * @param service the service to set
+	 */
+	public void setService(Integer service) {
+		this.service = service;
+	}
+}

src/main/java/com/nis/domain/configuration/AppBuiltInFeatureFile.java

@@ -0,0 +1,23 @@
+package com.nis.domain.configuration;
+
+import java.util.Date;
+
+/**
+ * 内置文件上传
+ * @author dell
+ *
+ */
+public class AppBuiltInFeatureFile extends BaseCfg<AppBuiltInFeatureFile> {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -2720862431960415564L;
+	private String filePath;
+	public String getFilePath() {
+		return filePath;
+	}
+	public void setFilePath(String filePath) {
+		this.filePath = filePath;
+	}
+}

src/main/java/com/nis/domain/configuration/AppByteCfg.java

@@ -0,0 +1,148 @@
+/**
+ *@Title: BaseStringConfig.java
+ *@Package com.nis.domain.restful 
+ *@Description TODO
+ *@author dell
+ *@date 2018年2月5日 下午5:26:02
+ *@version  版本号
+ */
+package com.nis.domain.configuration;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+import com.nis.util.excel.ExcelField;
+
+/**
+ * @Description: APP策略配置
+ * @author (dell)
+ * @date 2018年2月5日 下午5:26:02
+ * @version V1.0
+ */
+public class AppByteCfg extends BaseCfg<AppByteCfg> {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3350695484085989968L;
+	private static final String tableName="app_byte_cfg";
+	@Expose
+	private Integer compileId;
+	@Expose
+	private String ratelimit;
+	private Integer appCode;//specific_service_cfg表一级节点的spec_service_code
+	private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code
+	private Integer specServiceId;
+	private String bytes;
+	private String cfgKeywords;
+	private String appName;
+
+	@Expose
+	@ExcelField(title="expression_type")
+	@SerializedName("exprType")
+	protected Integer exprType ;
+
+	@Expose
+	@ExcelField(title="match_method")
+	@SerializedName("matchMethod")
+	protected Integer matchMethod ;
+
+	@Expose
+	@ExcelField(title="whether_hexbinary")
+	@SerializedName("isHexbin")
+	protected Integer isHexbin;
+
+	public Integer getExprType() {
+		return exprType;
+	}
+
+	public void setExprType(Integer exprType) {
+		this.exprType = exprType;
+	}
+
+	public Integer getMatchMethod() {
+		return matchMethod;
+	}
+
+	public void setMatchMethod(Integer matchMethod) {
+		this.matchMethod = matchMethod;
+	}
+
+	public Integer getIsHexbin() {
+		return isHexbin;
+	}
+
+	public void setIsHexbin(Integer isHexbin) {
+		this.isHexbin = isHexbin;
+	}
+	@Override
+	public void initDefaultValue() {
+		// TODO Auto-generated method stub
+		super.initDefaultValue();
+		this.isHexbin = 0;
+	}
+	
+	
+	public Integer getCompileId() {
+		return compileId;
+	}
+	public void setCompileId(Integer compileId) {
+		this.compileId = compileId;
+	}
+
+	public static String getTablename() {
+		return tableName;
+	}
+
+	public String getRatelimit() {
+		return ratelimit;
+	}
+
+	public void setRatelimit(String ratelimit) {
+		this.ratelimit = ratelimit;
+	}
+	public Integer getAppCode() {
+		return appCode;
+	}
+	public void setAppCode(Integer appCode) {
+		this.appCode = appCode;
+	}
+	public Integer getSpecServiceId() {
+		return specServiceId;
+	}
+	public void setSpecServiceId(Integer specServiceId) {
+		this.specServiceId = specServiceId;
+	}
+
+	public String getBytes() {
+		return bytes;
+	}
+
+	public void setBytes(String bytes) {
+		this.bytes = bytes;
+	}
+
+	public String getCfgKeywords() {
+		return cfgKeywords;
+	}
+
+	public void setCfgKeywords(String cfgKeywords) {
+		this.cfgKeywords = cfgKeywords;
+	}
+
+	public String getAppName() {
+		return appName;
+	}
+
+	public void setAppName(String appName) {
+		this.appName = appName;
+	}
+
+	public Integer getBehavCode() {
+		return behavCode;
+	}
+
+	public void setBehavCode(Integer behavCode) {
+		this.behavCode = behavCode;
+	}
+	
+}

src/main/java/com/nis/domain/configuration/AppComplexFeatureCfg.java

@@ -0,0 +1,331 @@
+/**
+ *@Title: BaseStringConfig.java
+ *@Package com.nis.domain.restful 
+ *@Description TODO
+ *@author dell
+ *@date 2018年2月5日 下午5:26:02
+ *@version  版本号
+ */
+package com.nis.domain.configuration;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+import com.nis.util.excel.ExcelField;
+
+/**
+ * APP Header层头特征配置
+ * @author dell
+ *
+ */
+public class AppComplexFeatureCfg extends BaseCfg<AppComplexFeatureCfg> {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 5718725405113991364L;
+	/**
+	 * 
+	 */
+	private static final String tableName="app_complex_feature_cfg";
+	@Expose
+	@ExcelField(title="cfg_id",sort=0)
+	private Integer compileId;
+	private Integer appCode;//specific_service_cfg表一级节点的spec_service_code
+	private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code
+	private Integer specServiceId;
+	@ExcelField(title="district",sort=1)
+	private String district;
+	@ExcelField(title="key_word",sort=201)
+	private String cfgKeywords;
+	private String appName;
+	private List<AppIpCfg> ipPortList = new ArrayList();
+	private String cfgRegionCode1;
+	//以下参数为APP PAYLOAD L3_HEADER的特殊属性（使用偏移表达式处理）
+	private String ver;
+	private String ihl;
+	private String tos;
+	private String totalLength;
+	private String flags;
+	private String fragmentOffset;
+	private String protocol;
+	private String icmpType;
+	private String icmpCode;
+	private String icmpIdentifier;
+	private String headerType;
+	//以下参数为APP payload payload的特殊属性（偏移量表达式时处理）
+	private Integer payloadOffset;
+	private Integer payloadSize;//下发综合服务接口时，为单独的域配置
+	private String payloadPacketDirection;//下发综合服务接口时，为单独的域配置
+	
+	
+	public String getCfgRegionCode1() {
+		return cfgRegionCode1;
+	}
+
+	public void setCfgRegionCode1(String cfgRegionCode1) {
+		this.cfgRegionCode1 = cfgRegionCode1;
+	}
+
+	/**
+	 * 表达式类型
+	 */
+	@Expose
+	@ExcelField(title="expression_type",dictType="EXPRESSION_TYPE",sort=202)
+	@SerializedName("exprType")
+	protected Integer exprType ;
+	/**
+	 * 匹配方式
+	 */
+	@Expose
+	@ExcelField(title="match_method",dictType="MATCH_METHOD",sort=203)
+	@SerializedName("matchMethod")
+	protected Integer matchMethod ;
+	/**
+	 * 是否hex
+	 */
+	@ExcelField(title="is_hex",sort=204)
+	protected Integer isHex;
+	/**
+	 * 是否hex
+	 */
+	@ExcelField(title="is_case_insenstive",sort=205)
+	protected Integer isCaseInsenstive;
+	/**
+	 * 是否hex二进制
+	 */
+	@Expose
+	@SerializedName("isHexbin")
+	protected Integer isHexbin;
+	
+	
+
+	public Integer getIsHex() {
+		return isHex;
+	}
+
+	public void setIsHex(Integer isHex) {
+		this.isHex = isHex;
+	}
+
+	public Integer getIsCaseInsenstive() {
+		return isCaseInsenstive;
+	}
+
+	public void setIsCaseInsenstive(Integer isCaseInsenstive) {
+		this.isCaseInsenstive = isCaseInsenstive;
+	}
+
+	public Integer getExprType() {
+		return exprType;
+	}
+
+	public void setExprType(Integer exprType) {
+		this.exprType = exprType;
+	}
+
+	public Integer getMatchMethod() {
+		return matchMethod;
+	}
+
+	public void setMatchMethod(Integer matchMethod) {
+		this.matchMethod = matchMethod;
+	}
+
+	public Integer getIsHexbin() {
+		return isHexbin;
+	}
+
+	public void setIsHexbin(Integer isHexbin) {
+		this.isHexbin = isHexbin;
+	}
+	@Override
+	public void initDefaultValue() {
+		// TODO Auto-generated method stub
+		super.initDefaultValue();
+		this.isHexbin = 0;
+	}
+	
+	
+	public Integer getCompileId() {
+		return compileId;
+	}
+	public void setCompileId(Integer compileId) {
+		this.compileId = compileId;
+	}
+
+	public static String getTablename() {
+		return tableName;
+	}
+
+	public Integer getAppCode() {
+		return appCode;
+	}
+	public void setAppCode(Integer appCode) {
+		this.appCode = appCode;
+	}
+	public Integer getSpecServiceId() {
+		return specServiceId;
+	}
+	public void setSpecServiceId(Integer specServiceId) {
+		this.specServiceId = specServiceId;
+	}
+
+	public String getDistrict() {
+		return district;
+	}
+
+	public void setDistrict(String district) {
+		this.district = district;
+	}
+
+	public String getCfgKeywords() {
+		return cfgKeywords;
+	}
+
+	public void setCfgKeywords(String cfgKeywords) {
+		this.cfgKeywords = cfgKeywords;
+	}
+
+	public String getAppName() {
+		return appName;
+	}
+
+	public void setAppName(String appName) {
+		this.appName = appName;
+	}
+
+	public Integer getBehavCode() {
+		return behavCode;
+	}
+
+	public void setBehavCode(Integer behavCode) {
+		this.behavCode = behavCode;
+	}
+
+	public List<AppIpCfg> getIpPortList() {
+		if(ipPortList.size()==0){
+			ipPortList.add(new AppIpCfg());
+		}
+		return ipPortList;
+	}
+
+	public void setIpPortList(List<AppIpCfg> ipPortList) {
+		this.ipPortList = ipPortList;
+	}
+
+	public String getVer() {
+		return ver;
+	}
+
+	public void setVer(String ver) {
+		this.ver = ver;
+	}
+
+	public String getIhl() {
+		return ihl;
+	}
+
+	public void setIhl(String ihl) {
+		this.ihl = ihl;
+	}
+
+	public String getTos() {
+		return tos;
+	}
+
+	public void setTos(String tos) {
+		this.tos = tos;
+	}
+
+	public String getTotalLength() {
+		return totalLength;
+	}
+
+	public void setTotalLength(String totalLength) {
+		this.totalLength = totalLength;
+	}
+
+	public String getFlags() {
+		return flags;
+	}
+
+	public void setFlags(String flags) {
+		this.flags = flags;
+	}
+
+	public String getFragmentOffset() {
+		return fragmentOffset;
+	}
+
+	public void setFragmentOffset(String fragmentOffset) {
+		this.fragmentOffset = fragmentOffset;
+	}
+
+	public String getProtocol() {
+		return protocol;
+	}
+
+	public void setProtocol(String protocol) {
+		this.protocol = protocol;
+	}
+
+	public String getIcmpType() {
+		return icmpType;
+	}
+
+	public void setIcmpType(String icmpType) {
+		this.icmpType = icmpType;
+	}
+
+	public String getIcmpCode() {
+		return icmpCode;
+	}
+
+	public void setIcmpCode(String icmpCode) {
+		this.icmpCode = icmpCode;
+	}
+
+	public String getIcmpIdentifier() {
+		return icmpIdentifier;
+	}
+
+	public void setIcmpIdentifier(String icmpIdentifier) {
+		this.icmpIdentifier = icmpIdentifier;
+	}
+
+	public String getHeaderType() {
+		return headerType;
+	}
+
+	public void setHeaderType(String headerType) {
+		this.headerType = headerType;
+	}
+
+	public Integer getPayloadOffset() {
+		return payloadOffset;
+	}
+
+	public void setPayloadOffset(Integer payloadOffset) {
+		this.payloadOffset = payloadOffset;
+	}
+
+	public Integer getPayloadSize() {
+		return payloadSize;
+	}
+
+	public void setPayloadSize(Integer payloadSize) {
+		this.payloadSize = payloadSize;
+	}
+
+	public String getPayloadPacketDirection() {
+		return payloadPacketDirection;
+	}
+
+	public void setPayloadPacketDirection(String payloadPacketDirection) {
+		this.payloadPacketDirection = payloadPacketDirection;
+	}
+	
+}

src/main/java/com/nis/domain/configuration/AppComplexKeywordCfg.java

@@ -0,0 +1,54 @@
+/**
+ *@Title: BaseEnhancedStringConfig.java
+ *@Package com.nis.domain.restful 
+ *@Description TODO
+ *@author dell
+ *@date 2018年2月5日 下午5:42:52
+ *@version  版本号
+ */
+package com.nis.domain.configuration;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * @ClassName: BaseEnhancedStringConfig.java 
+ * @Description: APP增强字符串类配置
+ * @author (zhangwei)
+ * @date 2018年4月3日 下午5:42:52
+ * @version V1.0
+ */
+public class AppComplexKeywordCfg extends ComplexkeywordCfg{
+	/**
+	 * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）
+	 *
+	 * @since 1.0.0
+	 */
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -8058690163147881374L;
+	@Expose
+	private Integer compileId;
+	
+	public Integer getCompileId() {
+		return compileId;
+	}
+	public void setCompileId(Integer compileId) {
+		this.compileId = compileId;
+	}
+	/* (non-Javadoc)
+	 * @see com.nis.domain.configuration.BaseCfg#initDefaultValue()
+	 */
+	@Override
+	public void initDefaultValue() {
+		// TODO Auto-generated method stub
+		super.initDefaultValue();
+		this.exprType=0;
+		this.isHexbin = 0 ;
+		this.matchMethod=3;
+	}
+}

src/main/java/com/nis/domain/configuration/AppDomainCfg.java

@@ -0,0 +1,175 @@
+/**
+ *@Title: BaseStringConfig.java
+ *@Package com.nis.domain.restful 
+ *@Description TODO
+ *@author dell
+ *@date 2018年2月5日 下午5:26:02
+ *@version  版本号
+ */
+package com.nis.domain.configuration;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+import com.nis.util.excel.ExcelField;
+
+/**
+ * @Description: APP策略配置
+ * @author (dell)
+ * @date 2018年2月5日 下午5:26:02
+ * @version V1.0
+ */
+public class AppDomainCfg extends BaseCfg<AppDomainCfg> {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -4685445179478960429L;
+	private static final String tableName="app_domain_cfg";
+	@Expose
+	@ExcelField(title="cfg_id",sort=0)
+	private Integer compileId;
+	@Expose
+	private String ratelimit;
+	private Integer appCode;//specific_service_cfg表一级节点的spec_service_code
+	private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code
+	private Integer specServiceId;
+	
+	@ExcelField(title="domain",sort=3)
+	private String cfgKeywords;
+	@ExcelField(title="social_app",sort=2)
+	private String appName;
+	/**
+	 * 表达式类型
+	 */
+	@Expose
+	@ExcelField(title="expression_type",dictType="EXPRESSION_TYPE",sort=7)
+	@SerializedName("exprType")
+	protected Integer exprType ;
+	/**
+	 * 匹配方式
+	 */
+	@Expose
+	@ExcelField(title="match_method",dictType="MATCH_METHOD",sort=8)
+	@SerializedName("matchMethod")
+	protected Integer matchMethod ;
+
+	@Expose
+	@SerializedName("isHexbin")
+	protected Integer isHexbin;
+	
+	
+	/**
+	 * 是否hex
+	 */
+	@ExcelField(title="is_hex",sort=5)
+	protected Integer isHex;
+	/**
+	 * 是否hex
+	 */
+	@ExcelField(title="is_case_insenstive",sort=6)
+	protected Integer isCaseInsenstive;
+	
+	
+
+	public Integer getIsHex() {
+		return isHex;
+	}
+
+	public void setIsHex(Integer isHex) {
+		this.isHex = isHex;
+	}
+
+	public Integer getIsCaseInsenstive() {
+		return isCaseInsenstive;
+	}
+
+	public void setIsCaseInsenstive(Integer isCaseInsenstive) {
+		this.isCaseInsenstive = isCaseInsenstive;
+	}
+
+	public Integer getExprType() {
+		return exprType;
+	}
+
+	public void setExprType(Integer exprType) {
+		this.exprType = exprType;
+	}
+
+	public Integer getMatchMethod() {
+		return matchMethod;
+	}
+
+	public void setMatchMethod(Integer matchMethod) {
+		this.matchMethod = matchMethod;
+	}
+
+	public Integer getIsHexbin() {
+		return isHexbin;
+	}
+
+	public void setIsHexbin(Integer isHexbin) {
+		this.isHexbin = isHexbin;
+	}
+	@Override
+	public void initDefaultValue() {
+		// TODO Auto-generated method stub
+		super.initDefaultValue();
+		this.isHexbin = 0;
+	}
+	
+	
+	public Integer getCompileId() {
+		return compileId;
+	}
+	public void setCompileId(Integer compileId) {
+		this.compileId = compileId;
+	}
+
+	public static String getTablename() {
+		return tableName;
+	}
+
+	public String getRatelimit() {
+		return ratelimit;
+	}
+
+	public void setRatelimit(String ratelimit) {
+		this.ratelimit = ratelimit;
+	}
+	public Integer getAppCode() {
+		return appCode;
+	}
+	public void setAppCode(Integer appCode) {
+		this.appCode = appCode;
+	}
+	public Integer getSpecServiceId() {
+		return specServiceId;
+	}
+	public void setSpecServiceId(Integer specServiceId) {
+		this.specServiceId = specServiceId;
+	}
+	public String getCfgKeywords() {
+		return cfgKeywords;
+	}
+
+	public void setCfgKeywords(String cfgKeywords) {
+		this.cfgKeywords = cfgKeywords;
+	}
+
+	public String getAppName() {
+		return appName;
+	}
+
+	public void setAppName(String appName) {
+		this.appName = appName;
+	}
+
+	public Integer getBehavCode() {
+		return behavCode;
+	}
+
+	public void setBehavCode(Integer behavCode) {
+		this.behavCode = behavCode;
+	}
+	
+}

src/main/java/com/nis/domain/configuration/AppFeatureIndex.java

@@ -0,0 +1,197 @@
+/**
+ *@Title: CfgIndexInfo.java
+ *@Package com.nis.domain.restful 
+ *@Description 索引公共表
+ *@author dell
+ *@date 2018年5月17日 下午16:59:17
+ *@version  版本号
+ */
+package com.nis.domain.configuration;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.nis.domain.basics.AsnIpCfg;
+import com.nis.util.excel.ExcelField;
+
+
+/**
+ * @ClassName: CfgIndexInfo.java 
+ * @author (dell)
+ * @date 2018年5月17日 下午16:59:17
+ * @version V1.0
+ */
+public class AppFeatureIndex extends BaseCfg<AppFeatureIndex> {
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -8069201965300255275L;
+	private static final String tableName="app_feature_index";
+	private Integer appCode;//specific_service_cfg表一级节点的spec_service_code
+	@ExcelField(title="social_app",sort=3)
+	private String appName;
+	private Integer specServiceId;
+	private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code
+	private AppHttpCfg complexStrCfg;
+	private AppByteCfg strCfg;
+	private AppIpCfg ipCfg;
+	private List<AppIpCfg> ipPortList = new ArrayList();
+	private List<AppStringFeatureCfg> strList = new ArrayList();
+	private List<AppComplexFeatureCfg> complexList = new ArrayList();
+	private List<AppTcpCfg> numCfgList = new ArrayList();
+	protected Integer exprType ;
+	protected Integer matchMethod ;
+	protected Integer isHexbin;
+	private String cfgRegionType;
+	private String cfgRegionValue;
+	private String cfgRegionCode1;
+	private Integer isDrop;//
+	private Integer isLoop;
+	private Integer dropTime;//drop持续时间，默认180s，0-1800s
+	private Integer loopTime;//loop持续时间，默认180s，0-1800s
+	private Integer isRelation;
+	private Integer relationTime;//关联持续时间，默认10s，0-180s
+	public static String getTablename() {
+		return tableName;
+	}
+	public Integer getAppCode() {
+		return appCode;
+	}
+	public void setAppCode(Integer appCode) {
+		this.appCode = appCode;
+	}
+	public Integer getSpecServiceId() {
+		return specServiceId;
+	}
+	public void setSpecServiceId(Integer specServiceId) {
+		this.specServiceId = specServiceId;
+	}
+	public List<AppIpCfg> getIpPortList() {
+		return ipPortList;
+	}
+	public void setIpPortList(List<AppIpCfg> ipPortList) {
+		this.ipPortList = ipPortList;
+	}
+	public List<AppComplexFeatureCfg> getComplexList() {
+		return complexList;
+	}
+	public void setComplexList(List<AppComplexFeatureCfg> complexList) {
+		this.complexList = complexList;
+	}
+	public AppHttpCfg getComplexStrCfg() {
+		return complexStrCfg;
+	}
+	public void setComplexStrCfg(AppHttpCfg complexStrCfg) {
+		this.complexStrCfg = complexStrCfg;
+	}
+	public AppByteCfg getStrCfg() {
+		return strCfg;
+	}
+	public void setStrCfg(AppByteCfg strCfg) {
+		this.strCfg = strCfg;
+	}
+	public AppIpCfg getIpCfg() {
+		return ipCfg;
+	}
+	public void setIpCfg(AppIpCfg ipCfg) {
+		this.ipCfg = ipCfg;
+	}
+	public List<AppStringFeatureCfg> getStrList() {
+		return strList;
+	}
+	public void setStrList(List<AppStringFeatureCfg> strList) {
+		this.strList = strList;
+	}
+	public String getAppName() {
+		return appName;
+	}
+	public void setAppName(String appName) {
+		this.appName = appName;
+	}
+	public Integer getBehavCode() {
+		return behavCode;
+	}
+	public void setBehavCode(Integer behavCode) {
+		this.behavCode = behavCode;
+	}
+	public String getCfgRegionType() {
+		return cfgRegionType;
+	}
+	public void setCfgRegionType(String cfgRegionType) {
+		this.cfgRegionType = cfgRegionType;
+	}
+	public String getCfgRegionValue() {
+		return cfgRegionValue;
+	}
+	public void setCfgRegionValue(String cfgRegionValue) {
+		this.cfgRegionValue = cfgRegionValue;
+	}
+	public String getCfgRegionCode1() {
+		return cfgRegionCode1;
+	}
+	public void setCfgRegionCode1(String cfgRegionCode1) {
+		this.cfgRegionCode1 = cfgRegionCode1;
+	}
+	public List<AppTcpCfg> getNumCfgList() {
+		return numCfgList;
+	}
+	public void setNumCfgList(List<AppTcpCfg> numCfgList) {
+		this.numCfgList = numCfgList;
+	}
+	public Integer getExprType() {
+		return exprType;
+	}
+	public void setExprType(Integer exprType) {
+		this.exprType = exprType;
+	}
+	public Integer getMatchMethod() {
+		return matchMethod;
+	}
+	public void setMatchMethod(Integer matchMethod) {
+		this.matchMethod = matchMethod;
+	}
+	public Integer getIsHexbin() {
+		return isHexbin;
+	}
+	public void setIsHexbin(Integer isHexbin) {
+		this.isHexbin = isHexbin;
+	}
+	public Integer getIsDrop() {
+		return isDrop;
+	}
+	public void setIsDrop(Integer isDrop) {
+		this.isDrop = isDrop;
+	}
+	public Integer getIsLoop() {
+		return isLoop;
+	}
+	public void setIsLoop(Integer isLoop) {
+		this.isLoop = isLoop;
+	}
+	public Integer getDropTime() {
+		return dropTime;
+	}
+	public void setDropTime(Integer dropTime) {
+		this.dropTime = dropTime;
+	}
+	public Integer getLoopTime() {
+		return loopTime;
+	}
+	public void setLoopTime(Integer loopTime) {
+		this.loopTime = loopTime;
+	}
+	public Integer getIsRelation() {
+		return isRelation;
+	}
+	public void setIsRelation(Integer isRelation) {
+		this.isRelation = isRelation;
+	}
+	public Integer getRelationTime() {
+		return relationTime;
+	}
+	public void setRelationTime(Integer relationTime) {
+		this.relationTime = relationTime;
+	}
+
+}

src/main/java/com/nis/domain/configuration/AppHeaderCfg.java

@@ -0,0 +1,147 @@
+/**
+ *@Title: BaseStringConfig.java
+ *@Package com.nis.domain.restful 
+ *@Description TODO
+ *@author dell
+ *@date 2018年2月5日 下午5:26:02
+ *@version  版本号
+ */
+package com.nis.domain.configuration;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+import com.nis.util.excel.ExcelField;
+
+/**
+ * APP Header层头特征配置
+ * @author dell
+ *
+ */
+public class AppHeaderCfg extends BaseCfg<AppHeaderCfg> {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -5024131931108849299L;
+	private static final String tableName="app_layer_header_cfg";
+	@Expose
+	private Integer compileId;
+	@Expose
+	private String ratelimit;
+	private Integer appCode;//specific_service_cfg表一级节点的spec_service_code
+	private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code
+	private Integer specServiceId;
+	private String district;
+	private String cfgKeywords;
+	private String appName;
+
+	@Expose
+	@ExcelField(title="expression_type")
+	@SerializedName("exprType")
+	protected Integer exprType ;
+
+	@Expose
+	@ExcelField(title="match_method")
+	@SerializedName("matchMethod")
+	protected Integer matchMethod ;
+
+	@Expose
+	@ExcelField(title="whether_hexbinary")
+	@SerializedName("isHexbin")
+	protected Integer isHexbin;
+
+	public Integer getExprType() {
+		return exprType;
+	}
+
+	public void setExprType(Integer exprType) {
+		this.exprType = exprType;
+	}
+
+	public Integer getMatchMethod() {
+		return matchMethod;
+	}
+
+	public void setMatchMethod(Integer matchMethod) {
+		this.matchMethod = matchMethod;
+	}
+
+	public Integer getIsHexbin() {
+		return isHexbin;
+	}
+
+	public void setIsHexbin(Integer isHexbin) {
+		this.isHexbin = isHexbin;
+	}
+	@Override
+	public void initDefaultValue() {
+		// TODO Auto-generated method stub
+		super.initDefaultValue();
+		this.isHexbin = 0;
+	}
+	
+	
+	public Integer getCompileId() {
+		return compileId;
+	}
+	public void setCompileId(Integer compileId) {
+		this.compileId = compileId;
+	}
+
+	public static String getTablename() {
+		return tableName;
+	}
+
+	public String getRatelimit() {
+		return ratelimit;
+	}
+
+	public void setRatelimit(String ratelimit) {
+		this.ratelimit = ratelimit;
+	}
+	public Integer getAppCode() {
+		return appCode;
+	}
+	public void setAppCode(Integer appCode) {
+		this.appCode = appCode;
+	}
+	public Integer getSpecServiceId() {
+		return specServiceId;
+	}
+	public void setSpecServiceId(Integer specServiceId) {
+		this.specServiceId = specServiceId;
+	}
+
+	public String getDistrict() {
+		return district;
+	}
+
+	public void setDistrict(String district) {
+		this.district = district;
+	}
+
+	public String getCfgKeywords() {
+		return cfgKeywords;
+	}
+
+	public void setCfgKeywords(String cfgKeywords) {
+		this.cfgKeywords = cfgKeywords;
+	}
+
+	public String getAppName() {
+		return appName;
+	}
+
+	public void setAppName(String appName) {
+		this.appName = appName;
+	}
+
+	public Integer getBehavCode() {
+		return behavCode;
+	}
+
+	public void setBehavCode(Integer behavCode) {
+		this.behavCode = behavCode;
+	}
+	
+}

src/main/java/com/nis/domain/configuration/AppHttpCfg.java

@@ -0,0 +1,186 @@
+/**
+ *@Title: BaseStringConfig.java
+ *@Package com.nis.domain.restful 
+ *@Description TODO
+ *@author dell
+ *@date 2018年2月5日 下午5:26:02
+ *@version  版本号
+ */
+package com.nis.domain.configuration;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+import com.nis.util.excel.ExcelField;
+
+/**
+ * @Description: APP策略配置
+ * @author (dell)
+ * @date 2018年2月5日 下午5:26:02
+ * @version V1.0
+ */
+public class AppHttpCfg extends BaseCfg<AppHttpCfg> {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7528723915857911560L;
+	private static final String tableName="app_http_cfg";
+	@Expose
+	@ExcelField(title="cfg_id",sort=0)
+	private Integer compileId;
+	@Expose
+	private String ratelimit;
+	private Integer appCode;//specific_service_cfg表一级节点的spec_service_code
+	private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code
+	private Integer specServiceId;
+	@ExcelField(title="district",sort=3)
+	private String district;
+	@ExcelField(title="key_word",sort=4)
+	private String cfgKeywords;
+	@ExcelField(title="social_app",sort=2)
+	private String appName;
+
+	
+	/**
+	 * 表达式类型
+	 */
+	@Expose
+	@ExcelField(title="expression_type",dictType="EXPRESSION_TYPE",sort=7)
+	@SerializedName("exprType")
+	protected Integer exprType ;
+	/**
+	 * 匹配方式
+	 */
+	@Expose
+	@ExcelField(title="match_method",dictType="MATCH_METHOD",sort=8)
+	@SerializedName("matchMethod")
+	protected Integer matchMethod ;
+
+	@Expose
+	@SerializedName("isHexbin")
+	protected Integer isHexbin;
+	
+	
+	/**
+	 * 是否hex
+	 */
+	@ExcelField(title="is_hex",sort=5)
+	protected Integer isHex;
+	/**
+	 * 是否hex
+	 */
+	@ExcelField(title="is_case_insenstive",sort=6)
+	protected Integer isCaseInsenstive;
+	
+
+	public Integer getIsHex() {
+		return isHex;
+	}
+
+	public void setIsHex(Integer isHex) {
+		this.isHex = isHex;
+	}
+
+	public Integer getIsCaseInsenstive() {
+		return isCaseInsenstive;
+	}
+
+	public void setIsCaseInsenstive(Integer isCaseInsenstive) {
+		this.isCaseInsenstive = isCaseInsenstive;
+	}
+
+	public Integer getExprType() {
+		return exprType;
+	}
+
+	public void setExprType(Integer exprType) {
+		this.exprType = exprType;
+	}
+
+	public Integer getMatchMethod() {
+		return matchMethod;
+	}
+
+	public void setMatchMethod(Integer matchMethod) {
+		this.matchMethod = matchMethod;
+	}
+
+	public Integer getIsHexbin() {
+		return isHexbin;
+	}
+
+	public void setIsHexbin(Integer isHexbin) {
+		this.isHexbin = isHexbin;
+	}
+	@Override
+	public void initDefaultValue() {
+		// TODO Auto-generated method stub
+		super.initDefaultValue();
+		this.isHexbin = 0;
+	}
+	
+	
+	public Integer getCompileId() {
+		return compileId;
+	}
+	public void setCompileId(Integer compileId) {
+		this.compileId = compileId;
+	}
+
+	public static String getTablename() {
+		return tableName;
+	}
+
+	public String getRatelimit() {
+		return ratelimit;
+	}
+
+	public void setRatelimit(String ratelimit) {
+		this.ratelimit = ratelimit;
+	}
+	public Integer getAppCode() {
+		return appCode;
+	}
+	public void setAppCode(Integer appCode) {
+		this.appCode = appCode;
+	}
+	public Integer getSpecServiceId() {
+		return specServiceId;
+	}
+	public void setSpecServiceId(Integer specServiceId) {
+		this.specServiceId = specServiceId;
+	}
+
+	public String getDistrict() {
+		return district;
+	}
+
+	public void setDistrict(String district) {
+		this.district = district;
+	}
+
+	public String getCfgKeywords() {
+		return cfgKeywords;
+	}
+
+	public void setCfgKeywords(String cfgKeywords) {
+		this.cfgKeywords = cfgKeywords;
+	}
+
+	public String getAppName() {
+		return appName;
+	}
+
+	public void setAppName(String appName) {
+		this.appName = appName;
+	}
+
+	public Integer getBehavCode() {
+		return behavCode;
+	}
+
+	public void setBehavCode(Integer behavCode) {
+		this.behavCode = behavCode;
+	}
+	
+}