zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

config update

Browse Source
This commit is contained in:
wangjinlei
2024-08-30 14:53:25 +08:00
parent 2e5d8bf24d
commit b71537af77
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/peanut/modules/pay/alipay/config/AliPayConfig.java
View File

@@ -35,7 +35,9 @@ public class AliPayConfig {
/** /**
* 回调地址 因为是内网开发 目前为内网穿透地址 * 回调地址 因为是内网开发 目前为内网穿透地址
*/ */
public static final String NOTIFY_URL = "http://59.110.212.44:9100/pb/pay/aliPay/notify"; // public static final String NOTIFY_URL = "http://59.110.212.44:9100/pb/pay/aliPay/notify";
public static final String NOTIFY_URL = "https://api.nuttyreading.com/pay/aliPay/notify";
/** /**
* 页面跳转同步通知页面路径 需http://格式的完整路径，不能加?id=123这类自定义参数 * 页面跳转同步通知页面路径 需http://格式的完整路径，不能加?id=123这类自定义参数

3
src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java
View File

@@ -110,6 +110,7 @@ public class AliPayServiceImpl implements AliPayService {
Map<String, String> params = new HashMap<>(); Map<String, String> params = new HashMap<>();
try { try {
Map requestParams = request.getParameterMap(); Map requestParams = request.getParameterMap();
// log.error("回调测试参数:"+requestParams.toString());
for (Iterator iter = requestParams.keySet().iterator(); iter.hasNext(); ) { for (Iterator iter = requestParams.keySet().iterator(); iter.hasNext(); ) {
String name = (String) iter.next(); String name = (String) iter.next();
String[] values = (String[]) requestParams.get(name); String[] values = (String[]) requestParams.get(name);
@@ -125,7 +126,7 @@ public class AliPayServiceImpl implements AliPayService {
params.get("trade_status"), params.get("out_trade_no"), params.toString()); params.get("trade_status"), params.get("out_trade_no"), params.toString());
//调用SDK验证签名，验证是阿里回调，而不是其他恶意回调 //调用SDK验证签名，验证是阿里回调，而不是其他恶意回调
boolean flag = AlipaySignature.rsaCheckV1(params, AliPayConfig.HS_ALIPAY_PUBLIC_KEY, AliPayConfig.CHARSET, AliPayConfig.SIGN_TYPE); boolean flag = AlipaySignature.rsaCheckV1(params, AliPayConfig.HS_ALIPAY_PUBLIC_KEY, AliPayConfig.CHARSET, AliPayConfig.SIGN_TYPE);
log.info(">>>>>>>>>>验签结果 flag = {}", flag); // log.error(">>>>>>>>>>验签结果 flag = {}", flag);
if (flag) { if (flag) {
log.info(">>>>>>>>>>验签通过"); log.info(">>>>>>>>>>验签通过");
//验签通过 获取交易状态 //验签通过 获取交易状态

2
src/main/java/com/peanut/modules/sociology/controller/CourseController.java
View File

@@ -193,7 +193,7 @@ public class CourseController {
Integer videoId = Integer.valueOf(map.get("videoId").toString()); Integer videoId = Integer.valueOf(map.get("videoId").toString());
String po = map.get("position").toString(); String po = map.get("position").toString();
if(Objects.equals(po, "none")){ if(Objects.equals(po, "none")||po==""){
return R.ok(); return R.ok();
} }
int position = Integer.valueOf(po); int position = Integer.valueOf(po);

2
src/main/resources/application.yml
View File

@@ -11,7 +11,7 @@ connection-timeout: 6000000ms
spring: spring:
# 环境 dev/dev1|test|prod # 环境 dev/dev1|test|prod
profiles: profiles:
active: dev1 active: prod
# jackson时间格式化 # jackson时间格式化
jackson: jackson:
time-zone: GMT+8 time-zone: GMT+8