1.修改代理的拦截策略，将IP与域名拦截整合为一个serviceId与functionId，可组合配置；

2.修改部分界面判断登录用户是否为超级用户的判断依据。

src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp

@@ -26,6 +26,27 @@
 	</div>
 </div>
 <br>
+<!-- 域名拦截增加拦截强度 -->
+<c:if test="${_cfg.functionId eq 200}">
+	<div class="row hidden intensity">
+		<div class="col-md-6">
+			<div class="form-group">
+				<label class="control-label col-md-3"><font color="red">*</font>
+						<spring:message code="intercept_intensity" />
+				</label>
+				<div class="col-md-6">
+					<select name="userRegion5"
+					class="selectpicker show-tick form-control required">
+						<c:forEach items="${fns:getDictList('INTERCEPT_DOMAIN_INTENSITY')}" var="intensityC">
+							<option value="${intensityC.itemCode}" <c:if test="${_cfg.userRegion5==intensityC.itemCode || (empty _cfg.userRegion5 && intensityC.itemCode eq 1)}">selected</c:if>><spring:message code="${intensityC.itemValue}"/></option>
+						</c:forEach>
+					</select>
+				</div>
+				<div for="userRegion5"></div>
+			</div>
+		</div>
+	</div>
+</c:if>
 <c:if test="${!empty region.configDistrict }">
 	<div class="row">
 		<div class="col-md-6">
@@ -85,7 +106,7 @@
 			<!-- 此配置的关键词可以输入多个关键词 -->
 			<c:if test="${region.configMultiKeywords eq 1}">
 				<div class="col-md-6">
-					<input class="form-control required tags" type="text" id="tags_${tabName}"
+					<input class="form-control required tags" type="text" id="tags_${tabName}${status.index}"
 						name="${cfgName}.cfgKeywords"
 						value="${cfg.cfgKeywords}">
 				</div>