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

Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

Browse Source
This commit is contained in:
DuanDongmei
2018-12-05 16:26:21 +08:00
parent efe7423167 7ca1f7c7a2
commit 0f547a4771
17 changed files with 93 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/nis/web/controller/configuration/maintenance/IpAddrPoolController.java
View File

@@ -164,26 +164,6 @@ public class IpAddrPoolController extends BaseController{
return true;
}
/**
* 校验地址池是否被策略引用
* @param addrPoolIds
* @param request
* @param response
* @return
*/
@ResponseBody
@RequestMapping(value = {"/ajaxIsUsed"})
public boolean ajaxIsUsed(String addrPoolIds, HttpServletRequest request, HttpServletResponse response){
for (String addrPoolId : addrPoolIds.split(",")) {
List<BaseIpCfg> ipList = ipCfgService.checkAddrPoolIsUsed(addrPoolId);
if(ipList != null && ipList.size() > 0){
return false;
}
}
return true;
}
@ResponseBody
@RequestMapping(value = {"/getCGIInfo"})
public Map<String,Object> getUserInfo(Integer addrPoolId,String cmd,HttpServletRequest request,HttpServletResponse response){

21
src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java
View File

@@ -258,6 +258,27 @@ public class IpMultiplexController extends CommonController {
return addrPoolsNew;
}
/**
* 校验地址池是否被策略引用
* @param addrPoolIds
* @param request
* @param response
* @return
*/
@ResponseBody
@RequestMapping(value = {"/ajaxIsUsed"})
public boolean ajaxIsUsed(String addrPoolIds, HttpServletRequest request, HttpServletResponse response){
for (String addrPoolId : addrPoolIds.split(",")) {
List<IpReusePolicyCfg> ipList = ipMultiplexService.checkAddrPoolIsUsed(addrPoolId);
if(ipList != null && ipList.size() > 0){
return false;
}
}
return true;
}
@RequestMapping(value = {"/dnatPolicyList"})
public String dnatPolicyList(String cfgName,Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) {
this._ipList(cfgName,model, cfg, request, response);

5
src/main/java/com/nis/web/dao/configuration/IpCfgDao.java
View File

@@ -46,8 +46,5 @@ public interface IpCfgDao extends CrudDao<BaseIpCfg>{
public void updateCfgValid(BaseCfg entity);
public void auditCfg(BaseCfg entity);
public List<CfgIndexInfo> getIpCfgList(CfgIndexInfo entity);
// 校验地址池是否被策略引用
public List<BaseIpCfg> checkAddrPoolIsUsed(@Param("addrPoolId")String addrPoolId);
}

10
src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
View File

@@ -1143,14 +1143,4 @@
</choose>
</select>
<select id="checkAddrPoolIsUsed" resultMap="BaseIpMap">
SELECT
<include refid="BaseIpCfg_Column_List_with_id" />
FROM
ip_port_cfg
WHERE
is_valid != -1 AND
ir_type IS NOT NULL AND
user_region2 = #{addrPoolId,jdbcType=VARCHAR}
</select>
</mapper>

3
src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.java
View File

@@ -21,5 +21,8 @@ public interface IpMultiplexDao extends CrudDao<IpMultiplexDao>{
void updatePolicyCfg(IpReusePolicyCfg entity);
String getUserType(@Param("userName")String userName);
// 校验地址池是否被引用
List<IpReusePolicyCfg> checkAddrPoolIsUsed(@Param("addrPoolId")String addrPoolId);
}

9
src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml
View File

@@ -311,4 +311,13 @@
WHERE cfg_id = #{cfgId,jdbcType=BIGINT}
</update>
<select id="checkAddrPoolIsUsed" resultMap="policyMap">
SELECT
<include refid="policyColumns"/>
FROM
ip_reuse_policy_cfg r
WHERE
r.addr_pool_id = #{addrPoolId} AND r.is_valid != -1
</select>
</mapper>

4
src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
View File

@@ -1578,13 +1578,13 @@ public class ConfigSynchronizationService extends BaseService{
list = configSynchronizationDao.getPxyObjTrustedCertCfgList(entity);
for(int i=0;i<list.size();i++){
PxyObjTrustedCaCert cfg = (PxyObjTrustedCaCert) list.get(i);
newList.add(convertCallBackProxyObjTrustedCa(cfg,null));
newList.addAll(convertCallBackProxyObjTrustedCa(cfg,null));
}
}else if(className.equals("PxyObjTrustedCaCrl")){
list = configSynchronizationDao.getPxyObjTrustedCrlCfgList(entity);
for(int i=0;i<list.size();i++){
PxyObjTrustedCaCrl cfg = (PxyObjTrustedCaCrl) list.get(i);
newList.add(convertCallBackProxyObjTrustedCa(null,cfg));
newList.addAll(convertCallBackProxyObjTrustedCa(null,cfg));
}
}else if(className.equals("DnsResStrategy")){
list = configSynchronizationDao.getDnsStrategyList(entity);

8
src/main/java/com/nis/web/service/configuration/IpCfgService.java
View File

@@ -932,12 +932,4 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
return page;
}
/**
* 校验地址池是否被策略引用
* @param addrPoolId
* @return
*/
public List<BaseIpCfg> checkAddrPoolIsUsed(String addrPoolId) {
return ipCfgDao.checkAddrPoolIsUsed(addrPoolId);
}
}

10
src/main/java/com/nis/web/service/configuration/IpMultiplexService.java
View File

@@ -15,7 +15,6 @@ import org.springframework.transaction.annotation.Transactional;
import com.beust.jcommander.internal.Lists;
import com.nis.domain.Page;
import com.nis.domain.configuration.IpReusePolicyCfg;
import com.nis.domain.configuration.UserManage;
import com.nis.domain.maat.ToMaatResult;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil;
@@ -192,4 +191,13 @@ public class IpMultiplexService extends BaseService{
}
}
/**
* 校验地址池是否被策略引用
* @param addrPoolId
* @return
*/
public List<IpReusePolicyCfg> checkAddrPoolIsUsed(String addrPoolId) {
return ipMultiplexDao.checkAddrPoolIsUsed(addrPoolId);
}
}

