From 96e8493509168673aeaf07272f1dda1d0f522c49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=B5=E5=86=AC=E6=A2=85?= <duandongmei@zdjizhi.com>
Date: Mon, 15 Apr 2019 16:57:34 +0800
Subject: [PATCH] =?UTF-8?q?IP=E5=9C=B0=E5=9D=80=E5=A2=9E=E5=8A=A0=E7=83=AD?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=92=8C=E9=85=8D=E7=BD=AE=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E7=94=9F=E6=95=88=E5=8A=9F=E8=83=BD=EF=BC=9B?=
 =?UTF-8?q?=20http=E8=AF=B7=E6=B1=82=E7=9A=84=E5=BC=82=E5=B8=B8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0logger.error=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/util/ConfigServiceUtil.java  | 20 ++++++++++++++---
 .../WEB-INF/views/cfg/ipaddr/ipForm.jsp       | 22 ++++++++++++++++---
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/nis/util/ConfigServiceUtil.java b/src/main/java/com/nis/util/ConfigServiceUtil.java
index bb44aca09..7ad8c9b30 100644
--- a/src/main/java/com/nis/util/ConfigServiceUtil.java
+++ b/src/main/java/com/nis/util/ConfigServiceUtil.java
@@ -157,6 +157,7 @@ public class ConfigServiceUtil {
 			long end=System.currentTimeMillis();
 			logger.warn("get ids finish,cost:"+(end-start));
 		} catch (Exception e) {
+			logger.error("getId()",e);
 			throw e;
 		}finally {
 			if (response != null) {
@@ -200,6 +201,7 @@ public class ConfigServiceUtil {
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			}
 		} catch (Exception e) {
+			logger.error("postMaatCfg()",e);
 			throw e;
 		}finally {
 			if (response != null) {
@@ -241,6 +243,7 @@ public class ConfigServiceUtil {
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			}
 		} catch (Exception e) {
+			logger.error("postCallbackCfg()",e);
 			throw e;
 		}finally {
 			if (response != null) {
@@ -284,6 +287,7 @@ public class ConfigServiceUtil {
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>"+result);
 			}
 		} catch (Exception e) {
+			logger.error("postFileCfg()",e);
 			throw e;
 		} finally {
 			if (response != null) {
@@ -330,6 +334,7 @@ public class ConfigServiceUtil {
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			}
 		} catch (Exception e) {
+			logger.error("delete()",e);
 			throw e;
 		} finally {
 			if (response != null) {
@@ -378,6 +383,7 @@ public class ConfigServiceUtil {
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			}
 		} catch (Exception e) {
+			logger.error("put()",e);
 			throw e;
 		}finally {
 			if (response != null) {
@@ -414,6 +420,7 @@ public class ConfigServiceUtil {
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			} 
 		} catch (Exception e) {
+			logger.error("patch()",e);
 			throw e;
 		} 
 		
@@ -455,6 +462,7 @@ public class ConfigServiceUtil {
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			}
 		} catch (Exception e) {
+			logger.error("getFileDigest()",e);
 			throw e;
 		} finally {
 			if (response != null) {
@@ -501,6 +509,7 @@ public class ConfigServiceUtil {
 			long end=System.currentTimeMillis();
 			logger.warn("postGroupReuseSources end,cost:"+(end-start));
 		} catch (Exception e) {
+			logger.error("postGroupReuseSources()",e);
 			throw e;
 		} finally {
 			if (response != null) {
@@ -559,6 +568,7 @@ public class ConfigServiceUtil {
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			}
 		} catch (Exception e) {
+			logger.error("getReport()",e);
 			throw e;
 		} finally {
 			if (response != null) {
@@ -617,6 +627,7 @@ public class ConfigServiceUtil {
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			}
 		} catch (Exception e) {
+			logger.error("getReport()",e);
 			throw e;
 		} finally {
 			if (response != null) {
@@ -679,6 +690,7 @@ public class ConfigServiceUtil {
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			}
 		} catch (Exception e) {
+			logger.error("getReport()",e);
 			throw e;
 		} finally {
 			if (response != null) {
@@ -744,6 +756,7 @@ public class ConfigServiceUtil {
 				
 			}
 		} catch (Exception e) {
+			logger.error("getCGI()",e);
 			throw e;
 		} finally {
 			if (response != null) {
@@ -809,7 +822,7 @@ public class ConfigServiceUtil {
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
+			logger.error("configSyncCmd()",e);
 			throw e;
 		}finally {
 			if (response != null) {
@@ -852,7 +865,7 @@ public class ConfigServiceUtil {
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
+			logger.error("configSyncStatus()",e);
 			throw e;
 		}finally {
 			if (response != null) {
@@ -899,7 +912,7 @@ public class ConfigServiceUtil {
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
+			logger.error("configSync()",e);
 			throw e;
 		}finally {
 			if (response != null) {
@@ -940,6 +953,7 @@ public class ConfigServiceUtil {
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			}
 		} catch (Exception e) {
+			logger.error("configStatusUpdate()",e);
 			throw e;
 		} 
 		
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
index 1ee5a1d2d..3fa087097 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
@@ -440,6 +440,8 @@ var showHideIPSECProtocol=function(obj){
 							<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
 							<input type="hidden" name="compileId" value="${_cfg.compileId}">
 							<input type="hidden" name="functionId" value="${_cfg.functionId}">
+							<input type="hidden" name="isValid" value="${_cfg.isValid}">
+							<input type="hidden" name="isAudit" value="${_cfg.isAudit}">
 							<input type="hidden" id="serviceId" name="serviceId"
 								value="${_cfg.serviceId}">
 							<c:forEach items="${regionList}" var="region">
@@ -744,9 +746,23 @@ var showHideIPSECProtocol=function(obj){
 															<div class="col-md-6">
 																<div class="row">
 																	<div class="col-md-offset-3 col-md-8">
-																		<button id="save" type="submit" class="btn green">
-																			<spring:message code="submit" />
-																		</button>
+																		<c:set var="auditPermission" value="false"></c:set>
+																		<!-- 拥有配置新增直接生效的功能权限 -->
+																		<shiro:hasPermission name="save:audit:permission">
+																			<c:set var="auditPermission" value="true"></c:set>
+																		</shiro:hasPermission>
+																		<c:choose>
+																			<c:when test="${!(fns:getUser().isAdmin()) && auditPermission}">
+																				<button id="audit" type="submit" class="btn green">
+																				<spring:message code="submit" />
+																			</button>
+																			</c:when>
+																			<c:otherwise>
+																				<button id="save" type="submit" class="btn green">
+																					<spring:message code="submit" />
+																				</button>
+																			</c:otherwise>
+																		</c:choose>
 																		<button id="cancel" type="button" class="btn default">
 																			<spring:message code="cancel" />
 																		</button>