Merge remote-tracking branch 'origin/master'

# Conflicts:
#	blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/service/impl/ShipServiceImpl.java
#	blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/stock/controller/StockDescController.java

blade-common/src/main/java/org/springblade/common/enums/CommonEnum.java

@@ -64,6 +64,11 @@ public enum CommonEnum {
 	OPEN_ZR_TRANSMIT("open.zr.transmit"),
 
 	/**
+	 * 是否开启共享
+	 */
+	WHETHER_OPEN_SHARE("whether_openShare"),
+
+	/**
 	 * 分隔符
 	 */
 	SPLIT_SYMBOL(","),

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/shopping/vo/WeChatGoodsDetailInventoryVo.java

@@ -0,0 +1,29 @@
+package org.springblade.salesPart.shopping.vo;
+
+import lombok.Data;
+import org.springblade.common.enums.NumberEnum;
+
+
+/**
+ * 小程序商品详情库存类
+ * @author Rain
+ */
+@Data
+public class WeChatGoodsDetailInventoryVo {
+
+	/**
+	 * 小时达库存
+	 */
+	private Long storeInventory;
+
+	/**
+	 * 共享库存
+	 */
+	private Long storeInventoryShare;
+
+	public void isZero(){
+		this.storeInventory = 0L;
+		this.storeInventoryShare = 0L;
+	}
+
+}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/service/impl/ShipServiceImpl.java

@@ -4112,7 +4112,6 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 					} else {
 						stockOneR.setRebatePrice(stockOneR.getRebateInventoryAmount().divide(stockOneR.getBalanceQuantity(), 2, RoundingMode.HALF_UP));
 					}
