From 021756ec0d4cbf53aa5e47661ccd4fdc8f945ee7 Mon Sep 17 00:00:00 2001 From: terrfly Date: Thu, 28 Mar 2024 15:07:46 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=AE=9D=E6=B2=99=E7=AE=B1=E7=8E=AF=E5=A2=83=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeequan/jeepay/core/model/params/alipay/AlipayConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/alipay/AlipayConfig.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/alipay/AlipayConfig.java index 947f3d7f..9a214972 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/alipay/AlipayConfig.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/model/params/alipay/AlipayConfig.java @@ -36,11 +36,11 @@ public class AlipayConfig{ public static String SANDBOX_SERVER_URL = "https://openapi-sandbox.dl.alipaydev.com/gateway.do"; public static String PROD_OAUTH_URL = "https://openauth.alipay.com/oauth2/publicAppAuthorize.htm?app_id=%s&scope=auth_base&state=&redirect_uri=%s"; - public static String SANDBOX_OAUTH_URL = "https://openapi-sandbox.dl.alipaydev.com/oauth2/publicAppAuthorize.htm?app_id=%s&scope=auth_base&state=&redirect_uri=%s"; + public static String SANDBOX_OAUTH_URL = "https://openauth-sandbox.dl.alipaydev.com/oauth2/publicAppAuthorize.htm?app_id=%s&scope=auth_base&state=&redirect_uri=%s"; /** isv获取授权商户URL地址 **/ public static String PROD_APP_TO_APP_AUTH_URL = "https://openauth.alipay.com/oauth2/appToAppAuth.htm?app_id=%s&redirect_uri=%s&state=%s"; - public static String SANDBOX_APP_TO_APP_AUTH_URL = "https://openapi-sandbox.dl.alipaydev.com/oauth2/appToAppAuth.htm?app_id=%s&redirect_uri=%s&state=%s"; + public static String SANDBOX_APP_TO_APP_AUTH_URL = "https://openauth-sandbox.dl.alipaydev.com/oauth2/appToAppAuth.htm?app_id=%s&redirect_uri=%s&state=%s"; public static String FORMAT = "json"; From b682c1ed2638d04ee5b110bc4c625126b4e8d7c9 Mon Sep 17 00:00:00 2001 From: "491733638@qq.com" <491733638@qq.com> Date: Thu, 28 Mar 2024 17:25:21 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E8=BD=AC?= =?UTF-8?q?=E8=B4=A6=E6=97=B6=EF=BC=8C=E4=B8=8D=E5=A1=AB=E5=86=99=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=A7=93=E5=90=8D=EF=BC=8C=E8=BF=94=E5=9B=9E=E8=BD=AC?= =?UTF-8?q?=E8=B4=A6=E5=A4=B1=E8=B4=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeepay/pay/channel/wxpay/WxpayTransferService.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayTransferService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayTransferService.java index 0e766f02..1159d0e9 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayTransferService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayTransferService.java @@ -119,6 +119,11 @@ public ChannelRetMsg transfer(TransferOrderRQ bizRQ, TransferOrder transferOrder TransferBatchesRequest request = new TransferBatchesRequest(); request.setAppid(wxServiceWrapper.getWxPayService().getConfig().getAppId()); request.setOutBatchNo(transferOrder.getTransferId()); + if(StringUtils.isNotBlank(transferOrder.getAccountName())){ + request.setBatchName(transferOrder.getAccountName()); + }else{ + request.setBatchName(transferOrder.getTransferDesc()); + } request.setBatchName(transferOrder.getAccountName()); request.setBatchRemark(transferOrder.getTransferDesc()); request.setTotalAmount(transferOrder.getAmount().intValue()); From e74a7ffbcb57be9f97e6bc065461c4b090ed11f7 Mon Sep 17 00:00:00 2001 From: "491733638@qq.com" <491733638@qq.com> Date: Thu, 28 Mar 2024 17:25:50 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E8=BD=AC?= =?UTF-8?q?=E8=B4=A6=E6=97=B6=EF=BC=8C=E4=B8=8D=E5=A1=AB=E5=86=99=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=A7=93=E5=90=8D=EF=BC=8C=E8=BF=94=E5=9B=9E=E8=BD=AC?= =?UTF-8?q?=E8=B4=A6=E5=A4=B1=E8=B4=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeequan/jeepay/pay/channel/wxpay/WxpayTransferService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayTransferService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayTransferService.java index 1159d0e9..ea9911f7 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayTransferService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayTransferService.java @@ -124,7 +124,6 @@ public ChannelRetMsg transfer(TransferOrderRQ bizRQ, TransferOrder transferOrder }else{ request.setBatchName(transferOrder.getTransferDesc()); } - request.setBatchName(transferOrder.getAccountName()); request.setBatchRemark(transferOrder.getTransferDesc()); request.setTotalAmount(transferOrder.getAmount().intValue()); request.setTotalNum(1); From 98b29ec9ec1b5df542eac6b29b27e61766e85c89 Mon Sep 17 00:00:00 2001 From: "491733638@qq.com" <491733638@qq.com> Date: Tue, 16 Apr 2024 16:47:15 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=BD=93=E5=BE=AE=E4=BF=A1=E8=BF=94?= =?UTF-8?q?=E5=9B=9EINVALID=5FREQUEST=E3=80=81SYSTEM=5FERROR=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=A0=81=E6=97=B6=EF=BC=8C=E5=BA=94=E8=AF=A5=E7=BB=A7?= =?UTF-8?q?=E7=BB=AD=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeepay/pay/channel/wxpay/WxpayTransferService.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayTransferService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayTransferService.java index ea9911f7..b79f7cfc 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayTransferService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/wxpay/WxpayTransferService.java @@ -198,8 +198,12 @@ public ChannelRetMsg query(TransferOrder transferOrder, MchAppConfigContext mchA } catch (WxPayException e) { - // 如果查询单号对应的数据不存在，那么数据不存在的原因可能是：（1）付款还在处理中；（2）付款处理失败导致付款订单没有落地，务必再次查询确认此次付款的结果。 - if("NOT_FOUND".equalsIgnoreCase(e.getErrCode())){ + + // NOT_FOUND:那么数据不存在的原因可能是：（1）付款还在处理中；（2）付款处理失败导致付款订单没有落地，务必再次查询确认此次付款的结果。 + // INVALID_REQUEST:请等待批次处理完成后再查询明细单据 + // SYSTEM_ERROR: 系统错误 + // 当出现以上情况时，继续查询，不能直接返回错误信息 + if("NOT_FOUND".equalsIgnoreCase(e.getErrCode()) || "INVALID_REQUEST".equalsIgnoreCase(e.getErrCode()) || "SYSTEM_ERROR".equalsIgnoreCase(e.getErrCode())){ return ChannelRetMsg.waiting(); } From 4d3dcca0638e34de3fd3f9f3d41468f4036c3bd6 Mon Sep 17 00:00:00 2001 From: "491733638@qq.com" <491733638@qq.com> Date: Tue, 16 Apr 2024 17:32:07 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=98=8E=E7=A1=AE=E8=BD=AC=E8=B4=A6?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E6=97=B6=EF=BC=8C=E8=AE=B0=E5=BD=95=E8=BD=AC?= =?UTF-8?q?=E8=B4=A6=E5=A4=B1=E8=B4=A5=E5=8E=9F=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeequan/jeepay/pay/service/TransferOrderReissueService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/service/TransferOrderReissueService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/service/TransferOrderReissueService.java index 9da09375..90351fdc 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/service/TransferOrderReissueService.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/service/TransferOrderReissueService.java @@ -78,7 +78,7 @@ public ChannelRetMsg processOrder(TransferOrder transferOrder){ }else if(channelRetMsg.getChannelState() == ChannelRetMsg.ChannelState.CONFIRM_FAIL){ // 转账失败 - transferOrderService.updateIng2Fail(transferId, channelRetMsg.getChannelOrderId(), channelRetMsg.getChannelUserId(), channelRetMsg.getChannelErrCode()); + transferOrderService.updateIng2Fail(transferId, channelRetMsg.getChannelOrderId(), channelRetMsg.getChannelErrCode(),channelRetMsg.getChannelErrMsg()); payMchNotifyService.transferOrderNotify(transferOrderService.getById(transferId)); } From 85718ecb8a3a922a2b4af1f003f331af8f42e3e1 Mon Sep 17 00:00:00 2001 From: terrfly Date: Tue, 28 May 2024 08:44:44 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=EF=BC=8C=E4=B8=80=E9=94=AE=E5=AE=89=E8=A3=85=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=20=E5=81=B6=E5=B0=94DB=E5=88=9D=E5=A7=8B=E5=8C=96=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E6=B2=A1=E6=9C=89=E7=94=9F=E6=95=88=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/install/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/install/install.sh b/docs/install/install.sh index af4a9ecb..02646328 100644 --- a/docs/install/install.sh +++ b/docs/install/install.sh @@ -114,7 +114,7 @@ docker run -p 3306:3306 --name mysql8 --network=jeepay-net \ -v $rootDir/mysql/log:/var/log/mysql \ -v $rootDir/mysql/data:/var/lib/mysql \ -v $rootDir/mysql/config:/etc/mysql \ --e MYSQL_ROOT_PASSWORD=$mysql_pwd \ +-e MYSQL_ROOT_PASSWORD=jeepaydb123456 \ -d mysql:8.0.25 # 容器重启 From f55d1cc83278f22d77533c1dc3e103c9e004ee18 Mon Sep 17 00:00:00 2001 From: terrfly Date: Fri, 31 May 2024 08:57:50 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=A7=A3=E5=86=B3mysql=E6=9C=AA=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E6=88=90=E5=8A=9F=E6=89=A7=E8=A1=8C=E8=AF=AD?= =?UTF-8?q?=E5=8F=A5=E5=A4=B1=E8=B4=A5=EF=BC=8C=E5=AF=BC=E8=87=B4=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=90=AF=E5=8A=A8=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/install/install.sh | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/docs/install/install.sh b/docs/install/install.sh index 02646328..4bcffa50 100644 --- a/docs/install/install.sh +++ b/docs/install/install.sh @@ -73,6 +73,7 @@ mkdir $rootDir/mysql -p mkdir $rootDir/mysql/config -p mkdir $rootDir/mysql/log -p mkdir $rootDir/mysql/data -p +mkdir $rootDir/mysql/mysql-files -p # mkdir $rootDir/activemq -p @@ -113,16 +114,29 @@ docker run -p 3306:3306 --name mysql8 --network=jeepay-net \ -v /etc/localtime:/etc/localtime:ro \ -v $rootDir/mysql/log:/var/log/mysql \ -v $rootDir/mysql/data:/var/lib/mysql \ --v $rootDir/mysql/config:/etc/mysql \ --e MYSQL_ROOT_PASSWORD=jeepaydb123456 \ --d mysql:8.0.25 - -# 容器重启 -docker restart mysql8 +-v $rootDir/mysql/mysql-files:/var/lib/mysql-files \ +-v $rootDir/mysql/config:/etc/mysql/conf.d \ +-e MYSQL_ROOT_PASSWORD=$mysql_pwd \ +-id mysql:8.0.25 # 避免未启动完成或出现错误： ERROR 2002 (HY000): Can't connect to local MySQL server through socket '/var/run/mysqld/mysqld.sock' -echo "等待重启mysql容器....... " -sleep 10 +# echo "等待重启mysql容器....... " + +while true +do + # docker exec mysql8 mysql | grep '(using password: NO)' 使用这个判断不行， 若没有启动会报错 + docker logs mysql8 > /tmp/installmysql.log + logContent=$(cat /tmp/installmysql.log | grep 'MySQL init process done') + if [ ! -n "$logContent" ];then + docker logs mysql8 + echo "[3] 等待启动mysql容器....... " + sleep 30 + else + echo "[3] mysql启动完成 $logContent" + sleep 10 + break + fi +done echo "[3] 初始化数据导入 ...... " # 创建数据库 && 导入数据