diff --git a/pom.xml b/pom.xml
index 0b5b9ca..10ff35b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.sunyard
sydapi4j
- 1.0.2022-SNAPSHOT
+ 1.13.20220909-1
jar
sydapi4j
@@ -26,59 +26,11 @@
4.12
test
-
- com.github.houbb
- junitperf
- 1.0.3
- test
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
com.sunyard
proto
- 1.1.20221215
+ 1.0.20221215
@@ -87,35 +39,6 @@
5.4.3
provided
-
-
-
- org.bouncycastle
- bcpkix-jdk15on
- 1.65
-
-
-
- org.bouncycastle
- bcprov-jdk15on
- 1.65
-
-
-
- cn.hutool
- hutool-all
- 5.8.4.M1
-
-
-
-
-
-
-
-
-
-
-
sydapi4j
@@ -149,8 +72,8 @@
- 6
- 6
+ 1.6
+ 1.6
groovy-eclipse-compiler
true
true
@@ -243,7 +166,7 @@
- com.Sample.TestDemo
+ racal.sunyard.main.Version
diff --git a/src/main/java/racal/sunyard/main/SydApi4j.java b/src/main/java/racal/sunyard/main/SydApi4j.java
index 491ba4f..be40ad4 100644
--- a/src/main/java/racal/sunyard/main/SydApi4j.java
+++ b/src/main/java/racal/sunyard/main/SydApi4j.java
@@ -728,7 +728,7 @@ public class SydApi4j implements SydApi {
data.put("signature", sign);
data.put("returnSign$option", 0);
ByteBuffer bb = proto.rend(packet);
-
+
synchronized(this) {
byte[] b = this.syncSend(bb);
bb = this.syncRead(b);
@@ -1676,7 +1676,7 @@ public class SydApi4j implements SydApi {
return m_certs;
}
-
+
// 测试通过
@Override
public RetWrap getAllCert(int dataFlag,String sqlite) throws UnsupportedEncodingException {
@@ -12409,10 +12409,12 @@ public class SydApi4j implements SydApi {
@Override
public byte[] attachedVerifyRD(byte[] sign) {
RetWrap retWrap = attachedVerifyAndGetAll(sign);
- if (retWrap == null)
+ if (retWrap == null) {
return null;
return (byte[]) retWrap.get("oData");
+ }
+ return (String) retWrap.get("oData");
}
/**
@@ -12422,23 +12424,29 @@ public class SydApi4j implements SydApi {
* @param sign 已签名数据
* @return 返回CERT_INFO结构的证书数据
*/
+ @Override
public X509 attachedVerifyAndGetX509(String sign) {
return attachedVerifyAndGetX509( sign.getBytes() );
}
+ @Override
public X509 attachedVerifyAndGetX509(byte[] sign) {
RetWrap retWrap = attachedVerifyAndGetAll( sign);
- if (retWrap == null)
+
+ if (retWrap == null) {
return null;
+ }
return (X509) retWrap.get("x509");
}
+
public RetWrap attachedVerifyAndGetAll(String sign) {
return attachedVerifyAndGetAll( sign.getBytes() );
}
// 大数据兼容处理
+ @Override
public RetWrap attachedVerifyAndGetAll(byte[] sign) {
if( sign.length > 4096 ) {