diff --git a/api-third/src/main/java/com/heyu/api/jsapi/JsapiPrepay.java b/api-third/src/main/java/com/heyu/api/jsapi/JsapiPrepay.java index 30ee2da..2b63c20 100644 --- a/api-third/src/main/java/com/heyu/api/jsapi/JsapiPrepay.java +++ b/api-third/src/main/java/com/heyu/api/jsapi/JsapiPrepay.java @@ -6,6 +6,7 @@ import com.heyu.api.jsapi.dto.DirectAPIv3JsapiPrepayRequest; import com.heyu.api.jsapi.dto.DirectAPIv3JsapiPrepayResponse; import lombok.extern.slf4j.Slf4j; import okhttp3.*; +import org.springframework.stereotype.Component; import java.io.IOException; import java.io.UncheckedIOException; @@ -16,7 +17,7 @@ import java.security.PublicKey; /** * JSAPI下单 */ -//@Component +@Component @Slf4j public class JsapiPrepay { diff --git a/api-web/api-interface/src/main/java/com/heyu/api/config/JSAPIConfig.java b/api-web/api-interface/src/main/java/com/heyu/api/config/JSAPIConfig.java index c179110..4515c0b 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/config/JSAPIConfig.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/config/JSAPIConfig.java @@ -3,12 +3,14 @@ package com.heyu.api.config; import com.heyu.api.jsapi.JsapiPrepay; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; -//@Configuration +@Configuration @Slf4j public class JSAPIConfig { -// @Bean + @Bean public JsapiPrepay jsapiPrepay(@Value("${eb.config.weixin.pay.mchid}") String mchid, @Value("${eb.config.weixin.pay.certificateSerialNo}") String certificateSerialNo, @Value("${eb.config.weixin.pay.privateKeyFilePath}") String privateKeyFilePath, diff --git a/api-web/api-interface/src/main/resources/bootstrap-online.yml b/api-web/api-interface/src/main/resources/bootstrap-online.yml index 7d486b3..5bb287c 100644 --- a/api-web/api-interface/src/main/resources/bootstrap-online.yml +++ b/api-web/api-interface/src/main/resources/bootstrap-online.yml @@ -61,9 +61,9 @@ eb: pay: mchid: 1731491745 certificateSerialNo: 793D48CCEB62C6B227E0A4F46AD90279B149A7BE - privateKeyFilePath: /mnt/admin/weixincert/apiclient_key.pem + privateKeyFilePath: /root/weixincert/apiclient_key.pem wechatPayPublicKeyId: PUB_KEY_ID_0117314917452025110400382304001401 - wechatPayPublicKeyFilePath: /mnt/admin/weixincert/wxp_pub.pem + wechatPayPublicKeyFilePath: /root/weixincert/wxp_pub.pem appid: wx75fa59c097bd3dfd notifyUrl: https://api.1024api.com/api-interface/app/weixin/payNotify apiv3key: E938F17ABF6843743F49688269F73B7D