From f7e1103e939d9030f034e0f3afbee9967e65d94a Mon Sep 17 00:00:00 2001
From: "junj2.liang" <junj2.liang@sunyard.com>
Date: Fri, 5 Aug 2022 10:47:09 +0800
Subject: [PATCH] Changes

---
 .../java/com/sunyard/sge/database/SydApi.java  | 10 ++--------
 .../sunyard/sge/database/SydApi4Database.java  | 18 +++++++++++++++++-
 src/test/java/sample/Sample.java               |  2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/sunyard/sge/database/SydApi.java b/src/main/java/com/sunyard/sge/database/SydApi.java
index 00b2559..7233398 100644
--- a/src/main/java/com/sunyard/sge/database/SydApi.java
+++ b/src/main/java/com/sunyard/sge/database/SydApi.java
@@ -26,17 +26,11 @@ public interface SydApi {
     static void SYD_SetLogConfig(
             String pcLogPath,
             int iLogLevel) {
-        Logger log = LogFactory.getLogger();
-        try {
-            if (iLogLevel<0||iLogLevel>3){
-                throw new IllegalArgumentException("IllegalArgumentException");
+            if (pcLogPath==null||iLogLevel<0||iLogLevel>3){
+                throw new IllegalArgumentException("地址不能为空且等级范围为0到3");
             }
             Logger logger = LogFactory.createLogger(pcLogPath, iLogLevel);
             SydApi4j.setLogger( logger );
-        }
-        catch (IllegalArgumentException e){
-                log.error(e.getMessage());
-        }
     }
 
     /**
diff --git a/src/main/java/com/sunyard/sge/database/SydApi4Database.java b/src/main/java/com/sunyard/sge/database/SydApi4Database.java
index c5d3008..543099d 100644
--- a/src/main/java/com/sunyard/sge/database/SydApi4Database.java
+++ b/src/main/java/com/sunyard/sge/database/SydApi4Database.java
@@ -52,6 +52,9 @@ public class SydApi4Database implements SydApi {
         if (LogFactory.iLogLevel==3) {
             log.debug("SYD_SM3_Hash_ShortData方法接收参数：pcData：{}", Arrays.toString(pcData));
         }
+        if (pcData.length==0){
+            throw new SydApiException(-19);
+        }
         if (null == this.hsms || this.hsms.length < 1) {
             throw new SydApiException(-1);
         }
@@ -78,6 +81,7 @@ public class SydApi4Database implements SydApi {
         if (LogFactory.iLogLevel==3) {
             log.debug("SYD_SM3_Hash_LongData方法接收参数：pcData：{},iPkgNum：{},pcProcData：{}", Arrays.toString(pcData), iPkgNum, pcProcData);
         }
+
         if (null == this.hsms || this.hsms.length < 1) {
             throw new SydApiException(-1);
         }
@@ -114,6 +118,9 @@ public class SydApi4Database implements SydApi {
         if (LogFactory.iLogLevel==3) {
             log.debug("SYD_SM4_ShortData方法接收参数：iKeyIndex：{},pcData：{},iFlag：{}", iKeyIndex, Arrays.toString(pcData), iFlag);
         }
+        if (iFlag==Consts.ECB_DEC&&null==pcData||pcData.length==0){
+            throw new SydApiException(19);
+        }
         if (null == this.hsms || this.hsms.length < 1) {
             throw new SydApiException(-1);
         }
@@ -152,6 +159,13 @@ public class SydApi4Database implements SydApi {
         if (LogFactory.iLogLevel==3) {
             log.debug("SYD_SM4_BatchData方法接收参数：iKeyIndex：{},pcData元素个数为：{},iFlag：{}", iKeyIndex, pcData.size(), iFlag);
         }
+        if (iFlag==Consts.ECB_DEC){
+            for (byte[] pcdata:pcData){
+                if (null==pcData||pcdata.length==0) {
+                    throw new SydApiException(19);
+                }
+            }
+        }
         if (null == this.hsms || this.hsms.length < 1) {
             throw new SydApiException(-1);
         }
@@ -186,10 +200,12 @@ public class SydApi4Database implements SydApi {
         if (LogFactory.iLogLevel==3) {
             log.debug("SYD_SM4_LongData方法接收参数：iKeyIndex：{},pcData：{},iPkgNum：{},iFlag：{}", iKeyIndex, Arrays.toString(pcData), iPkgNum, iFlag);
         }
+        if (iFlag==Consts.ECB_DEC&&null==pcData||pcData.length==0){
+            throw new SydApiException(19);
+        }
         if (null == this.hsms || this.hsms.length < 1) {
             throw new SydApiException(-1);
         }
-
         String keyIndex = String.format("%08d", iKeyIndex);
 
         SydApiException le = null;
diff --git a/src/test/java/sample/Sample.java b/src/test/java/sample/Sample.java
index 5fc1b64..6d57047 100644
--- a/src/test/java/sample/Sample.java
+++ b/src/test/java/sample/Sample.java
@@ -16,7 +16,7 @@ public class Sample
     public static void main(String[] args) {
 
         // 路径要以 / 或 \\ 结尾表示目录
-        SydApi.SYD_SetLogConfig("./logs/",2);
+        SydApi.SYD_SetLogConfig("./logs/",3);
 
         Logger log = LogFactory.getLogger();
         log.info("start");