diff --git a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java index 7bedd441b..e69b406c9 100644 --- a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java @@ -1262,7 +1262,13 @@ public class AppCfgController extends BaseController { entity.setAppCode(specificService.getSpecServiceCode()); } appCfgService.saveOrUpdateAppSslCfg(entity); - addMessage(redirectAttributes, "success", "save_success"); + //配置仅保存 + if(StringUtil.isEmpty(entity.getIsValid()) || entity.getIsValid()!=1) { + addMessage(redirectAttributes, "success", "save_success"); + }else { + //配置直接生效 + addMessage(redirectAttributes, "success", "audit_success"); + } } catch (Exception e) { e.printStackTrace(); logger.error("saveAppSslCfg failed", e); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java index 1399b9b3d..4fa813bfc 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java @@ -311,7 +311,13 @@ public class AvController extends BaseController { } avCfgService.saveOrUpdateAvFileSample(entity, srcFile); - addMessage(redirectAttributes, "success", "save_success"); + //配置仅保存 + if(StringUtil.isEmpty(entity.getIsValid()) || entity.getIsValid()!=1) { + addMessage(redirectAttributes, "success", "save_success"); + }else { + //配置直接生效 + addMessage(redirectAttributes, "success", "audit_success"); + } } catch (Exception e) { logger.error("文件上传失败", e); e.printStackTrace(); diff --git a/src/main/java/com/nis/web/service/configuration/AppCfgService.java b/src/main/java/com/nis/web/service/configuration/AppCfgService.java index fe9376671..d41f0c39f 100644 --- a/src/main/java/com/nis/web/service/configuration/AppCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AppCfgService.java @@ -960,6 +960,10 @@ public class AppCfgService extends BaseService { public void saveOrUpdateAppSslCfg(AppSslCertCfg entity) throws Exception { // 设置区域运营商信息 setAreaEffectiveIds(entity); + int isValid=0; + if(!StringUtil.isEmpty(entity.getIsValid()) && entity.getIsValid()==1) { + isValid=1; + } if (entity.getCfgId() == null) { Integer compileId = 0; try { @@ -1011,6 +1015,12 @@ public class AppCfgService extends BaseService { } } + if(isValid==1) { + entity.setIsAudit(1); + entity.setIsValid(1); + entity.setAuditTime(new Date()); + auditAppSslCfg(entity, entity.getIsAudit()); + } } diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp index 946e7af20..6946a33ba 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp @@ -95,6 +95,8 @@ function changeDistrict(obj){ + + @@ -434,18 +436,36 @@ function changeDistrict(obj){ <%-- <%@include file="/WEB-INF/include/form/basicInfo.jsp" %> --%>
-
-
-
-
- - -
-
-
-
-
-
+
+
+
+
+ + + + + + + + + + + + + + +
+
+
+
+
+