6
src/main/resources/sql/20181204/update_function_service_dict.sql
View File

@@ -1,6 +0,0 @@
-- ftp
UPDATE function_service_dict SET is_valid = 0 WHERE dict_id = 42 AND function_id = 51;
-- mail地址
UPDATE function_service_dict SET is_valid = 0 WHERE dict_id = 149 AND function_id = 37;
-- mail高级
UPDATE function_service_dict SET is_valid = 0 WHERE dict_id = 37 AND function_id = 35;

19
src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
View File

@@ -23,6 +23,23 @@
}); */
$("#serviceId").val($(".action:checked").attr("serviceId"));
$("#protocolId").val($(".action:checked").attr("protocolId"));
var action=$("input[name='action']:checked").val();
if(action==16){
$("#keywords").addClass("hidden");
}else{
$("#keywords").removeClass("hidden");
}
$(".action").on("change", function() {
var action=$("input[name='action']:checked").val();
if(action==16){
$("#keywords").addClass("hidden");
}else{
$("#keywords").removeClass("hidden");
}
});
$("#cfgFrom").validate(
{
errorPlacement : function(error, element) {
@@ -299,7 +316,7 @@
</c:if>
<c:if test="${region.configServiceType eq 'keywords' }">
<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
<h4 class="form-section">
<h4 class="form-section" id="keywords">
<spring:message code="${region.configRegionValue}" />
<small> <span
class="glyphicon glyphicon-plus ${tabName}Add"

15
src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
View File

@@ -17,9 +17,22 @@
/* $("#cancel").on("click", function() {
window.history.back();
});*/
var action=$("input[name='action']:checked").val()
if(action==16){
$("#NTC_MAIL_BODY").addClass("hidden");
}else{
$("#NTC_MAIL_BODY").removeClass("hidden");
}
$(".action").on("change", function() {
$("#serviceId").val($(this).attr("serviceId"));
$("#protocolId").val($(this).attr("protocolId"));
var action=$("input[name='action']:checked").val()
if(action==16){
$("#NTC_MAIL_BODY").addClass("hidden");
}else{
$("#NTC_MAIL_BODY").removeClass("hidden");
}
});
$("#fileInfo").on('click',function(){
$("#file").trigger("click");
@@ -269,7 +282,7 @@
</c:if>
<c:if test="${region.regionType eq 3 }">
<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
<h4 class="form-section">
<h4 class="form-section" id="${region.configRegionValue}" >
<spring:message code="${region.configRegionValue}" />
<small> <span
class="glyphicon glyphicon-plus ${tabName}Add"

2
src/main/webapp/WEB-INF/views/home.jsp
View File

@@ -340,7 +340,7 @@ background:#3d3d3d;
<a href="${ctx}/sys/help" id="helpHref" target="mainFrame" >
<i class="icon-question font-sharp"></i>
<span class="username username-hide-on-mobile" id="help">
help
<spring:message code="help" />
</span>
</a>
</li>

5
src/main/webapp/WEB-INF/views/report/entranceId.jsp
View File

@@ -18,14 +18,19 @@ $(function(){
<script type="text/javascript">
var trContent = "";
<c:forEach items="${datas}" var="data">
var flag=false;
trContent += "<tr>";
<c:forEach items="${data.key}" var="entranceId" varStatus="status">
trContent += "<td>";
<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dic">
<c:if test="${dic.itemCode eq entranceId}">
trContent += "<spring:message code="${dic.itemValue}"/>";
flag=true;
</c:if>
</c:forEach>
if(!flag){
trContent +="${entranceId}";
}
trContent += "</td>";
</c:forEach>
<c:forEach items="${data.value}" var="cloumn" varStatus="status">

16
src/main/webapp/WEB-INF/views/report/list.jsp
View File

@@ -80,7 +80,7 @@ $(document).ready(function() {
});
$("#myexport").click();
$("caption").remove();
totaltb(pato,size);
//totaltb(pato,size);
});
@@ -253,10 +253,10 @@ function customColumnClick(){
//合计table中某一段数据
function totaltb(paNo,paSize){
if(paSize>0){
/* if(paSize>0){
size=paSize;
pato=paNo;
}
} */
$('#total').remove();
var reportBusinessType=$("#reportBusinessType").val()
var tableId="tagTable";
@@ -285,10 +285,10 @@ function customColumnClick(){
s=2;
}
if(paNo > 1){
/* if(paNo > 1){
row=(paNo-1)*paSize+1;
}
for (var i = row; i < rows.length; i++) {
} */
for (var i = 1; i < rows.length; i++) {
for (var j = s; j <rows[i].cells.length ; j++) {
if(list[j]!=null){
list[j-s]=parseInt(rows[i].cells[j].innerHTML)+parseInt(list[j-s]);
@@ -296,10 +296,10 @@ function customColumnClick(){
list[j-s]=parseInt(rows[i].cells[j].innerHTML);
}
}
num++;
/* num++;
if(num == paSize){
break;
}
} */
}
if(rows.length > 1){
var trtotal="";

1
src/main/webapp/WEB-INF/views/sys/configSyncInfo.jsp
View File

@@ -5,7 +5,6 @@
<title></title>
<script type="text/javascript">
$(document) .ready(function() {
top.$.jBox.closeTip();
$("#cfgFrom").validate({
submitHandler : function(form) {
top.$.jBox.tip("The system is being maintained and temporarily inaccessible.",'loading',{opacity:0.5,persistent:true});

3
src/main/webapp/static/global/scripts/pzLog.js
View File

@@ -71,7 +71,8 @@ var GetLogTotal=function(_data){
for(var i=0;i<data.length;i++){
if($(this).attr("compileId")==data[i].compileId){
$(this).attr("id",i+"logTotal");
$(this).html("<a href='javascript:;' onclick='toLogSearch("+i+")'>"+data[i].sum+"<a>");
$(this).html(data[i].sum);
$(this).parent("tr").find("td:eq(1)").html("<a href='javascript:;' onclick='toLogSearch("+i+")'>"+data[i].compileId+"<a>");
hasLog=true;
}
}