zwhui 2 роки тому
батько
коміт
f813b44928

+ 4 - 1
netflix-service/src/main/java/com/cyksj/common/EnvCommonService.java

@@ -33,9 +33,12 @@ public class EnvCommonService {
 	private String domain;
 
 	public String getHost() {
-		port = EnvCommonService.active_prd.equals(getEnv()) ? "8081" : "8083";
+		port = getPort();
 		return domain;
 	}
+	public String getPort() {
+		return port = EnvCommonService.active_prd.equals(getEnv()) ? "8081" : "8083";
+	}
 
 	public String getDomain() {
 		return this.getHost().substring(0, this.getHost().indexOf(port));

+ 4 - 1
netflix-service/src/main/java/com/cyksj/service/paypal/PayPalService.java

@@ -1,5 +1,6 @@
 package com.cyksj.service.paypal;
 
+import com.cyksj.common.EnvCommonService;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.task.GlobalThreadPoolTaskExecutor;
 import com.cyksj.common.util.Jsons;
@@ -44,6 +45,8 @@ public class PayPalService{
 
     private final RedisService redisService;
 
+    private final EnvCommonService envCommonService;
+
 
     private static final String SANDBOX_URL = "https://api-m.sandbox.paypal.com";
     private static final String LIVE_URL = "https://api-m.paypal.com";
@@ -125,7 +128,7 @@ public class PayPalService{
         RedirectUrls redirectUrls = new RedirectUrls();
 
         redirectUrls.setCancelUrl(paypalPayConfig.getCancelUrl());
-        String returnUrl = "https://" + paypalPayConfig.getHost() + "/8081/api/applets/order/paypal/notify";
+        String returnUrl = "https://" + paypalPayConfig.getHost() + "/"+envCommonService.getPort()+"/api/applets/order/paypal/notify";
         //成功回调地址(自己写的/pay/success)
         redirectUrls.setReturnUrl(returnUrl);