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

develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	证书颁发机构及 吊销列表功能提交

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

@@ -29,7 +29,7 @@ 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=2)
+	@ExcelField(title="social_app",sort=3)
 	private String appName;
 	private Integer specServiceId;
 	private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code

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

@@ -26,28 +26,64 @@ public class AppStringFeatureCfg extends BaseCfg<AppStringFeatureCfg> {
 	private static final long serialVersionUID = 8677301658049443801L;
 	private static final String tableName="app_string_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;
 	private String bytes;
+	@ExcelField(title="URL",sort=201)
 	private String cfgKeywords;
 	private String appName;
 
+	/**
+	 * 表达式类型
+	 */
 	@Expose
-	@ExcelField(title="expression_type")
+	@ExcelField(title="expression_type",dictType="EXPRESSION_TYPE",sort=202)
 	@SerializedName("exprType")
 	protected Integer exprType ;
-
+	/**
+	 * 匹配方式
+	 */
 	@Expose
-	@ExcelField(title="match_method")
+	@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
-	@ExcelField(title="whether_hexbinary")
 	@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;

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

@@ -24,6 +24,7 @@ public class AppTopicDomainCfg extends BaseCfg<AppTopicDomainCfg> {
 	
 	private static final String tableName="app_topic_domain_cfg";
 	@Expose
+	@ExcelField(title="cfg_id",sort=0)
 	private Integer compileId;
 	@Expose
 	private String ratelimit;

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

@@ -72,7 +72,7 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	 * GK类型
 	 */
 	@Expose
-	@ExcelField(title="action",dictType="SERVICE_ACTION",sort=2)
+	@ExcelField(title="block_type",dictType="SERVICE_ACTION",sort=2)
 	protected Integer action;
 	/**
 	 * 有效标识

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

@@ -0,0 +1,40 @@
+package com.nis.domain.configuration;
+
+
+/**
+ * 可信证书
+ * @author ddm
+ *
+ */
+public class PxyObjTrustedCaCert extends BaseCfg<PxyObjTrustedCaCert> {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -2720862431960415564L;
+	private String indexTable="pxy_obj_trusted_ca_cert";
+	private String issuer; //颁发者
+	private String certFile; 
+	public String getIssuer() {
+		return issuer;
+	}
+	public void setIssuer(String issuer) {
+		this.issuer = issuer;
+	}
+	
+	public String getCertFile() {
+		return certFile;
+	}
+	public void setCertFile(String certFile) {
+		this.certFile = certFile;
+	}
+	
+	public String getIndexTable() {
+		return indexTable;
+	}
+	public void setIndexTable(String indexTable) {
+		this.indexTable = indexTable;
+	}
+	
+	
+}

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

@@ -0,0 +1,49 @@
+package com.nis.domain.configuration;
+
+import java.util.Date;
+
+import com.nis.util.excel.ExcelField;
+
+/**
+ * 吊销证书列表
+ * @author ddm
+ *
+ */
+public class PxyObjTrustedCaCrl extends BaseCfg<PxyObjTrustedCaCrl> {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -2720862431960415564L;
+	private String indexTable="pxy_obj_trusted_ca_crl";
+	private String issuer; //颁发者
+	private Integer certId; //证书Id 默认证书为空
+	private String crlFile; //crlFile
+	public String getIssuer() {
+		return issuer;
+	}
+	public void setIssuer(String issuer) {
+		this.issuer = issuer;
+	}
+	
+	public String getCrlFile() {
+		return crlFile;
+	}
+	public void setCrlFile(String crlFile) {
+		this.crlFile = crlFile;
+	}
+	public Integer getCertId() {
+		return certId;
+	}
+	public void setCertId(Integer certId) {
+		this.certId = certId;
+	}
+	public String getIndexTable() {
+		return indexTable;
+	}
+	public void setIndexTable(String indexTable) {
+		this.indexTable = indexTable;
+	}
+	
+	
+}