From b71537af7755da23ae6d2085f13415803e13bc4a Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Fri, 30 Aug 2024 14:53:25 +0800
Subject: [PATCH] config update

---
 .../com/peanut/modules/pay/alipay/config/AliPayConfig.java    | 4 +++-
 .../modules/pay/alipay/service/impl/AliPayServiceImpl.java    | 3 ++-
 .../peanut/modules/sociology/controller/CourseController.java | 2 +-
 src/main/resources/application.yml                            | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/peanut/modules/pay/alipay/config/AliPayConfig.java b/src/main/java/com/peanut/modules/pay/alipay/config/AliPayConfig.java
index 3a7b10d2..4c5f04c1 100644
--- a/src/main/java/com/peanut/modules/pay/alipay/config/AliPayConfig.java
+++ b/src/main/java/com/peanut/modules/pay/alipay/config/AliPayConfig.java
@@ -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这类自定义参数
diff --git a/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java b/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java
index 654b16fd..7ddc1e15 100644
--- a/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java
+++ b/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java
@@ -110,6 +110,7 @@ public class AliPayServiceImpl  implements AliPayService {
         Map<String, String> params = new HashMap<>();
         try {
             Map requestParams = request.getParameterMap();
+//            log.error("回调测试参数:"+requestParams.toString());
             for (Iterator iter = requestParams.keySet().iterator(); iter.hasNext(); ) {
                 String name = (String) iter.next();
                 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());
             //调用SDK验证签名，验证是阿里回调，而不是其他恶意回调
             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) {
                 log.info(">>>>>>>>>>验签通过");
                 //验签通过 获取交易状态
diff --git a/src/main/java/com/peanut/modules/sociology/controller/CourseController.java b/src/main/java/com/peanut/modules/sociology/controller/CourseController.java
index bab93659..0a369e6f 100644
--- a/src/main/java/com/peanut/modules/sociology/controller/CourseController.java
+++ b/src/main/java/com/peanut/modules/sociology/controller/CourseController.java
@@ -193,7 +193,7 @@ public class CourseController {
 
         Integer videoId = Integer.valueOf(map.get("videoId").toString());
         String po = map.get("position").toString();
-        if(Objects.equals(po, "none")){
+        if(Objects.equals(po, "none")||po==""){
             return R.ok();
         }
         int position = Integer.valueOf(po);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 78c2dc0a..558f513f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -11,7 +11,7 @@ connection-timeout: 6000000ms
 spring:
   # 环境 dev/dev1|test|prod
   profiles:
-    active: dev1
+    active: prod
   # jackson时间格式化
   jackson:
     time-zone: GMT+8