tashow/tashow-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/xlj' into feature/order

Browse Source 
# Conflicts:
#	tashow-module/tashow-module-infra/src/main/resources/application-local.yaml
This commit is contained in:
liwq
2025-10-16 15:28:17 +08:00
parent e5f0d57286 4ae13cf1e6
commit f7d4ef8e4c
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/dto/CategoryDto.java
View File

@@ -12,7 +12,6 @@ import java.util.List;
* @author 芋道源码 * @author 芋道源码
*/ */
@Data @Data
public class CategoryDto { public class CategoryDto {
/** /**

2
tashow-module/tashow-module-infra/src/main/resources/logback-spring.xml
View File

@@ -2,7 +2,7 @@
<!-- 引用 Spring Boot 的 logback 基础配置 --> <!-- 引用 Spring Boot 的 logback 基础配置 -->
<include resource="org/springframework/boot/logging/logback/defaults.xml" /> <include resource="org/springframework/boot/logging/logback/defaults.xml" />
<!-- 变量 yudao.info.base-package，基础业务包 --> <!-- 变量 yudao.info.base-package，基础业务包 -->
<springProperty scope="context" name="yudao.info.base-package" source="yudao.info.base-package"/> <springProperty scope="context" name="tashow.info.base-package" source="tashow.info.base-package"/>
<!-- 格式化输出：%d 表示日期，%X{tid} SkWalking 链路追踪编号，%thread 表示线程名，%-5level：级别从左显示 5 个字符宽度，%msg：日志消息，%n是换行符 --> <!-- 格式化输出：%d 表示日期，%X{tid} SkWalking 链路追踪编号，%thread 表示线程名，%-5level：级别从左显示 5 个字符宽度，%msg：日志消息，%n是换行符 -->
<property name="PATTERN_DEFAULT" value="%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} | %highlight(${LOG_LEVEL_PATTERN:-%5p} ${PID:- }) | %boldYellow(%thread [%tid]) %boldGreen(%-40.40logger{39}) | %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/> <property name="PATTERN_DEFAULT" value="%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} | %highlight(${LOG_LEVEL_PATTERN:-%5p} ${PID:- }) | %boldYellow(%thread [%tid]) %boldGreen(%-40.40logger{39}) | %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/>

1
tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/package-info.java Normal file
View File

@@ -0,0 +1 @@
package com.tashow.cloud.product.controller;

6
tashow-module/tashow-module-product/src/main/resources/application.yaml
View File

@@ -8,5 +8,9 @@ spring:
config: config:
import: import:
- optional:classpath:application-${spring.profiles.active}.yaml # 加载【本地】配置 - optional:classpath:application-${spring.profiles.active}.yaml # 加载【本地】配置
- optional:nacos:application.yaml # 加载【Nacos】的配置 - optional:nacos:application.yaml # 加载【Nacos】通用的配置
- optional:nacos:tenant.yaml # 加载【Nacos】通用的配置
- optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml # 加载【Nacos】的配置 - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml # 加载【Nacos】的配置
mybatis-plus:
type-handlers-package: com.tashow.cloud.productapi.general