fix:完善多机证书导入功能

src/test/java/sample/Test4NongxinCW.java

@@ -1,23 +1,21 @@
 package sample;
 
+import cn.hutool.core.date.StopWatch;
+import com.google.gson.Gson;
 import com.sunyard.SydApiException;
-import com.sunyard.entity.ServerConfig;
 import com.sunyard.proto.Util;
 import com.sunyard.snmp.SnmpTrapSender;
-import com.sunyard.util.CertUtil;
-import com.sunyard.util.SYMUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import racal.sunyard.main.SydApi4j;
-import racal.sunyard.main.SydApiBuilder;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
-import java.util.concurrent.ThreadFactory;
+import java.util.Map;
 
 import static com.sunyard.util.CertUtil.convertToX509Cert;
 
@@ -29,26 +27,26 @@ public class Test4NongxinCW {
 
     byte[] orgData = new byte[100];
 
-//    @Before
-//    public void before() {
-//        // 通过设置debug的属性开启debug，如果不设置则默认不打开
-//        api = (SydApi4j) new SydApi4j().connect("172.16.17.34", 8889, null, 1000);
-//
-//    }
-//
-//    @Test
-//    public void connection() {
-//
-//    }
-//
-//    @After
-//    public void after() {
-//        try {
-//            this.api.disconnect();
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
+    @Before
+    public void before() {
+        // 通过设置debug的属性开启debug，如果不设置则默认不打开
+        api = (SydApi4j) new SydApi4j().connect("172.16.18.6", 8889, null, 1000);
+
+    }
+
+    @Test
+    public void connection() {
+
+    }
+
+    @After
+    public void after() {
+        try {
+            this.api.disconnect();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
     @Test
     public void nakeSign(){
@@ -99,6 +97,20 @@ public class Test4NongxinCW {
                 "jY4S64AdH/IWiO+aUyfPAiAu+9MrvCfd27KGZQKurf/djfbe5xBQg2CG6ae+Tax9lQ==\n" +
                 "-----END CERTIFICATE-----";
 
+        String cert = "-----BEGIN CERTIFICATE-----\n" +
+                "MIICITCCAcWgAwIBAgIGAZbD4M8uMAwGCCqBHM9VAYN1BQAwSzELMAkGA1UEBhMC\n" +
+                "Q04xDjAMBgNVBAoTBUdNU1NMMRAwDgYDVQQLEwdQS0kvU00yMRowGAYDVQQDExFN\n" +
+                "aWRkbGVDQSBmb3IgVGVzdDAiGA8yMDI1MDUxMTE2MDAwMFoYDzIwMjYwNTExMTYw\n" +
+                "MDAwWjBQMQswCQYDVQQGDAJDTjERMA8GA1UECAwIaGFuZ3pob3UxETAPBgNVBAcM\n" +
+                "CGhhbmd6aG91MQwwCgYDVQQKDANzc3MxDTALBgNVBAMMBHNzc3MwWTATBgcqhkjO\n" +
+                "PQIBBggqgRzPVQGCLQNCAARGnQQLJSiMkoH2iCqbsTpGkZmHPCP7ThQQmzf1m8jr\n" +
+                "NjgMzBJ0p2rXJQSglaVqaVcaL/ox5wfV8okIavToNQjao4GJMIGGMBsGA1UdIwQU\n" +
+                "MBKAEPl/VbQnlDNiplbKb8xdGv8wGQYDVR0OBBIEEMu/aP+Gw3PMakxFSVzC5MYw\n" +
+                "MQYIKwYBBQUHAQEEJTAjMCEGCCsGAQUFBzABhhVodHRwczovL29jc3AuZ21zc2wu\n" +
+                "Y24wCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCAMAwDAYIKoEcz1UBg3UFAANIADBF\n" +
+                "AiEAnoN1iWj1Cv6M4eUtSt2XEoKpswLTEy7gczIn/ZTI+JYCIB2but+jsuUD6Udp\n" +
+                "uFp7xVvOp8IKQyazXx9bA4N9PbLo\n" +
+                "-----END CERTIFICATE-----";
 
         //将证书导入设备，获取证书主题
         String dn = api.importCertAndGetDN(certBySign);
@@ -174,33 +186,64 @@ public class Test4NongxinCW {
 
     @Test
     public void importAllCert() {
+        StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+        String cert = "-----BEGIN CERTIFICATE-----\n" +
+                "MIICMDCCAdagAwIBAgIJAOWoGwJCnjlLMAoGCCqBHM9VAYN1MGcxCzAJBgNVBAYT\n" +
+                "AkNOMRAwDgYDVQQIDAdCZWlqaW5nMRAwDgYDVQQHDAdIYWlEaWFuMRMwEQYDVQQK\n" +
+                "DApHTUNlcnQub3JnMR8wHQYDVQQDDBZHTUNlcnQgR00gUm9vdCBDQSAtIDAxMB4X\n" +
+                "DTI1MDUxMzAyMzUxM1oXDTI2MDUxMzAyMzUxM1owRTELMAkGA1UEBgwCQ04xCzAJ\n" +
+                "BgNVBAgMAnp6MQswCQYDVQQHDAJ6ejEMMAoGA1UECgwDenp6MQ4wDAYDVQQDDAV6\n" +
+                "enp6ejBZMBMGByqGSM49AgEGCCqBHM9VAYItA0IABK5fyRSACWPIBBr/3U+qvjvp\n" +
+                "niropv2PrA3ZLU1bG8vQpwAEMA0kwyqGgXURBPbvWdAhN7s9wfvHbJyMd9CMZGqj\n" +
+                "gYwwgYkwDAYDVR0TAQH/BAIwADALBgNVHQ8EBAMCB4AwLAYJYIZIAYb4QgENBB8W\n" +
+                "HUdNQ2VydC5vcmcgU2lnbmVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSQB7UUqEuG\n" +
+                "kl4mrx3MAhKTptfbYjAfBgNVHSMEGDAWgBR/Wl47AIRZKg+YvqEObzmVQxBNBzAK\n" +
+                "BggqgRzPVQGDdQNIADBFAiEA4kgTdn/iA/XYfjTEeOcELwBXd0tTFghkpfP8DhBF\n" +
+                "KFQCIAXZTL6VPtW67tM/DF4ZgFt5S/YIiFombKa2bWOfL81u\n" +
+                "-----END CERTIFICATE-----";
+        String cert1 = "-----BEGIN CERTIFICATE-----\n" +
+                "MIIDNTCCAh2gAwIBAgIFE2lVIzcwDQYJKoZIhvcNAQEFBQAwITELMAkGA1UEBhMC\n" +
+                "Q04xEjAQBgNVBAoTCUNGQ0EgT0NBMTAeFw0yMjA0MjIwODIyMTVaFw0yNzA0MjIw\n" +
+                "ODIyMTVaMGQxCzAJBgNVBAYTAkNOMRIwEAYDVQQKEwlDRkNBIE9DQTExDzANBgNV\n" +
+                "BAsTBlRQQy1TMzEVMBMGA1UECxMMSW5kaXZpZHVhbC0xMRkwFwYDVQQDExBBUkNV\n" +
+                "NTIwMDAyNTI3MDg1MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC74cciiBbs\n" +
+                "UcfmBxVlMWtsILsc85erRngknMaMW6wFyBsfJGrcL0TC7EO5XIsJXRrJN32vWdoo\n" +
+                "6Qm8WUGour+hrSNDzJ7cVtNA1ragPIjlkmMgbDLD0UsEbjHmA902079Fktv35L4l\n" +
+                "Hqe/vBygXcUoWJsGY5+8ykmI8W0LYPRkVwIDAQABo4G0MIGxMB8GA1UdIwQYMBaA\n" +
+                "FNHb6YiC5d0aj0yqAIy+fPKrG/bZMDgGA1UdHwQxMC8wLaAroCmGJ2h0dHA6Ly9j\n" +
+                "cmwuY2ZjYS5jb20uY24vUlNBL2NybDMwMDgyLmNybDALBgNVHQ8EBAMCA+gwHQYD\n" +
+                "VR0OBBYEFMM/joQIWvRFdLOx0HarTXAtZk7RMCgGA1UdJQQhMB8GCCsGAQUFBwMC\n" +
+                "BggrBgEFBQcDBAYJKoZIhvcvAQEFMA0GCSqGSIb3DQEBBQUAA4IBAQANEhHR34gg\n" +
+                "iivRj9VTO2lS0StsHQy4A4seq9YmaQa6QZDUEndFwcxr5DN6CAf6xA1YiHG5FoYd\n" +
+                "yH4sLORUhdfzQUWle7ZTPn4TfFjddPh3RDHXMXOh+pHNgrSjXpdACwadHedJO5e4\n" +
+                "HqXI8wEoNovDA8HT4ucMmsZHbIyQMhxW9k+DgTHx8nvltqv3reoDou3ekQ1tSWvW\n" +
+                "nUteKp64vop1ktgiIKjLshKRaUmZO4/fo9EcJHCH51J6f/2TAM7S+IaFzXR/VWf3\n" +
+                "JaiaGbT8kAJI854SmKWqRE8HVzMo/NYNdP0M7xZ2kt68PVE/UIl20xWii9P2/7Oh\n" +
+                "KYAnLX1nKjbg\n" +
+                "-----END CERTIFICATE-----";
         List<String> masterNodes = new ArrayList<>();
-        masterNodes.add("192.168.55.80:3336");
-        masterNodes.add("172.16.128.2:8889");
-        masterNodes.add("172.16.128.3:8889");
-        masterNodes.add("172.16.128.4:8889");
+//        masterNodes.add("172.16.18.99:8889");
+        masterNodes.add("172.16.18.5:8889");
+        masterNodes.add("172.16.18.6:8889");
+//        masterNodes.add("172.16.18.7:8889");
+//        masterNodes.add("172.16.18.8:8889");
         int timeout = 1000;
-        String pwd = null;
-        String cert = "";
+        Map<String, String> map = new HashMap<>();
+        map.put("snmp.target.ip", "172.16.18.113");
+        map.put("snmp.target.port", "162");
+        map.put("enterprise.oid", "1.3.6.1.4.1.9999");
+        map.put("snmp.community", "public");
+        map.put("snmp.version", "1");
         SydApi4j sydApi4j = new SydApi4j();
-//        sydApi4j.initSnmpTrapConfig("");
-        sydApi4j.importCertToServers(masterNodes, timeout, cert);
+        sydApi4j.importCertToServers(masterNodes, timeout, cert1, "12345678", new Gson().toJson(map));
+        stopWatch.stop();
+        System.out.println(stopWatch.getTotalTimeSeconds());
     }
 
     @Test
     public void snmpTest() {
-        try {
-            SnmpTrapSender sender = SnmpTrapSender.getInstance();
 
-            // 发送不同级别的日志
-            sender.sendTrap("Application started", 0);
-            sender.sendTrap("High CPU usage", 1);
-            sender.sendTrap("Database connection lost", 5);
-
-            sender.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
     }