diff --git a/pom.xml b/pom.xml index 494932b..5c31f27 100644 --- a/pom.xml +++ b/pom.xml @@ -156,10 +156,16 @@ yb zephyr1.7.0 + + + + + + - org.bouncycastle - bcprov-jdk15to18 - 1.69 + com.glxp + bcprov + 1.6.0 diff --git a/src/main/java/com/glxp/mipsdl/controller/YbApiController.java b/src/main/java/com/glxp/mipsdl/controller/YbApiController.java index 0c8e795..5ad51c2 100644 --- a/src/main/java/com/glxp/mipsdl/controller/YbApiController.java +++ b/src/main/java/com/glxp/mipsdl/controller/YbApiController.java @@ -78,7 +78,7 @@ public class YbApiController { private BasicUdirelDao basicUdirelDao; /** - * 通用字典下载接口 + * 销售提交 */ @PostMapping("/udiwms/erp/yb/postOrder") public BaseResponse postOrder(@RequestBody PostCollectOrderRequest postCollectOrderRequest) { diff --git a/src/main/java/com/glxp/mipsdl/req/yb/BaseYbRequest.java b/src/main/java/com/glxp/mipsdl/req/yb/BaseYbRequest.java index 8e2c07f..33fee17 100644 --- a/src/main/java/com/glxp/mipsdl/req/yb/BaseYbRequest.java +++ b/src/main/java/com/glxp/mipsdl/req/yb/BaseYbRequest.java @@ -5,5 +5,5 @@ import lombok.Data; @Data public class BaseYbRequest { - private SignRequest sign; + private SignRequest signIn; } diff --git a/src/main/java/com/glxp/mipsdl/service/yb/YbClient.java b/src/main/java/com/glxp/mipsdl/service/yb/YbClient.java index 076500d..4ff5fe9 100644 --- a/src/main/java/com/glxp/mipsdl/service/yb/YbClient.java +++ b/src/main/java/com/glxp/mipsdl/service/yb/YbClient.java @@ -30,6 +30,7 @@ public class YbClient { if (thrYbSetup == null) throw new RuntimeException("未配置医保接口"); String infno = apiNo; + SignTypeEnum signType = SignTypeEnum.SM3; EncryptionModeEnum encType = EncryptionModeEnum.SM4; String msgId = thrYbSetup.getFixmedins_code() + DateUtil.formatYbDateTime(new Date()) + thrYbSetup.getSequenceNum(); @@ -48,7 +49,7 @@ public class YbClient { req.setFixmedinsName(thrYbSetup.getFixmedins_name()); com.alibaba.fastjson.JSONObject dataJson = JSONObject.parseObject(data, com.alibaba.fastjson.JSONObject.class); req.setInput(dataJson); - req.setSignNo(thrYbSetup.getSignNo()); +// req.setSignNo(thrYbSetup.getSignNo()); log.info("【" + apiNo + "】医保接口请求参数:" + JSONObject.toJSONString(req)); ChsMedicalResponse resp = client.execute(req); return resp;