diff --git a/src/main/java/com/nis/exceptions/CallExternalProceduresException.java b/src/main/java/com/nis/exceptions/CallExternalProceduresException.java index dcf945419..75690f417 100644 --- a/src/main/java/com/nis/exceptions/CallExternalProceduresException.java +++ b/src/main/java/com/nis/exceptions/CallExternalProceduresException.java @@ -34,12 +34,12 @@ public class CallExternalProceduresException extends RuntimeException { 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")); + if (language.equals("zh_cn") || language.equals("zh")) { + msgProp = Configurations.getMsgPropZh(); + } else if (language.equals("ru")) { + msgProp = Configurations.getMsgPropRu(); + } else { + msgProp = Configurations.getMsgPropEn(); } } catch (Exception e) { diff --git a/src/main/java/com/nis/interceptor/MultipartFileIntercepter.java b/src/main/java/com/nis/interceptor/MultipartFileIntercepter.java index 8b6dce83a..2332318b7 100644 --- a/src/main/java/com/nis/interceptor/MultipartFileIntercepter.java +++ b/src/main/java/com/nis/interceptor/MultipartFileIntercepter.java @@ -211,12 +211,12 @@ public class MultipartFileIntercepter extends CommonsMultipartResolver{ 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")); + if (language.equals("zh_cn") || language.equals("zh")) { + msgProp=Configurations.getMsgPropZh(); + } else if (language.equals("ru")) { + msgProp=Configurations.getMsgPropRu(); + } else { + msgProp=Configurations.getMsgPropEn(); } } catch (Exception e) { diff --git a/src/main/java/com/nis/util/Configurations.java b/src/main/java/com/nis/util/Configurations.java index b5f539472..a14cddb13 100644 --- a/src/main/java/com/nis/util/Configurations.java +++ b/src/main/java/com/nis/util/Configurations.java @@ -9,13 +9,18 @@ import com.nis.util.StringUtil; public final class Configurations { private static Properties prop = new Properties(); - + private static Properties msgPropZh = new Properties(); + private static Properties msgPropRu = new Properties(); + private static Properties msgPropEn = new Properties(); static { try { prop.load(Configurations.class.getResourceAsStream("/nis.properties")); prop.load(Configurations.class.getResourceAsStream("/table.properties")); prop.load(Configurations.class.getResourceAsStream("/matt.properties")); - + //加载国际化配置文件 + msgPropZh.load(Configurations.class.getResourceAsStream("/messages/message_zh_CN.properties")); + msgPropRu.load(Configurations.class.getResourceAsStream("/messages/message_ru.properties")); + msgPropEn.load(Configurations.class.getResourceAsStream("/messages/message_en.properties")); } catch (Exception e) { prop = null; System.err.println("未知nis.properties,请确定文件是否存在!"); @@ -75,10 +80,16 @@ public final class Configurations { return prop; } + public static Properties getMsgPropEn() { + return msgPropEn; + } + public static Properties getMsgPropRu() { + return msgPropRu; + } - - - + public static Properties getMsgPropZh() { + return msgPropZh; + } } diff --git a/src/main/java/com/nis/util/LogUtils.java b/src/main/java/com/nis/util/LogUtils.java index 3082c07c5..d2be92d71 100644 --- a/src/main/java/com/nis/util/LogUtils.java +++ b/src/main/java/com/nis/util/LogUtils.java @@ -10,6 +10,7 @@ import java.util.Properties; import javax.servlet.http.HttpServletRequest; import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.web.method.HandlerMethod; import com.google.common.collect.Lists; @@ -206,8 +207,15 @@ public class LogUtils { menuMap2 = Maps.newHashMap(); Properties msgProp = new Properties(); try { - msgProp.load(Configurations.class.getResourceAsStream("/messages/message_en.properties")); - } catch (IOException e) { + String language = LocaleContextHolder.getLocale().getLanguage(); + if (language.equals("zh_cn") || language.equals("zh")) { + msgProp=Configurations.getMsgPropZh(); + } else if (language.equals("ru")) { + msgProp=Configurations.getMsgPropRu(); + } else { + msgProp=Configurations.getMsgPropEn(); + } + } catch (Exception e) { e.printStackTrace(); } List menuList = menuDao.findAllList(new SysMenu()); diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index a658362c8..5246ed69a 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -749,11 +749,13 @@ public class BaseController { 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")); + if (language.equals("zh_cn") || language.equals("zh")) { + msgProp=Configurations.getMsgPropZh(); + } else if (language.equals("ru")) { + msgProp=Configurations.getMsgPropRu(); + } else { + msgProp=Configurations.getMsgPropEn(); + } } } catch (Exception e) { @@ -1918,57 +1920,58 @@ public class BaseController { * @param serviceDict */ public void loadTemplate(ImportBigExcel ei,FunctionRegionDict regionDict,FunctionServiceDict serviceDict) { + Properties msgProp = this.getMsgProp(); if (regionDict.getRegionType().equals(1)) {// IP if (regionDict.getFunctionId().equals(5)) { if (serviceDict!=null&&serviceDict.getAction().equals(64)) { - ei.loadInitParams(IpRateLimitTemplate.class, this.getMsgProp(), regionDict, serviceDict); + ei.loadInitParams(IpRateLimitTemplate.class, msgProp, regionDict, serviceDict); } else { - ei.loadInitParams(IpAllTemplate.class, this.getMsgProp(), regionDict, serviceDict); + ei.loadInitParams(IpAllTemplate.class, msgProp, regionDict, serviceDict); } } else if (regionDict.getFunctionId().equals(7)&&serviceDict!=null&&serviceDict.getAction().intValue()==16) { - ei.loadInitParams(DnsIpTemplate.class, this.getMsgProp(), regionDict, serviceDict); + ei.loadInitParams(DnsIpTemplate.class, msgProp, regionDict, serviceDict); }else if(regionDict.getFunctionId().equals(401)) { - ei.loadInitParams(DnsIpTemplate.class, this.getMsgProp(), regionDict, serviceDict); + ei.loadInitParams(DnsIpTemplate.class, msgProp, regionDict, serviceDict); }else if (regionDict.getFunctionId().equals(212)) { - ei.loadInitParams(IpPayloadTemplate.class, this.getMsgProp(), regionDict, serviceDict); + ei.loadInitParams(IpPayloadTemplate.class, msgProp, regionDict, serviceDict); } else if (regionDict.getFunctionId().equals(510) && "p2p_ip".equals(regionDict.getConfigServiceType())) { // P2p IP - ei.loadInitParams(P2pIpTemplate.class, this.getMsgProp(), regionDict, serviceDict); + ei.loadInitParams(P2pIpTemplate.class, msgProp, regionDict, serviceDict); } else if (regionDict.getFunctionId().equals(600)) {// ASN IP - ei.loadInitParams(AsnIpTemplate.class, this.getMsgProp(), regionDict, serviceDict); + ei.loadInitParams(AsnIpTemplate.class, msgProp, regionDict, serviceDict); } else if (regionDict.getFunctionId().equals(301)) {// DDOS IP - ei.loadInitParams(DdosIpTemplate.class, this.getMsgProp(), regionDict, serviceDict); + ei.loadInitParams(DdosIpTemplate.class, msgProp, regionDict, serviceDict); } else { - ei.loadInitParams(IpAllTemplate.class, this.getMsgProp(), regionDict, serviceDict); + ei.loadInitParams(IpAllTemplate.class, msgProp, regionDict, serviceDict); } } else if (regionDict.getRegionType().equals(2)) {// 字符串类 if (regionDict.getFunctionId().equals(510) && "p2p_hash".equals(regionDict.getConfigServiceType())) { // P2p hash - ei.loadInitParams(P2pHashStringTemplate.class, this.getMsgProp(), regionDict, serviceDict); + ei.loadInitParams(P2pHashStringTemplate.class, msgProp, regionDict, serviceDict); }else if (regionDict.getFunctionId().equals(403)) { - ei.loadInitParams(AppDomainTemplate.class, this.getMsgProp(), regionDict, serviceDict); + ei.loadInitParams(AppDomainTemplate.class, msgProp, regionDict, serviceDict); } else if(regionDict.getFunctionId().equals(201)){// Domain Intercept if(serviceDict.getAction().equals(1)){// 监测 - ei.loadInitParams(DomainInterceptMonitTemplate.class, this.getMsgProp(), regionDict, serviceDict); + ei.loadInitParams(DomainInterceptMonitTemplate.class, msgProp, regionDict, serviceDict); }else if(serviceDict.getAction().equals(64)){// 限速 - ei.loadInitParams(DomainInterceptRateLimitTemplate.class, this.getMsgProp(), regionDict, serviceDict); + ei.loadInitParams(DomainInterceptRateLimitTemplate.class, msgProp, regionDict, serviceDict); }else{// 白名单 - ei.loadInitParams(DomainInterceptTemplate.class, this.getMsgProp(), regionDict, serviceDict); + ei.loadInitParams(DomainInterceptTemplate.class, msgProp, regionDict, serviceDict); } } else { - ei.loadInitParams(StringAllTemplate.class, this.getMsgProp(), regionDict, serviceDict); + ei.loadInitParams(StringAllTemplate.class, msgProp, regionDict, serviceDict); } } else if (regionDict.getRegionType().equals(3)) {// 增强字符串类 if (regionDict.getFunctionId().equals(7)&&serviceDict!=null&&serviceDict.getAction().intValue()==16) { - ei.loadInitParams(DnsComplexStringTemplate.class, this.getMsgProp(), regionDict, serviceDict); + ei.loadInitParams(DnsComplexStringTemplate.class, msgProp, regionDict, serviceDict); } else { - ei.loadInitParams(ComplexStringAllTemplate.class, this.getMsgProp(), regionDict, serviceDict); + ei.loadInitParams(ComplexStringAllTemplate.class, msgProp, regionDict, serviceDict); } }else if (regionDict.getRegionType().equals(6)) {// 回调类 if (regionDict.getFunctionId().equals(400)) { - ei.loadInitParams(DnsResStrategyTemplate.class, this.getMsgProp(), regionDict, serviceDict); + ei.loadInitParams(DnsResStrategyTemplate.class, msgProp, regionDict, serviceDict); } } diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java index 5e9978a1a..87feb33ca 100644 --- a/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java +++ b/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java @@ -423,7 +423,7 @@ public class IpMultiplexController extends CommonController { Map> classMap=new HashMap>(); Map dataMap=new HashMap(); Map noExportMap=new HashMap(); - + Properties msgProp = getMsgProp(); /*//导出选中记录 * if(!StringUtil.isEmpty(ids)){ @@ -440,7 +440,6 @@ public class IpMultiplexController extends CommonController { Page page = ipCfgService.findPage(pageInfo, entity);// for (BaseIpCfg baseIp : page.getList()) { if(StringUtil.isEmpty(baseIp.getGroupName())){ - Properties msgProp = getMsgProp(); baseIp.setGroupName(msgProp.getProperty("default_group")); } } @@ -469,7 +468,7 @@ public class IpMultiplexController extends CommonController { Map> classMap=new HashMap>(); Map dataMap=new HashMap(); Map noExportMap=new HashMap(); - + Properties msgProp = getMsgProp(); /*//导出选中记录 * if(!StringUtil.isEmpty(ids)){ @@ -486,7 +485,6 @@ public class IpMultiplexController extends CommonController { Page page = ipCfgService.findPage(pageInfo, entity);// for (BaseIpCfg baseIp : page.getList()) { if(StringUtil.isEmpty(baseIp.getGroupName())){ - Properties msgProp = getMsgProp(); baseIp.setGroupName(msgProp.getProperty("default_group")); } } diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java index 4b176812b..f72403808 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java @@ -10,6 +10,7 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Properties; import java.util.UUID; import javax.servlet.http.HttpServletRequest; @@ -627,6 +628,7 @@ public class AvController extends BaseController { Map map = new HashMap(); map.put("picFilePath", picFilePath); try { + Properties msgProp = getMsgProp(); FileCopyUtils.copy(srcFile.getBytes(), uploadSrcFile);//保存源文件 if(validateAvDuration(uploadSrcFile)){ String shellName = Constants.VEDIO_TO_PICTURE_PROC; @@ -660,7 +662,7 @@ public class AvController extends BaseController { }else{ if(StringUtil.isEmpty(resObject.getString("message"))){ map.put("status", 0); - map.put("msg", getMsgProp().getProperty("call_external_procedures_failed", "Call external procedures failed")); + map.put("msg", msgProp.getProperty("call_external_procedures_failed", "Call external procedures failed")); }else{ map.put("status", 0); map.put("msg", resObject.getString("message")); @@ -669,11 +671,11 @@ public class AvController extends BaseController { }else{ map.put("status", 0); - map.put("msg", getMsgProp().getProperty("call_external_procedures_failed", "Call external procedures failed")); + map.put("msg", msgProp.getProperty("call_external_procedures_failed", "Call external procedures failed")); } }else{ map.put("status", 0); - map.put("msg", this.getMsgProp().get("exceeds_duration_limit")); + map.put("msg", msgProp.get("exceeds_duration_limit")); } } catch (IOException e) { diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java index f2644af23..6524cb3ae 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java @@ -300,54 +300,54 @@ public class IpController extends BaseController{ if(regionDict.getFunctionId().equals(5)){// IP Address if(serviceDict.getAction().equals(64)){//ip限速 List classList=new ArrayList(); - ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, IpRateLimitTemplate.class, 2); - excel.setDataList(this.getMsgProp(),classList,null). + ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, IpRateLimitTemplate.class, 2); + excel.setDataList(pro,classList,null). write(request,response, fileName).dispose(); }else{ List classList=new ArrayList(); - ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, IpAllTemplate.class, 2); - excel.setDataList(this.getMsgProp(),classList,null). + ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, IpAllTemplate.class, 2); + excel.setDataList(pro,classList,null). write(request,response, fileName).dispose(); } }else if(regionDict.getFunctionId().equals(212)){ //IP Payload List classList=new ArrayList(); - ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, IpPayloadTemplate.class, 2); - excel.setDataList(this.getMsgProp(),classList,null). + ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, IpPayloadTemplate.class, 2); + excel.setDataList(pro,classList,null). write(request,response, fileName).dispose(); }else if(regionDict.getFunctionId().equals(7)||regionDict.getFunctionId().equals(401)){ //Dns IP，DNS FAKE IP List classList=new ArrayList(); - ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, DnsIpTemplate.class, 2); - excel.setDataList(this.getMsgProp(),classList,null). + ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, DnsIpTemplate.class, 2); + excel.setDataList(pro,classList,null). write(request,response, fileName).dispose(); }else if(regionDict.getFunctionId().equals(510) && "p2p_ip".equals(regionDict.getConfigServiceType())){ //P2p IP List classList=new ArrayList(); - ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, P2pIpTemplate.class, 2); - excel.setDataList(this.getMsgProp(),classList,null). + ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, P2pIpTemplate.class, 2); + excel.setDataList(pro,classList,null). write(request,response, fileName).dispose(); }else if(regionDict.getFunctionId().equals(600)){ //asnip List classList=new ArrayList(); - ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, AsnIpTemplate.class, 2); - excel.setDataList(this.getMsgProp(),classList,null). + ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, AsnIpTemplate.class, 2); + excel.setDataList(pro,classList,null). write(request,response, fileName).dispose(); }else if(regionDict.getFunctionId().equals(3)){ //ip whitelist List classList=new ArrayList(); - ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, IpWhitelistTemplate.class, 2); - excel.setDataList(this.getMsgProp(),classList,null). + ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, IpWhitelistTemplate.class, 2); + excel.setDataList(pro,classList,null). write(request,response, fileName).dispose(); }else if(regionDict.getFunctionId().equals(301)){ //ddos ip List classList=new ArrayList(); - ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, DdosIpTemplate.class, 2); - excel.setDataList(this.getMsgProp(),classList,null). + ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, DdosIpTemplate.class, 2); + excel.setDataList(pro,classList,null). write(request,response, fileName).dispose(); }else if(regionDict.getFunctionId().equals(633)){ //snat ip池 List classList=new ArrayList(); - ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, SnatTemplate.class, 2); - excel.setDataList(this.getMsgProp(),classList,null). + ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, SnatTemplate.class, 2); + excel.setDataList(pro,classList,null). write(request,response, fileName).dispose(); }else{ List classList=new ArrayList(); - ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, IpAllTemplate.class, 2); - excel.setDataList(this.getMsgProp(),classList,null). + ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, IpAllTemplate.class, 2); + excel.setDataList(pro,classList,null). write(request,response, fileName).dispose(); } } @@ -355,35 +355,35 @@ public class IpController extends BaseController{ if(regionDict.getRegionType().equals(2)){ if(regionDict.getFunctionId().equals(510) && "p2p_hash".equals(regionDict.getConfigServiceType())){ //P2p hash List classList=new ArrayList(); - ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, P2pHashStringTemplate.class, 2); - excel.setDataList(this.getMsgProp(),classList,null). + ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, P2pHashStringTemplate.class, 2); + excel.setDataList(pro,classList,null). write(request,response, fileName).dispose(); }else if(regionDict.getFunctionId().equals(403)) {//app domain List classList=new ArrayList(); - ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, AppDomainTemplate.class, 2); - excel.setDataList(this.getMsgProp(),classList,null). + ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, AppDomainTemplate.class, 2); + excel.setDataList(pro,classList,null). write(request,response, fileName).dispose(); }else if(regionDict.getFunctionId().equals(201)){// Domain Intercept if(serviceDict.getAction().equals(1)){// 监测 List classList=new ArrayList(); - ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, DomainInterceptMonitTemplate.class, 2); - excel.setDataList(this.getMsgProp(),classList,null). + ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, DomainInterceptMonitTemplate.class, 2); + excel.setDataList(pro,classList,null). write(request,response, fileName).dispose(); }else if(serviceDict.getAction().equals(64)){// 限速 List classList=new ArrayList(); - ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, DomainInterceptRateLimitTemplate.class, 2); - excel.setDataList(this.getMsgProp(),classList,null). + ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, DomainInterceptRateLimitTemplate.class, 2); + excel.setDataList(pro,classList,null). write(request,response, fileName).dispose(); }else{// 白名单 List classList=new ArrayList(); - ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, DomainInterceptTemplate.class, 2); - excel.setDataList(this.getMsgProp(),classList,null). + ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, DomainInterceptTemplate.class, 2); + excel.setDataList(pro,classList,null). write(request,response, fileName).dispose(); } }else{ List classList=new ArrayList(); - ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, StringAllTemplate.class, 2); - excel.setDataList(this.getMsgProp(),classList,null). + ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, StringAllTemplate.class, 2); + excel.setDataList(pro,classList,null). write(request,response, fileName).dispose(); } @@ -392,21 +392,21 @@ public class IpController extends BaseController{ if(regionDict.getRegionType().equals(3)){ if(regionDict.getFunctionId().equals(7)){//DNS DISTRICT STRING List classList=new ArrayList(); - ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, DnsComplexStringTemplate.class, 2); - excel.setDataList(this.getMsgProp(),classList,null). + ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, DnsComplexStringTemplate.class, 2); + excel.setDataList(pro,classList,null). write(request,response, fileName).dispose(); }else{ List classList=new ArrayList(); - ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, ComplexStringAllTemplate.class, 2); - excel.setDataList(this.getMsgProp(),classList,null). + ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, ComplexStringAllTemplate.class, 2); + excel.setDataList(pro,classList,null). write(request,response, fileName).dispose(); } } if(regionDict.getRegionType().equals(6)){ if(regionDict.getFunctionId().equals(400)){ List classList=new ArrayList(); - ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, DnsResStrategyTemplate.class, 2); - excel.setDataList(this.getMsgProp(),classList,null). + ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, DnsResStrategyTemplate.class, 2); + excel.setDataList(pro,classList,null). write(request,response, fileName).dispose(); } } diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java index 90b7f2d2d..b2d57d3fe 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java @@ -759,7 +759,7 @@ public class WebsiteController extends BaseController{ Map> classMap=new HashMap>(); Map dataMap=new HashMap(); Map noExportMap=new HashMap(); - + Properties msgProp = getMsgProp(); List ipLists=new ArrayList(); //导出选中记录 if(!StringUtil.isEmpty(ids)){ @@ -774,7 +774,6 @@ public class WebsiteController extends BaseController{ } for (int i = 0; i < ipLists.size(); i++) { - Properties msgProp = getMsgProp(); if(ipLists.get(i).getDnsStrategyId()!=null && ipLists.get(i).getDnsStrategyId()!=0){ List resStrategys=dnsResStrategyService.findDnsResStrategys(ipLists.get(i).getDnsStrategyId(), 1,1); if(resStrategys!=null && resStrategys.size()>0){ diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java index 0d5f2c96a..c96d0c2a3 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java @@ -240,7 +240,7 @@ public class InterceptController extends CommonController{ Map dataMap=new HashMap(); Map noExportMap=new HashMap(); Map replaceExportMap=new HashMap(); - + Properties prop = getMsgProp(); List ipLists=new ArrayList(); //导出选中记录 if(!StringUtil.isEmpty(ids)){ @@ -263,7 +263,6 @@ public class InterceptController extends CommonController{ } for (CfgIndexInfo str : ipLists) { if(!StringUtil.isEmpty(str.getUserRegion5())){ - Properties prop = getMsgProp(); String cs= DictUtils.getDictLabel("INTERCEPT_DOMAIN_INTENSITY", str.getUserRegion5()); str.setUserRegion5(prop.getProperty(cs)); } diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java index 341fa4afb..7ad6a5603 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java @@ -15,6 +15,7 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Properties; import java.util.UUID; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -103,22 +104,23 @@ public class PxyObjKeyringController extends BaseController { File file = null; boolean validFlag=true; try { + Properties msgProp = this.getMsgProp(); boolean publicKeyFileflag=validCertFileContent(publicKeyFileI,"-incert"); boolean privateKeyFileflag=validCertFileContent(privateKeyFileI,"-inkey"); if(!publicKeyFileflag && !privateKeyFileflag){ addMessage(redirectAttributes,"error","save_failed"); logger.error(publicKeyFileI.getOriginalFilename()+" and "+privateKeyFileI.getOriginalFilename()+" file non certificate file format "); throw new MultiPartNewException( - this.getMsgProp().getProperty("certificate_error") + msgProp.getProperty("certificate_error") ); }else if(!publicKeyFileflag){ addMessage(redirectAttributes,"error","save_failed"); logger.error(publicKeyFileI.getOriginalFilename()+" file non public key file format "); - throw new MultiPartNewException(this.getMsgProp().getProperty("public_file_error")); + throw new MultiPartNewException(msgProp.getProperty("public_file_error")); }else if(!privateKeyFileflag){ addMessage(redirectAttributes,"error","save_failed"); logger.error(privateKeyFileI.getOriginalFilename()+" file non private key file format "); - throw new MultiPartNewException(this.getMsgProp().getProperty("private_file_error")); + throw new MultiPartNewException(msgProp.getProperty("private_file_error")); } } catch (Exception e) { validFlag=false; diff --git a/src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java b/src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java index 6f218bf97..c9e455bf1 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Properties; import java.util.Map.Entry; import javax.servlet.http.HttpServletRequest; @@ -102,6 +103,7 @@ public class NtcConnRecordLogController extends BaseController { @ResponseBody public JSONObject ajaxConnRecordPercent(String searchFoundStartTime, String searchFoundEndTime, String searchStreamDir, HttpServletRequest request, HttpServletResponse response) { + Properties msgProp = getMsgProp(); JSONObject resultAllJson = new JSONObject(); JSONObject result = new JSONObject(); Map params = new HashMap<>(); @@ -119,10 +121,10 @@ public class NtcConnRecordLogController extends BaseController { result.put("success", "success"); } catch (MaatConvertException e) { logger.error("ajaxConnRecordPercent检索失败", e); - result.put("error", getMsgProp().get("request_service_failed")); + result.put("error", msgProp.get("request_service_failed")); } catch (Exception e) { logger.error("ajaxConnRecordPercent检索失败", e); - result.put("error", getMsgProp().get("search_error")); + result.put("error", msgProp.get("search_error")); } return result; } diff --git a/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java b/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java index 586283fb7..bf6da0511 100644 --- a/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java +++ b/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java @@ -125,21 +125,7 @@ public class SpecificServiceHostCfgController extends BaseController { @RequiresPermissions("specific:serviceIp:edit") @RequestMapping(value = "import/template") public String importFileTemplate(HttpServletRequest request,HttpServletResponse response, RedirectAttributes redirectAttributes) { - 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; - System.err.println("未知i18n消息配置文件,请确定文件是否存在!"); - } + Properties msgProp = getMsgProp(); try { String fileName = msgProp.getProperty("agreement_ip_configuration").replaceAll(" ", "_")+".xlsx"; List list = Lists.newArrayList(); diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java index c7d65241d..fee3a0c03 100644 --- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java @@ -910,17 +910,17 @@ public class IpCfgService extends CrudService { 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")); + if (language.equals("zh_cn") || language.equals("zh")) { + msgProp=Configurations.getMsgPropZh(); + } else if (language.equals("ru")) { + msgProp=Configurations.getMsgPropRu(); + } else { + msgProp=Configurations.getMsgPropEn(); } - + } catch (Exception e) { msgProp = null; - logger.error("未知i18n消息配置文件,请确定文件是否存在!",e); + logger.error("未知i18n消息配置文件,请确定文件是否存在!", e); } return msgProp; }