zoujiajian 1 ano atrás
pai
commit
0ed8895e77

+ 10 - 0
netflix-service/src/main/java/com/cyksj/common/EnvCommonService.java

@@ -32,6 +32,9 @@ public class EnvCommonService {
 	@Value(value = "${wechat.domain}")
 	private String domain;
 
+	@Value(value = "${wechat.notifyDomain}")
+	private String notifyDomain;
+
 	public String getHost() {
 		if (isPreEnv()) {
 			return domain.replaceAll("8081", "8082");
@@ -39,6 +42,13 @@ public class EnvCommonService {
 		return domain;
 	}
 
+	public String getNotifyHost() {
+		if (isPreEnv()) {
+			return notifyDomain.replaceAll("8081", "8082");
+		}
+		return notifyDomain;
+	}
+
 	public String getDomain() {
 		return this.getHost().substring(0, this.getHost().indexOf("80"));
 	}

+ 1 - 1
netflix-service/src/main/java/com/cyksj/service/mange/impl/SpotifySendMsgServiceImpl.java

@@ -45,7 +45,7 @@ public class SpotifySendMsgServiceImpl implements SpotifySendMsgService {
 
 	@PostConstruct
 	public void init() {
-		String host = envCommonService.getHost();
+		String host = envCommonService.getNotifyHost();
 		String domain = envCommonService.getDomain();
 		String redirectUrl = String.format("%s%s", domain, "yinhe/web/?temp=couponId?1?goodsId?4?skuId?14");
 		spotifyUnLimitSuccessUrl = String.format("%sauth/weChat?url=%s", host, redirectUrl);

+ 3 - 3
netflix-service/src/main/java/com/cyksj/service/pay/impl/AliPayCommonServiceImpl.java

@@ -80,7 +80,7 @@ public class AliPayCommonServiceImpl implements AliPayCommonService {
 		}
 		registerOrderDonMapper.updateById(orderDon);
 		//回调地址
-		String host = envCommonService.getHost();
+		String host = envCommonService.getNotifyHost();
 		String notifyUrl = String.format("%s%s", host, BaseZfbConfig.zfb_register_notify_url);
 		if (ZfbProductCode.MOBILE_WEB.getProductCode().equals(productCode) && BaseZfbConfig.qrPayMode_redirect.equals(payMode)) {
 			returnUrl = String.format("%s%s", envCommonService.getDomain(), BaseZfbConfig.zfb_register_login_return_url);
@@ -126,7 +126,7 @@ public class AliPayCommonServiceImpl implements AliPayCommonService {
 		GoodsDon goodsDon = goodsDonMapper.selectById(orderDon.getGoodsId());
 		String subject = goodsDon.getTitle().contains("ChatGPT") ? "AI订阅" : goodsDon.getTitle();
 		//回调地址
-		String host = envCommonService.getHost();
+		String host = envCommonService.getNotifyHost();
 		String notifyUrl = String.format("%s%s", host, BaseZfbConfig.notifyUrl);
 		//手机h5 跳转
 		OrderDonPost orderDonPost = orderDonPostMapper.selectOne(Wrappers.lambdaQuery(OrderDonPost.class)
@@ -277,7 +277,7 @@ public class AliPayCommonServiceImpl implements AliPayCommonService {
 		UpgradePackage upgradePackage = upgradePackageMapper.selectById(orderDon.getPackageId());
 		String subject = upgradePackage.getName();
 		//回调地址
-		String host = envCommonService.getHost();
+		String host = envCommonService.getNotifyHost();
 		String notifyUrl = String.format("%s%s", host, BaseZfbConfig.upgradeNotifyUrl);
 		//是否在微信内支付 微信内支付宝支付后 支付宝回调页面不跳转
 		Boolean isWx = Optional.ofNullable(re.getIsWx()).orElse(false);

+ 1 - 1
netflix-service/src/main/java/com/cyksj/service/user/impl/UserIdentCertServiceImpl.java

@@ -153,7 +153,7 @@ public class UserIdentCertServiceImpl implements UserIdentCertService {
 		DetectAuthRequest req = new DetectAuthRequest();
 		req.setRuleId(ruleId);
 		Long mappingId = SEQUENCE.nextId();
-		req.setRedirectUrl(envCommonService.getHost() + REDIRECT_URL + mappingId);
+		req.setRedirectUrl(envCommonService.getNotifyHost() + REDIRECT_URL + mappingId);
 		// 返回的resp是一个DetectAuthResponse的实例,与请求对象对应
 		DetectAuthResponse resp = client.DetectAuth(req);
 

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

@@ -406,7 +406,7 @@ public class AuthorizationController {
      */
     @GetMapping("/wx/login/redirect")
     public void wxLoginRedirect(String code, String state, HttpServletResponse response) throws Exception {
-        String domain = envCommonService.getHost();
+        String domain = envCommonService.getNotifyHost();
         String url = String.format("%sweChat/baseRedirect?code=%s&state=%s", domain, code, state);
         response.sendRedirect(url);
     }