From bb1b7fa8280e7e9e26029723ffddd55466d843ef Mon Sep 17 00:00:00 2001 From: xydkj Date: Tue, 26 May 2026 15:30:08 +0800 Subject: [PATCH 1/7] =?UTF-8?q?PBCAgent2G=E6=97=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/com/infosec/netsign/agent/Main.java | 16 +--------------- .../cn/com/infosec/netsign/agent/PBCAgent2G.java | 12 ++++++------ 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/Main.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/Main.java index 21257e2..7aed8c6 100644 --- a/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/Main.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/Main.java @@ -1,26 +1,12 @@ package cn.com.infosec.netsign.agent; -import cn.com.infosec.netsign.agent.config.OkHttpClientHolder; -import cn.com.infosec.netsign.agent.config.SignServerProperties; -import cn.com.infosec.netsign.agent.config.SignServerPropertiesLoader; -import com.fasterxml.jackson.databind.ObjectMapper; -import okhttp3.OkHttpClient; - import java.nio.charset.StandardCharsets; public class Main { public static void main(String[] args) { - OkHttpClient okHttpClient = OkHttpClientHolder.getClient(); - ObjectMapper objectMapper = new ObjectMapper(); - SignServerProperties properties = SignServerPropertiesLoader.getProperties(); - - PBCAgent2G signClient = new PBCAgent2G( - okHttpClient, - objectMapper, - properties - ); + PBCAgent2G signClient = new PBCAgent2G(); try { signClient.rawSign("test".getBytes(StandardCharsets.UTF_8), "dn"); diff --git a/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java index 56e62e2..814e987 100644 --- a/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java @@ -1,6 +1,8 @@ package cn.com.infosec.netsign.agent; +import cn.com.infosec.netsign.agent.config.OkHttpClientHolder; import cn.com.infosec.netsign.agent.config.SignServerProperties; +import cn.com.infosec.netsign.agent.config.SignServerPropertiesLoader; import cn.com.infosec.netsign.agent.dto.*; import cn.com.infosec.netsign.agent.exception.BusinessException; import com.fasterxml.jackson.core.JsonProcessingException; @@ -26,12 +28,10 @@ public class PBCAgent2G{ private final SignServerProperties properties; private final ThreadLocal lastReturnCode = new ThreadLocal<>(); - public PBCAgent2G(OkHttpClient okHttpClient, - ObjectMapper objectMapper, - SignServerProperties properties) { - this.okHttpClient = okHttpClient; - this.objectMapper = objectMapper; - this.properties = properties; + public PBCAgent2G() { + this.okHttpClient = OkHttpClientHolder.getClient(); + this.objectMapper = new ObjectMapper(); + this.properties = SignServerPropertiesLoader.getProperties(); } From 7a9cdac10ac280d761a59800173ea55d75456795 Mon Sep 17 00:00:00 2001 From: xydkj Date: Tue, 26 May 2026 16:19:37 +0800 Subject: [PATCH 2/7] =?UTF-8?q?PBCAgent2G=E6=B7=BB=E5=8A=A0=E6=97=A0?= =?UTF-8?q?=E5=8F=82=E6=9E=84=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openapi-sdk/pom.xml | 18 ++++++++++++++++++ .../com/infosec/netsign/agent/PBCAgent2G.java | 6 ++++++ 2 files changed, 24 insertions(+) diff --git a/openapi-sdk/pom.xml b/openapi-sdk/pom.xml index e3d01c0..d6805c9 100644 --- a/openapi-sdk/pom.xml +++ b/openapi-sdk/pom.xml @@ -53,19 +53,37 @@ + ${project.artifactId}-${project.version} + + org.apache.maven.plugins + maven-jar-plugin + 3.4.2 + + true + + + + + + org.apache.maven.plugins maven-assembly-plugin + 3.7.1 cn.com.infosec.netsign.agent.Main + jar-with-dependencies + + false + make-assembly diff --git a/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java index 814e987..63884a5 100644 --- a/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java @@ -34,6 +34,12 @@ public class PBCAgent2G{ this.properties = SignServerPropertiesLoader.getProperties(); } + public PBCAgent2G(boolean usingSingleServiceList) { + this.okHttpClient = OkHttpClientHolder.getClient(); + this.objectMapper = new ObjectMapper(); + this.properties = SignServerPropertiesLoader.getProperties(); + } + public String rawSign(byte[] origBytes, String dn) { From 861ecd6108ab89f6cfbe4e938cf838047433dc96 Mon Sep 17 00:00:00 2001 From: xydkj Date: Tue, 26 May 2026 16:51:17 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9PBCAgent2G?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/infosec/netsign/agent/PBCAgent2G.java | 45 +++++++++++-------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java index 63884a5..049b496 100644 --- a/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java @@ -1,8 +1,6 @@ package cn.com.infosec.netsign.agent; import cn.com.infosec.netsign.agent.config.OkHttpClientHolder; -import cn.com.infosec.netsign.agent.config.SignServerProperties; -import cn.com.infosec.netsign.agent.config.SignServerPropertiesLoader; import cn.com.infosec.netsign.agent.dto.*; import cn.com.infosec.netsign.agent.exception.BusinessException; import com.fasterxml.jackson.core.JsonProcessingException; @@ -22,22 +20,31 @@ public class PBCAgent2G{ MediaType.parse("application/json; charset=utf-8"); + private static final String baseUrl = "http://127.0.0.1:8080/api/v1/openapi"; + private static final String apiKey = "key"; + + private static final String rawSignPath = "/rawSign"; + private static final String rawVerifyPath = "/rawVerify"; + + private static final String dettachedSignPath = "/dettachedSign"; + private static final String dettachedVerifyPath = "/dettachedVerify"; + private static final String dettachedVerifySimplePath = "/dettachedVerifySimple"; + + private static final String uploadCertPath = "/uploadCert"; + private final OkHttpClient okHttpClient; private final ObjectMapper objectMapper; - private final SignServerProperties properties; private final ThreadLocal lastReturnCode = new ThreadLocal<>(); public PBCAgent2G() { this.okHttpClient = OkHttpClientHolder.getClient(); this.objectMapper = new ObjectMapper(); - this.properties = SignServerPropertiesLoader.getProperties(); } public PBCAgent2G(boolean usingSingleServiceList) { this.okHttpClient = OkHttpClientHolder.getClient(); this.objectMapper = new ObjectMapper(); - this.properties = SignServerPropertiesLoader.getProperties(); } @@ -82,10 +89,10 @@ public class PBCAgent2G{ ); Request request = new Request.Builder() - .url(buildUrl(properties.getRawSignPath())) + .url(buildUrl(rawSignPath)) .post(requestBody) .addHeader("Content-Type", "application/json") - .addHeader("X-API-Key", properties.getApiKey()) + .addHeader("X-API-Key", apiKey) .build(); @@ -164,10 +171,10 @@ public class PBCAgent2G{ ); Request request = new Request.Builder() - .url(buildUrl(properties.getRawVerifyPath())) + .url(buildUrl(rawVerifyPath)) .post(requestBody) .addHeader("Content-Type", "application/json") - .addHeader("X-API-Key", properties.getApiKey()) + .addHeader("X-API-Key", apiKey) .build(); System.out.println("准备连接签名服务器"); @@ -234,10 +241,10 @@ public class PBCAgent2G{ ); Request request = new Request.Builder() - .url(buildUrl(properties.getDettachedSignPath())) + .url(buildUrl(dettachedSignPath)) .post(requestBody) .addHeader("Content-Type", "application/json") - .addHeader("X-API-Key", properties.getApiKey()) + .addHeader("X-API-Key", apiKey) .build(); @@ -306,10 +313,10 @@ public class PBCAgent2G{ ); Request request = new Request.Builder() - .url(buildUrl(properties.getDettachedVerifyPath())) + .url(buildUrl(dettachedVerifyPath)) .post(requestBody) .addHeader("Content-Type", "application/json") - .addHeader("X-API-Key", properties.getApiKey()) + .addHeader("X-API-Key", apiKey) .build(); System.out.println("准备连接签名服务器"); @@ -380,10 +387,10 @@ public class PBCAgent2G{ ); Request request = new Request.Builder() - .url(buildUrl(properties.getDettachedVerifySimplePath())) + .url(buildUrl(dettachedVerifySimplePath)) .post(requestBody) .addHeader("Content-Type", "application/json") - .addHeader("X-API-Key", properties.getApiKey()) + .addHeader("X-API-Key", apiKey) .build(); System.out.println("准备连接签名服务器"); @@ -446,10 +453,10 @@ public class PBCAgent2G{ ); Request request = new Request.Builder() - .url(buildUrl(properties.getUploadCertPath())) + .url(buildUrl(uploadCertPath)) .post(requestBody) .addHeader("Content-Type", "application/json") - .addHeader("X-API-Key", properties.getApiKey()) + .addHeader("X-API-Key", apiKey) .build(); System.out.println("准备连接签名服务器"); @@ -486,7 +493,7 @@ public class PBCAgent2G{ private String buildUrl(String path) { - String baseUrl = properties.getBaseUrl(); + String baseUrl = "http://127.0.0.1:8080/api/v1/openapi"; if (baseUrl.endsWith("/") && path.startsWith("/")) { return baseUrl.substring(0, baseUrl.length() - 1) + path; @@ -495,7 +502,7 @@ public class PBCAgent2G{ if (!baseUrl.endsWith("/") && !path.startsWith("/")) { return baseUrl + "/" + path; } - + System.out.println(baseUrl + path); return baseUrl + path; } } From b7da42c5ab7a6e0df5b14dbee8ae043f948d35e1 Mon Sep 17 00:00:00 2001 From: xydkj Date: Tue, 26 May 2026 16:58:51 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9PBCAgent2G?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java index 049b496..9599a57 100644 --- a/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java @@ -34,6 +34,7 @@ public class PBCAgent2G{ private final OkHttpClient okHttpClient; private final ObjectMapper objectMapper; + private boolean isDebug; private final ThreadLocal lastReturnCode = new ThreadLocal<>(); @@ -47,6 +48,9 @@ public class PBCAgent2G{ this.objectMapper = new ObjectMapper(); } + public void isDebug(boolean isDebug){ + this.isDebug = isDebug; + } public String rawSign(byte[] origBytes, String dn) { From 4d973c4ab3250b6b04fc8406311f717d5e3fede1 Mon Sep 17 00:00:00 2001 From: xydkj Date: Tue, 26 May 2026 17:31:30 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9PBCAgent2G?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/com/infosec/netsign/agent/PBCAgent2G.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java index 9599a57..eb36e46 100644 --- a/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java @@ -35,6 +35,9 @@ public class PBCAgent2G{ private final OkHttpClient okHttpClient; private final ObjectMapper objectMapper; private boolean isDebug; + private String encoding; + private int orderdn; + private int timeout; private final ThreadLocal lastReturnCode = new ThreadLocal<>(); @@ -52,6 +55,19 @@ public class PBCAgent2G{ this.isDebug = isDebug; } + public void setEncoding(String encoding){ + this.encoding = encoding; + } + + public void setOrderdn(int orderdn){ + this.orderdn = orderdn; + } + + public void setTimeout(int timeout){ + this.timeout = timeout; + } + + public String rawSign(byte[] origBytes, String dn) { System.out.println("调用rawSign, dn:" + dn); From 9846ff13f78a25381bb93f12965096f254b0ac6b Mon Sep 17 00:00:00 2001 From: xydkj Date: Tue, 26 May 2026 17:45:08 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9PBCAgent2G?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/com/infosec/netsign/agent/PBCAgent2G.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java index eb36e46..24f5bb1 100644 --- a/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java @@ -67,6 +67,19 @@ public class PBCAgent2G{ this.timeout = timeout; } + public boolean openSignServer(String ip, int port, String password){ + System.out.println(ip); + System.out.println(port); + System.out.println(password); + return true; + }; + + public boolean[] openSignServer(String ip, String port,String password){ + System.out.println(ip); + System.out.println(port); + System.out.println(password); + return new boolean[]{true}; + }; public String rawSign(byte[] origBytes, String dn) { From 563b6254568512c1975a9981b885211aec19e49d Mon Sep 17 00:00:00 2001 From: xydkj Date: Wed, 27 May 2026 09:43:53 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9PBCAgent2G?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/com/infosec/netsign/agent/PBCAgent2G.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java index 24f5bb1..77ce955 100644 --- a/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java @@ -67,6 +67,15 @@ public class PBCAgent2G{ this.timeout = timeout; } + + public int getReturnCode(){ + return 1; + } + + public boolean closeSignServer(){ + return true; + } + public boolean openSignServer(String ip, int port, String password){ System.out.println(ip); System.out.println(port);