测试脚本

src/main/java/com/Sample/TestCert.java

@@ -10,7 +10,7 @@ import java.io.IOException;
 import java.util.*;
 
 public class TestCert {
-    public static void main(String[] args) throws InterruptedException {
+    public static void main(String[] args) throws Exception {
         StopWatch stopWatch = new StopWatch();
         stopWatch.start();
         System.out.println("-----------start---------------");
@@ -29,15 +29,7 @@ public class TestCert {
         String bkCode = map.get("bkcode");
         Map<String, String> snmpMap = readFileToMap(snmpInfo);
         Gson gson = new Gson();
-        try {
-            sydApi4j.importCertToServers(ipList, timeout, cert, bkCode, gson.toJson(snmpMap));
-        } catch (Exception e) {
-            System.out.println();
-            System.out.println();
-            System.out.println();
-            System.out.println("---------------------证书导入失败日志----------------------");
-            System.out.println(e.getMessage());
-        }
+        sydApi4j.importCertToServers(ipList, timeout, cert, bkCode, gson.toJson(snmpMap));
         System.out.println("------------end-----------------------");
         stopWatch.stop();
         System.out.println("耗时:" + stopWatch.getTotalTimeMillis() + "ms");

src/main/java/com/sunyard/SydApi.java

@@ -120,5 +120,4 @@ public interface SydApi extends
 
     public void setBindObject(Object bindObject);
 
-    void importCertToServers(List<String> addressList, int timeout, String cert, String bkCode, String snmpConfig);
 }

src/main/java/racal/sunyard/main/SydApi4j.java

@@ -32,9 +32,7 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.pqc.math.linearalgebra.ByteUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.snmp4j.PDU;
 import org.snmp4j.event.ResponseEvent;
-import org.snmp4j.mp.SnmpConstants;
 import racal.sunyard.main.dto.DTO77;
 import racal.sunyard.main.dto.DTO78;
 import racal.sunyard.main.dto.DTO79;
@@ -56,7 +54,6 @@ import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.text.SimpleDateFormat;
 import java.time.Duration;
-import java.time.LocalDateTime;
 import java.util.*;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
@@ -1312,8 +1309,7 @@ public class SydApi4j implements SydApi {
     }
 
 
-    @Override
-    public void importCertToServers(List<String> addressList, int timeout, String cert, String bkCode, String snmpConfig) {
+    public String importCertToServers(List<String> addressList, int timeout, String cert, String bkCode, String snmpConfig) {
         if (null == addressList || addressList.isEmpty()) {
             throw new IllegalArgumentException("签名服务器地址不能为空");
         }
@@ -1337,17 +1333,17 @@ public class SydApi4j implements SydApi {
                 stringBuilder.append("签名服务器:").append(taskOutcome.getContext().getAddress()).append("/导入失败:").append(taskOutcome.getError().getMessage()).append("\n");
             }
         }
+        String dn = null;
+        String serialNumber = null;
+        X509Certificate certificate = null;
+        try {
+            certificate = CertUtil.convertToX509Cert(cert);
+            dn = certificate.getSubjectDN().toString();
+            serialNumber = certificate.getSerialNumber().toString();
+        } catch (Exception e) {
+            log.warn("导入证书格式错误！");
+        }
         if (!failures.isEmpty()) {
-            String dn = "";
-            String serialNumber = "";
-            X509Certificate certificate = null;
-            try {
-                certificate = CertUtil.convertToX509Cert(cert);
-                dn = certificate.getSubjectDN().toString();
-                serialNumber = certificate.getSerialNumber().toString();
-            } catch (Exception e) {
-                log.info("证书格式错误！");
-            }
             //记录失败日志
             stringBuilder.append("行号：").append(bkCode).append("\n").append("DN：").append(dn)
                     .append("\n序列号：").append(serialNumber).append("\n证书：").append(cert);
@@ -1374,9 +1370,9 @@ public class SydApi4j implements SydApi {
             } catch (Exception e) {
                 log.warn("snmp告警消息发送失败:{}", e.getMessage());
             }
-            throw new SydApiException("证书导入失败！", 56300, true);
+//            throw new SydApiException("证书未全部导入成功！", 56300, true);
         }
-
+        return dn;
     }
 
     private TaskContext<String> createTaskContext(String address, int timeout, String cert) {