diff --git a/openapi-sdk/pom.xml b/openapi-sdk/pom.xml index c9ef35b..e3d01c0 100644 --- a/openapi-sdk/pom.xml +++ b/openapi-sdk/pom.xml @@ -3,8 +3,8 @@ 4.0.0 com.cisd - openapi-sdk - 1.0-SNAPSHOT + netsignapi + 1.0.0 1.8 @@ -48,5 +48,34 @@ 2.19.4 + + + + + + + maven-assembly-plugin + + + + cn.com.infosec.netsign.agent.Main + + + + jar-with-dependencies + + + + + make-assembly + package + + single + + + + + + diff --git a/openapi-sdk/src/main/java/com/cisd/openapi/Main.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/Main.java similarity index 74% rename from openapi-sdk/src/main/java/com/cisd/openapi/Main.java rename to openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/Main.java index 028a47c..21257e2 100644 --- a/openapi-sdk/src/main/java/com/cisd/openapi/Main.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/Main.java @@ -1,9 +1,9 @@ -package com.cisd.openapi; +package cn.com.infosec.netsign.agent; -import com.cisd.openapi.config.OkHttpClientHolder; -import com.cisd.openapi.config.SignServerProperties; -import com.cisd.openapi.config.SignServerPropertiesLoader; +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; @@ -16,7 +16,7 @@ public class Main ObjectMapper objectMapper = new ObjectMapper(); SignServerProperties properties = SignServerPropertiesLoader.getProperties(); - SignClient signClient = new SignClient( + PBCAgent2G signClient = new PBCAgent2G( okHttpClient, objectMapper, properties diff --git a/openapi-sdk/src/main/java/com/cisd/openapi/SignClient.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java similarity index 88% rename from openapi-sdk/src/main/java/com/cisd/openapi/SignClient.java rename to openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java index 8bef183..56e62e2 100644 --- a/openapi-sdk/src/main/java/com/cisd/openapi/SignClient.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/PBCAgent2G.java @@ -1,8 +1,8 @@ -package com.cisd.openapi; +package cn.com.infosec.netsign.agent; -import com.cisd.openapi.config.SignServerProperties; -import com.cisd.openapi.dto.*; -import com.cisd.openapi.exception.BusinessException; +import cn.com.infosec.netsign.agent.config.SignServerProperties; +import cn.com.infosec.netsign.agent.dto.*; +import cn.com.infosec.netsign.agent.exception.BusinessException; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -14,18 +14,19 @@ import java.util.Base64; import java.util.UUID; -public class SignClient{ +public class PBCAgent2G{ private static final MediaType JSON_MEDIA_TYPE = MediaType.parse("application/json; charset=utf-8"); + private final OkHttpClient okHttpClient; private final ObjectMapper objectMapper; private final SignServerProperties properties; private final ThreadLocal lastReturnCode = new ThreadLocal<>(); - public SignClient(OkHttpClient okHttpClient, + public PBCAgent2G(OkHttpClient okHttpClient, ObjectMapper objectMapper, SignServerProperties properties) { this.okHttpClient = okHttpClient; @@ -36,6 +37,7 @@ public class SignClient{ public String rawSign(byte[] origBytes, String dn) { + System.out.println("调用rawSign, dn:" + dn); String sessionId = UUID.randomUUID().toString().replace("-", ""); if (origBytes == null) { @@ -81,7 +83,9 @@ public class SignClient{ .build(); + System.out.println("准备连接签名服务器"); try (Response response = okHttpClient.newCall(request).execute()) { + System.out.println("连接成功，并收到响应"); String responseBody = response.body() == null ? "" : response.body().string(); JsonNode root = objectMapper.readTree(responseBody); int code = root.get("code").asInt(); @@ -100,13 +104,16 @@ public class SignClient{ } } catch (IOException e) { + System.err.println("连接签名服务器异常" + e.getMessage()); throw new RuntimeException("调用rawSign异常:" + e.getMessage(), e); + } finally { + System.out.println("请求结束, 连接资源已释放"); } } public boolean rawVerify(byte[] origBytes, String certStr, String dn) { - + System.out.println("调用rawVerify, dn:" + dn); String sessionId = UUID.randomUUID().toString().replace("-", ""); if (origBytes == null) { @@ -157,8 +164,9 @@ public class SignClient{ .addHeader("X-API-Key", properties.getApiKey()) .build(); - + System.out.println("准备连接签名服务器"); try (Response response = okHttpClient.newCall(request).execute()) { + System.out.println("连接成功，并收到响应"); String responseBody = response.body() == null ? "" : response.body().string(); JsonNode root = objectMapper.readTree(responseBody); int code = root.get("code").asInt(); @@ -176,13 +184,16 @@ public class SignClient{ } } catch (IOException e) { + System.err.println("连接签名服务器异常" + e.getMessage()); throw new RuntimeException("调用rawVerify异常", e); + } finally { + System.out.println("请求结束, 连接资源已释放"); } } public String dettachedSign(byte[] origBytes, String dn) { - + System.out.println("调用dettachedSign, dn:" + dn); String sessionId = UUID.randomUUID().toString().replace("-", ""); if (origBytes == null) { @@ -224,7 +235,9 @@ public class SignClient{ .build(); + System.out.println("准备连接签名服务器"); try (Response response = okHttpClient.newCall(request).execute()) { + System.out.println("连接成功，并收到响应"); String responseBody = response.body() == null ? "" : response.body().string(); JsonNode root = objectMapper.readTree(responseBody); int code = root.get("code").asInt(); @@ -242,7 +255,10 @@ public class SignClient{ } } catch (IOException e) { + System.err.println("连接签名服务器异常" + e.getMessage()); throw new RuntimeException("调用dettachedSign异常", e); + } finally { + System.out.println("请求结束, 连接资源已释放"); } } @@ -290,8 +306,9 @@ public class SignClient{ .addHeader("X-API-Key", properties.getApiKey()) .build(); - + System.out.println("准备连接签名服务器"); try (Response response = okHttpClient.newCall(request).execute()) { + System.out.println("连接成功，并收到响应"); String responseBody = response.body() == null ? "" : response.body().string(); JsonNode root = objectMapper.readTree(responseBody); int code = root.get("code").asInt(); @@ -311,7 +328,10 @@ public class SignClient{ } } catch (IOException e) { + System.err.println("连接签名服务器异常" + e.getMessage()); throw new RuntimeException("调用dettachedVerify异常", e); + } finally { + System.out.println("请求结束, 连接资源已释放"); } } @@ -360,8 +380,9 @@ public class SignClient{ .addHeader("X-API-Key", properties.getApiKey()) .build(); - + System.out.println("准备连接签名服务器"); try (Response response = okHttpClient.newCall(request).execute()) { + System.out.println("连接成功，并收到响应"); String responseBody = response.body() == null ? "" : response.body().string(); JsonNode root = objectMapper.readTree(responseBody); int code = root.get("code").asInt(); @@ -379,7 +400,10 @@ public class SignClient{ } } catch (IOException e) { + System.err.println("连接签名服务器异常" + e.getMessage()); throw new RuntimeException("调用dettachedVerifySimple异常", e); + } finally { + System.out.println("请求结束, 连接资源已释放"); } } @@ -422,8 +446,9 @@ public class SignClient{ .addHeader("X-API-Key", properties.getApiKey()) .build(); - + System.out.println("准备连接签名服务器"); try (Response response = okHttpClient.newCall(request).execute()) { + System.out.println("连接成功，并收到响应"); String responseBody = response.body() == null ? "" : response.body().string(); JsonNode root = objectMapper.readTree(responseBody); int code = root.get("code").asInt(); @@ -441,7 +466,10 @@ public class SignClient{ } } catch (IOException e) { + System.err.println("连接签名服务器异常" + e.getMessage()); throw new RuntimeException("调用uploadCert异常", e); + } finally { + System.out.println("请求结束, 连接资源已释放"); } } diff --git a/openapi-sdk/src/main/java/com/cisd/openapi/config/OkHttpClientHolder.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/config/OkHttpClientHolder.java similarity index 91% rename from openapi-sdk/src/main/java/com/cisd/openapi/config/OkHttpClientHolder.java rename to openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/config/OkHttpClientHolder.java index d3f6b7b..e2dcd6a 100644 --- a/openapi-sdk/src/main/java/com/cisd/openapi/config/OkHttpClientHolder.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/config/OkHttpClientHolder.java @@ -1,4 +1,4 @@ -package com.cisd.openapi.config; +package cn.com.infosec.netsign.agent.config; import okhttp3.OkHttpClient; diff --git a/openapi-sdk/src/main/java/com/cisd/openapi/config/SignServerProperties.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/config/SignServerProperties.java similarity index 83% rename from openapi-sdk/src/main/java/com/cisd/openapi/config/SignServerProperties.java rename to openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/config/SignServerProperties.java index 87f571c..5cdfeae 100644 --- a/openapi-sdk/src/main/java/com/cisd/openapi/config/SignServerProperties.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/config/SignServerProperties.java @@ -1,4 +1,4 @@ -package com.cisd.openapi.config; +package cn.com.infosec.netsign.agent.config; import lombok.Data; @@ -21,5 +21,4 @@ public class SignServerProperties { private String uploadCertPath; - private String lastReturnCodePath; } \ No newline at end of file diff --git a/openapi-sdk/src/main/java/com/cisd/openapi/config/SignServerPropertiesLoader.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/config/SignServerPropertiesLoader.java similarity index 88% rename from openapi-sdk/src/main/java/com/cisd/openapi/config/SignServerPropertiesLoader.java rename to openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/config/SignServerPropertiesLoader.java index 6c8d1b1..6f6ef48 100644 --- a/openapi-sdk/src/main/java/com/cisd/openapi/config/SignServerPropertiesLoader.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/config/SignServerPropertiesLoader.java @@ -1,4 +1,4 @@ -package com.cisd.openapi.config; +package cn.com.infosec.netsign.agent.config; import java.io.InputStream; import java.util.Properties; @@ -37,12 +37,10 @@ public class SignServerPropertiesLoader { config.setDettachedVerifyPath(props.getProperty("sign-server.dettachedVerifyPath")); config.setDettachedVerifySimplePath(props.getProperty("sign-server.dettachedVerifySimplePath")); config.setUploadCertPath(props.getProperty("sign-server.uploadCertPath")); - config.setLastReturnCodePath(props.getProperty("sign-server.lastReturnCodePath")); - return config; } catch (Exception e) { - throw new RuntimeException("加载 sign-server 配置失败", e); + throw new RuntimeException("加载签名服务器配置失败", e); } } } \ No newline at end of file diff --git a/openapi-sdk/src/main/java/com/cisd/openapi/dto/CertificateInfo.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/CertificateInfo.java similarity index 83% rename from openapi-sdk/src/main/java/com/cisd/openapi/dto/CertificateInfo.java rename to openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/CertificateInfo.java index 0685b06..336d8d8 100644 --- a/openapi-sdk/src/main/java/com/cisd/openapi/dto/CertificateInfo.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/CertificateInfo.java @@ -1,4 +1,4 @@ -package com.cisd.openapi.dto; +package cn.com.infosec.netsign.agent.dto; public class CertificateInfo { private String subjectDN; diff --git a/openapi-sdk/src/main/java/com/cisd/openapi/dto/DettachedSignRequest.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/DettachedSignRequest.java similarity index 88% rename from openapi-sdk/src/main/java/com/cisd/openapi/dto/DettachedSignRequest.java rename to openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/DettachedSignRequest.java index 84308e6..dcc04f9 100644 --- a/openapi-sdk/src/main/java/com/cisd/openapi/dto/DettachedSignRequest.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/DettachedSignRequest.java @@ -1,4 +1,4 @@ -package com.cisd.openapi.dto; +package cn.com.infosec.netsign.agent.dto; import lombok.Data; diff --git a/openapi-sdk/src/main/java/com/cisd/openapi/dto/DettachedSignResponse.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/DettachedSignResponse.java similarity index 70% rename from openapi-sdk/src/main/java/com/cisd/openapi/dto/DettachedSignResponse.java rename to openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/DettachedSignResponse.java index 42ef804..75f3829 100644 --- a/openapi-sdk/src/main/java/com/cisd/openapi/dto/DettachedSignResponse.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/DettachedSignResponse.java @@ -1,4 +1,4 @@ -package com.cisd.openapi.dto; +package cn.com.infosec.netsign.agent.dto; import lombok.Data; diff --git a/openapi-sdk/src/main/java/com/cisd/openapi/dto/DettachedVerifyRequest.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/DettachedVerifyRequest.java similarity index 88% rename from openapi-sdk/src/main/java/com/cisd/openapi/dto/DettachedVerifyRequest.java rename to openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/DettachedVerifyRequest.java index f8ea40a..0f9d8c9 100644 --- a/openapi-sdk/src/main/java/com/cisd/openapi/dto/DettachedVerifyRequest.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/DettachedVerifyRequest.java @@ -1,4 +1,4 @@ -package com.cisd.openapi.dto; +package cn.com.infosec.netsign.agent.dto; import lombok.Data; diff --git a/openapi-sdk/src/main/java/com/cisd/openapi/dto/DettachedVerifyResponse.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/DettachedVerifyResponse.java similarity index 74% rename from openapi-sdk/src/main/java/com/cisd/openapi/dto/DettachedVerifyResponse.java rename to openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/DettachedVerifyResponse.java index 981391e..87f4aae 100644 --- a/openapi-sdk/src/main/java/com/cisd/openapi/dto/DettachedVerifyResponse.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/DettachedVerifyResponse.java @@ -1,4 +1,4 @@ -package com.cisd.openapi.dto; +package cn.com.infosec.netsign.agent.dto; import lombok.Data; diff --git a/openapi-sdk/src/main/java/com/cisd/openapi/dto/DettachedVerifySimpleRequest.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/DettachedVerifySimpleRequest.java similarity index 88% rename from openapi-sdk/src/main/java/com/cisd/openapi/dto/DettachedVerifySimpleRequest.java rename to openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/DettachedVerifySimpleRequest.java index c6e72c6..f74bd6a 100644 --- a/openapi-sdk/src/main/java/com/cisd/openapi/dto/DettachedVerifySimpleRequest.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/DettachedVerifySimpleRequest.java @@ -1,4 +1,4 @@ -package com.cisd.openapi.dto; +package cn.com.infosec.netsign.agent.dto; import lombok.Data; diff --git a/openapi-sdk/src/main/java/com/cisd/openapi/dto/DettachedVerifySimpleResponse.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/DettachedVerifySimpleResponse.java similarity index 75% rename from openapi-sdk/src/main/java/com/cisd/openapi/dto/DettachedVerifySimpleResponse.java rename to openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/DettachedVerifySimpleResponse.java index 6415584..4722080 100644 --- a/openapi-sdk/src/main/java/com/cisd/openapi/dto/DettachedVerifySimpleResponse.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/DettachedVerifySimpleResponse.java @@ -1,4 +1,4 @@ -package com.cisd.openapi.dto; +package cn.com.infosec.netsign.agent.dto; import lombok.Data; diff --git a/openapi-sdk/src/main/java/com/cisd/openapi/dto/ErrorDataResponse.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/ErrorDataResponse.java similarity index 70% rename from openapi-sdk/src/main/java/com/cisd/openapi/dto/ErrorDataResponse.java rename to openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/ErrorDataResponse.java index 4d8289d..52556f2 100644 --- a/openapi-sdk/src/main/java/com/cisd/openapi/dto/ErrorDataResponse.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/ErrorDataResponse.java @@ -1,4 +1,4 @@ -package com.cisd.openapi.dto; +package cn.com.infosec.netsign.agent.dto; import lombok.Data; diff --git a/openapi-sdk/src/main/java/com/cisd/openapi/dto/GenericCertificate.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/GenericCertificate.java similarity index 94% rename from openapi-sdk/src/main/java/com/cisd/openapi/dto/GenericCertificate.java rename to openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/GenericCertificate.java index 0e36845..88bd059 100644 --- a/openapi-sdk/src/main/java/com/cisd/openapi/dto/GenericCertificate.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/GenericCertificate.java @@ -1,8 +1,8 @@ -package com.cisd.openapi.dto; +package cn.com.infosec.netsign.agent.dto; -import com.cisd.openapi.util.Base64; -import com.cisd.openapi.util.NetSignAgentUtil; -import com.cisd.openapi.util.PBCUtil; +import cn.com.infosec.netsign.agent.util.Base64; +import cn.com.infosec.netsign.agent.util.NetSignAgentUtil; +import cn.com.infosec.netsign.agent.util.PBCUtil; import java.security.cert.X509Certificate; import java.text.SimpleDateFormat; diff --git a/openapi-sdk/src/main/java/com/cisd/openapi/dto/LastReturnCodeRequest.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/LastReturnCodeRequest.java similarity index 82% rename from openapi-sdk/src/main/java/com/cisd/openapi/dto/LastReturnCodeRequest.java rename to openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/LastReturnCodeRequest.java index aaa613b..2c00ae7 100644 --- a/openapi-sdk/src/main/java/com/cisd/openapi/dto/LastReturnCodeRequest.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/LastReturnCodeRequest.java @@ -1,4 +1,4 @@ -package com.cisd.openapi.dto; +package cn.com.infosec.netsign.agent.dto; import lombok.Data; diff --git a/openapi-sdk/src/main/java/com/cisd/openapi/dto/LastReturnCodeResponse.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/LastReturnCodeResponse.java similarity index 70% rename from openapi-sdk/src/main/java/com/cisd/openapi/dto/LastReturnCodeResponse.java rename to openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/LastReturnCodeResponse.java index 18aed67..dc83156 100644 --- a/openapi-sdk/src/main/java/com/cisd/openapi/dto/LastReturnCodeResponse.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/LastReturnCodeResponse.java @@ -1,4 +1,4 @@ -package com.cisd.openapi.dto; +package cn.com.infosec.netsign.agent.dto; import lombok.Data; diff --git a/openapi-sdk/src/main/java/com/cisd/openapi/dto/RawSignRequest.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/RawSignRequest.java similarity index 86% rename from openapi-sdk/src/main/java/com/cisd/openapi/dto/RawSignRequest.java rename to openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/RawSignRequest.java index 2ead011..2f59348 100644 --- a/openapi-sdk/src/main/java/com/cisd/openapi/dto/RawSignRequest.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/RawSignRequest.java @@ -1,4 +1,4 @@ -package com.cisd.openapi.dto; +package cn.com.infosec.netsign.agent.dto; import lombok.Data; diff --git a/openapi-sdk/src/main/java/com/cisd/openapi/dto/RawSignResponse.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/RawSignResponse.java similarity index 68% rename from openapi-sdk/src/main/java/com/cisd/openapi/dto/RawSignResponse.java rename to openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/RawSignResponse.java index 6510c5a..1764dba 100644 --- a/openapi-sdk/src/main/java/com/cisd/openapi/dto/RawSignResponse.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/RawSignResponse.java @@ -1,4 +1,4 @@ -package com.cisd.openapi.dto; +package cn.com.infosec.netsign.agent.dto; import lombok.Data; diff --git a/openapi-sdk/src/main/java/com/cisd/openapi/dto/RawVerifyRequest.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/RawVerifyRequest.java similarity index 89% rename from openapi-sdk/src/main/java/com/cisd/openapi/dto/RawVerifyRequest.java rename to openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/RawVerifyRequest.java index b003a67..7810da8 100644 --- a/openapi-sdk/src/main/java/com/cisd/openapi/dto/RawVerifyRequest.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/RawVerifyRequest.java @@ -1,4 +1,4 @@ -package com.cisd.openapi.dto; +package cn.com.infosec.netsign.agent.dto; import lombok.Data; diff --git a/openapi-sdk/src/main/java/com/cisd/openapi/dto/RawVerifyResponse.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/RawVerifyResponse.java similarity index 74% rename from openapi-sdk/src/main/java/com/cisd/openapi/dto/RawVerifyResponse.java rename to openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/RawVerifyResponse.java index 2c3b53c..64c3a20 100644 --- a/openapi-sdk/src/main/java/com/cisd/openapi/dto/RawVerifyResponse.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/RawVerifyResponse.java @@ -1,4 +1,4 @@ -package com.cisd.openapi.dto; +package cn.com.infosec.netsign.agent.dto; import lombok.Data; diff --git a/openapi-sdk/src/main/java/com/cisd/openapi/dto/UploadCertRequest.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/UploadCertRequest.java similarity index 89% rename from openapi-sdk/src/main/java/com/cisd/openapi/dto/UploadCertRequest.java rename to openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/UploadCertRequest.java index c317cfd..848ceca 100644 --- a/openapi-sdk/src/main/java/com/cisd/openapi/dto/UploadCertRequest.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/UploadCertRequest.java @@ -1,4 +1,4 @@ -package com.cisd.openapi.dto; +package cn.com.infosec.netsign.agent.dto; import lombok.Data; diff --git a/openapi-sdk/src/main/java/com/cisd/openapi/dto/UploadCertResponse.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/UploadCertResponse.java similarity index 69% rename from openapi-sdk/src/main/java/com/cisd/openapi/dto/UploadCertResponse.java rename to openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/UploadCertResponse.java index 0a159ea..e916728 100644 --- a/openapi-sdk/src/main/java/com/cisd/openapi/dto/UploadCertResponse.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/dto/UploadCertResponse.java @@ -1,4 +1,4 @@ -package com.cisd.openapi.dto; +package cn.com.infosec.netsign.agent.dto; import lombok.Data; diff --git a/openapi-sdk/src/main/java/com/cisd/openapi/exception/BusinessException.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/exception/BusinessException.java similarity index 75% rename from openapi-sdk/src/main/java/com/cisd/openapi/exception/BusinessException.java rename to openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/exception/BusinessException.java index 4cecad0..a6bc8eb 100644 --- a/openapi-sdk/src/main/java/com/cisd/openapi/exception/BusinessException.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/exception/BusinessException.java @@ -1,6 +1,6 @@ -package com.cisd.openapi.exception; +package cn.com.infosec.netsign.agent.exception; -import com.cisd.openapi.dto.ErrorDataResponse; +import cn.com.infosec.netsign.agent.dto.ErrorDataResponse; public class BusinessException extends RuntimeException { private final ErrorDataResponse errorData; diff --git a/openapi-sdk/src/main/java/com/cisd/openapi/util/Base64.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/util/Base64.java similarity index 99% rename from openapi-sdk/src/main/java/com/cisd/openapi/util/Base64.java rename to openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/util/Base64.java index cbc7bde..423b356 100644 --- a/openapi-sdk/src/main/java/com/cisd/openapi/util/Base64.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/util/Base64.java @@ -1,4 +1,4 @@ -package com.cisd.openapi.util; +package cn.com.infosec.netsign.agent.util; import java.util.Arrays; diff --git a/openapi-sdk/src/main/java/com/cisd/openapi/util/DNItemReverseUtil.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/util/DNItemReverseUtil.java similarity index 98% rename from openapi-sdk/src/main/java/com/cisd/openapi/util/DNItemReverseUtil.java rename to openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/util/DNItemReverseUtil.java index 34488ba..25bd668 100644 --- a/openapi-sdk/src/main/java/com/cisd/openapi/util/DNItemReverseUtil.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/util/DNItemReverseUtil.java @@ -1,4 +1,4 @@ -package com.cisd.openapi.util; +package cn.com.infosec.netsign.agent.util; import java.util.Stack; import java.util.StringTokenizer; diff --git a/openapi-sdk/src/main/java/com/cisd/openapi/util/NetSignAgentRes.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/util/NetSignAgentRes.java similarity index 99% rename from openapi-sdk/src/main/java/com/cisd/openapi/util/NetSignAgentRes.java rename to openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/util/NetSignAgentRes.java index 0783f9f..6c05b97 100644 --- a/openapi-sdk/src/main/java/com/cisd/openapi/util/NetSignAgentRes.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/util/NetSignAgentRes.java @@ -1,4 +1,4 @@ -package com.cisd.openapi.util; +package cn.com.infosec.netsign.agent.util; // //import cn.com.infosec.netsign.agent.communication.APIToServer; diff --git a/openapi-sdk/src/main/java/com/cisd/openapi/util/NetSignAgentUtil.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/util/NetSignAgentUtil.java similarity index 99% rename from openapi-sdk/src/main/java/com/cisd/openapi/util/NetSignAgentUtil.java rename to openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/util/NetSignAgentUtil.java index 258cda8..d1a655f 100644 --- a/openapi-sdk/src/main/java/com/cisd/openapi/util/NetSignAgentUtil.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/util/NetSignAgentUtil.java @@ -1,4 +1,4 @@ -package com.cisd.openapi.util; +package cn.com.infosec.netsign.agent.util; //import cn.com.infosec.jce.provider.*; //import cn.com.infosec.jce.provider.fastparser.DerUtil; diff --git a/openapi-sdk/src/main/java/com/cisd/openapi/util/PBCUtil.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/util/PBCUtil.java similarity index 94% rename from openapi-sdk/src/main/java/com/cisd/openapi/util/PBCUtil.java rename to openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/util/PBCUtil.java index fa31534..aca2b07 100644 --- a/openapi-sdk/src/main/java/com/cisd/openapi/util/PBCUtil.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/util/PBCUtil.java @@ -1,4 +1,4 @@ -package com.cisd.openapi.util; +package cn.com.infosec.netsign.agent.util; public class PBCUtil { public static String getBankID(String dn) { diff --git a/openapi-sdk/src/main/java/com/cisd/openapi/util/X509NameTokenizer.java b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/util/X509NameTokenizer.java similarity index 97% rename from openapi-sdk/src/main/java/com/cisd/openapi/util/X509NameTokenizer.java rename to openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/util/X509NameTokenizer.java index 8d55bed..73e1825 100644 --- a/openapi-sdk/src/main/java/com/cisd/openapi/util/X509NameTokenizer.java +++ b/openapi-sdk/src/main/java/cn/com/infosec/netsign/agent/util/X509NameTokenizer.java @@ -1,4 +1,4 @@ -package com.cisd.openapi.util; +package cn.com.infosec.netsign.agent.util; public class X509NameTokenizer { diff --git a/openapi-sdk/src/main/resources/sign-server.properties b/openapi-sdk/src/main/resources/sign-server.properties index c300b46..60c10bb 100644 --- a/openapi-sdk/src/main/resources/sign-server.properties +++ b/openapi-sdk/src/main/resources/sign-server.properties @@ -1,12 +1,11 @@ -sign-server.baseUrl=http://127.0.0.1:8080 +sign-server.baseUrl=http://127.0.0.1:8080/api/v1/openapi sign-server.apiKey=key -sign-server.rawSignPath=/raw/sign -sign-server.rawVerifyPath=/raw/verify +sign-server.rawSignPath=/rawSign +sign-server.rawVerifyPath=/rawVerify -sign-server.dettachedSignPath=/dettached/sign -sign-server.dettachedVerifyPath=/dettached/verify -sign-server.dettachedVerifySimplePath=/dettached/verify/simple +sign-server.dettachedSignPath=/dettachedSign +sign-server.dettachedVerifyPath=/dettachedVerify +sign-server.dettachedVerifySimplePath=/dettachedVerifySimple -sign-server.uploadCertPath=/cert/upload -sign-server.lastReturnCodePath=/last/return/code \ No newline at end of file +sign-server.uploadCertPath=/uploadCert \ No newline at end of file diff --git a/src/main/java/com/cisd/tms/modules/log/service/OperationAuditService.java b/src/main/java/com/cisd/tms/modules/log/service/OperationAuditService.java index 0117fd4..5fd957f 100644 --- a/src/main/java/com/cisd/tms/modules/log/service/OperationAuditService.java +++ b/src/main/java/com/cisd/tms/modules/log/service/OperationAuditService.java @@ -216,8 +216,7 @@ public class OperationAuditService { if (!AuditStatus.PENDING.equals(existLog.getAuditStatus())) { throw new BizException(ErrorCode.BIZ_ERROR.getCode(), "该日志已审计，禁止重复操作"); } - String d = buildSignValueSource(existLog, req.getAuditResult()); - System.out.println(d); + String auditSign = trim(req.getAuditSign()); if (auditSign.isEmpty()){ diff --git a/src/main/java/com/cisd/tms/modules/mk/config/MasterKeyActivateProperties.java b/src/main/java/com/cisd/tms/modules/mk/config/MasterKeyActivateProperties.java deleted file mode 100644 index 60a7e89..0000000 --- a/src/main/java/com/cisd/tms/modules/mk/config/MasterKeyActivateProperties.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.cisd.tms.modules.mk.config; - - -import org.springframework.boot.context.properties.ConfigurationProperties; - -@ConfigurationProperties(prefix = "tms.mk.activate") -public class MasterKeyActivateProperties { - - //todo 后续添加到配置文件 - private String platformUrl = "http://127.0.0.1:8080/device/active"; - - public String getPlatformUrl() { return platformUrl; } - - public void setPlatformUrl(String platformUrl) { this.platformUrl = platformUrl; } -} diff --git a/src/main/java/com/cisd/tms/modules/mk/dto/MasterKeyActivateRequest.java b/src/main/java/com/cisd/tms/modules/mk/dto/MasterKeyActivateRequest.java index 0047f01..812934d 100644 --- a/src/main/java/com/cisd/tms/modules/mk/dto/MasterKeyActivateRequest.java +++ b/src/main/java/com/cisd/tms/modules/mk/dto/MasterKeyActivateRequest.java @@ -13,4 +13,10 @@ public class MasterKeyActivateRequest { private String credential; @Schema(description = "设备激活码", example = "1234567") private String activationCode; + + @Schema(description = "网络地址", example = "192.168.10.100") + private String ipAddress; + + @Schema(description = "端口号", example = "80") + private Integer port; } diff --git a/src/main/java/com/cisd/tms/modules/mk/service/impl/MasterKeyActivateServiceImpl.java b/src/main/java/com/cisd/tms/modules/mk/service/impl/MasterKeyActivateServiceImpl.java index 16925d2..8be0d6f 100644 --- a/src/main/java/com/cisd/tms/modules/mk/service/impl/MasterKeyActivateServiceImpl.java +++ b/src/main/java/com/cisd/tms/modules/mk/service/impl/MasterKeyActivateServiceImpl.java @@ -9,7 +9,6 @@ import com.cisd.tms.modules.device.dto.DeviceInfoResponse; import com.cisd.tms.modules.device.entity.DeviceSoftwareVersionEntity; import com.cisd.tms.modules.device.repository.DeviceSoftwareVersionRepository; import com.cisd.tms.modules.device.service.DeviceService; -import com.cisd.tms.modules.mk.config.MasterKeyActivateProperties; import com.cisd.tms.modules.mk.dto.MasterKeyActivateInfoResponse; import com.cisd.tms.modules.mk.dto.MasterKeyActivateRequest; import com.cisd.tms.modules.mk.entity.MasterKeyActivateEntity; @@ -29,10 +28,12 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.OutputStream; +import java.net.ConnectException; import java.net.URI; import java.net.http.HttpClient; import java.net.http.HttpRequest; import java.net.http.HttpResponse; +import java.net.http.HttpTimeoutException; import java.nio.charset.StandardCharsets; import java.security.PublicKey; import java.security.SecureRandom; @@ -47,15 +48,15 @@ import java.util.Optional; public class MasterKeyActivateServiceImpl implements MasterKeyActivateService { private static final String DEVICE_DIR = "/home/tms/device"; - public static final String SIGN_FILE = DEVICE_DIR + "/dev.sign"; + private static final String SIGN_FILE = DEVICE_DIR + "/dev.sign"; private static final String ACTIVATION_PUBLIC_KEY_FILE = DEVICE_DIR + "/dev.active.pub"; + private static final String ACTIVATION_PLATFORM_URL = "/device/active"; private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); private static final SecureRandom SECURE_RANDOM = new SecureRandom(); private final PcieCryptoService pcieCryptoService; - private final MasterKeyActivateProperties masterKeyActivateProperties; private final DeviceSoftwareVersionRepository deviceSoftwareVersionRepository; private final DeviceProfileProperties deviceProfileProperties; private final DeviceService deviceService; @@ -139,6 +140,23 @@ public class MasterKeyActivateServiceImpl implements MasterKeyActivateService { throw new IllegalArgumentException("设备激活码不能为空"); } + if (masterKeyActivateRequest.getIpAddress() == null){ + throw new IllegalArgumentException("IP地址不能为空"); + } + + + String ipAddress = masterKeyActivateRequest.getIpAddress().trim(); + + + Integer portValue = masterKeyActivateRequest.getPort(); + + if (portValue == null || portValue < 1 || portValue > 65535) { + throw new IllegalArgumentException("非法端口: " + portValue); + } + + String port = String.valueOf(portValue); + String url = "http://" + ipAddress + ":" + port + ACTIVATION_PLATFORM_URL; + try { DeviceFingerprintService deviceFingerprintService = new DeviceFingerprintService(); DeviceFingerprint deviceFingerprint = deviceFingerprintService.getDeviceFingerprint(); @@ -175,10 +193,9 @@ public class MasterKeyActivateServiceImpl implements MasterKeyActivateService { request.setHash(hash); String json = OBJECT_MAPPER.writeValueAsString(request); - //todo 抛异常 // System.out.print(json); HttpRequest httpRequest = HttpRequest.newBuilder() - .uri(URI.create(masterKeyActivateProperties.getPlatformUrl())) + .uri(URI.create(url)) .header("Content-Type", "application/json;charset=UTF-8") .header("Accept", "application/json") .POST(HttpRequest.BodyPublishers.ofString(json, StandardCharsets.UTF_8)) @@ -204,9 +221,15 @@ public class MasterKeyActivateServiceImpl implements MasterKeyActivateService { masterKeyActivateRepository.update(masterKeyActivateEntity); writeFile(ACTIVATION_PUBLIC_KEY_FILE, deviceActivationPublicKey.getBytes(StandardCharsets.UTF_8)); } else { - throw new Exception(result.getMsg()); + throw new RuntimeException(result.getMsg()); } + } catch (ConnectException | HttpTimeoutException e) { + + masterKeyActivateEntity.setActivationStatus(false); + masterKeyActivateRepository.update(masterKeyActivateEntity); + throw new BizException(ErrorCode.BIZ_ERROR.getCode(), "连接激活平台失败"); + } catch (Exception e) { masterKeyActivateEntity.setActivationStatus(false); masterKeyActivateRepository.update(masterKeyActivateEntity); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 1934519..02f09d3 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -334,9 +334,6 @@ tms: old-pin-base64: ${TMS_MK_INIT_IDENTIFY_OLD_PIN_BASE64:NjY2NjY2} # SDFE_InitIdentify 新 PIN（Base64 编码）；主密钥初始化接口会读取该值。 new-pin-base64: ${TMS_MK_INIT_IDENTIFY_NEW_PIN_BASE64:NjY2NjY2} - activate: - # 激活服务平台路径 - platform-url: ${TMS_MK_ACTIVATE_PLATFORM_URL:http://172.16.18.195:8170/device/active} security: # 内部接口鉴权 token（前后端内部调用需一致）。 internal-token: ${TMS_INTERNAL_TOKEN:change-me-internal-token}