fix 回调域名

netflix-service/src/main/java/com/cyksj/config/BaseWeChatConfig.java

@@ -32,6 +32,11 @@ public abstract class BaseWeChatConfig {
      */
     private String domain;
 
+    /**
+     * 回调域名
+     */
+    private String notifyDomain;
+
     /**
      * 商户平台id
      */

netflix-service/src/main/java/com/cyksj/service/authorization/impl/AuthorizationServiceImpl.java

@@ -47,14 +47,14 @@ public class AuthorizationServiceImpl implements AuthorizationService {
         String redirectHost = getHostFromUrl(url);
 
         // 从配置中获取预设的回调URL，并获取其Host
-        String preUrl = weChatConfig.getDomain();
+        String preUrl = weChatConfig.getNotifyDomain();
         String authHost = getHostFromUrl(preUrl);
 
         // 记录回调URL日志
         log.info("回调url: {}", preUrl);
 
         // 构造最终的重定向URL
-        String weChatRedirectUrl = weChatConfig.getDomain() + WeChatAuthRedirectUrl.get(authType).getUrl();
+        String weChatRedirectUrl = weChatConfig.getNotifyDomain() + WeChatAuthRedirectUrl.get(authType).getUrl();
 
         // 如果重定向URL和授权域名不同，则追加 "/other"
         if (!redirectHost.equals(authHost)) {

netflix-service/src/main/java/com/cyksj/service/mange/impl/CmsOrderDonServiceImpl.java

@@ -622,7 +622,7 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
                 outRefundNo,
                 orderDon.getMoney(),
                 refundReq.getRefundMoney(),
-                weChatConfig.getDomain() + "manage/order/wx/refund/notify");
+                weChatConfig.getNotifyDomain() + "manage/order/wx/refund/notify");
         //记录退款信息
         return outRefundNo;
     }

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -712,7 +712,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 				orderDon.getOpenId(),
 				orderDon.getMoney().intValue(),
 				orderDon.getOrderNo(),
-				weChatConfig.getDomain() + "applets/order/prepay/notify",
+				weChatConfig.getNotifyDomain() + "applets/order/prepay/notify",
 				toWechatAttach,
 				"银河录像局",
 				tradeType,
@@ -752,7 +752,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 				orderDon.getOpenId(),
 				orderDon.getMoney().intValue(),
 				orderDon.getOrderNo(),
-				weChatConfig.getDomain() + "applets/order/pc/prepay/notify",
+				weChatConfig.getNotifyDomain() + "applets/order/pc/prepay/notify",
 				toWechatAttach,
 				"银河录像局",
 				tradeType,

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderRefundServiceImpl.java

@@ -162,7 +162,7 @@ public class OrderRefundServiceImpl implements OrderRefundService {
 				outRefundNo,
 				orderDon.getMoney(),
 				refundReq.getRefundMoney(),
-				weChatConfig.getDomain() + "manage/order/wx/refund/notify");
+				weChatConfig.getNotifyDomain() + "manage/order/wx/refund/notify");
 		//记录退款信息
 		return outRefundNo;
 	}

netflix-service/src/main/java/com/cyksj/service/register/impl/RegisterOrderDonServiceImpl.java

@@ -365,7 +365,7 @@ public class RegisterOrderDonServiceImpl extends ServiceImpl<RegisterOrderDonMap
                 orderDon.getOpenId(),
                 orderDon.getMoney().intValue(),
                 orderDon.getOrderNo(),
-                weChatConfig.getDomain() + "applets/register/prepay/notify",
+                weChatConfig.getNotifyDomain() + "applets/register/prepay/notify",
                 toWechatAttach,
                 "注册服务",
                 "JSAPI",
@@ -446,7 +446,7 @@ public class RegisterOrderDonServiceImpl extends ServiceImpl<RegisterOrderDonMap
                 outRefundNo,
                 registerOrderDon.getMoney(),
                 refundReq.getRefundMoney(),
-                weChatConfig.getDomain() + "manage/register/wx/refund/notify");
+                weChatConfig.getNotifyDomain() + "manage/register/wx/refund/notify");
         //修改订单状态
         registerOrderDon.setStatus(RegisterOrderDon.Status.refund);
         registerOrderDon.setRefundMoney(refundReq.getRefundMoney());

netflix-web/src/main/java/com/cyksj/web/controller/user/AuthorizationController.java

@@ -183,7 +183,7 @@ public class AuthorizationController {
         log.info("非主域名授权请求地址:{}", requestUrl);
 
         log.info("微信非主域名授权转跳. url: {}", url);
-        String path = URLUtil.getPath(weChatConfig.getDomain());
+        String path = URLUtil.getPath(weChatConfig.getNotifyDomain());
         response.sendRedirect(URLUtil.getHost(new URL(url)).toString()  + path + "auth/weChat/baseRedirect" + "?code=" + code + "&state=" + state);
     }
 
@@ -207,7 +207,7 @@ public class AuthorizationController {
         log.info("非主域名授权请求地址:{}", requestUrl);
 
         log.info("微信非主域名授权转跳. url: {}", url);
-        String path = URLUtil.getPath(weChatConfig.getDomain());
+        String path = URLUtil.getPath(weChatConfig.getNotifyDomain());
 
         response.sendRedirect(URLUtil.getHost(new URL(url)).toString()  + path + "auth/weChat/silentRedirect" + "?code=" + code + "&state=" + state);
     }

netflix-web/src/main/resources/application-pre.yml

@@ -128,6 +128,7 @@ wechat:
   appid: wx6cbc2de2a55e5579
   secret: 2ab6340e7787ab24de9f29094dee9d24
   domain: https://nf.video/8082/api/
+  notifyDomain: https://phoenix.nf.video/8082/api/
   #默认微信商户
   shopid: 1634772026
   shopKey: p2B8BAKi2V3PgMDSSez82V67aIvMKBt5