diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java index a31e3418f..6ebeb7d02 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java @@ -78,7 +78,7 @@ public class PxyObjKeyringController extends BaseController { MultipartFile privateKeyFileI, MultipartFile publicKeyFileI, RedirectAttributes redirectAttributes){ - File file = null; + File file = null; try{ if(publicKeyFileI != null) { // 获取公钥信息 diff --git a/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml b/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml index bfc5eff4b..fa9e45fa3 100644 --- a/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml @@ -247,6 +247,9 @@ cfg_desc = #{cfgDesc,jdbcType=VARCHAR}, + + cfg_type = #{cfgType,jdbcType=VARCHAR}, + compile_Id = #{compileId,jdbcType=VARCHAR}, diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 034e5ddbd..93faa095e 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1118,8 +1118,8 @@ public_key_file=Public Key File expire_after=Expire After issuer=Certificate Issuer certificate_subject=Certificate Subject -not_Before_Time=Certificate Start Time -not_After_Time=Certificate End Time +not_before_time=Certificate Start Time +not_after_time=Certificate End Time certificate_validity=Certificate Validity Period end_entity=End-entity Certificate header=Header diff --git a/src/main/resources/sql/truncate_tables.sql b/src/main/resources/sql/truncate_tables.sql index c20906246..be594f2cf 100644 --- a/src/main/resources/sql/truncate_tables.sql +++ b/src/main/resources/sql/truncate_tables.sql @@ -48,4 +48,5 @@ DELETE FROM p2p_keyword_cfg; DELETE FROM policy_group_info; DELETE FROM pptp_url_cfg; DELETE FROM proxy_file_strategy_cfg; -DELETE FROM ssl_keyword_cfg; \ No newline at end of file +DELETE FROM ssl_keyword_cfg; +DELETE FROM pxy_obj_keyring; \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp index 770518ed7..eb8e83681 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp @@ -237,14 +237,14 @@ var switchKeyringType=function(){
- +
hidden">
- +
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp index 79296b282..46d7897ca 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp @@ -92,7 +92,7 @@
-
+ <%--
@@ -103,8 +103,8 @@
-
-
+
--%> + <%--
@@ -115,7 +115,7 @@
-
+
--%>