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

(1)域名列表配置状态一列替换为系统字典

Browse Source 
(2)ip配置新增/修改时cfg_region_code,cfg_type两个字段的值修复
(3)ip审核不再调用maat_service字典,改为根据配置的cfg_type字段结合function_region_dict字典的is_maat字段判断下发方式。maat_service字典只有ip导入时使用。
This commit is contained in:
wangxin
2018-08-07 13:05:00 +08:00
parent 10dd90c974
commit 91f0ede041
9 changed files with 64 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,15 +4,16 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.nis.domain.FunctionRegionDict;
import com.nis.domain.SysDataDictionaryItem;
import com.nis.domain.callback.InlineIp;
import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.BaseIpCfg;
@@ -27,6 +28,7 @@ import com.nis.domain.maat.ToMaatBean;
import com.nis.domain.maat.ToMaatResult;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Configurations;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.StringUtil;
@@ -161,20 +163,16 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
List<FunctionRegionDict> dictList = DictUtils.getFunctionRegionDictList(cfg.getFunctionId());
int maatType=0;
//判断下发类型是走maat还是callback
List<SysDataDictionaryItem> maatServiceList = DictUtils.getDictList("MAAT_SERVICE");
for(SysDataDictionaryItem maatService:maatServiceList){
if(Integer.parseInt(maatService.getItemCode())==cfg.getServiceId().intValue()){
for(FunctionRegionDict f:dictList){
if(maatService.getItemValue().equals(f.getConfigRegionValue())){
maatType=f.getIsMaat();
break;
}
String regionValue=cfg.getCfgType();
if(regionValue!=null) {
for(FunctionRegionDict region:dictList) {
if(regionValue.equals(region.getConfigRegionValue())) {
maatType=region.getIsMaat();
break;
}
break;
}
}
Properties props=this.getMsgProp();
if(cfg.getIsAudit()==Constants.AUDIT_YES){
if(maatType==Constants.CALLBACK_TYPE){
List<InlineIp> ipList=new ArrayList<>();
@@ -251,6 +249,8 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
logger.error("IP配置配置下发失败",e);
throw e;
}
}else {
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+props.getProperty("unknown_cfg_type"));
}
}else if(cfg.getIsAudit()==Constants.AUDIT_NOT_YES){
if(maatType==Constants.CALLBACK_TYPE){
@@ -291,6 +291,8 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
logger.info("IP管控取消配置失败");
throw e;
}
}else {
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+props.getProperty("unknown_cfg_type"));
}
}
}
@@ -483,4 +485,26 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
// TODO Auto-generated method stub
return ipCfgDao.getListByCfgIdWithName(tablename,functionId,ids);
}
/**
* 获取国际化配置文件
* @return
*/
public Properties getMsgProp(){
Properties msgProp = new Properties();
try {
String language = LocaleContextHolder.getLocale().getLanguage();
if(language.equals("zh_cn")||language.equals("zh")){
msgProp.load(Configurations.class.getResourceAsStream("/messages/message_zh_CN.properties"));
}else if(language.equals("ru")){
msgProp.load(Configurations.class.getResourceAsStream("/messages/message_ru.properties"));
}else{
msgProp.load(Configurations.class.getResourceAsStream("/messages/message_en.properties"));
}
} catch (Exception e) {
msgProp = null;
logger.error("未知i18n消息配置文件,请确定文件是否存在!",e);
}
return msgProp;
}
}