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

develop

Conflicts:
	src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java
	证书增加CN和SAN列，修改时间类型
	common.js去掉无用字符
	国际化增加cert_not_match_domain

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

@@ -22,7 +22,7 @@ public class PolicyGroupInfo extends BaseCfg<PolicyGroupInfo> implements Seriali
 	private Integer groupType;
 	private Integer serviceGroupId;
 	private String description;
-	private Integer asnNo;
+	private Long asnNo;
 	
 	public Integer getServiceGroupId() {
 		return serviceGroupId;
@@ -66,10 +66,10 @@ public class PolicyGroupInfo extends BaseCfg<PolicyGroupInfo> implements Seriali
 	public void setDescription(String description) {
 		this.description = description;
 	}
-	public Integer getAsnNo() {
+	public Long getAsnNo() {
 		return asnNo;
 	}
-	public void setAsnNo(Integer asnNo) {
+	public void setAsnNo(Long asnNo) {
 		this.asnNo = asnNo;
 	}
 	

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

@@ -43,7 +43,14 @@ public class BaseStringCfg<T> extends BaseCfg<T> {
 	protected Integer appCode;//仅用于copy属性使用
 	protected Integer behavCode;//仅用于copy属性使用
 	protected Integer specServiceId;//仅用于copy属性使用
+	protected String domain;//仅用于copy属性使用
 	
+	public String getDomain() {
+		return domain;
+	}
+	public void setDomain(String domain) {
+		this.domain = domain;
+	}
 	public Integer getAppCode() {
 		return appCode;
 	}

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

@@ -29,13 +29,28 @@ public class PxyObjKeyring extends BaseCfg<PxyObjKeyring> {
 	@ExcelField(title="issuer",sort=6)
 	private String issuer;
 	@ExcelField(title="not_before_time",sort=8)
-	private Date notBeforeTime;
+	private String notBeforeTime;
 	@ExcelField(title="not_after_time",sort=9)
-	private Date notAfterTime;
+	private String notAfterTime;
 	@ExcelField(title="certificate_subject",sort=7)
 	private String subject;
 	@ExcelField(title="keyring_name",sort=1)
 	private String keyringName;
+	private String cn;
+	private String altName;
+	
+	public String getCn() {
+		return cn;
+	}
+	public String getAltName() {
+		return altName;
+	}
+	public void setCn(String cn) {
+		this.cn = cn;
+	}
+	public void setAltName(String altName) {
+		this.altName = altName;
+	}
 	
 	
 	public String getKeyringName() {
@@ -86,16 +101,16 @@ public class PxyObjKeyring extends BaseCfg<PxyObjKeyring> {
 	public void setIssuer(String issuer) {
 		this.issuer = issuer;
 	}
-	public Date getNotAfterTime() {
+	public String getNotAfterTime() {
 		return notAfterTime;
 	}
-	public Date getNotBeforeTime() {
+	public String getNotBeforeTime() {
 		return notBeforeTime;
 	}
-	public void setNotAfterTime(Date notAfterTime) {
+	public void setNotAfterTime(String notAfterTime) {
 		this.notAfterTime = notAfterTime;
 	}
-	public void setNotBeforeTime(Date notBeforeTime) {
+	public void setNotBeforeTime(String notBeforeTime) {
 		this.notBeforeTime = notBeforeTime;
 	}
 	public String getSubject() {

src/main/java/com/nis/domain/configuration/template/AppDomainTemplate.java

@@ -0,0 +1,58 @@
+/**
+ *@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.template;
+
+import com.nis.util.excel.ExcelField;
+
+/**
+ * @Description: excel导入字符串类配置
+ */
+public class AppDomainTemplate {
+	private String cfgDesc;
+	private String cfgKeywords;
+	private Integer matchMethod ;
+	private Integer isHex;
+	private Integer isCaseInsenstive;
+	
+	@ExcelField(title="config_describe",align=2,sort=1)
+	public String getCfgDesc() {
+		return cfgDesc;
+	}
+	public void setCfgDesc(String cfgDesc) {
+		this.cfgDesc = cfgDesc;
+	}
+	@ExcelField(title="domain_name",sort=2)
+	public String getCfgKeywords() {
+		return cfgKeywords;
+	}
+	public void setCfgKeywords(String cfgKeywords) {
+		this.cfgKeywords = cfgKeywords;
+	}
+	@ExcelField(title="match_method",dictType="MATCH_METHOD",sort=13)
+	public Integer getMatchMethod() {
+		return matchMethod;
+	}
+	public void setMatchMethod(Integer matchMethod) {
+		this.matchMethod = matchMethod;
+	}
+	@ExcelField(title="is_hex",dictType="IS_HEX",sort=14)
+	public Integer getIsHex() {
+		return isHex;
+	}
+	public void setIsHex(Integer isHex) {
+		this.isHex = isHex;
+	}
+	@ExcelField(title="is_case_insenstive",dictType="CASE_INSENSTIVE",sort=15)
+	public Integer getIsCaseInsenstive() {
+		return isCaseInsenstive;
+	}
+	public void setIsCaseInsenstive(Integer isCaseInsenstive) {
+		this.isCaseInsenstive = isCaseInsenstive;
+	}
+}

src/main/java/com/nis/domain/dashboard/NtcRadiusReport.java

@@ -0,0 +1,140 @@
+package com.nis.domain.dashboard;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.google.gson.annotations.SerializedName;
+import com.wordnik.swagger.annotations.ApiModelProperty;
+
+public class NtcRadiusReport implements Serializable{
+	
+	private static final long serialVersionUID = 7635016645942704971L;
+	@JsonInclude(value = Include.NON_NULL)
+	@ApiModelProperty(value = "接入IP", required = true)
+	protected String nasIp;
+	@JsonInclude(value = Include.NON_NULL)
+	@ApiModelProperty(value = "用户名", required = true)
+	protected String account;
+	@JsonInclude(value = Include.NON_NULL)
+	@ApiModelProperty(value = "次数", required = true)
+	protected Long num;
+	@JsonInclude(value = Include.NON_NULL)
+	@ApiModelProperty(value = "统计时间", required = true)
+	protected String reportTime;
+
+	/**
+	 * 业务类型：1:用户名和接口IP列表 2:根据用户，统计IP变化趋势 3：IP根据，统计用户变化趋势
+	 */
+	protected String searchBusinessType = "1";
+	@SerializedName("searchReportStartTime")
+	protected String searchFoundStartTime;
+	@SerializedName("searchReportEndTime")
+	protected String searchFoundEndTime;
+	protected Long searchReportStartTimeCluster;
+	protected Long searchReportEndTimeCluster;
+
+	protected String searchNasIp;
+	protected String searchAccount;
+	protected String groupType;
+
+	public String getNasIp() {
+		return nasIp;
+	}
+
+	public void setNasIp(String nasIp) {
+		this.nasIp = nasIp;
+	}
+
+	public String getAccount() {
+		return account;
+	}
+
+	public void setAccount(String account) {
+		this.account = account;
+	}
+
+	public Long getNum() {
+		return num;
+	}
+
+	public void setNum(Long num) {
+		this.num = num;
+	}
+
+	public String getReportTime() {
+		return reportTime;
+	}
+
+	public void setReportTime(String reportTime) {
+		this.reportTime = reportTime;
+	}
+
+	public String getSearchBusinessType() {
+		return searchBusinessType;
+	}
+	@JsonIgnore
+	public void setSearchBusinessType(String searchBusinessType) {
+		this.searchBusinessType = searchBusinessType;
+	}
+	@JsonIgnore
+	public String getSearchFoundStartTime() {
+		return searchFoundStartTime;
+	}
+
+	public void setSearchFoundStartTime(String searchFoundStartTime) {
+		this.searchFoundStartTime = searchFoundStartTime;
+	}
+	@JsonIgnore
+	public String getSearchFoundEndTime() {
+		return searchFoundEndTime;
+	}
+
+	public void setSearchFoundEndTime(String searchFoundEndTime) {
+		this.searchFoundEndTime = searchFoundEndTime;
+	}
+
+	@JsonIgnore
+	public Long getSearchReportStartTimeCluster() {
+		return searchReportStartTimeCluster;
+	}
+
+	public void setSearchReportStartTimeCluster(
+			Long searchReportStartTimeCluster) {
+		this.searchReportStartTimeCluster = searchReportStartTimeCluster;
+	}
+	@JsonIgnore
+	public Long getSearchReportEndTimeCluster() {
+		return searchReportEndTimeCluster;
+	}
+
+	public void setSearchReportEndTimeCluster(Long searchReportEndTimeCluster) {
+		this.searchReportEndTimeCluster = searchReportEndTimeCluster;
+	}
+	@JsonIgnore
+	public String getSearchNasIp() {
+		return searchNasIp;
+	}
+
+	public void setSearchNasIp(String searchNasIp) {
+		this.searchNasIp = searchNasIp;
+	}
+	@JsonIgnore
+	public String getSearchAccount() {
+		return searchAccount;
+	}
+
+	public void setSearchAccount(String searchAccount) {
+		this.searchAccount = searchAccount;
+	}
+	@JsonIgnore
+	public String getGroupType() {
+		return groupType;
+	}
+	
+	public void setGroupType(String groupType) {
+		this.groupType = groupType;
+	}
+
+}

src/main/java/com/nis/domain/specific/ConfigGroupInfo.java

@@ -16,12 +16,12 @@ public class ConfigGroupInfo {
 	private Integer groupType;
 	@ExcelField(title="cfg_id",sort=301)
 	private Integer compileId;
-	private Integer asnId;
+	private Long asnId;
 	
-	public Integer getAsnId() {
+	public Long getAsnId() {
 		return asnId;
 	}
-	public void setAsnId(Integer asnId) {
+	public void setAsnId(Long asnId) {
 		this.asnId = asnId;
 	}
 	public Integer getCompileId() {