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

develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	证书颁发机构及 吊销列表功能提交

src/main/java/com/nis/util/ConfigDictUtils.java

@@ -1,5 +1,6 @@
 package com.nis.util;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -14,10 +15,12 @@ import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.domain.basics.SysDictInfo;
 import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
+import com.nis.domain.configuration.PxyObjTrustedCaCrl;
 import com.nis.domain.specific.SpecificServiceCfg;
 import com.nis.web.dao.SysDictDao;
 import com.nis.web.dao.basics.ServiceDictInfoDao;
 import com.nis.web.dao.basics.SysDictInfoDao;
+import com.nis.web.dao.configuration.PxyObjKeyringDao;
 import com.nis.web.dao.configuration.WebsiteCfgDao;
 import com.nis.web.dao.specific.SpecificServiceCfgDao;
 import com.nis.web.service.SpringContextHolder;
@@ -37,6 +40,7 @@ public class ConfigDictUtils {
 	private final static SysDictInfoDao sysDictInfoDao = SpringContextHolder.getBean(SysDictInfoDao.class);
 	private final static SpecificServiceCfgDao specificServiceCfgDao = SpringContextHolder.getBean(SpecificServiceCfgDao.class);
 	private final static WebsiteCfgDao websiteCfgDao = SpringContextHolder.getBean(WebsiteCfgDao.class);
+	private final static PxyObjKeyringDao pxyObjKeyringDao = SpringContextHolder.getBean(PxyObjKeyringDao.class);
 
 	/**
 	 * 根据主键查询配置详情
@@ -177,4 +181,26 @@ public class ConfigDictUtils {
 		}
 		return httpBodyKeyword;
 	}
+	/**
+	 * 根据compileId获取配置内容
+	 * @param compileId
+	 * @return
+	 */
+	public static String getTrustedCrlByCerId(Integer certId ) {
+		String crlFIle="";
+		try {
+			if(!StringUtil.isEmpty(certId)){
+				PxyObjTrustedCaCrl crl=new PxyObjTrustedCaCrl();
+				crl.setCertId(certId);
+				crl=pxyObjKeyringDao.getPxyObjTrustedCaCrl(crl);
+				if(crl != null ){
+					crlFIle=crl.getCrlFile();
+				}
+			}
+			
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return crlFIle;
+	}
 }