From 01880dca0d0b6fce0b77ec9b32ebafc27fc84f02 Mon Sep 17 00:00:00 2001
From: cheney <cbed@163.com>
Date: Tue, 12 Jul 2022 20:04:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=B7=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kit.json                                      |  66 ++++++++++++++++
 pom.xml                                       |   7 ++
 .../java/com/sunyard/SydApiException.java     |  30 -------
 .../java/com/sunyard/sge/database/Consts.java |   6 ++
 .../sunyard/sge/database/SydApi4Database.java |  73 ++++++++++++++++--
 src/test/java/sample/Sample.java              |  52 ++++++++++++-
 .../com/sunyard/sge/database/Consts.class     | Bin 0 -> 375 bytes
 .../com/sunyard/sge/database/SydApi.class     | Bin 0 -> 413 bytes
 .../sge/database/SydApi4Database.class        | Bin 0 -> 2870 bytes
 target/test-classes/sample/Sample.class       | Bin 0 -> 2377 bytes
 10 files changed, 192 insertions(+), 42 deletions(-)
 create mode 100644 kit.json
 delete mode 100644 src/main/java/com/sunyard/SydApiException.java
 create mode 100644 src/main/java/com/sunyard/sge/database/Consts.java
 create mode 100644 target/classes/com/sunyard/sge/database/Consts.class
 create mode 100644 target/classes/com/sunyard/sge/database/SydApi.class
 create mode 100644 target/classes/com/sunyard/sge/database/SydApi4Database.class
 create mode 100644 target/test-classes/sample/Sample.class

diff --git a/kit.json b/kit.json
new file mode 100644
index 0000000..5949328
--- /dev/null
+++ b/kit.json
@@ -0,0 +1,66 @@
+{
+  "vars": {
+    "version": "git()",
+    "out_path": "./pack",
+    "target_f1": "./target/sydapi4j-jar-with-dependencies.jar",
+    "target_t1": "%out_path%/sydapi4j-jar-with-dependencies.jar",
+    "target_f2": "./target/sydapi4j.jar",
+    "target_t2": "%out_path%/sydapi4j.jar"
+  },
+  "clear": [
+    {
+      "func": "rmdir",
+      "path": "%out_path%"
+    }
+  ],
+  "init": [
+    {
+      "func": "mkdir",
+      "path": "%out_path%"
+    },
+    {
+      "func": "mkdir",
+      "path": "%out_path%/jar"
+    },
+    {
+      "func": "mkdir",
+      "path": "%out_path%/jar/dependences"
+    },
+    {
+      "func": "mkdir",
+      "path": "%out_path%/doc"
+    }
+  ],
+  "dependencies": [{
+    "func" : "pom",
+    "xml" : "%out_path%/jar"
+  }, {
+    "cmd" : "mvn dependency:copy-dependencies -DincludeScope=runtime -DoutputDirectory=%out_path%/jar/dependences",
+    "check": "BUILD SUCCESS"
+  }],
+  "gen" : [{
+    "cmd" : "dproto"
+  }],
+  "build": [
+    {
+      "cmd": "mvn package -DskipTests",
+      "check": "BUILD SUCCESS"
+    },
+    {
+      "func": "rename",
+      "from": "%target_f1%",
+      "to": "%target_t1%"
+    },
+    {
+      "func": "rename",
+      "from": "%target_f2%",
+      "to": "%target_t2%"
+    },
+    {
+      "func": "zip",
+      "from": "%out_path%",
+      "to": "%out_path%/sydapi-%version%.zip"
+    }
+  ]
+
+}
diff --git a/pom.xml b/pom.xml
index 57bfafb..ca56169 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,13 @@
       <version>4.11</version>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>com.sunyard</groupId>
+      <artifactId>sydapi4j</artifactId>
+      <version>1.0.20220712</version>
+    </dependency>
+
   </dependencies>
 
   <build>
