diff --git a/pom.xml b/pom.xml
index 8cd5d01..b1306fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,12 +111,12 @@
-
- ch.qos.logback
- logback-classic
- 1.3.15
- compile
-
+
+
+
+
+
+
@@ -256,7 +256,7 @@
- com.Sample.TestCert
+ com.Sample.TestDemo
diff --git a/src/main/java/com/jmeter/test/Test4Jemter.java b/src/main/java/com/jmeter/test/Test4Jemter.java
index e5cd733..2255573 100644
--- a/src/main/java/com/jmeter/test/Test4Jemter.java
+++ b/src/main/java/com/jmeter/test/Test4Jemter.java
@@ -17,9 +17,13 @@ public class Test4Jemter extends AbstractJavaSamplerClient {
private String SM2dn ;
private String RSAdn ;
private String ip ;
+
+ private int port;
private String ip2 ;
private String oData;
private String sign;
+
+ private String detachedSign;
private byte[] orgData;
private int type;
@@ -34,13 +38,15 @@ public class Test4Jemter extends AbstractJavaSamplerClient {
@Override
public Arguments getDefaultParameters() {
Arguments arguments = new Arguments();
- arguments.addArgument("SM2dn", "C=CN,O=CFCA OCA1,OU=YCCA,OU=Individual-2,CN=YCCA@黄金交易所@Zhuangj@1");
+ arguments.addArgument("SM2dn", "C=CN,ST=zz,L=zz,O=zzz,CN=zzzzz");
arguments.addArgument("RSAdn", "C=cn,O=CFCA TEST CA,OU=NCS2,OU=Enterprises,CN=041@Z402451000010@ShanDong@00000001");
arguments.addArgument("orgData", "12345678");
- arguments.addArgument("ip", "192.168.0.166");
+ arguments.addArgument("ip", "172.1.41.139");
+// arguments.addArgument("port", "8891");
// arguments.addArgument("ip2", "172.16.17.161");
arguments.addArgument("type", "1");
arguments.addArgument("sign", "12345678");
+ arguments.addArgument("detachedSign", "12345678");
return arguments;
}
@@ -55,11 +61,14 @@ public class Test4Jemter extends AbstractJavaSamplerClient {
RSAdn = context.getParameter("RSAdn");
oData = context.getParameter("orgData");
ip = context.getParameter("ip");
+// port = Integer.parseInt(context.getParameter("8891"));
// ip2 = context.getParameter("ip2");
type = context.getIntParameter("type");
sign = context.getParameter("sign");
+ detachedSign = context.getParameter("detachedSign");
System.setProperty("com.sunyard.dnsort", "false");
api = new ThreadLocal() {
+ @Override
public SydApi4j initialValue() {
SydApiBuilder builder = new SydApiBuilder().setIp(ip);
@@ -87,14 +96,16 @@ public class Test4Jemter extends AbstractJavaSamplerClient {
//执行业务逻辑
switch(type){
case 1:
- api.get().SYD_NakedSign(SM2dn, orgData, (byte[]) null);
+// api.get().SYD_NakedSign(SM2dn, orgData, (byte[]) null);
+ api.get().SYD_NakedSign(orgData,SM2dn);
sr.setResponseCodeOK();
//sr.setResponseData(Util.encodeBase64(nakedSign1), StandardCharsets.UTF_8.displayName());
break;
case 2:
- api.get().SYD_NakedVerify(SM2dn, Util.decodeBase64(sign), orgData, (byte[])null) ;
+// api.get().SYD_NakedVerify(SM2dn, Util.decodeBase64(sign), orgData, (byte[])null) ;
+ api.get().SYD_NakedVerify(orgData,Util.hexString2Bytes(sign), SM2dn);
sr.setResponseCodeOK();
//sr.setResponseData(String.valueOf(nakedVerify1), StandardCharsets.UTF_8.displayName());
break;
@@ -113,13 +124,15 @@ public class Test4Jemter extends AbstractJavaSamplerClient {
break;
case 5:
- api.get().detachedSign(1, orgData, SM2dn);
+// api.get().detachedSign(1, orgData, SM2dn);
+ api.get().detachedSign(orgData, SM2dn);
sr.setResponseCodeOK();
//sr.setResponseData(detSign1, StandardCharsets.UTF_8.displayName());
break;
case 6:
- api.get().detachedVerify(1, orgData, sign);
+// api.get().detachedVerify(1, orgData, sign);
+ api.get().detachedVerify(orgData, detachedSign);
sr.setResponseCodeOK();
//sr.setResponseData(String.valueOf(detV1), StandardCharsets.UTF_8.displayName());
break;
@@ -189,6 +202,9 @@ public class Test4Jemter extends AbstractJavaSamplerClient {
//sr.setResponseData(new String(oDataRSA), StandardCharsets.UTF_8.displayName());
break;
+ case 17:
+ sr.setResponseCodeOK();
+ break;
default:
sr.setResponseCodeOK();
sr.setResponseData("请选择测试组", StandardCharsets.UTF_8.displayName());
diff --git a/src/main/java/racal/sunyard/main/SydApi4j.java b/src/main/java/racal/sunyard/main/SydApi4j.java
index 9d3bee5..42db634 100644
--- a/src/main/java/racal/sunyard/main/SydApi4j.java
+++ b/src/main/java/racal/sunyard/main/SydApi4j.java
@@ -555,6 +555,7 @@ public class SydApi4j implements SydApi {
}
+ @Override
public byte[] SYD_NakedSign(byte[] orgData, String sCertDN) {
if (orgData == null) {
throw new IllegalArgumentException("输入数据为 null");
diff --git a/src/test/java/sample/Test4NongxinCW.java b/src/test/java/sample/Test4NongxinCW.java
index b272d05..4960ceb 100644
--- a/src/test/java/sample/Test4NongxinCW.java
+++ b/src/test/java/sample/Test4NongxinCW.java
@@ -23,35 +23,39 @@ public class Test4NongxinCW {
private SydApi4j api;
- final String SM2dn = "C=CN,O=Sunyard,OU=8001,CN=8001";
+ final String SM2dn = "C=CN,ST=zz,L=zz,O=zzz,CN=zzzzz";
byte[] orgData = new byte[100];
-// @Before
-// public void before() {
-// // 通过设置debug的属性开启debug，如果不设置则默认不打开
-// api = (SydApi4j) new SydApi4j().connect("172.16.18.6", 8889, null, 1000);
-//
-// }
+ @Before
+ public void before() {
+ //主备调用接口
+// SydApi4j.SYD_Set_Parameter_HA("", "", 8889, 1000);
+// api = new SydApi4j();
+ // 通过设置debug的属性开启debug，如果不设置则默认不打开
+ api = (SydApi4j) new SydApi4j().connect("172.1.41.139", 8891, null, 1000);
+
+ }
@Test
public void connection() {
}
-// @After
-// public void after() {
-// try {
-// this.api.disconnect();
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// }
+ @After
+ public void after() {
+ try {
+ this.api.disconnect();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
@Test
public void nakeSign(){
+ orgData = "12345678".getBytes();
//裸签
- byte[] nakedSign = api.SYD_NakedSign(orgData,SM2dn );
+ byte[] nakedSign = api.SYD_NakedSign(orgData,SM2dn);
System.out.println("SM2签名："+ Util.bytes2HexString(nakedSign));
//裸签验签
@@ -61,6 +65,7 @@ public class Test4NongxinCW {
@Test
public void detSign(){
+ orgData = "12345678".getBytes();
//detach签名
String detachedSign = api.detachedSign(orgData, SM2dn);
System.out.println("detach签名："+ detachedSign);
@@ -225,10 +230,10 @@ public class Test4NongxinCW {
List masterNodes = new ArrayList<>();
// masterNodes.add("172.16.18.99:8889");
// masterNodes.add("172.16.18.5:8889");
- masterNodes.add("172.16.18.6:8889");
+ masterNodes.add("172.1.41.139:8889");
// masterNodes.add("172.16.18.7:8889");
// masterNodes.add("172.16.18.8:8889");
- int timeout = 1;
+ int timeout = 100;
Map map = new HashMap<>();
map.put("snmp.target.ip", "172.1.41.191");
map.put("snmp.target.port", "162");
@@ -237,13 +242,20 @@ public class Test4NongxinCW {
map.put("snmp.version", "1");
String snmpConfig = new Gson().toJson(map);
SydApi4j sydApi4j = new SydApi4j();
- sydApi4j.importCertToServers(masterNodes, timeout, cert, "12345678", snmpConfig);
+ sydApi4j.importCertToServers(masterNodes, timeout, cert1, "12345678", snmpConfig);
stopWatch.stop();
System.out.println(stopWatch.getTotalTimeSeconds());
}
@Test
- public void snmpTest() {
+ public void delCert() {
+ boolean del = api.deleteCert(SM2dn);
+ System.out.println("删除："+ del);
+ }
+
+ @Test
+ public void selectCert(){
+ String sign = null;
}