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

ldt-core/src/main/java/org/springblade/common/utils/GlobalExceptionHandler.java

@@ -10,6 +10,7 @@ import org.springblade.ldt.bills.service.IPointBillsService;
 import org.springblade.ldt.user.service.ILoginUserService;
 import org.springblade.ldt.user.service.IUserChannelPointService;
 import org.springblade.payment.handle.handler.CancelTradeHandle;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -26,6 +27,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @ControllerAdvice
 @ResponseBody
 public class GlobalExceptionHandler {
+	@Autowired
 	private CancelTradeHandle cancelTradeHandle;
 
 	@ExceptionHandler(YopServiceException.class)

ldt-core/src/main/java/org/springblade/gateway/client_gateway/controller/ClientTradeController.java

@@ -65,14 +65,15 @@ public class ClientTradeController {
 			.openId(loginUser.getOpenid())
 			.build();
 
-		SuccessParams successParams = null;
+		/*SuccessParams successParams = null;
 
 		try {
 			successParams = trade.tradeForScanPay(order, clientTradeDto.getChannelId());
 		} catch (Exception e) {
 			e.printStackTrace();
-			throw new ServiceException(ResCode.TRADE_ERROR);
-		}
+			throw new TradeException(ResCode.TRADE_ERROR, successParams);
+		}*/
+		SuccessParams successParams = trade.tradeForScanPay(order, clientTradeDto.getChannelId());
 		return R.data(successParams);
 	}
 

ldt-core/src/main/java/org/springblade/gateway/web_gateway/controller/PressureTestController.java

@@ -1,9 +1,12 @@
 package org.springblade.gateway.web_gateway.controller;
 
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.common.cache.PaymentCache;
@@ -23,6 +26,10 @@ import org.springblade.payment.event.UserPayEvent;
 import org.springblade.payment.event.UserWithdrawEvent;
 import org.springblade.payment.handle.Trade;
 import org.springblade.payment.handle.entity.Order;
+import org.springblade.wx.config.ConfigForShop;
+import org.springblade.wx.constant.MessageTemplate;
+import org.springblade.wx.constant.MiniProgramType;
+import org.springblade.wx.service.WeChatService;
 import org.springblade.yeePay.common.YeePayConst;
 import org.springblade.yeePay.common.YeepayApiConstant;
 import org.springframework.context.ApplicationEventPublisher;
@@ -53,6 +60,8 @@ public class PressureTestController {
 	private ApplicationEventPublisher eventPublisher;
 	private ILoginUserService loginUserService;
 	private Trade trade;
+	private ConfigForShop configForShop;
+	private WeChatService weChatService;
 
 	@PostMapping("/userBalanceWithdraw")
 	@ApiOperation(value = "用户余额提现（结算）")
@@ -140,14 +149,8 @@ public class PressureTestController {
 			.openId(loginUser.getOpenid())
 			.build();
 
-		SuccessParams successParams = null;
+		SuccessParams successParams = trade.tradeForScanPay(order, clientTradeDto.getChannelId());
 
-		try {
-			successParams = trade.tradeForScanPay(order, clientTradeDto.getChannelId());
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new ServiceException(ResCode.TRADE_ERROR);
-		}
 		String res = "{\"channelOrderId\":\"4200001127202110301273440365\"," +
 			"\"orderId\":\"" + successParams.getBills().getId() + "\"," +
 			"\"bankOrderId\":\"5062869652211030\"," +
@@ -186,4 +189,13 @@ public class PressureTestController {
 		return R.data(successParams);
 	}
 
+	@PostMapping("/sendWXMessage")
+	@ApiModelProperty("测试发送微信收款信息")
+	public void sendWXMessage() {
+		String openId = "ofVsB40EmE24bQP-ZhUV5I5hBB0M";
+		String contentStr = String.format(MessageTemplate.PAYMENT_NOTICE.getContentString(), BigDecimal.valueOf(0.01), "已完结", "1457649143315988481", DateUtil.format(LocalDateTime.now(), "yyyy年MM月dd日 HH:mm:ss"));
+		JSONObject content = JSON.parseObject(contentStr);
+		weChatService.sendTemplateMessage(openId, MessageTemplate.PAYMENT_NOTICE, content, configForShop.getPaymentPage(), MiniProgramType.SHOP);
+	}
+
 }

ldt-core/src/main/java/org/springblade/ldt/bills/service/IFrozenRecService.java

@@ -44,5 +44,5 @@ public interface IFrozenRecService extends BaseService<FrozenRec> {
 	 */
 	IPage<FrozenRecVO> selectFrozenRecPage(IPage<FrozenRecVO> page, FrozenRecVO frozenRec);
 
-	boolean addFrozenRec(BigDecimal handlePrice, Bills bills, LoginUser user, FrozenType type, UserChannelPoint channelPoint);
+	FrozenRec addFrozenRec(BigDecimal handlePrice, Bills bills, LoginUser user, FrozenType type, UserChannelPoint channelPoint);
 }

ldt-core/src/main/java/org/springblade/ldt/bills/service/impl/FrozenRecServiceImpl.java

@@ -27,6 +27,7 @@ import org.springblade.ldt.bills.service.IFrozenRecService;
 import org.springblade.ldt.bills.vo.FrozenRecVO;
 import org.springblade.ldt.user.entity.LoginUser;
 import org.springblade.ldt.user.entity.UserChannelPoint;
+import org.springblade.payment.handle.handler.DataHandle;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -41,16 +42,17 @@ import java.util.Objects;
 @Service
 public class FrozenRecServiceImpl extends BaseServiceImpl<FrozenRecMapper, FrozenRec> implements IFrozenRecService {
 
+	private DataHandle dataHandle;
+
 	@Override
 	public IPage<FrozenRecVO> selectFrozenRecPage(IPage<FrozenRecVO> page, FrozenRecVO frozenRec) {
 		return page.setRecords(baseMapper.selectFrozenRecPage(page, frozenRec));
 	}
 
 	@Override
-	public boolean addFrozenRec(BigDecimal handlePrice, Bills bills, LoginUser user, FrozenType type, UserChannelPoint userChannelPoint) {
+	public FrozenRec addFrozenRec(BigDecimal handlePrice, Bills bills, LoginUser user, FrozenType type, UserChannelPoint userChannelPoint) {
 
 		FrozenRec frozenRec = new FrozenRec();
-		frozenRec.setBeforeNum(user.getBalance());
 		frozenRec.setFrozenNum(handlePrice);
 		frozenRec.setUserId(user.getId());
 		frozenRec.setTradeNo(bills.getId());
@@ -59,16 +61,17 @@ public class FrozenRecServiceImpl extends BaseServiceImpl<FrozenRecMapper, Froze
 		frozenRec.setFrozenSatus(FrozenSatus.SUCCEED_FROZEN);
 
 		if (Objects.equals(type, FrozenType.POINT)) {
+			frozenRec.setBeforeNum(userChannelPoint.getAvailable());
 			user.setChannelPoint(user.getChannelPoint().subtract(handlePrice));
 			user.setFrozenPoint(user.getFrozenPoint().add(handlePrice));
 			userChannelPoint.setAvailable(userChannelPoint.getAvailable().subtract(handlePrice));
-		}
-		if (Objects.equals(type, FrozenType.BALANCE)) {
+		} else if (Objects.equals(type, FrozenType.BALANCE)) {
+			frozenRec.setBeforeNum(user.getBalance());
 			user.setBalance(user.getBalance().subtract(handlePrice));
 			user.setFrozenBalance(user.getFrozenBalance().add(handlePrice));
 		}
 
-		return this.saveOrUpdate(frozenRec);
+		return frozenRec;
 	}
 
 }

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

@@ -44,7 +44,7 @@ public class MallSendCallback {
 	private IBillsService billsService;
 
 	@EventListener
-	private void handle(MallSendPointEvent mallSendPointEvent){
+	public void handle(MallSendPointEvent mallSendPointEvent){
 		SuccessParams successParams = mallSendPointEvent.getSuccessParams();
 		String requestNo = successParams.getRes().getString("requestNo");
 		PointBills pointBills = pointBillsService.getOne(new QueryWrapper<PointBills>().lambda().eq(PointBills::getRequestNo, requestNo));

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

@@ -41,7 +41,7 @@ public class ShopSendCallback {
 	private ILoginUserService loginUserService;
 
 	@EventListener
-	private void handle(ShopSendPointEvent shopSendPointEvent){
+	public void handle(ShopSendPointEvent shopSendPointEvent){
 		SuccessParams successParams = shopSendPointEvent.getSuccessParams();
 		String requestNo = successParams.getRes().getString("requestNo");
 		BalanceBills balanceBills = balanceBillsService.getOne(new QueryWrapper<BalanceBills>().lambda().eq(BalanceBills::getRequestNo, requestNo));

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

@@ -1,6 +1,7 @@
 package org.springblade.payment.callback.trade;
 
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -77,7 +78,7 @@ public class UserPayCS {
 
 
 	@EventListener
-	@Async
+	//@Async
 	public void PaySuccess(UserPayCsEvent userPayCsEvent) {
 		SuccessParams successParams = userPayCsEvent.getSuccessParams();
 		PaymentVO paymentVO = PaymentVO.builder().isSuccess(Boolean.FALSE).msg("订单付款异常！").build();
@@ -151,7 +152,8 @@ public class UserPayCS {
 				applicationEventPublisher.publishEvent(new BillSuccessEvent(successParams));
 
 				String openId = shop.getOpenId();
-				String contentStr = String.format(String.valueOf(ypSettleAmount), bills.getPayStatus(), bills.getId(), bills.getUpdateTime());
+				String time = DateUtil.format(bills.getUpdateTime(), "yyyy年MM月dd日 HH:mm:ss");
+				String contentStr = String.format(MessageTemplate.PAYMENT_NOTICE.getContentString(), bills.getCost(), bills.getPayStatus(), bills.getId(), time);
 				JSONObject content = JSON.parseObject(contentStr);
 				weChatService.sendTemplateMessage(openId, MessageTemplate.PAYMENT_NOTICE, content, configForShop.getPaymentPage(), MiniProgramType.SHOP);
 			}

ldt-core/src/main/java/org/springblade/payment/handle/Trade.java

@@ -152,7 +152,7 @@ public class Trade {
 						successParams.setStatus(AppConstant.BillPayStatus.付款成功.name());
 						bills.setPayStatus(AppConstant.BillPayStatus.付款成功.name());
 						dataHandle.saveOrUpdateEntity(billsService, successParams.getBills());
-						applicationEventPublisher.publishEvent(new UserPayCsEvent(successParams));
+						dataHandle.publishEvent(new UserPayCsEvent(successParams));
 						break;
 					}
 				}
@@ -165,13 +165,14 @@ public class Trade {
 				PaymentCache.putSuccessParams(Convert.toStr(successParams.getBills().getId()), successParams);
 
 				//判断是否是待付款
-				if(StringUtils.equals(successParams.getStatus(),AppConstant.BillPayStatus.待付款.name())){
+				if (StringUtils.equals(successParams.getStatus(), AppConstant.BillPayStatus.待付款.name())) {
 					//发送消息队列
 					orderSend.sendOrderMessage(successParams);
 				}
 				return successParams;
 			}
 		} catch (Exception e) {
+			e.printStackTrace();
 			throw new TradeException(ResCode.TRADE_ERROR, successParams);
 		}
 

ldt-core/src/main/java/org/springblade/payment/handle/handler/BalanceHandle.java

@@ -7,6 +7,7 @@ import org.springblade.common.enums.OrderType;
 import org.springblade.common.enums.ResCode;
 import org.springblade.common.utils.TradeException;
 import org.springblade.ldt.bills.entity.BalanceBills;
+import org.springblade.ldt.bills.entity.FrozenRec;
 import org.springblade.ldt.bills.service.IBalanceBillsService;
 import org.springblade.ldt.bills.service.IFrozenRecService;
 import org.springblade.ldt.user.entity.LoginUser;
@@ -69,7 +70,8 @@ public class BalanceHandle implements BaseHandle {
 			handlePrice = myBalance;
 		}
 
-		Assert.isTrue(frozenRecService.addFrozenRec(handlePrice, successParams.getBills(), user, FrozenType.BALANCE, null), () -> {
+		FrozenRec frozenRec = frozenRecService.addFrozenRec(handlePrice, successParams.getBills(), user, FrozenType.POINT, null);
+		Assert.isTrue(dataHandle.saveOrUpdateEntity(frozenRecService, frozenRec), () -> {
 			throw new TradeException(ResCode.TRADE_ERROR, successParams);
 		});
 		BalanceBills balanceBills = buildBills(order, user, handlePrice, successParams, BigDecimal.ZERO);

ldt-core/src/main/java/org/springblade/payment/handle/handler/ChannelPointHandle.java

@@ -7,6 +7,7 @@ import org.springblade.common.enums.FrozenType;
 import org.springblade.common.enums.OrderType;
 import org.springblade.common.enums.ResCode;
 import org.springblade.common.utils.TradeException;
+import org.springblade.ldt.bills.entity.FrozenRec;
 import org.springblade.ldt.bills.entity.PointBills;
 import org.springblade.ldt.bills.service.IFrozenRecService;
 import org.springblade.ldt.bills.service.IPointBillsService;
@@ -77,7 +78,8 @@ public class ChannelPointHandle implements BaseHandle {
 			throw new TradeException(ResCode.TRADE_ERROR, successParams);
 		});
 
-		Assert.isTrue(frozenRecService.addFrozenRec(handlePrice, successParams.getBills(), user, FrozenType.POINT, channelPoint), () -> {
+		FrozenRec frozenRec = frozenRecService.addFrozenRec(handlePrice, successParams.getBills(), user, FrozenType.POINT, channelPoint);
+		Assert.isTrue(dataHandle.saveOrUpdateEntity(frozenRecService, frozenRec), () -> {
 			throw new TradeException(ResCode.TRADE_ERROR, successParams);
 		});
 		Assert.isTrue(dataHandle.saveOrUpdateEntity(loginUserService, user), () -> {

ldt-core/src/main/java/org/springblade/payment/handle/handler/DataHandle.java

@@ -5,6 +5,12 @@ import org.springblade.ldt.bills.entity.Bills;
 import org.springblade.ldt.bills.service.IBillsService;
 import org.springblade.ldt.user.entity.LoginUser;
 import org.springblade.ldt.user.service.ILoginUserService;
+import org.springblade.payment.entity.SuccessParams;
+import org.springblade.payment.event.UserPayCsEvent;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -19,6 +25,9 @@ import java.util.Objects;
 @Component
 public class DataHandle {
 
+	@Autowired
+	private ApplicationEventPublisher applicationEventPublisher;
+
 	@Transactional(propagation = Propagation.REQUIRES_NEW)
 	public <T> boolean saveOrUpdateEntity(BaseService<T> service,T t) {
 		if(Objects.isNull(t)){
@@ -27,4 +36,8 @@ public class DataHandle {
 		return service.saveOrUpdate(t);
 	}
 
+	@Transactional(propagation = Propagation.NOT_SUPPORTED)
+	public void publishEvent(ApplicationEvent applicationEvent){
+		applicationEventPublisher.publishEvent(applicationEvent);
+	}
 }

ldt-core/src/main/java/org/springblade/payment/service/impl/PaymentService.java

@@ -1,10 +1,11 @@
 package org.springblade.payment.service.impl;
 
+import lombok.AllArgsConstructor;
 import org.springblade.common.enums.OrderType;
+import org.springblade.payment.callback.trade.*;
 import org.springblade.payment.entity.SuccessParams;
 import org.springblade.payment.event.*;
 import org.springblade.payment.service.IPaymentService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 
@@ -14,44 +15,93 @@ import org.springframework.stereotype.Service;
  * @since: 8/5/21 -- 2:34 PM
  */
 @Service
+@AllArgsConstructor
 public class PaymentService implements IPaymentService {
 
-	@Autowired
 	private ApplicationEventPublisher eventPublisher;
+	private AgentChargeCallback agentChargeCallback;
+	private MallChargeCallback mallChargeCallback;
+	private MallRechargeCallback mallRechargeCallback;
+	private MallSendCallback mallSendCallback;
+	private ShopSendCallback shopSendCallback;
+	private UserPayCallback userPayCallback;
+	private UserPayCS userPayCS;
+	private UserPointTransferWithdrawCallback userPointTransferWithdrawCallback;
+	private UserPointWithdrawCallback userPointWithdrawCallback;
+	private UserWithdrawCallback userWithdrawCallback;
+	private WeChatPayCallback weChatPayCallback;
+
+//	@Override
+//	public void success(SuccessParams successParams) {
+//		switch (OrderType.valueOf(successParams.getOrderType())) {
+//			case USER_PAY:
+//				eventPublisher.publishEvent(new UserPayEvent(successParams));
+//				return;
+//			case AGENT_CHARGE:
+//				eventPublisher.publishEvent(new AgentChargeEvent(successParams));
+//				return;
+//			case MALL_CHARGE:
+//				eventPublisher.publishEvent(new MallChargeEvent(successParams));
+//				return;
+//			case WECHAT_PAY:
+//				eventPublisher.publishEvent(new WeChatPayEvent(successParams));
+//				return;
+//			case USER_WITHDRAW:
+//				eventPublisher.publishEvent(new UserWithdrawEvent(successParams));
+//				return;
+//			case MALL_SEND:
+//				eventPublisher.publishEvent(new MallSendPointEvent(successParams));
+//				return;
+//			case SHOP_SEND:
+//				eventPublisher.publishEvent(new ShopSendPointEvent(successParams));
+//				return;
+//			case MALL_RECHARGE:
+//				eventPublisher.publishEvent(new MallRechargeEvent((successParams)));
+//			case USER_POINT_TRANSFER_WITHDRAW:
+//				eventPublisher.publishEvent(new UserPointTransferWithdrawEvent(successParams));
+//			case USER_POINT_WITHDRAW:
+//				eventPublisher.publishEvent(new UserPointWithdrawEvent(successParams));
+//			default:
+//				return;
+//
+//		}
+//	}
 
 	@Override
 	public void success(SuccessParams successParams) {
 		switch (OrderType.valueOf(successParams.getOrderType())) {
 			case USER_PAY:
-				eventPublisher.publishEvent(new UserPayEvent(successParams));
+				userPayCallback.PaySuccess(new UserPayEvent(successParams));
 				return;
 			case AGENT_CHARGE:
-				eventPublisher.publishEvent(new AgentChargeEvent(successParams));
+				agentChargeCallback.PaySuccess(new AgentChargeEvent(successParams));
 				return;
 			case MALL_CHARGE:
-				eventPublisher.publishEvent(new MallChargeEvent(successParams));
+				mallChargeCallback.PaySuccess(new MallChargeEvent(successParams));
 				return;
 			case WECHAT_PAY:
-				eventPublisher.publishEvent(new WeChatPayEvent(successParams));
+				weChatPayCallback.handleWeChatPayCallback(new WeChatPayEvent(successParams));
 				return;
 			case USER_WITHDRAW:
-				eventPublisher.publishEvent(new UserWithdrawEvent(successParams));
+				userWithdrawCallback.PaySuccess(new UserWithdrawEvent(successParams));
 				return;
 			case MALL_SEND:
-				eventPublisher.publishEvent(new MallSendPointEvent(successParams));
+				mallSendCallback.handle(new MallSendPointEvent(successParams));
 				return;
 			case SHOP_SEND:
-				eventPublisher.publishEvent(new ShopSendPointEvent(successParams));
+				shopSendCallback.handle(new ShopSendPointEvent(successParams));
 				return;
 			case MALL_RECHARGE:
-				eventPublisher.publishEvent(new MallRechargeEvent((successParams)));
+				mallRechargeCallback.PaySuccess(new MallRechargeEvent((successParams)));
+				return;
 			case USER_POINT_TRANSFER_WITHDRAW:
-				eventPublisher.publishEvent(new UserPointTransferWithdrawEvent(successParams));
+				userPointTransferWithdrawCallback.PaySuccess(new UserPointTransferWithdrawEvent(successParams));
+				return;
 			case USER_POINT_WITHDRAW:
-				eventPublisher.publishEvent(new UserPointWithdrawEvent(successParams));
+				userPointWithdrawCallback.PaySuccess(new UserPointWithdrawEvent(successParams));
+				return;
 			default:
 				return;
-
 		}
 	}
 
@@ -59,7 +109,8 @@ public class PaymentService implements IPaymentService {
 	public void cs(SuccessParams successParams) {
 		switch (OrderType.valueOf(successParams.getOrderType())) {
 			case USER_PAY:
-				eventPublisher.publishEvent(new UserPayCsEvent(successParams));
+				//eventPublisher.publishEvent(new UserPayCsEvent(successParams));
+				userPayCS.PaySuccess(new UserPayCsEvent(successParams));
 				return;
 			default:
 				return;

ldt-core/src/main/java/org/springblade/wx/constant/MessageTemplate.java

@@ -31,16 +31,16 @@ public enum MessageTemplate {
 	PAYMENT_NOTICE("2TcoWv042wo8Bf0SLRkjSLG00JAb9bE-usMy_aAW3Js", "" +
 		"{\n" +
 		"    \"amount3\":{\n" +
-		"        \"DATA\":\"%s\"\n" +
+		"        \"value\":\"%s\"\n" +
 		"    },\n" +
 		"    \"phrase1\":{\n" +
-		"        \"DATA\":\"%s\"\n" +
+		"        \"value\":\"%s\"\n" +
 		"    },\n" +
 		"    \"character_string8\":{\n" +
-		"        \"DATA\":\"%s\"\n" +
+		"        \"value\":\"%s\"\n" +
 		"    },\n" +
 		"    \"time4\":{\n" +
-		"        \"DATA\":\"%s\"\n" +
+		"        \"value\":\"%s\"\n" +
 		"    }\n" +
 		"}"),
 	;

ldt-core/src/main/resources/log/logback-test.xml

@@ -25,7 +25,7 @@
     <appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件输出的文件名 -->
-            <FileNamePattern>target/blade/log/info-%d{yyyy-MM-dd}.log</FileNamePattern>
+            <FileNamePattern>/home/ldt/server/log/info-%d{yyyy-MM-dd}.log</FileNamePattern>
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <pattern>%n%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId}] [%logger{50}] %n%-5level: %msg%n</pattern>
@@ -42,7 +42,7 @@
     <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件输出的文件名 -->
-            <FileNamePattern>target/blade/log/error-%d{yyyy-MM-dd}.log</FileNamePattern>
+            <FileNamePattern>/home/ldt/server/log/error-%d{yyyy-MM-dd}.log</FileNamePattern>
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <pattern>%n%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId}] [%logger{50}] %n%-5level: %msg%n</pattern>