diff --git a/src/main/java/com/sunyard/SydApiException.java b/src/main/java/com/sunyard/SydApiException.java
deleted file mode 100644
index d4e0f9a..0000000
--- a/src/main/java/com/sunyard/SydApiException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.sunyard;
-
-public class SydApiException extends RuntimeException {
-    // 错误编码
-    private int retCode;
-
-    // 错误消息
-    private String msg;
-
-    public SydApiException(int retCode, String msg) {
-        this.retCode = retCode;
-        this.msg = msg;
-    }
-
-    public int getRetCode() {
-        return retCode;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    @Override
-    public String toString() {
-        return "SydApiException{" +
-                "retCode=" + retCode +
-                ", msg='" + msg + '\'' +
-                '}';
-    }
-}
diff --git a/src/main/java/com/sunyard/sge/database/Consts.java b/src/main/java/com/sunyard/sge/database/Consts.java
new file mode 100644
index 0000000..4a45873
--- /dev/null
+++ b/src/main/java/com/sunyard/sge/database/Consts.java
@@ -0,0 +1,6 @@
+package com.sunyard.sge.database;
+
+public class Consts {
+    public static final int ECB_DEC = 0;
+    public static final int ECB_ENC = 1;
+}
diff --git a/src/main/java/com/sunyard/sge/database/SydApi4Database.java b/src/main/java/com/sunyard/sge/database/SydApi4Database.java
index 37feaff..0d4ccc8 100644
--- a/src/main/java/com/sunyard/sge/database/SydApi4Database.java
+++ b/src/main/java/com/sunyard/sge/database/SydApi4Database.java
@@ -1,5 +1,9 @@
 package com.sunyard.sge.database;
 
+import com.sunyard.SydApiException;
+import com.sunyard.util.SYMUtil;
+import racal.sunyard.main.SydApi4j;
+
 import java.util.List;
 
 /**
@@ -9,28 +13,81 @@ import java.util.List;
 public class SydApi4Database implements SydApi
 {
 
-    public static void SYD_SetLogConfig (
-            String pcLogPath,
-            int   iLogLevel) {
-    }
+//    public static void SYD_SetLogConfig (
+//            String pcLogPath,
+//            int   iLogLevel) {
+//    }
+
+    private SydApi4j api4j = null;
 
     @Override
     public SydApi SYD_Connect_Ex(String[] pcIpList, int[] iPortList, int iConnectTimeOut, int iDealTimeOut) {
-        return null;
+
+
+        if (    null == pcIpList &&
+                null == iPortList &&
+                pcIpList.length != iPortList.length ) {
+            throw new IllegalArgumentException("入参错误");
+        }
+        if ( null != api4j ) {
+            this.SYD_Disconnect_Ex();
+        }
+
+        api4j = (SydApi4j) new SydApi4j().connect( pcIpList[0], iPortList[0],  null, iConnectTimeOut, iDealTimeOut);
+
+        return this;
     }
 
     @Override
     public void SYD_Disconnect_Ex() {
-
+        if ( null != this.api4j ) {
+            try {
+                this.api4j.disconnect();
+            }catch ( Exception e ){
+            }
+        }
+        this.api4j = null;
     }
 
     @Override
     public byte[] SYD_SM4_ShortData(int iKeyIndex, byte[] pcData, int iFlag) {
-        return new byte[0];
+
+        if ( null == this.api4j ) {
+            throw new SydApiException(-1);
+        }
+
+        String keyIndex = String.format("%08d", iKeyIndex);
+
+        if ( Consts.ECB_ENC == iFlag ) {
+            return this.api4j.SYMEncryptData(
+                    com.sunyard.SydApi.NALG_SM4,
+                    "SK" + SYMUtil.genPrivateKeyMark("000000", "00A", keyIndex),
+                    1,
+                    pcData );
+        } else {
+            return this.api4j.SYMDecryptData(
+                    com.sunyard.SydApi.NALG_SM4,
+                    "SK" + SYMUtil.genPrivateKeyMark("000000", "00A", keyIndex),
+                    1,
+                    pcData );
+        }
     }
 
     @Override
     public List<byte[]> SYD_SM4_BatchData(int[] iKeyIndex, List<byte[]> pcData, int iFlag) {
-        return null;
+        if ( null == this.api4j ) {
+            throw new SydApiException(-1);
+        }
+
+        String[] keys = new String[ iKeyIndex.length ];
+        for ( int i = 0 ; i < iKeyIndex.length ; i++ ) {
+            keys[i] = "SK" + SYMUtil.genPrivateKeyMark("000000", "00A", String.format("%08d",  iKeyIndex[i] ));
+        }
+
+        if ( Consts.ECB_ENC == iFlag ) {
+            return this.api4j.SYMEncryptDecryptBatchData(8, keys, 1, pcData);
+        } else {
+            return this.api4j.SYMEncryptDecryptBatchData(9, keys, 1, pcData);
+        }
     }
 }
diff --git a/src/test/java/sample/Sample.java b/src/test/java/sample/Sample.java
index db9d76d..e9885b6 100644
--- a/src/test/java/sample/Sample.java
+++ b/src/test/java/sample/Sample.java
@@ -1,28 +1,72 @@
 package sample;
 
+import com.sunyard.proto.Util;
+import com.sunyard.sge.database.Consts;
 import com.sunyard.sge.database.SydApi;
 import com.sunyard.sge.database.SydApi4Database;
+import org.junit.Assert;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public class Sample
 {
     public static void main(String[] args) {
 
-        SydApi4Database.SYD_SetLogConfig("./sydapi/log", 1);
+        // System.setProperty("com.sunyard.sydapi4j.debug", "true");
+
         SydApi api = new SydApi4Database();
         try {
             api = api.SYD_Connect_Ex(
-                    new String[]{ "192.168.0.100" },
+                    new String[]{ "192.168.0.200" },
                     new int[]{ 8889 },
-                    3,
+                    10,
                     15
             );
 
 
+            // 短数据
+            shortData( api );
 
 
+            // 批量
+            batchData( api );
+
 
         } finally {
-            api.SYD_Disconnect_Ex();
+            if ( null != api ) {
+                api.SYD_Disconnect_Ex();
+            }
         }
     }
+
+    public static void shortData(SydApi api){
+        // 密钥索引
+        int keyIdx = 0;
+        // 测试数据
+        byte[] data = new byte[16];
+        byte[] encData = api.SYD_SM4_ShortData( keyIdx , data, Consts.ECB_ENC );
+        byte[] orgData = api.SYD_SM4_ShortData( keyIdx , encData, Consts.ECB_DEC );
+        System.out.println( "HEX=" + Util.bytes2HexString( encData ) );
+        Assert.assertArrayEquals( orgData, data );
+    }
+
+    public static void batchData(SydApi api){
+        // 密钥索引
+        int[] keyIdx = new int[]{ 0, 1, 2 };
+        // 测试数据
+        List<byte[]> data = new ArrayList<>();
+        data.add( new byte[8] );
+        data.add( new byte[16] );
+        data.add( new byte[1024] );
+
+        List<byte[]> encData = api.SYD_SM4_BatchData( keyIdx , data, Consts.ECB_ENC );
+        List<byte[]> orgData = api.SYD_SM4_BatchData( keyIdx , encData, Consts.ECB_DEC );
+
+        for ( int i = 0 ; i < data.size() ;  i++ ) {
+            System.out.println( "HEX=" + Util.bytes2HexString( encData.get(  i  ) ) );
+            Assert.assertArrayEquals( orgData.get( i ), data.get( i ) );
+        }
+
+    }
 }
diff --git a/target/classes/com/sunyard/sge/database/Consts.class b/target/classes/com/sunyard/sge/database/Consts.class
new file mode 100644
index 0000000000000000000000000000000000000000..2897998400ed7611beea4e41c9d65ed4dd4fabe2
GIT binary patch
literal 375
zcmaiwzfQw25XQf2k_OV2mhwkpLfwD?4;?`agdibBWdLPGPGS{TsUsy05|71%#J~ga
zP>4(Dz{cQD{(X1nyYtug$0vX}4g>Vy_;82t&?ih*@<ob5nx(i;S1PlF{-rkBUJ;y=
z)5OOX;W#VTqHfHqta4E=mB^))sjQU<OH<pL;78&0(@hi-=#DVzY-wyFi$*!z7@L%6
z5w=JKH!O2S7{}VEMYB#-^(fPVooQTVvPfj5Ti%$ieb(G&7XLHJ1tEASn<`Vcx_xZ$
zJK%Y{C1&t>dGI;HHUge$(9w{2^oMsiLhbjkjyXeg40vbnptr7M!rF!b2fM7p?(SiV
LJto3FYYzuMd7etX

literal 0
HcmV?d00001

diff --git a/target/classes/com/sunyard/sge/database/SydApi.class b/target/classes/com/sunyard/sge/database/SydApi.class
new file mode 100644
index 0000000000000000000000000000000000000000..fb539347b3078f1e4a07f394777e4ee1997a98b1
GIT binary patch
literal 413
zcmah_O-sW-6r62q(+{ofFYqKJ2i=37j0nakEJQpk2(pK;O+vaQZY0@={c9fl0sbg)
zn+h%T;OWhKGxOf?zJETy09;_^phIwyl&`dI^h#DKt@Dhg(#W~2Gs;)#?VEDYBbYAb
zyQGEGIenThv&0Zg_)8eym0H^_zW*S&az(V2aZ@Rs`+_m%MgN@e31;hUp{kReg<aQs
z{$u##Wy}|4WkMT{VBj(lFi!+KbRbQ#*wCl0V4En7Q3Z`uZG4-e4Y!>T47tj+G)<Ke
zob7wAMR2q4Yo`PwUN%*dJ*dK($D3E3uP^io2)g#cK+k^e0DTJx91Pkz#Hg)f99rFx
MRdq12=(t7GU(iKvHUIzs

literal 0
HcmV?d00001

diff --git a/target/classes/com/sunyard/sge/database/SydApi4Database.class b/target/classes/com/sunyard/sge/database/SydApi4Database.class
new file mode 100644
index 0000000000000000000000000000000000000000..8016d41b884e6976e88dbaaef0bf0d80948f3de0
GIT binary patch
literal 2870
zcma)8-BS}+6#w01<A%5>M367>`y(VkP^nUaC^68k22g|8m{z(ZYgkA&>1IQLemm`R
zU;5Igb~>XzYG+z-%7}gGOaBjN+CQP4ex1A7d_Wkd%&>d!x#ynqJHK=Goc#LFPg?-a
z<ADbbI7J8&T-d|Vw5TjA!HlA(gVXbiYSLubGotC5Im+Pl^~^TFjRp}O340+i_>#G7
zuu#-j6(bcaq}5<bF_n3xpax^Bsj<8^7_s*ZE`_#>4Bb&fNh+Djt*oNyW$nd~h<yyl
zt03e|MolZ3F(X~fs=7J8l2r4imebv6Vvt^b@$luB4}SmZ>))O{@t_f29>oEMR$sJg
zB4!$zo(}cQdI)=~go8ZJ=2$#37tspIoUT)pbK@%_+8MfDfz5+9IQgSX!Xb1si1uZM
zOS|}!>mkT;Pqdb>5=S9!^N56_IL6>fRWMnE%OXxN9H>T9VL-$w!dq{yqTs<voZ*D{
z7zCf(GwX(*R;LDrQXcf8Pei|jAO?txs(D#A)wF6*aLY=js7~K!I7oMEVzD&{^*Nju
zF(~0RT-a7PCBmt2?&plGLKXD-F7za7OqMDwRO`h~nusBWBeg+pE3&IOy<iqZ3^RCZ
zl}f~l7-49u##XW!E^3*SYIqQW(~Zjvj@Wg+8IuskRYI-g^QxX==-UN#Jw)4F$c=Hj
zJ7E2}@dhPtU|`Gx8P`Nymk`AyLwha8qN!zqvH0X|dQ%G0s(!=JmK9UIuC7ih#uCG|
zT>#XuW>ZuzsRv2P3SnBp4cugKo4Im^T70|ewjm~A2DcgZ5x{XhX{_c={v|VX`s8|t
zaw6Q52=g+&BjK&`y@*=5$B*txNZ@U<P-C*B5mwCPLdpC^pIloQc8Io1i?OIyFw2!v
z6^OX^syZpv0~P<(TuNowAJueqs+gTujTvP=LlSQ^M?Gm)F*Lrng@U=D6&U>6zS(W{
zx1-60EW#plRF-yAVHo!95>P_k*$Q?sOV-@^q@3pwQw!L|3`2u<BWIW;4M#$z&@|im
zjFwfWi*%8ZRMH}<lBtLqW2TZ^npE<3pjI=CO%Be*7RXvD6K={xSf;dcCsdNMo>Et+
z!t=?}xr3j$w26$8CY(zZ1#f+M*xi;ps7duHU!pFr<wjFYEaBIvxs;67iUo2>$vL<^
zajW@q@>+IW8A*gkX}S>DhM1Pt6|-ni-uvo7Sc-K(EGf0;SgvR!)d`IkP0Nn-_w!bR
zV>D$PV0efA9ehgCoORKf#w$JNXg6e?10Medn4kR!@q3aw@Gd?1I0j8J0j*GICD9!&
zokx=13@NC#l^-CIO(4PokI=z-AE70%)w}f#8aL4x_wL_7^9$xDt%nf(>uB+BqAk9G
zj)3!Aud|<Zw+id%{26WJ-v5;BI4%F3gc9gNGY-@9C{9p3XK0XwaoWN&Sn_G(A@8`4
zw1qK(1!xxf2o|wK_V{UrRsyoL7U1aGOPVx(?Fh1@&7<wKVeaQ>*KzpHV+c{37pg5Z
z;Q)?r!xtcFAIXDs(vKFLMF&lzDqo#8KJHhf1~1Zma;hU|yZ(bfaPmyc^&?1|I2m_r
z;PeY`kMJChxU=gS0<mW}J1hv@-=c>@6E+bd1}}L>*Kx%g@lJFI&+sO#*D)pZuH)9z
z|D!cqCEHJl1ujxBLqvFp$i4(0MsXQeaE;zmM4*ZZ<mt_WE0J$j$T#U^i6Wvn@E#0{
zOcMo*{1doI(xOd%102nNVMHXB7?$xqsZu4fLsXwU-)nU=1h$^z+_2!h;A(XRw!Xt~
zhtTTU8Go6pK&z|YrmI3o>~j};{O>QEyk<^Ile<IUB*iU~ni|SG@-A4FcNz_}o+2`)
ziHuulM~t#IL(drExPyB%Su(h55iv@ryNI9_3YDjEtwPBfQKDIttPv%v7A0#oCGDiO
sM%60d1G-cCvbffVq{S;`AB5(=`LElL*q@YTd`vP2J|SzLTC30g1DJcb(EtDd

literal 0
HcmV?d00001

diff --git a/target/test-classes/sample/Sample.class b/target/test-classes/sample/Sample.class
new file mode 100644
index 0000000000000000000000000000000000000000..6c5daad38aa5244a32172c183957a5fe0f607eb4
GIT binary patch
literal 2377
zcmah~TUQfT6#h;!VL})sLGXr`dch_T2vBO307?Wk8jKo6F|{}(Qy2_MoS7)0mzVaj
zkA3Y+YnQ8!`k+$n<+=SwuCCheOad5im9>&Nd!N~RpZ$G%pFMy5`|IxjKEl@lc;Ho`
zXz-y)Ah@VM)MEv`I3G*TEgCsTplQS`n$DPjHyoK(;TH(!N=q@jQmpD$K4#AwvApi+
zbGmKBGS&Qe*&Ldv>j9`TcuPavjANO_c|Udt>=-yb*f((UR9}DJV1IuLS`kzc($I!o
z0*ALbMPO%UW@7eSsaRy5vy;mL!{Kad13>Mdcs7|#MpD}ZiwDqw-75BI*o%G4%+{C6
z1p;yxfo6N5WH}O-!13_5(IV3_UZ;iwGFbDR?&KDvvxIm^!(mBvNM=7_+PQTADvtag
zY$CNCTZTBM;W)bLAu>}#vzd+T{NZFak&I*$&G-;u6%h^H=xMA#)pm>}7PM4heLHHD
znWflO7RDiKhQ1V6(JQcLGnt8sS;!k!08x1T=oe5fPTn4s>Y&DM8e+HT<+4%C3-pG!
zmLjrcs~(W_pTs9BPH8xeVS(N6maA-)oKozjV-^Hj=c<lj4_-8uYt^M`IGflSmjR;~
z(J%@&uHPxGS+|GZYkL;sDiRvbVM1V+i@K2y0ktgIDHKWA`;f8V=W#*BMGZ+@BHblx
zKDJol&54cMwqcRzknRfOmZeuGA5`>$&8W<t`SV_-)()-^Xv{TAnYI(aWq4bV##I&9
zG+al9eeWjd+DQ`@QqPm|hP-OGHy*ho`{kyFY213JUlMB#DbN+pCTnF`4;bftX*?n>
zGnmnE2U*tKHdhRH93<uTT@9aMmioLQyD7Zp{LT<zH}T$hvI#n$E9L3jnlg*VmCDkb
zVcpQ@3fyT+m2!GvTDMH8*Ebbs!6ZwqsfOzqXP713WGPtuEiDy~O!K{N&C_w$dtOVr
z%BH}PZErEhK*rH?_owu-n~#b`73H-$x%h4@Sfxib08RIeYBJ9$B$7N|jzpH%DCTNI
zLuEhIB*C*iS=t0QlT18~Bvi|5M6_?R9myuf$m%13K&Di&a>jX6lGsw4SADX2IKmO+
z;gkmy2sz&QoTC=wD!BT(UqC#i;6aX0`5MrWcb~2S417+l8S_}EJO52PFZV9Jf;#g8
z&8Z&cHw0$9ZCXZo%{6p%H608DTUW8uhg8o?wDZ4T^!$wdJ*zk<@C2bLsW#Wt=pRoR
z*^get8P)4%(v1M+Htx2g3kMM)lwL}MI6<o}jB~w!FfUrf&33m7^Ab!f($9|s?xVn{
zOVm2yeM={gilWM!AXJq8K?|R6XwWQ&eI3{@WXVT|Gv1M4@U?%cyECe+;;4cv-JQK&
zR~lBH;lwLMiMy{Y_8bGfFYz&#=ZHVYnSDz1B_=ocJj9P5n74<7tLR4v1N<Be;uHtv
z7>3-;hiXT<`N}$s;sGos#7PJnI(I_ogG0$n-(#pyQkXVBE48$RL%oUTJZ_Tgd($(D
zlAiJT(y3Rt%si*2qCx*_|0=F{a4RZ-)y0s4HMzS-BE2Dz_DH0Zh86EgUxzQcirWG|
zBDooNhi?_1dhjRiH8QZVAKehi%C|o8<n1%bjp9~#kbMSX3}Toih!fceagI_ug9)7F
zR7v12r|~z`exUpl>n;0oj99PZ8Xl4*S**u(=7RX1%snC}d+{BaTPAZ8xJTxe$y^#Y
z$=ou}uF~fN?$oSS)~#07tyX9y`{n>VZ+TP`n?}VKD$=zduf-c&<vCx{#)Gf^1Lk!f
A_W%F@

literal 0
HcmV?d00001