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

IP地址增加热修改和配置新增直接生效功能；

Browse Source 
http请求的异常增加logger.error打印
This commit is contained in:
段冬梅
2019-04-15 16:57:34 +08:00
parent faad92ed0d
commit 96e8493509
2 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/nis/util/ConfigServiceUtil.java
View File

@@ -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;
}

22
src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
View File

@@ -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>