diff options
| author | wangxin <[email protected]> | 2019-06-21 10:35:55 +0800 |
|---|---|---|
| committer | wangxin <[email protected]> | 2019-06-21 10:35:55 +0800 |
| commit | 399396815fdad6726534731bbf1248a5423c7414 (patch) | |
| tree | 5a74c657f7ff4a71dd30f8e5641ae2528aecab53 | |
| parent | eab1a85554346dcf8a3e4433dca198887235537c (diff) | |
form表单注释HTTPS跟Intercept,恢复之前被注释的取消配置代码
| -rw-r--r-- | src/main/java/com/nis/web/service/BaseService.java | 4 | ||||
| -rw-r--r-- | src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index d0da93fa9..8ef57688c 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -3537,12 +3537,12 @@ public abstract class BaseService { maatBean.setVersion(Constants.MAAT_VERSION); maatBean.setOpAction(Constants.UPDATE_ACTION); } - }/*else if(cfgIndexInfo.getIsValid().equals(Constants.VALID_NO)&&cfgIndexInfo.getIsAudit().equals(Constants.AUDIT_NOT_YES)){//生效的配置 置为了失效 + }else if(userRgionMap.isEmpty()&&cfgIndexInfo.getIsValid().equals(Constants.VALID_NO)&&cfgIndexInfo.getIsAudit().equals(Constants.AUDIT_NOT_YES)){//生效的配置,组清空了，在方法已经将属性只为无效，生成取消配置maat maatCfg.setCompileId(cfgIndexInfo.getCompileId()); maatCfg.setServiceId(cfgIndexInfo.getServiceId()); maatCfg.setIsValid(0);//无效 cancelConfigCompileList.add(maatCfg); - }*/ + } if(cancelConfigCompileList.size()>0&&CollectionUtils.isEmpty(cancelMaatBean.getConfigCompileList())){ cancelMaatBean.setConfigCompileList(cancelConfigCompileList); cancelMaatBean.setAuditTime(cfgIndexInfo.getAuditTime()); diff --git a/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp b/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp index 4b7f38348..e98e939cb 100644 --- a/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp @@ -340,8 +340,8 @@ var delContent = function(contentClassName, addBtnClassName) { <label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label> <div class="col-md-6"> <select name="userRegion1" data-live-search="true" class="selectpicker form-control"> - <option value="https" <c:if test="${_cfg.userRegion1 eq 'https'}">selected</c:if>><spring:message code="HTTPS"/></option> - <option value="intercept" <c:if test="${_cfg.userRegion1 eq 'intercept'}">selected</c:if>> <spring:message code="intercept"/></option> + <%--<option value="https" <c:if test="${_cfg.userRegion1 eq 'https'}">selected</c:if>><spring:message code="HTTPS"/></option> + <option value="intercept" <c:if test="${_cfg.userRegion1 eq 'intercept'}">selected</c:if>> <spring:message code="intercept"/></option>--%> <option value="http" <c:if test="${_cfg.userRegion1 eq 'http'}">selected</c:if>> <spring:message code="HTTP"/></option> </select> </div> |