diff --git a/cweb/src/main/java/com/cweb/controller/BsMerController.java b/cweb/src/main/java/com/cweb/controller/BsMerController.java index cc1a9f5..9d31a8b 100644 --- a/cweb/src/main/java/com/cweb/controller/BsMerController.java +++ b/cweb/src/main/java/com/cweb/controller/BsMerController.java @@ -296,8 +296,8 @@ public class BsMerController { || StringUtils.isBlank(merSettleAcct.getBankCardNo()) || StringUtils.isBlank(merSettleAcct.getBankCardHolder()) || merSettleAcct.getOpenningBankAreaCode() == null -/* || merSettleAcct.getMerRateList() == null - || merSettleAcct.getMerRateList().size() == 0*/ + || merSettleAcct.getMerRateList() == null + || merSettleAcct.getMerRateList().size() == 0 ) { log.error("configMerBasis error!","参数错误"); throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); diff --git a/cweb/src/main/java/com/cweb/controller/TestController.java b/cweb/src/main/java/com/cweb/controller/TestController.java index b85ac86..5571adc 100644 --- a/cweb/src/main/java/com/cweb/controller/TestController.java +++ b/cweb/src/main/java/com/cweb/controller/TestController.java @@ -60,8 +60,8 @@ public class TestController { public ResponseData getApplyment() { try { - HttpClientBuilder clientBuilder = new HttpClientBuilder(); - return ResponseMsgUtil.success(clientBuilder.getApplyment("1668965085182")); + + return ResponseMsgUtil.success(LaKaLaConfig.queryCardBin("6226633602992094")); } catch (Exception e) { log.error(e.getMessage(), e); diff --git a/cweb/src/main/resources/prod/config.properties b/cweb/src/main/resources/prod/config.properties index 5bfbba3..4437ab6 100644 --- a/cweb/src/main/resources/prod/config.properties +++ b/cweb/src/main/resources/prod/config.properties @@ -1,5 +1,13 @@ fileUrl=/home/project/gratia-pay/filesystem cmsPath=/home/project/gratia-pay/filesystem/cmsPath +domainName=https://pay.dctpay.com + wxAppId=wxa075e8509802f826 wxAppSecret=0e606fc1378d35e359fcf3f15570b2c5 + +// WeChat service provider +wxUnifiedOrderUrl=https://api.mch.weixin.qq.com/pay/unifiedorder +wxMchAppId=wx637bd6f7314daa46 +wxApiKey=Skufk5oi85wDFGl888i6wsRSTkdd5df5 +wxMchId=1289663601 diff --git a/cweb/src/main/resources/prod/logback.xml b/cweb/src/main/resources/prod/logback.xml index e509de0..19f75d1 100644 --- a/cweb/src/main/resources/prod/logback.xml +++ b/cweb/src/main/resources/prod/logback.xml @@ -69,4 +69,26 @@ + + + + log/alipay/alipaylog.log + + log/alipay.log.%d.%i + + + 64 MB + + + + + %d %p (%file:%line\)- %m%n + + UTF-8 + + + + + + diff --git a/service/pom.xml b/service/pom.xml index 5d3917a..bdcf515 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -232,7 +232,6 @@ javase 3.3.0 - com.itextpdf kernel @@ -248,18 +247,11 @@ xmlworker 5.5.13 - com.itextpdf itext-asian 5.2.0 - - io.netty - netty-all - 4.1.6.Final - compile - com.google.code.gson gson diff --git a/service/src/main/resources/prod/commonConfig.properties b/service/src/main/resources/prod/commonConfig.properties index 0c4e162..47548c0 100644 --- a/service/src/main/resources/prod/commonConfig.properties +++ b/service/src/main/resources/prod/commonConfig.properties @@ -1,5 +1,5 @@ -obs_bucket_name=xuan-pay-private -obs_end_point=https://obs.cn-east-3.myhuaweicloud.com +obs_bucket_name=gratia-pay +obs_end_point=https://obs.cn-southwest-2.myhuaweicloud.com obs_url=https://gratia-pay.obs.cn-southwest-2.myhuaweicloud.com qr_code_data_url=https://pay.dctpay.com/scanPay