Merge branch 'master' of http://192.168.1.218:3000/lianghanqiang/ldt

ldt-core/src/main/java/org/springblade/gateway/common_gateway/controller/PaymentController.java

@@ -6,7 +6,9 @@ import org.springblade.common.enums.AppConstant;
 import org.springblade.common.enums.PaymentScene;
 import org.springblade.common.enums.PaymentType;
 import org.springblade.common.enums.ResCode;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.log.logger.BladeLogger;
 import org.springblade.core.tool.api.R;
 import org.springblade.payment.callback.inivtation.InvitationCallback;
 import org.springblade.payment.entity.PayParam;
@@ -35,6 +37,8 @@ public class PaymentController {
 
 	@Autowired
 	YeePayService yeePayService;
+	@Autowired
+	BladeLogger bladeLogger;
 
 	@ApiOperation("订单支付")
 	@GetMapping("/payOrder/{paymentType}/{paymentScene}")
@@ -68,30 +72,33 @@ public class PaymentController {
 		return R.data(PaymentType.values());
 	}
 
-
+	@ApiLog
 	@ApiOperation(value = "支付回调")
 	@RequestMapping(value = "/callback/{paymentType}", method = {RequestMethod.GET, RequestMethod.POST})
 	public String callback(HttpServletRequest request, @PathVariable String paymentType) {
-		System.out.println("我是回调:");
+		bladeLogger.info(paymentType + "支付回调", request.getParameterMap().toString());
 		//获取支付插件
 		Payment payment = pluginBuild(paymentType);
 		payment.callback(request);
 		return "SUCCESS";
 	}
 
+	@ApiLog
 	@ApiOperation(value = "清算回调")
 	@RequestMapping(value = "/csurl/{paymentType}", method = {RequestMethod.GET, RequestMethod.POST})
 	public String csBack(HttpServletRequest request, @PathVariable String paymentType) {
-		System.out.println("我是清算回调:");
+		bladeLogger.info(paymentType + "清算回调", request.getParameterMap().toString());
 		//获取支付插件
 		Payment payment = pluginBuild(paymentType);
 		payment.csUrl(request);
 		return "SUCCESS";
 	}
 
+	@ApiLog
 	@ApiOperation(value = "入驻回调")
 	@RequestMapping(value = "/invitation/callback/{invitationType}", method = {RequestMethod.GET, RequestMethod.POST})
 	public String invitationCallback(HttpServletRequest request, @PathVariable String invitationType) {
+		bladeLogger.info(invitationType + "入驻回调", request.getParameterMap().toString());
 		AppConstant.InvitationType type = AppConstant.InvitationType.valueOf(invitationType);
 		new InvitationCallback().handle(request, type);
 		return "SUCCESS";

ldt-core/src/main/java/org/springblade/gateway/common_gateway/controller/WithdrawController.java

@@ -6,7 +6,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.enums.PaymentType;
 import org.springblade.common.enums.ResCode;
 import org.springblade.common.enums.WithdrawType;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.log.logger.BladeLogger;
 import org.springblade.core.tool.api.R;
 import org.springblade.payment.entity.PayParam;
 import org.springblade.payment.plugin.PaymentBuilder;
@@ -32,9 +34,10 @@ public class WithdrawController {
 
 	@Autowired
 	PaymentBuilder paymentBuilder;
-
 	@Autowired
 	YeePayService yeePayService;
+	@Autowired
+	BladeLogger bladeLogger;
 
 	@ApiOperation("提现")
 	@GetMapping("/{type}/{withdrawType}")
@@ -54,20 +57,22 @@ public class WithdrawController {
 		}
 	}
 
+	@ApiLog
 	@ApiOperation(value = "余额提现回调")
 	@RequestMapping(value = "/csurl/{withdrawType}", method = {RequestMethod.GET, RequestMethod.POST})
 	public String balanceCallback(HttpServletRequest request, @PathVariable String withdrawType) {
-		System.out.println("我是回调:");
+		bladeLogger.info(withdrawType + "余额提现回调", request.getParameterMap().toString());
 		//获取支付插件
 		Withdraw payment = pluginBuild(withdrawType);
 		payment.csUrl(request);
 		return "SUCCESS";
 	}
 
+	@ApiLog
 	@ApiOperation(value = "积分提现回调")
 	@RequestMapping(value = "/callback/{withdrawType}", method = {RequestMethod.GET, RequestMethod.POST})
 	public String callback(HttpServletRequest request, @PathVariable String withdrawType) {
-		System.out.println("我是回调:");
+		bladeLogger.info(withdrawType + "积分提现回调", request.getParameterMap().toString());
 		//获取支付插件
 		Withdraw payment = pluginBuild(withdrawType);
 		payment.callback(request);

ldt-core/src/main/java/org/springblade/modules/system/controller/LogApiController.java

@@ -43,7 +43,7 @@ import java.util.Map;
 @ApiIgnore
 @RestController
 @AllArgsConstructor
-@RequestMapping(AppConstant.APPLICATION_LOG_NAME + "/constant")
+@RequestMapping(AppConstant.APPLICATION_LOG_NAME + "/api")
 public class LogApiController {
 
 	private final ILogApiService logService;

ldt-core/src/main/java/org/springblade/payment/callback/trade/UserPointTransferWithdrawCallback.java

@@ -68,6 +68,7 @@ public class UserPointTransferWithdrawCallback {
 		withdrawRec.setRequestNo(requestNo);
 		withdrawRecService.saveOrUpdate(withdrawRec);
 
+		bladeLogger.info("用户积分余额提现--提现请求参数", withdrawOrderDto.toString());
 		YopResponse yopResponse = yeepaySaasService.withdrawOrder(withdrawOrderDto);
 		JSONObject res = JSON.parseObject(yopResponse.getStringResult());
 		if (!Objects.equals(res.getString("returnCode"), "UA00000")) {

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

@@ -122,6 +122,8 @@ public class WithdrawPlugin implements Withdraw {
 			.notifyUrl(csUrl(PaymentType.YEE_PAY_WITHDRAW.name()))
 			.operatePeriod(YeepayApiConstant.operatePeriod.ALL)
 			.build();
+
+		bladeLogger.info("用户余额提现请求参数", settleSelfSettleApplyDto.toString());
 		YopResponse yopResponse = yeepaySaasService.settleSelfSettleApply(settleSelfSettleApplyDto);
 		JSONObject res = JSON.parseObject(yopResponse.getStringResult());
 
@@ -179,11 +181,12 @@ public class WithdrawPlugin implements Withdraw {
 			.notifyUrl(callbackUrl(PaymentType.YEE_PAY_WITHDRAW.name()))
 			.build();
 		transferOrderDto.setParentMerchantNo(yeePayConst.getPlatformServiceNo());
+
+		bladeLogger.info("用户积分余额提现--转账请求参数", transferOrderDto.toString());
 		YopResponse yopResponse = yeepaySaasService.transferOrder(transferOrderDto);
 		JSONObject res = JSON.parseObject(yopResponse.getStringResult());
 		if (!Objects.equals(res.getString("returnCode"), "UA00000")) {
 			userPointWithdrawFail(transferRec, res);
-			bladeLogger.info("userPointWithdraw-转账", res.toJSONString());
 			throw new ServiceException(res.getString("returnMsg"));
 		}
 		String transferStatus = res.getString("transferStatus");
@@ -224,6 +227,8 @@ public class WithdrawPlugin implements Withdraw {
 		transferRec.setTransferStatus(TransferStatus.FAIL);
 		withdrawRec.setFailReason(res.toJSONString());
 		transferRecService.saveOrUpdate(transferRec);
+
+		bladeLogger.info("userPointWithdraw-转账", res.toJSONString());
 	}
 
 	/**

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

@@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.cache.PaymentCache;
 import org.springblade.common.enums.OrderType;
 import org.springblade.common.enums.PaymentType;
+import org.springblade.core.log.logger.BladeLogger;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.ldt.agent.entity.AgentLeagueRecord;
@@ -58,6 +59,7 @@ public class YeePayPlugin implements Payment {
 	ApplicationEventPublisher eventPublisher;
 	ITransferRecService transferRecService;
 	IAgentLeagueRecordService agentLeagueRecordService;
+	BladeLogger bladeLogger;
 
 
 	@Override
@@ -141,9 +143,8 @@ public class YeePayPlugin implements Payment {
 			.build();
 
 		setDtoInfo(payParam, initOrderDto);
-
+		bladeLogger.info("微信支付请求参数", initOrderDto.toString());
 		YopResponse yopResponse = yeepaySaasService.aggPrepay(initOrderDto);
-		log.info("微信支付请求参数：{}", initOrderDto);
 		return R.data(JSON.parseObject(yopResponse.getStringResult()));
 
 	}

ldt-risk/dependency-reduced-pom.xml

@@ -131,38 +131,6 @@
     </repository>
   </repositories>
   <dependencies>
-    <dependency>
-      <groupId>org.apache.flink</groupId>
-      <artifactId>flink-java</artifactId>
-      <version>1.14.0</version>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>commons-math3</artifactId>
-          <groupId>org.apache.commons</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.flink</groupId>
-      <artifactId>flink-streaming-java_2.11</artifactId>
-      <version>1.14.0</version>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>flink-file-sink-common</artifactId>
-          <groupId>org.apache.flink</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>flink-scala_2.11</artifactId>
-          <groupId>org.apache.flink</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>commons-math3</artifactId>
-          <groupId>org.apache.commons</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>