diff --git a/jsowell-admin/src/main/resources/application-dev.yml b/jsowell-admin/src/main/resources/application-dev.yml index 1415f37aa..0a9cea295 100644 --- a/jsowell-admin/src/main/resources/application-dev.yml +++ b/jsowell-admin/src/main/resources/application-dev.yml @@ -154,6 +154,11 @@ wechat: # 汇付支付 adapay: + debugFlag: true + prodMode: false + apiKey: api_live_b9bff039-0598-4491-88e7-06ca6dc7289e + mockApiKey: api_test_15662261-8123-4b51-95d9-ad0af60eab53 + rsaPrivateKey: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAOl7qJyrkrks7FKnBPr/Sngub897Ni5Bkn5pEa81zfs+4LrYsuWZQ8G1n7Q8/rjH4G/T7vPX+So41vNU74Sqn6E1b3BpW+wWBULhs9p1JSPT7Kzima4FmPigUr80NLrlVKn5bW+V4/odpN+bJWvpxdd024edHAD8mXX1M1N1lU5ZAgMBAAECgYA+mxbiM6tbFe2kV/6g4vVv9luq0cn8az7BwKCqT44U8Y5G67ZElG0zsuTI6pYOrCHFOpnXLrE0HhudEchL1YiJqW/SDKaoC4oDZf5nybhh11kOR3N5maLqvUz/WxdNy17th/2XxqVfTTu752X9yeeoXDj89N5OxyMl0jmxlhWbgQJBAPeoitR7FCxcjKtcKsEyrtV3T0H2WtQ2Pbku7CGe6VCtL4+DJNeUentn7plBj4IhbH3EwNmyCYzNlfp0X2d8fWkCQQDxWONjt1vV/dyKQYRvSVw/SWQWlR7g2OnHZokU2SNeewiCX2umCdYKh0doN0JHbSTLOGG5IA3+6Vxam+9hzPtxAkEAjr+QHf8/Vn6V+mOqpSdgjNwzS/MC0ZTeKPI52vsswnrAkjjmMHh9zMnQRnf6juhTD38sJY6wYH9TdkRDhXPFGQJATiFYe4+AS2ZDXv6WwPAezN4VaLodpOyTwdmPxxAEQzHRL2N0levZPs9MbpB1BGpw3tkBycx2u28QVsTkWeTiAQJAGRsAVr6Rhhdaq2vTjt9orhMVwt6BCoSQ0zzHSYilv4PMOtSu1Pyt4K8BDv3gjEyAi1GtE7kkJ0dcbsvOGiLzqQ== appId: app_d0c80cb1-ffc8-48cb-a030-fe9bec823aaa callback: https://api.jsowellcloud.com/uniapp/pay/adapayCallback refundCallback: https://api.jsowellcloud.com/uniapp/pay/adapayRefundCallback \ No newline at end of file diff --git a/jsowell-admin/src/main/resources/application-prd.yml b/jsowell-admin/src/main/resources/application-prd.yml index 1358fd3ba..6ebd80c57 100644 --- a/jsowell-admin/src/main/resources/application-prd.yml +++ b/jsowell-admin/src/main/resources/application-prd.yml @@ -153,6 +153,11 @@ wechat: # 汇付支付 adapay: + debugFlag: false + prodMode: true + apiKey: api_live_b9bff039-0598-4491-88e7-06ca6dc7289e + mockApiKey: api_test_15662261-8123-4b51-95d9-ad0af60eab53 + rsaPrivateKey: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAOl7qJyrkrks7FKnBPr/Sngub897Ni5Bkn5pEa81zfs+4LrYsuWZQ8G1n7Q8/rjH4G/T7vPX+So41vNU74Sqn6E1b3BpW+wWBULhs9p1JSPT7Kzima4FmPigUr80NLrlVKn5bW+V4/odpN+bJWvpxdd024edHAD8mXX1M1N1lU5ZAgMBAAECgYA+mxbiM6tbFe2kV/6g4vVv9luq0cn8az7BwKCqT44U8Y5G67ZElG0zsuTI6pYOrCHFOpnXLrE0HhudEchL1YiJqW/SDKaoC4oDZf5nybhh11kOR3N5maLqvUz/WxdNy17th/2XxqVfTTu752X9yeeoXDj89N5OxyMl0jmxlhWbgQJBAPeoitR7FCxcjKtcKsEyrtV3T0H2WtQ2Pbku7CGe6VCtL4+DJNeUentn7plBj4IhbH3EwNmyCYzNlfp0X2d8fWkCQQDxWONjt1vV/dyKQYRvSVw/SWQWlR7g2OnHZokU2SNeewiCX2umCdYKh0doN0JHbSTLOGG5IA3+6Vxam+9hzPtxAkEAjr+QHf8/Vn6V+mOqpSdgjNwzS/MC0ZTeKPI52vsswnrAkjjmMHh9zMnQRnf6juhTD38sJY6wYH9TdkRDhXPFGQJATiFYe4+AS2ZDXv6WwPAezN4VaLodpOyTwdmPxxAEQzHRL2N0levZPs9MbpB1BGpw3tkBycx2u28QVsTkWeTiAQJAGRsAVr6Rhhdaq2vTjt9orhMVwt6BCoSQ0zzHSYilv4PMOtSu1Pyt4K8BDv3gjEyAi1GtE7kkJ0dcbsvOGiLzqQ== appId: app_d0c80cb1-ffc8-48cb-a030-fe9bec823aaa callback: https://api.jsowellcloud.com/uniapp/pay/adapayCallback refundCallback: https://api.jsowellcloud.com/uniapp/pay/adapayRefundCallback \ No newline at end of file diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/config/AdapayConfig.java b/jsowell-pile/src/main/java/com/jsowell/adapay/config/AdapayConfig.java index 86cda8919..078cd256f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/config/AdapayConfig.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/config/AdapayConfig.java @@ -2,6 +2,9 @@ package com.jsowell.adapay.config; import com.huifu.adapay.Adapay; import com.huifu.adapay.model.MerConfig; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.CommandLineRunner; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; @@ -10,17 +13,34 @@ import org.springframework.stereotype.Component; @Component public class AdapayConfig implements CommandLineRunner { + private Logger logger = LoggerFactory.getLogger(AdapayConfig.class); + + @Value("${adapay.apiKey}") + private String API_KEY; + + @Value("${adapay.mockApiKey}") + private String MOCK_API_KEY; + + @Value("${adapay.rsaPrivateKey}") + private String RSA_PRIVATE_KEY; + + @Value("${adapay.debugFlag}") + private boolean DEBUG_FLAG; + + @Value("${adapay.prodMode}") + private boolean PROD_MODE; + @Override public void run(String... args) throws Exception { /** * debug 模式,开启后有详细的日志 */ - Adapay.debug = true; + Adapay.debug = DEBUG_FLAG; /** * prodMode 模式,默认为生产模式,false可以使用mock模式 */ - Adapay.prodMode = false; + Adapay.prodMode = PROD_MODE; /** * 初始化商户配置,服务器启动前,必须通过该方式初始化商户配置完成 @@ -28,13 +48,15 @@ public class AdapayConfig implements CommandLineRunner { * mockApiKey为mock模式的API KEY * rsaPrivateKey为商户发起请求时,用于请求参数加签所需要的RSA私钥 */ - String apiKey = "api_live_b9bff039-0598-4491-88e7-06ca6dc7289e"; - String mockApiKey = "api_test_15662261-8123-4b51-95d9-ad0af60eab53"; - String rsaPrivateKey = "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAOl7qJyrkrks7FKnBPr/Sngub897Ni5Bkn5pEa81zfs+4LrYsuWZQ8G1n7Q8/rjH4G/T7vPX+So41vNU74Sqn6E1b3BpW+wWBULhs9p1JSPT7Kzima4FmPigUr80NLrlVKn5bW+V4/odpN+bJWvpxdd024edHAD8mXX1M1N1lU5ZAgMBAAECgYA+mxbiM6tbFe2kV/6g4vVv9luq0cn8az7BwKCqT44U8Y5G67ZElG0zsuTI6pYOrCHFOpnXLrE0HhudEchL1YiJqW/SDKaoC4oDZf5nybhh11kOR3N5maLqvUz/WxdNy17th/2XxqVfTTu752X9yeeoXDj89N5OxyMl0jmxlhWbgQJBAPeoitR7FCxcjKtcKsEyrtV3T0H2WtQ2Pbku7CGe6VCtL4+DJNeUentn7plBj4IhbH3EwNmyCYzNlfp0X2d8fWkCQQDxWONjt1vV/dyKQYRvSVw/SWQWlR7g2OnHZokU2SNeewiCX2umCdYKh0doN0JHbSTLOGG5IA3+6Vxam+9hzPtxAkEAjr+QHf8/Vn6V+mOqpSdgjNwzS/MC0ZTeKPI52vsswnrAkjjmMHh9zMnQRnf6juhTD38sJY6wYH9TdkRDhXPFGQJATiFYe4+AS2ZDXv6WwPAezN4VaLodpOyTwdmPxxAEQzHRL2N0levZPs9MbpB1BGpw3tkBycx2u28QVsTkWeTiAQJAGRsAVr6Rhhdaq2vTjt9orhMVwt6BCoSQ0zzHSYilv4PMOtSu1Pyt4K8BDv3gjEyAi1GtE7kkJ0dcbsvOGiLzqQ=="; + String apiKey = API_KEY; + String mockApiKey = MOCK_API_KEY; + String rsaPrivateKey = RSA_PRIVATE_KEY; MerConfig merConfig = new MerConfig(); merConfig.setApiKey(apiKey); merConfig.setApiMockKey(mockApiKey); merConfig.setRSAPrivateKey(rsaPrivateKey); Adapay.initWithMerConfig(merConfig); + logger.info("汇付配置初始化成功,debug:{}, prodMode:{}, apiKey:{}, mockApiKey:{}, rsaPrivateKey:{}" + , DEBUG_FLAG, PROD_MODE, API_KEY, MOCK_API_KEY, RSA_PRIVATE_KEY); } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/AdapayMemberInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/AdapayMemberInfo.java index f6f676bac..454aba793 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/AdapayMemberInfo.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/AdapayMemberInfo.java @@ -1,11 +1,8 @@ package com.jsowell.pile.domain; +import lombok.*; + import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; /** * 汇付会员表 @@ -75,6 +72,11 @@ public class AdapayMemberInfo { */ private String status; + /** + * 汇付返回的创建时间 + */ + private String createdTime; + private Date createTime; /**