Merge remote-tracking branch 'origin/dev' into dev

ldt-core/src/main/java/org/springblade/payment/plugin/WithdrawPlugin.java

@@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.yeepay.yop.sdk.service.common.response.YopResponse;
 import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.cache.PaymentCache;
 import org.springblade.common.enums.OrderType;
@@ -37,6 +38,7 @@ import org.springblade.yeePay.entity.saas.settlement.SettleSelfSettleApplyDto;
 import org.springblade.yeePay.service.YeePayService;
 import org.springblade.yeePay.service.YeepaySaasService;
 import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -65,6 +67,19 @@ public class WithdrawPlugin implements Withdraw {
 	ApplicationEventPublisher eventPublisher;
 	ITransferRecService transferRecService;
 	BladeLogger bladeLogger;
+	Environment env;
+
+	@Override
+	public String callbackUrl(String paymentType) {
+		String callbackDomain = env.getProperty("callback.domain");
+		return callbackDomain + CALLBACK_PREFIX + paymentType;
+	}
+
+	@Override
+	public String csUrl(String paymentType) {
+		String callbackDomain = env.getProperty("callback.domain");
+		return callbackDomain + CSURL_PREFIX + paymentType;
+	}
 
 	@Override
 	public void callback(HttpServletRequest request) {

ldt-core/src/main/java/org/springblade/payment/plugin/YeePayPlugin.java

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.yeepay.yop.sdk.service.common.response.YopResponse;
 import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -39,9 +40,13 @@ import org.springblade.yeePay.entity.MerchantInfo;
 import org.springblade.yeePay.entity.saas.PayLinkOrderDto;
 import org.springblade.yeePay.service.YeePayService;
 import org.springblade.yeePay.service.YeepaySaasService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletRequest;
 
 
@@ -67,6 +72,20 @@ public class YeePayPlugin implements Payment {
 	ITransferRecService transferRecService;
 	IAgentLeagueRecordService agentLeagueRecordService;
 	BladeLogger bladeLogger;
+	Environment env;
+
+	@Override
+	public String callbackUrl(String paymentType) {
+		String callbackDomain = env.getProperty("callback.domain");
+		return callbackDomain + CALLBACK_PREFIX + paymentType;
+	}
+
+	@Override
+	public String csUrl(String paymentType) {
+		String callbackDomain = env.getProperty("callback.domain");
+		return callbackDomain + CSURL_PREFIX + paymentType;
+	}
+
 
 	@Override
 	public R nativePay(PayParam payParam) {
@@ -139,12 +158,12 @@ public class YeePayPlugin implements Payment {
 	public R miniProgram(PayParam payParam) {
 		Bills bills = billsService.getById(payParam.getOrderId());
 		//判断订单是否超时(默认90s)
-		if(ObjectUtils.isEmpty(bills)){
+		if (ObjectUtils.isEmpty(bills)) {
 			//判断支付状态
-			if(StringUtils.equals(bills.getPayStatus(), AppConstant.BillPayStatus.待付款.name())){
+			if (StringUtils.equals(bills.getPayStatus(), AppConstant.BillPayStatus.待付款.name())) {
 				//判断超时时间
-				if(DateTime.now().getTime() >
-					DateTime.of(bills.getCreateTime()).offset(DateField.SECOND,90).getTime()){
+				if (DateTime.now().getTime() >
+					DateTime.of(bills.getCreateTime()).offset(DateField.SECOND, 90).getTime()) {
 					SuccessParams successParams = PaymentCache.getSuccessParams(payParam.getOrderId());
 					throw new TradeException(ResCode.TRADE_TIME_OUT, successParams);
 				}

ldt-core/src/main/resources/application-dev.yml

@@ -80,5 +80,8 @@ blade:
     upload-domain: http://localhost:8999
     remote-path: /usr/share/nginx/html
 
+callback:
+  domain: https://192.168.1.218:2366/api
+
 
 

ldt-core/src/main/resources/application-prod.yml

@@ -40,3 +40,6 @@ blade:
     upload-domain: http://127.0.0.1:9736
     remote-path: /usr/share/nginx/html
 
+callback:
+  domain: https://ldt.guosen-fumao.cn/api
+

ldt-core/src/main/resources/application-test.yml

@@ -31,6 +31,11 @@ social:
 
 #blade配置
 blade:
+  secure:
+    skip-url:
+      - /common/account/**
+      - /sms/**
+      - /**
   #分布式锁配置
   lock:
     ##是否启用分布式锁
@@ -45,3 +50,6 @@ blade:
     upload-domain: http://localhost:8999
     remote-path: /usr/share/nginx/html
 
+callback:
+  domain: https://127.0.0.1:2366/api
+