-//					stockOneR.setDot("");
 					stockOneR.setVersion(stockOneR.getVersion());
 					pjStockDescArrayList.add(stockOneR);
 				} else {

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/shopping/controller/ShoppingMallDetailController.java

@@ -16,9 +16,7 @@
  */
 package org.springblade.salesPart.shopping.controller;
 
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -27,40 +25,34 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.common.enums.CommonEnum;
+import org.springblade.common.enums.NumberEnum;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
-import org.springblade.salesPart.brand.service.IBrandDescService;
-import org.springblade.salesPart.brand.service.IBrandFigureService;
-import org.springblade.salesPart.brand.service.IBrandFilesService;
-import org.springblade.salesPart.corps.service.ICorpsAttnService;
-import org.springblade.salesPart.corps.service.ICorpsDescService;
-import org.springblade.salesPart.entity.*;
-import org.springblade.salesPart.productLaunch.service.IProductLaunchFilesService;
+import org.springblade.salesPart.entity.PjProductLaunch;
+import org.springblade.salesPart.entity.PjStockDesc;
+import org.springblade.salesPart.productLaunch.service.IProductLaunchService;
 import org.springblade.salesPart.share.entity.SharePutOnShelves;
 import org.springblade.salesPart.share.service.ISharePutOnShelvesService;
 import org.springblade.salesPart.shopping.entity.ShoppingMallDetail;
 import org.springblade.salesPart.shopping.service.IShoppingMallDetailService;
 import org.springblade.salesPart.shopping.vo.ShoppingMallDetailVO;
-import org.springblade.salesPart.stock.mapper.StockDescMapper;
-import org.springblade.salesPart.util.UserUtils;
-import org.springblade.salesPart.vo.WeChatDetailStockVo;
+import org.springblade.salesPart.shopping.vo.WeChatGoodsDetailInventoryVo;
 import org.springblade.salesPart.vo.WeChatGoodsDetailStockVo;
 import org.springblade.system.feign.ISysClient;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.math.BigDecimal;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * VIEW 控制器
@@ -75,14 +67,8 @@ import java.util.stream.Collectors;
 public class ShoppingMallDetailController extends BladeController {
 
 	private final IShoppingMallDetailService shoppingMallDetailService;
-	private final IBrandFilesService brandFilesService;
-	private final IBrandDescService brandDescService;
-	private final IProductLaunchFilesService productLaunchFilesService;
-	private final ICorpsAttnService corpsAttnService;//客户联系人
-	private final ICorpsDescService corpsDescService;//客户
+	private final IProductLaunchService productLaunchService;
 	private final ISysClient iSysClient;
-	private final IBrandFigureService brandFigureService;
-	private final StockDescMapper stockDescMapper;
 	private final ISharePutOnShelvesService sharePutOnShelvesService;
 
 	/**
@@ -187,38 +173,45 @@ public class ShoppingMallDetailController extends BladeController {
 	 */
 	@GetMapping("/listShareV1")
 	@ApiOperationSupport(order = 2)
-	public R<Map<String, Object>> listShareV1(PjStockDesc stockDesc) {
+	public R<WeChatGoodsDetailInventoryVo> listShareV1(PjStockDesc stockDesc) {
+		WeChatGoodsDetailInventoryVo weChatGoodsDetailInventoryVo = new WeChatGoodsDetailInventoryVo();
 		Map<String, Object> map = new HashMap<>(2);
 		if (ObjectUtils.isNull(stockDesc.getCode())) {
-			map.put("storeInventory", CommonEnum.ZERO.info);
-			map.put("storeInventoryShare", CommonEnum.ZERO.info);
-			return R.data(map);
+			weChatGoodsDetailInventoryVo.isZero();
+			return R.data(weChatGoodsDetailInventoryVo);
 		}
 		// 根据当前登录人获得客户
 		BladeUser bladeUser = AuthUtil.getUser();
-		PjCorpsAttn corpsAttn = corpsAttnService.getAttn(bladeUser.getUserId());
-		if (ObjectUtil.isEmpty(corpsAttn)) {
-			throw new RuntimeException("未查到用户信息");
-		}
-		PjCorpsDesc corpsDesc = corpsDescService.getCorpsDesc(corpsAttn.getPid());
-		if (ObjectUtil.isEmpty(corpsDesc)) {
-			throw new RuntimeException("未查到用户信息");
-		}
-		LambdaQueryWrapper<ShoppingMallDetail> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-		lambdaQueryWrapper.eq(ShoppingMallDetail::getTenantId, bladeUser.getTenantId())
-			.eq(ShoppingMallDetail::getIsDeleted, 0)
-			.eq(ShoppingMallDetail::getBillType, 0);
-		if (ObjectUtil.isNotEmpty(stockDesc.getId())) {
-			lambdaQueryWrapper.eq(ShoppingMallDetail::getId, stockDesc.getId());
+		String isOpenShare = iSysClient.getParamService(CommonEnum.WHETHER_OPEN_SHARE.info);
+		String isZeroInventory = iSysClient.getParamService(CommonEnum.WHETHER_ZERO_INVENTORY.info);
+		if (CommonEnum.ONE.info.equals(isOpenShare)) {
+			LambdaQueryWrapper<ShoppingMallDetail> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+			lambdaQueryWrapper.eq(ShoppingMallDetail::getTenantId, bladeUser.getTenantId())
+				.eq(ShoppingMallDetail::getIsDeleted, 0)
+				.eq(ShoppingMallDetail::getBillType, 0);
+			if (ObjectUtil.isNotEmpty(stockDesc.getId())) {
+				lambdaQueryWrapper.eq(ShoppingMallDetail::getId, stockDesc.getId());
+			} else {
+				lambdaQueryWrapper.eq(ShoppingMallDetail::getGoodsCode, stockDesc.getCode());
+			}
+			if (ObjectUtils.isNull(isZeroInventory) || CommonEnum.ZERO.info.equals(isZeroInventory)) {
+				lambdaQueryWrapper.gt(ShoppingMallDetail::getInventory, 0);
+			}
+			ShoppingMallDetail shoppingMallDetail = shoppingMallDetailService.getOne(lambdaQueryWrapper);
+			weChatGoodsDetailInventoryVo.setStoreInventory(shoppingMallDetail != null ? shoppingMallDetail.getInventory().longValue() : 0L);
 		} else {
-			lambdaQueryWrapper.eq(ShoppingMallDetail::getGoodsCode, stockDesc.getCode());
+			LambdaQueryWrapper<PjProductLaunch> productLaunchLambdaQueryWrapper = new LambdaQueryWrapper<>();
+			if (ObjectUtil.isNotEmpty(stockDesc.getId())) {
+				productLaunchLambdaQueryWrapper.eq(PjProductLaunch::getId, stockDesc.getId());
+			} else {
+				productLaunchLambdaQueryWrapper.eq(PjProductLaunch::getCode, stockDesc.getCode());
+			}
+			productLaunchLambdaQueryWrapper.eq(PjProductLaunch::getTenantId, bladeUser.getTenantId());
+			productLaunchLambdaQueryWrapper.eq(PjProductLaunch::getIsDeleted, NumberEnum.Zero.number);
+			productLaunchLambdaQueryWrapper.last("limit 1");
+			PjProductLaunch  productLaunch = productLaunchService.getOne(productLaunchLambdaQueryWrapper);
+			weChatGoodsDetailInventoryVo.setStoreInventory(Objects.isNull(productLaunch) ? 0L : productLaunch.getInventory().longValue());
 		}
-		String status1 = iSysClient.getParamService(CommonEnum.WHETHER_ZERO_INVENTORY.info);
-		if (ObjectUtils.isNull(status1) || CommonEnum.ZERO.info.equals(status1)) {
-			lambdaQueryWrapper.gt(ShoppingMallDetail::getInventory, 0);
-		}
-		ShoppingMallDetail shoppingMallDetail = shoppingMallDetailService.getOne(lambdaQueryWrapper);
-		map.put("storeInventory", shoppingMallDetail != null ? shoppingMallDetail.getInventory() : CommonEnum.ZERO.info);
 		List<SharePutOnShelves> sharePutOnShelvesList = sharePutOnShelvesService.list(new LambdaQueryWrapper<SharePutOnShelves>()
 			.eq(SharePutOnShelves::getTenantId, bladeUser.getTenantId())
 			.eq(SharePutOnShelves::getIsDeleted, 0)
@@ -226,7 +219,7 @@ public class ShoppingMallDetailController extends BladeController {
 			.eq(SharePutOnShelves::getShareStatus, "已确认")
 			.eq(SharePutOnShelves::getGoodsCode, stockDesc.getCode()));
 		map.put("storeInventoryShare", !sharePutOnShelvesList.isEmpty() ? sharePutOnShelvesList.stream().map(SharePutOnShelves::getInventory).reduce(BigDecimal.ZERO, BigDecimal::add) : CommonEnum.ZERO.info);
-		return R.data(map);
+		return R.data(weChatGoodsDetailInventoryVo);
 	}
 
 

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/stock/controller/StockDescController.java

@@ -108,7 +108,8 @@ public class StockDescController extends BladeController {
 			.eq(ObjectUtil.isNotEmpty(stockDesc.getBrandId()), PjStockDesc::getBrandId, stockDesc.getBrandId())
 			.eq(ObjectUtil.isNotEmpty(stockDesc.getBrandName()), PjStockDesc::getBrandName, stockDesc.getBrandName())
 			.eq(ObjectUtil.isNotEmpty(stockDesc.getGoodsTypeId()), PjStockDesc::getGoodsTypeId, stockDesc.getGoodsTypeId())
-			.like(ObjectUtil.isNotEmpty(stockDesc.getDot()), PjStockDesc::getDot, stockDesc.getDot());
+			.like(ObjectUtil.isNotEmpty(stockDesc.getDot()), PjStockDesc::getDot, stockDesc.getDot())
+			.orderByDesc(PjStockDesc::getBalanceQuantity);
 		String appWhetherZeroInventory = iSysClient.getParamService("app.whether.zero.inventory");
 		if ("0".equals(appWhetherZeroInventory)){
 			lambdaQueryWrapper.ne(PjStockDesc::getBalanceQuantity, 0);
@@ -203,16 +204,9 @@ public class StockDescController extends BladeController {
 				}
 			}
 		}
-		if ("1".equals(stockDesc.getSort())){
-			lambdaQueryWrapper.orderByDesc(PjStockDesc::getCname);
-			lambdaQueryWrapper.orderByDesc(PjStockDesc::getStorageId);
-			lambdaQueryWrapper.orderByDesc(PjStockDesc::getBalanceQuantity);
-			lambdaQueryWrapper.orderByDesc(PjStockDesc::getDot);
-		}else{
-			lambdaQueryWrapper.orderByDesc(PjStockDesc::getBalanceQuantity);
-		}
+		lambdaQueryWrapper.orderByDesc(PjStockDesc::getBalanceQuantity);
 		IPage<PjStockDesc> iPage = Condition.getPage(query);
-		if (ObjectUtils.isNotNull(query.getSize()) && query.getSize() > NumberEnum.FIVE_HUNDRED.number) {
+		if (query.getSize() > NumberEnum.FIVE_HUNDRED.number) {
 			iPage.setSize(-1L);
 		}
 		IPage<PjStockDesc> pages = stockDescService.page(iPage, lambdaQueryWrapper);

blade-service/blade-user/src/main/resources/log/logback-dev.xml

@@ -13,6 +13,10 @@
     <!-- 彩色日志格式 -->
     <property name="CONSOLE_LOG_PATTERN"
               value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+
+    <!-- 定义日志存储目录 -->
+    <property name="LOG_DIR" value="logs" />
+
     <!-- 控制台输出 -->
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
@@ -21,6 +25,26 @@
         </encoder>
     </appender>
 
+    <!-- 按日期滚动的文件Appender -->
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 当前正在写入的日志文件路径 -->
+        <file>${LOG_DIR}/${springAppName:-application}.log</file>
+        <!-- 基于时间的滚动策略 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 归档日志文件的命名模式，按天分割 -->
+            <fileNamePattern>${LOG_DIR}/${springAppName:-application}.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 保留日志的天数，超过此天数的旧日志文件会被自动删除 -->
+            <maxHistory>30</maxHistory>
+            <!-- 可选：总日志文件大小限制，防止日志占满磁盘 -->
+            <totalSizeCap>3GB</totalSizeCap>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!-- 使用详细的日志格式 -->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{40} - %msg%n</pattern>
+            <charset>utf8</charset>
+        </encoder>
+    </appender>
+
     <if condition='property("ELK_MODE").toUpperCase().contains("TRUE")'>
         <then>
             <!-- 推送日志至elk -->
@@ -58,56 +82,55 @@
     </if>
 
     <!-- 日志输出级别 -->
-    <root level="ERROR">
+    <root level="DEBUG">
         <appender-ref ref="STDOUT"/>
+        <appender-ref ref="FILE"/> <!-- 新增的文件输出 -->
         <appender-ref ref="${STDOUT_APPENDER}"/>
     </root>
 
-    <logger name="net.sf.ehcache" level="ERROR"/>
-    <logger name="druid.sql" level="ERROR"/>
-
+    <!-- 以下为各种logger的级别配置，保持不变 -->
+    <logger name="net.sf.ehcache" level="DEBUG"/>
+    <logger name="druid.sql" level="DEBUG"/>
 
     <!-- MyBatis log configure -->
-    <logger name="com.apache.ibatis" level="ERROR"/>
-    <logger name="org.mybatis.spring" level="ERROR"/>
-    <logger name="java.sql.Connection" level="ERROR"/>
-    <logger name="java.sql.Statement" level="ERROR"/>
-    <logger name="java.sql.PreparedStatement" level="ERROR"/>
+    <logger name="com.apache.ibatis" level="DEBUG"/>
+    <logger name="org.mybatis.spring" level="DEBUG"/>
+    <logger name="java.sql.Connection" level="DEBUG"/>
+    <logger name="java.sql.Statement" level="DEBUG"/>
+    <logger name="java.sql.PreparedStatement" level="DEBUG"/>
 
     <!-- 减少部分debug日志 -->
-    <logger name="druid.sql" level="ERROR"/>
-    <logger name="org.apache.shiro" level="ERROR"/>
-    <logger name="org.mybatis.spring" level="ERROR"/>
-    <logger name="org.springframework" level="ERROR"/>
-    <logger name="org.springframework.context" level="ERROR"/>
-    <logger name="org.springframework.beans" level="ERROR"/>
-    <logger name="com.baomidou.mybatisplus" level="ERROR"/>
-    <logger name="org.apache.ibatis.io" level="ERROR"/>
-    <logger name="org.apache.velocity" level="ERROR"/>
-    <logger name="org.eclipse.jetty" level="ERROR"/>
-    <logger name="io.undertow" level="ERROR"/>
-    <logger name="org.xnio.nio" level="ERROR"/>
-    <logger name="org.thymeleaf" level="ERROR"/>
-    <logger name="springfox.documentation" level="ERROR"/>
-    <logger name="org.hibernate.validator" level="ERROR"/>
-    <logger name="com.netflix.loadbalancer" level="ERROR"/>
-    <logger name="com.netflix.hystrix" level="ERROR"/>
-    <logger name="com.netflix.zuul" level="ERROR"/>
-    <logger name="de.codecentric" level="ERROR"/>
-    <!-- cache INFO -->
-    <logger name="net.sf.ehcache" level="ERROR"/>
-    <logger name="org.springframework.cache" level="ERROR"/>
+    <logger name="druid.sql" level="DEBUG"/>
+    <logger name="org.apache.shiro" level="DEBUG"/>
+    <logger name="org.mybatis.spring" level="DEBUG"/>
+    <logger name="org.springframework" level="DEBUG"/>
+    <logger name="org.springframework.context" level="DEBUG"/>
+    <logger name="org.springframework.beans" level="DEBUG"/>
+    <logger name="com.baomidou.mybatisplus" level="DEBUG"/>
+    <logger name="org.apache.ibatis.io" level="DEBUG"/>
+    <logger name="org.apache.velocity" level="DEBUG"/>
+    <logger name="org.eclipse.jetty" level="DEBUG"/>
+    <logger name="io.undertow" level="DEBUG"/>
+    <logger name="org.xnio.nio" level="DEBUG"/>
+    <logger name="org.thymeleaf" level="DEBUG"/>
+    <logger name="springfox.documentation" level="DEBUG"/>
+    <logger name="org.hibernate.validator" level="DEBUG"/>
+    <logger name="com.netflix.loadbalancer" level="DEBUG"/>
+    <logger name="com.netflix.hystrix" level="DEBUG"/>
+    <logger name="com.netflix.zuul" level="DEBUG"/>
+    <logger name="de.codecentric" level="DEBUG"/>
+    <!-- cache DEBUG -->
+    <logger name="net.sf.ehcache" level="DEBUG"/>
+    <logger name="org.springframework.cache" level="DEBUG"/>
     <!-- cloud -->
-    <logger name="org.apache.http" level="ERROR"/>
-    <logger name="com.netflix.discovery" level="ERROR"/>
-    <logger name="com.netflix.eureka" level="ERROR"/>
+    <logger name="org.apache.http" level="DEBUG"/>
+    <logger name="com.netflix.discovery" level="DEBUG"/>
+    <logger name="com.netflix.eureka" level="DEBUG"/>
     <!-- 业务日志 -->
-    <Logger name="org.springblade" level="ERROR"/>
-    <Logger name="org.springblade.core.tenant" level="ERROR"/>
-    <Logger name="org.springblade.core.version" level="ERROR"/>
+    <Logger name="org.springblade" level="DEBUG"/>
+    <Logger name="org.springblade.core.tenant" level="DEBUG"/>
+    <Logger name="org.springblade.core.version" level="DEBUG"/>
 
     <!-- 减少nacos日志 -->
-    <logger name="com.alibaba.nacos" level="ERROR"/>
-
-
+    <logger name="com.alibaba.nacos" level="DEBUG"/>
 </configuration>

blade-service/blade-user/src/main/resources/log/logback-prod.xml

@@ -13,6 +13,10 @@
     <!-- 彩色日志格式 -->
     <property name="CONSOLE_LOG_PATTERN"
               value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+
+    <!-- 定义日志存储目录 -->
+    <property name="LOG_DIR" value="logs" />
+
     <!-- 控制台输出 -->
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
@@ -21,44 +25,30 @@
         </encoder>
     </appender>
 
-    <!-- 生成日志文件 -->
-    <appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <!-- 按日期滚动的文件Appender -->
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 当前正在写入的日志文件路径 -->
+        <file>${LOG_DIR}/${springAppName:-application}.log</file>
+        <!-- 基于时间的滚动策略 -->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件输出的文件名 -->
-            <FileNamePattern>target/blade/log/info-%d{yyyy-MM-dd}.log</FileNamePattern>
+            <!-- 归档日志文件的命名模式，按天分割 -->
+            <fileNamePattern>${LOG_DIR}/${springAppName:-application}.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 保留日志的天数，超过此天数的旧日志文件会被自动删除 -->
+            <maxHistory>30</maxHistory>
+            <!-- 可选：总日志文件大小限制，防止日志占满磁盘 -->
+            <totalSizeCap>3GB</totalSizeCap>
         </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>
-        </encoder>
-        <!-- 打印日志级别 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>INFO</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 生成日志文件 -->
-    <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>
-        </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>
+            <!-- 使用详细的日志格式 -->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{40} - %msg%n</pattern>
+            <charset>utf8</charset>
         </encoder>
-        <!-- 打印日志级别 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
     </appender>
 
     <if condition='property("ELK_MODE").toUpperCase().contains("TRUE")'>
         <then>
             <!-- 推送日志至elk -->
-            <appender name="INFO_LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+            <appender name="STDOUT_LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
                 <destination>${DESTINATION}</destination>
                 <!-- 日志输出编码 -->
                 <encoder charset="UTF-8" class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
@@ -87,65 +77,60 @@
                         <stackTrace/>
                     </providers>
                 </encoder>
-                <!-- 打印日志级别 -->
-                <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                    <level>INFO</level>
-                    <onMatch>ACCEPT</onMatch>
-                    <onMismatch>DENY</onMismatch>
-                </filter>
-            </appender>
-
-            <!-- 推送日志至elk -->
-            <appender name="ERROR_LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-                <destination>${DESTINATION}</destination>
-                <!-- 日志输出编码 -->
-                <encoder charset="UTF-8" class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
-                    <providers>
-                        <timestamp>
-                            <timeZone>UTC</timeZone>
-                        </timestamp>
-                        <pattern>
-                            <pattern>
-                                {
-                                "traceId": "%X{traceId}",
-                                "requestId": "%X{requestId}",
-                                "accountId": "%X{accountId}",
-                                "tenantId": "%X{tenantId}",
-                                "logLevel": "%level",
-                                "serviceName": "${springAppName:-SpringApp}",
-                                "pid": "${PID:-}",
-                                "thread": "%thread",
-                                "class": "%logger{40}",
-                                "line":"%L",
-                                "message": "%message"
-                                }
-                            </pattern>
-                        </pattern>
-                        <mdc/>
-                        <stackTrace/>
-                    </providers>
-                </encoder>
-                <!-- 打印日志级别 -->
-                <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                    <level>ERROR</level>
-                    <onMatch>ACCEPT</onMatch>
-                    <onMismatch>DENY</onMismatch>
-                </filter>
             </appender>
         </then>
     </if>
 
     <!-- 日志输出级别 -->
-    <root level="ERROR">
+    <root level="DEBUG">
         <appender-ref ref="STDOUT"/>
-        <appender-ref ref="${INFO_APPENDER}"/>
-        <appender-ref ref="${ERROR_APPENDER}"/>
+        <appender-ref ref="FILE"/> <!-- 新增的文件输出 -->
+        <appender-ref ref="${STDOUT_APPENDER}"/>
     </root>
 
-    <logger name="net.sf.ehcache" level="ERROR"/>
-    <logger name="druid.sql" level="ERROR"/>
+    <!-- 以下为各种logger的级别配置，保持不变 -->
+    <logger name="net.sf.ehcache" level="DEBUG"/>
+    <logger name="druid.sql" level="DEBUG"/>
 
-    <!-- 减少nacos日志 -->
-    <logger name="com.alibaba.nacos" level="ERROR"/>
+    <!-- MyBatis log configure -->
+    <logger name="com.apache.ibatis" level="DEBUG"/>
+    <logger name="org.mybatis.spring" level="DEBUG"/>
+    <logger name="java.sql.Connection" level="DEBUG"/>
+    <logger name="java.sql.Statement" level="DEBUG"/>
+    <logger name="java.sql.PreparedStatement" level="DEBUG"/>
 
+    <!-- 减少部分debug日志 -->
+    <logger name="druid.sql" level="DEBUG"/>
+    <logger name="org.apache.shiro" level="DEBUG"/>
+    <logger name="org.mybatis.spring" level="DEBUG"/>
+    <logger name="org.springframework" level="DEBUG"/>
+    <logger name="org.springframework.context" level="DEBUG"/>
+    <logger name="org.springframework.beans" level="DEBUG"/>
+    <logger name="com.baomidou.mybatisplus" level="DEBUG"/>
+    <logger name="org.apache.ibatis.io" level="DEBUG"/>
+    <logger name="org.apache.velocity" level="DEBUG"/>
+    <logger name="org.eclipse.jetty" level="DEBUG"/>
+    <logger name="io.undertow" level="DEBUG"/>
+    <logger name="org.xnio.nio" level="DEBUG"/>
+    <logger name="org.thymeleaf" level="DEBUG"/>
+    <logger name="springfox.documentation" level="DEBUG"/>
+    <logger name="org.hibernate.validator" level="DEBUG"/>
+    <logger name="com.netflix.loadbalancer" level="DEBUG"/>
+    <logger name="com.netflix.hystrix" level="DEBUG"/>
+    <logger name="com.netflix.zuul" level="DEBUG"/>
+    <logger name="de.codecentric" level="DEBUG"/>
+    <!-- cache DEBUG -->
+    <logger name="net.sf.ehcache" level="DEBUG"/>
+    <logger name="org.springframework.cache" level="DEBUG"/>
+    <!-- cloud -->
+    <logger name="org.apache.http" level="DEBUG"/>
+    <logger name="com.netflix.discovery" level="DEBUG"/>
+    <logger name="com.netflix.eureka" level="DEBUG"/>
+    <!-- 业务日志 -->
+    <Logger name="org.springblade" level="DEBUG"/>
+    <Logger name="org.springblade.core.tenant" level="DEBUG"/>
+    <Logger name="org.springblade.core.version" level="DEBUG"/>
+
+    <!-- 减少nacos日志 -->
+    <logger name="com.alibaba.nacos" level="DEBUG"/>
 </configuration>

blade-service/blade-user/src/main/resources/log/logback-test.xml

@@ -13,6 +13,10 @@
     <!-- 彩色日志格式 -->
     <property name="CONSOLE_LOG_PATTERN"
               value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+
+    <!-- 定义日志存储目录 -->
+    <property name="LOG_DIR" value="logs" />
+
     <!-- 控制台输出 -->
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
@@ -21,44 +25,30 @@
         </encoder>
     </appender>
 
-    <!-- 生成日志文件 -->
-    <appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <!-- 按日期滚动的文件Appender -->
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 当前正在写入的日志文件路径 -->
+        <file>${LOG_DIR}/${springAppName:-application}.log</file>
+        <!-- 基于时间的滚动策略 -->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件输出的文件名 -->
-            <FileNamePattern>target/blade/log/info-%d{yyyy-MM-dd}.log</FileNamePattern>
+            <!-- 归档日志文件的命名模式，按天分割 -->
+            <fileNamePattern>${LOG_DIR}/${springAppName:-application}.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 保留日志的天数，超过此天数的旧日志文件会被自动删除 -->
+            <maxHistory>30</maxHistory>
+            <!-- 可选：总日志文件大小限制，防止日志占满磁盘 -->
+            <totalSizeCap>3GB</totalSizeCap>
         </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>
-        </encoder>
-        <!-- 打印日志级别 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>INFO</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 生成日志文件 -->
-    <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>
-        </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>
+            <!-- 使用详细的日志格式 -->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{40} - %msg%n</pattern>
+            <charset>utf8</charset>
         </encoder>
-        <!-- 打印日志级别 -->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
     </appender>
 
     <if condition='property("ELK_MODE").toUpperCase().contains("TRUE")'>
         <then>
             <!-- 推送日志至elk -->
-            <appender name="INFO_LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+            <appender name="STDOUT_LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
                 <destination>${DESTINATION}</destination>
                 <!-- 日志输出编码 -->
                 <encoder charset="UTF-8" class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
@@ -87,65 +77,60 @@
                         <stackTrace/>
                     </providers>
                 </encoder>
-                <!-- 打印日志级别 -->
-                <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                    <level>INFO</level>
-                    <onMatch>ACCEPT</onMatch>
-                    <onMismatch>DENY</onMismatch>
-                </filter>
-            </appender>
-
-            <!-- 推送日志至elk -->
-            <appender name="ERROR_LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-                <destination>${DESTINATION}</destination>
-                <!-- 日志输出编码 -->
-                <encoder charset="UTF-8" class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
-                    <providers>
-                        <timestamp>
-                            <timeZone>UTC</timeZone>
-                        </timestamp>
-                        <pattern>
-                            <pattern>
-                                {
-                                "traceId": "%X{traceId}",
-                                "requestId": "%X{requestId}",
-                                "accountId": "%X{accountId}",
-                                "tenantId": "%X{tenantId}",
-                                "logLevel": "%level",
-                                "serviceName": "${springAppName:-SpringApp}",
-                                "pid": "${PID:-}",
-                                "thread": "%thread",
-                                "class": "%logger{40}",
-                                "line":"%L",
-                                "message": "%message"
-                                }
-                            </pattern>
-                        </pattern>
-                        <mdc/>
-                        <stackTrace/>
-                    </providers>
-                </encoder>
-                <!-- 打印日志级别 -->
-                <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                    <level>ERROR</level>
-                    <onMatch>ACCEPT</onMatch>
-                    <onMismatch>DENY</onMismatch>
-                </filter>
             </appender>
         </then>
     </if>
 
     <!-- 日志输出级别 -->
-    <root level="ERROR">
+    <root level="DEBUG">
         <appender-ref ref="STDOUT"/>
-        <appender-ref ref="${INFO_APPENDER}"/>
-        <appender-ref ref="${ERROR_APPENDER}"/>
+        <appender-ref ref="FILE"/> <!-- 新增的文件输出 -->
+        <appender-ref ref="${STDOUT_APPENDER}"/>
     </root>
 
-    <logger name="net.sf.ehcache" level="ERROR"/>
-    <logger name="druid.sql" level="ERROR"/>
+    <!-- 以下为各种logger的级别配置，保持不变 -->
+    <logger name="net.sf.ehcache" level="DEBUG"/>
+    <logger name="druid.sql" level="DEBUG"/>
 
-    <!-- 减少nacos日志 -->
-    <logger name="com.alibaba.nacos" level="ERROR"/>
+    <!-- MyBatis log configure -->
+    <logger name="com.apache.ibatis" level="DEBUG"/>
+    <logger name="org.mybatis.spring" level="DEBUG"/>
+    <logger name="java.sql.Connection" level="DEBUG"/>
+    <logger name="java.sql.Statement" level="DEBUG"/>
+    <logger name="java.sql.PreparedStatement" level="DEBUG"/>
 
+    <!-- 减少部分debug日志 -->
+    <logger name="druid.sql" level="DEBUG"/>
+    <logger name="org.apache.shiro" level="DEBUG"/>
+    <logger name="org.mybatis.spring" level="DEBUG"/>
+    <logger name="org.springframework" level="DEBUG"/>
+    <logger name="org.springframework.context" level="DEBUG"/>
+    <logger name="org.springframework.beans" level="DEBUG"/>
+    <logger name="com.baomidou.mybatisplus" level="DEBUG"/>
+    <logger name="org.apache.ibatis.io" level="DEBUG"/>
+    <logger name="org.apache.velocity" level="DEBUG"/>
+    <logger name="org.eclipse.jetty" level="DEBUG"/>
+    <logger name="io.undertow" level="DEBUG"/>
+    <logger name="org.xnio.nio" level="DEBUG"/>
+    <logger name="org.thymeleaf" level="DEBUG"/>
+    <logger name="springfox.documentation" level="DEBUG"/>
+    <logger name="org.hibernate.validator" level="DEBUG"/>
+    <logger name="com.netflix.loadbalancer" level="DEBUG"/>
+    <logger name="com.netflix.hystrix" level="DEBUG"/>
+    <logger name="com.netflix.zuul" level="DEBUG"/>
+    <logger name="de.codecentric" level="DEBUG"/>
+    <!-- cache DEBUG -->
+    <logger name="net.sf.ehcache" level="DEBUG"/>
+    <logger name="org.springframework.cache" level="DEBUG"/>
+    <!-- cloud -->
+    <logger name="org.apache.http" level="DEBUG"/>
+    <logger name="com.netflix.discovery" level="DEBUG"/>
+    <logger name="com.netflix.eureka" level="DEBUG"/>
+    <!-- 业务日志 -->
+    <Logger name="org.springblade" level="DEBUG"/>
+    <Logger name="org.springblade.core.tenant" level="DEBUG"/>
+    <Logger name="org.springblade.core.version" level="DEBUG"/>
+
+    <!-- 减少nacos日志 -->
+    <logger name="com.alibaba.nacos" level="DEBUG"/>
 </configuration>