gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
develop

Conflicts:
	src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java
	证书增加CN和SAN列，修改时间类型
	common.js去掉无用字符
	国际化增加cert_not_match_domain
This commit is contained in:
duandongmei
2018-11-06 11:36:31 +08:00
parent 295c45f3b7 554fd2a01e
commit e579e0d617
119 changed files with 2944 additions and 1579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/nis/domain/configuration/PxyObjKeyring.java
View File

@@ -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() {