合并

# Conflicts:
#	pom.xml
#	src/main/java/com/sunyard/SydApiException.java
#	src/main/java/racal/sunyard/main/SydApi4j.java
#	src/test/java/com/sunyard/sydapi/test/TestAllMethods.java

src/test/java/com/sunyard/sydapi/ChuanhuaDemo1.java

@@ -0,0 +1,45 @@
+package com.sunyard.sydapi;
+
+import org.junit.Test;
+import racal.sunyard.main.SydApi4j;
+
+/**
+ * 传化签名验签demo
+ * */
+public class ChuanhuaDemo1 {
+
+    public  static void main(String[] args) {
+
+        // 调试模式
+        System.setProperty("com.sunyard.sydapi4j.debug", "true");
+
+        // 建立链接（单台）
+        SydApi4j api = (SydApi4j) new SydApi4j().connect("192.168.0.100", 8889, null, 1000);
+
+        try {
+
+            final String testSN1 = "1004282451";
+            final String testSN2 = "1004282452";
+
+            byte[] testData = "1234567812345678信达雅SUNYARDsunyard".getBytes("UTF-8");
+
+            System.out.println("\n\n----- 用指定的证书私钥对指定的数据进行数字签名。 -----");
+            String signPri = api.netSign(testSN1, testData);
+            System.out.print("sign : ");
+            System.out.println(signPri);
+            // 验签传原始数据
+            System.out.println("\n\n----- 用指定的证书私钥对指定的数据进行数字验证。 -----");
+            if (api.netVerify(testSN1, testData, signPri)) {
+                System.out.println("验证通过");
+            } else {
+                System.out.println("验证失败");
+            }
+
+        }catch (Exception e){
+            e.printStackTrace();
+        }finally {
+            api.disconnect();
+        }
+    }
+
+}

src/test/java/com/sunyard/sydapi/ChuanhuaDemo2.java

@@ -0,0 +1,65 @@
+package com.sunyard.sydapi;
+
+import com.sunyard.proto.Util;
+import org.junit.Assert;
+import racal.sunyard.main.SydApi4j;
+
+
+/**
+ * 传化国密加解密demo
+ * */
+public class ChuanhuaDemo2 {
+
+    /*public static void write(String file, byte[] content) {
+        try {
+            File f = new File(file);
+            if (!f.exists()) {
+                f.createNewFile();
+            }
+            FileOutputStream fos = new FileOutputStream(f);
+            fos.write(content);
+        } catch (Exception e) {
+            System.out.println("写入文件 " + file + " 异常");
+        }
+    }*/
+    public static void main(String[] args){
+
+        // 调试模式
+        System.setProperty("com.sunyard.sydapi4j.debug", "true");
+
+        // 建立链接（单台）
+//        SydApi4j api = (SydApi4j) new SydApi4j().connect("192.168.0.100", 8889, null, 1000);
+        SydApi4j api = (SydApi4j) new SydApi4j().connect("172.16.18.59", 8889, null, 1000);
+
+
+        try{
+
+//            final String testSN1 = "1004282451";//签名
+//            final String testSN2 = "1004282452";//加密
+            final String userId = "1747";
+
+            byte[] testData = "1234567812345678信达雅SUNYARDsunyard@!#$%^加密s".getBytes("GBK");
+
+            String pk = api.SM2GetPublicKeyC(userId, 1);
+            System.out.println("pk= " + pk);
+
+            System.out.println("\n\n----- 用输入的会话密钥，对指定报文数据进行加密处理。 SM2 -----");
+            String sdata = api.SM2Encrypt(Util.hexString2Bytes(pk), testData);
+            System.out.println("加密后的数据： " + sdata);
+
+            System.out.println("\n\n----- 用输入的会话密钥，对指定报文数据进行解密处理。 SM2 -----");
+            byte[] data = api.SM2DecryptC(userId, sdata);
+            Assert.assertArrayEquals(testData, data);
+            System.out.println("解密后的数据: " + new String(data));
+//            write("./data.txt",data);
+
+
+        }catch (Exception e){
+            e.printStackTrace();
+        }finally {
+            api.disconnect();
+        }
+
+    }
+
+}

src/test/java/com/sunyard/sydapi/test/Test8011.java

@@ -0,0 +1,32 @@
+package com.sunyard.sydapi.test;
+
+import racal.sunyard.main.SydApi4j;
+
+public class Test8011 {
+
+    private static final String dn = "C=CN,O=CFCA OCA1,OU=YCCA,OU=Individual-2,CN=YCCA@黄金交易所@Zhuangj@1";
+
+ //   private static final String dn = "C=CN,O=Sunyard,OU=8001,CN=8001";
+    //  private static final String dn = "1004282451";
+
+
+    public static void main(String[] args) {
+
+        System.setProperty("com.sunyard.sydapi4j.debug", "true");
+
+        SydApi4j api = (SydApi4j) new SydApi4j().connect("172.16.18.59", 8889, null, 1000);
+
+        try {
+
+            boolean sign = api.deleteCert(dn);
+            System.out.println(sign);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            api.disconnect();
+        }
+
+
+    }
+}