zgty/zt-dsc
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'base-version/main' into dev

Browse Source 
# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
#	zt-module-infra/zt-module-infra-api/src/main/java/com/zt/plat/module/infra/api/websocket/WebSocketSenderApi.java
#	zt-module-infra/zt-module-infra-server/src/main/resources/application-dev.yaml
This commit is contained in:
chenbowen
2025-12-01 10:21:34 +08:00
parent 9b911124e5 e9542acd27
commit 7fae3203bc
438 changed files with 859 additions and 1650219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zt-module-infra/zt-module-infra-api/src/main/java/com/zt/plat/module/infra/api/config/ConfigApi.java
View File

@@ -8,7 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory =
@FeignClient(name = ApiConstants.NAME) // TODO ZT：fallbackFactory =
@Tag(name = "RPC 服务 - 参数配置")
public interface ConfigApi {

2
zt-module-infra/zt-module-infra-api/src/main/java/com/zt/plat/module/infra/api/file/FileApi.java
View File

@@ -12,7 +12,7 @@ import jakarta.validation.constraints.NotNull;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory =
@FeignClient(name = ApiConstants.NAME) // TODO ZT：fallbackFactory =
@Tag(name = "RPC 服务 - 文件")
public interface FileApi {

2
zt-module-infra/zt-module-infra-api/src/main/java/com/zt/plat/module/infra/api/websocket/WebSocketSenderApi.java
View File

@@ -11,7 +11,7 @@ import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory =
@FeignClient(name = ApiConstants.NAME) // TODO ZT：fallbackFactory =
@Tag(name = "RPC 服务 - WebSocket 发送器的") // 对 WebSocketMessageSender 进行封装，提供给其它模块使用
public interface WebSocketSenderApi {

2
zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/controller/admin/codegen/CodegenController.java
View File

@@ -51,7 +51,7 @@ public class CodegenController {
@Parameters({
@Parameter(name = "dataSourceConfigId", description = "数据源配置的编号", required = true, example = "1"),
@Parameter(name = "name", description = "表名，模糊匹配", example = "zt"),
@Parameter(name = "comment", description = "描述，模糊匹配", example = "芋道")
@Parameter(name = "comment", description = "描述，模糊匹配", example = "ZT")
})
@PreAuthorize("@ss.hasPermission('infra:codegen:query')")
public CommonResult<List<DatabaseTableRespVO>> getDatabaseTableList(

2
zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/controller/admin/codegen/vo/table/CodegenTablePageReqVO.java
View File

@@ -16,7 +16,7 @@ public class CodegenTablePageReqVO extends PageParam {
@Schema(description = "表名称，模糊匹配", example = "zt")
private String tableName;
@Schema(description = "表描述，模糊匹配", example = "芋道")
@Schema(description = "表描述，模糊匹配", example = "ZT")
private String tableComment;
@Schema(description = "实体，模糊匹配", example = "Zt")

4
zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/controller/admin/codegen/vo/table/CodegenTableRespVO.java
View File

@@ -18,7 +18,7 @@ public class CodegenTableRespVO {
@Schema(description = "表名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "zt")
private String tableName;
@Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
@Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT")
private String tableComment;
@Schema(description = "备注", example = "我是备注")
@@ -36,7 +36,7 @@ public class CodegenTableRespVO {
@Schema(description = "类描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "代码生成器的表定义")
private String classComment;
@Schema(description = "作者", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
@Schema(description = "作者", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT源码")
private String author;
@Schema(description = "模板类型，参见 CodegenTemplateTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")

4
zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/controller/admin/codegen/vo/table/CodegenTableSaveReqVO.java
View File

@@ -25,7 +25,7 @@ public class CodegenTableSaveReqVO {
@NotNull(message = "表名称不能为空")
private String tableName;
@Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
@Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT")
@NotNull(message = "表描述不能为空")
private String tableComment;
@@ -48,7 +48,7 @@ public class CodegenTableSaveReqVO {
@NotNull(message = "类描述不能为空")
private String classComment;
@Schema(description = "作者", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
@Schema(description = "作者", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT源码")
@NotNull(message = "作者不能为空")
private String author;

2
zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/controller/admin/codegen/vo/table/DatabaseTableRespVO.java
View File

@@ -10,7 +10,7 @@ public class DatabaseTableRespVO {
@Schema(description = "表名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "yuanma")
private String name;
@Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
@Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT源码")
private String comment;
}

2
zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/controller/admin/demo/demo02/vo/Demo02CategoryListReqVO.java
View File

@@ -12,7 +12,7 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
@Data
public class Demo02CategoryListReqVO {
@Schema(description = "名字", example = "芋艿")
@Schema(description = "名字", example = "ZT")
private String name;
@Schema(description = "父级编号", example = "6080")

2
zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/controller/admin/demo/demo02/vo/Demo02CategoryRespVO.java
View File

@@ -16,7 +16,7 @@ public class Demo02CategoryRespVO {
@ExcelProperty("编号")
private Long id;
@Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
@Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT")
@ExcelProperty("名字")
private String name;

2
zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/controller/admin/demo/demo02/vo/Demo02CategorySaveReqVO.java
View File

@@ -12,7 +12,7 @@ public class Demo02CategorySaveReqVO {
@Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10304")
private Long id;
@Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
@Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT")
@NotEmpty(message = "名字不能为空")
private String name;

2
zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/controller/admin/demo/demo03/erp/vo/Demo03StudentErpPageReqVO.java
View File

@@ -13,7 +13,7 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
@Data
public class Demo03StudentErpPageReqVO extends PageParam {
@Schema(description = "名字", example = "芋艿")
@Schema(description = "名字", example = "ZT")
private String name;
@Schema(description = "性别")

2
zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/controller/admin/demo/demo03/erp/vo/Demo03StudentErpRespVO.java
View File

@@ -18,7 +18,7 @@ public class Demo03StudentErpRespVO {
@ExcelProperty("编号")
private Long id;
@Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
@Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT")
@ExcelProperty("名字")
private String name;

2
zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/controller/admin/demo/demo03/erp/vo/Demo03StudentErpSaveReqVO.java
View File

@@ -14,7 +14,7 @@ public class Demo03StudentErpSaveReqVO {
@Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "8525")
private Long id;
@Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
@Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT")
@NotEmpty(message = "名字不能为空")
private String name;

2
zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/controller/admin/demo/demo03/inner/vo/Demo03StudentInnerPageReqVO.java
View File

@@ -13,7 +13,7 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
@Data
public class Demo03StudentInnerPageReqVO extends PageParam {
@Schema(description = "名字", example = "芋艿")
@Schema(description = "名字", example = "ZT")
private String name;
@Schema(description = "性别")

2
zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/controller/admin/demo/demo03/inner/vo/Demo03StudentInnerRespVO.java
View File

@@ -18,7 +18,7 @@ public class Demo03StudentInnerRespVO {
@ExcelProperty("编号")
private Long id;
@Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
@Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT")
@ExcelProperty("名字")
private String name;

2
zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/controller/admin/demo/demo03/inner/vo/Demo03StudentInnerSaveReqVO.java
View File

@@ -17,7 +17,7 @@ public class Demo03StudentInnerSaveReqVO {
@Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "8525")
private Long id;
@Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
@Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT")
@NotEmpty(message = "名字不能为空")
private String name;

2
zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/controller/admin/demo/demo03/normal/vo/Demo03StudentNormalPageReqVO.java
View File

@@ -13,7 +13,7 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
@Data
public class Demo03StudentNormalPageReqVO extends PageParam {
@Schema(description = "名字", example = "芋艿")
@Schema(description = "名字", example = "ZT")
private String name;
@Schema(description = "性别")

2
zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/controller/admin/demo/demo03/normal/vo/Demo03StudentNormalRespVO.java
View File

@@ -18,7 +18,7 @@ public class Demo03StudentNormalRespVO {
@ExcelProperty("编号")
private Long id;
@Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
@Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT")
@ExcelProperty("名字")
private String name;

2
zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/controller/admin/demo/demo03/normal/vo/Demo03StudentNormalSaveReqVO.java
View File

@@ -17,7 +17,7 @@ public class Demo03StudentNormalSaveReqVO {
@Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "8525")
private Long id;
@Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
@Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZT")
@NotEmpty(message = "名字不能为空")
private String name;

2
zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogRespVO.java
View File

@@ -89,7 +89,7 @@ public class ApiAccessLogRespVO {
@ExcelProperty("结果码")
private Integer resultCode;
@Schema(description = "结果提示", example = "芋道源码，牛逼！")
@Schema(description = "结果提示", example = "ZT源码，牛逼！")
@ExcelProperty("结果提示")
private String resultMsg;

1
zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md
View File

@@ -1 +0,0 @@
<http://www.iocoder.cn/Spring-Boot/MapStruct/?zt>

1
zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/framework/monitor/《芋道 Spring Boot 监控工具 Admin 入门》.md
View File

@@ -1 +0,0 @@
<http://www.iocoder.cn/Spring-Boot/Admin/?zt>

2
zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/framework/security/config/SecurityConfiguration.java
View File

@@ -42,7 +42,7 @@ public class SecurityConfiguration {
registry.requestMatchers(buildAdminApi("/infra/doc-file/file-content")).permitAll();
registry.requestMatchers(buildAdminApi("/infra/doc-file/callback")).permitAll();
// TODO 芋艿：这个每个项目都需要重复配置，得捉摸有没通用的方案
// TODO ZT：这个每个项目都需要重复配置，得捉摸有没通用的方案
// RPC 服务的安全配置
registry.requestMatchers(ApiConstants.PREFIX + "/**").permitAll();
}

2
zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/service/codegen/inner/CodegenBuilder.java
View File

@@ -210,7 +210,7 @@ public class CodegenBuilder {
}
// name
if (StrUtil.endWithIgnoreCase(column.getJavaField(), "name")) {
column.setExample(randomEle(new String[]{"张三", "李四", "王五", "赵六", "芋艿"}));
column.setExample(randomEle(new String[]{"张三", "李四", "王五", "赵六", "ZT"}));
return;
}
// status

2
zt-module-infra/zt-module-infra-server/src/main/resources/application-dev.yaml
View File

@@ -96,7 +96,7 @@ spring:
# Spring Boot Admin Server 服务端的相关配置
context-path: /admin # 配置 Spring
--- #################### 芋道相关配置 ####################
--- #################### ZT相关配置 ####################
# 芋道配置项，设置当前项目所有自定义的配置
zt:
file:

6
zt-module-infra/zt-module-infra-server/src/main/resources/application-local.yaml
View File

@@ -109,11 +109,11 @@ logging:
com.zt.plat.module.infra.dal.mysql: debug
com.zt.plat.module.infra.dal.mysql.logger.ApiErrorLogMapper: INFO # 配置 ApiErrorLogMapper 的日志级别为 info，避免和 GlobalExceptionHandler 重复打印
com.zt.plat.module.infra.dal.mysql.file.FileConfigMapper: INFO # 配置 FileConfigMapper 的日志级别为 info
org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR # TODO 芋艿：先禁用，Spring Boot 3.X 存在部分错误的 WARN 提示
org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR # TODO ZT：先禁用，Spring Boot 3.X 存在部分错误的 WARN 提示
--- #################### 芋道相关配置 ####################
--- #################### ZT相关配置 ####################
# 芋道配置项，设置当前项目所有自定义的配置
# ZT配置项，设置当前项目所有自定义的配置
zt:
env: # 多环境的配置项
tag: ${HOSTNAME}

4
zt-module-infra/zt-module-infra-server/src/main/resources/application.yaml
View File

@@ -68,7 +68,7 @@ springdoc:
default-flat-param-object: true # 参见 https://doc.xiaominfo.com/docs/faq/v4/knife4j-parameterobject-flat-param 文档
knife4j:
enable: false # TODO 芋艿：需要关闭增强，具体原因见：https://github.com/xiaoymin/knife4j/issues/874
enable: false # TODO ZT：需要关闭增强，具体原因见：https://github.com/xiaoymin/knife4j/issues/874
setting:
language: zh_cn
@@ -140,7 +140,7 @@ xxl:
logpath: ${user.home}/logs/xxl-job/${spring.application.name} # 执行器运行日志文件存储磁盘路径
accessToken: default_token # 执行器通讯TOKEN
--- #################### 芋道相关配置 ####################
--- #################### ZT相关配置 ####################
zt:
# 附件加密相关配置

14
zt-module-infra/zt-module-infra-server/src/test/java/com/zt/plat/module/infra/service/codegen/CodegenServiceImplTest.java
View File

@@ -81,7 +81,7 @@ public class CodegenServiceImplTest extends BaseDbUnitTest {
TableInfo tableInfo = mock(TableInfo.class);
when(databaseTableService.getTable(eq(1L), eq("t_yunai"), eq(false)))
.thenReturn(tableInfo);
when(tableInfo.getComment()).thenReturn("芋艿");
when(tableInfo.getComment()).thenReturn("ZT");
// mock 方法（TableInfo fields）
TableField field01 = mock(TableField.class);
when(field01.getComment()).thenReturn("主键");
@@ -129,7 +129,7 @@ public class CodegenServiceImplTest extends BaseDbUnitTest {
assertServiceException(() -> codegenService.validateTableInfo(tableInfo),
CODEGEN_TABLE_INFO_TABLE_COMMENT_IS_NULL);
// 情况三
when(tableInfo.getComment()).thenReturn("芋艿");
when(tableInfo.getComment()).thenReturn("ZT");
assertServiceException(() -> codegenService.validateTableInfo(tableInfo),
CODEGEN_IMPORT_COLUMNS_NULL);
// 情况四
@@ -242,7 +242,7 @@ public class CodegenServiceImplTest extends BaseDbUnitTest {
TableInfo tableInfo = mock(TableInfo.class);
when(databaseTableService.getTable(eq(1L), eq("t_yunai"), eq(false)))
.thenReturn(tableInfo);
when(tableInfo.getComment()).thenReturn("芋艿");
when(tableInfo.getComment()).thenReturn("ZT");
// mock 方法（TableInfo fields）
TableField field01 = mock(TableField.class);
when(field01.getComment()).thenReturn("主键");
@@ -317,7 +317,7 @@ public class CodegenServiceImplTest extends BaseDbUnitTest {
// mock 数据
CodegenTableDO tableDO = randomPojo(CodegenTableDO.class, o -> {
o.setTableName("t_yunai");
o.setTableComment("芋艿");
o.setTableComment("ZT");
o.setClassName("SystemYunai");
o.setCreateTime(buildTime(2021, 3, 10));
}).setScene(CodegenSceneEnum.ADMIN.getScene());
@@ -532,10 +532,10 @@ public class CodegenServiceImplTest extends BaseDbUnitTest {
// mock 方法
TableInfo tableInfo01 = mock(TableInfo.class);
when(tableInfo01.getName()).thenReturn("t_yunai");
when(tableInfo01.getComment()).thenReturn("芋艿");
when(tableInfo01.getComment()).thenReturn("ZT");
TableInfo tableInfo02 = mock(TableInfo.class);
when(tableInfo02.getName()).thenReturn("t_yunai_02");
when(tableInfo02.getComment()).thenReturn("芋艿_02");
when(tableInfo02.getComment()).thenReturn("ZT_02");
when(databaseTableService.getTableList(eq(dataSourceConfigId), eq(name), eq(comment)))
.thenReturn(ListUtil.toList(tableInfo01, tableInfo02));
// mock 数据
@@ -550,7 +550,7 @@ public class CodegenServiceImplTest extends BaseDbUnitTest {
// 断言
assertEquals(1, result.size());
assertEquals("t_yunai", result.get(0).getName());
assertEquals("芋艿", result.get(0).getComment());
assertEquals("ZT", result.get(0).getComment());
}
}

2
zt-module-infra/zt-module-infra-server/src/test/java/com/zt/plat/module/infra/service/config/ConfigServiceImplTest.java
View File

@@ -147,7 +147,7 @@ public class ConfigServiceImplTest extends BaseDbUnitTest {
public void testGetConfigPage() {
// mock 数据
ConfigDO dbConfig = randomConfigDO(o -> { // 等会查询到
o.setName("芋艿");
o.setName("ZT");
o.setConfigKey("yunai");
o.setType(ConfigTypeEnum.SYSTEM.getType());
o.setCreateTime(buildTime(2021, 2, 1));

4
zt-module-infra/zt-module-infra-server/src/test/java/com/zt/plat/module/infra/service/file/FileConfigServiceImplTest.java
View File

@@ -179,7 +179,7 @@ public class FileConfigServiceImplTest extends BaseDbUnitTest {
@Test
public void testGetFileConfigPage() {
// mock 数据
FileConfigDO dbFileConfig = randomFileConfigDO().setName("芋道源码")
FileConfigDO dbFileConfig = randomFileConfigDO().setName("ZT源码")
.setStorage(FileStorageEnum.LOCAL.getStorage());
dbFileConfig.setCreateTime(LocalDateTimeUtil.parse("2020-01-23", DatePattern.NORM_DATE_PATTERN));// 等会查询到
fileConfigMapper.insert(dbFileConfig);
@@ -191,7 +191,7 @@ public class FileConfigServiceImplTest extends BaseDbUnitTest {
fileConfigMapper.insert(cloneIgnoreId(dbFileConfig, o -> o.setCreateTime(LocalDateTimeUtil.parse("2020-11-23", DatePattern.NORM_DATE_PATTERN))));
// 准备参数
FileConfigPageReqVO reqVO = new FileConfigPageReqVO();
reqVO.setName("芋道");
reqVO.setName("ZT");
reqVO.setStorage(FileStorageEnum.LOCAL.getStorage());
reqVO.setCreateTime((new LocalDateTime[]{buildTime(2020, 1, 1),
buildTime(2020, 1, 24)}));

2
zt-module-infra/zt-module-infra-server/src/test/java/com/zt/plat/module/infra/service/logger/ApiAccessLogServiceImplTest.java
View File

@@ -91,7 +91,7 @@ public class ApiAccessLogServiceImplTest extends BaseDbUnitTest {
assertEquals(1, count);
List<ApiAccessLogDO> logs = apiAccessLogMapper.selectList();
assertEquals(1, logs.size());
// TODO @芋艿：createTime updateTime 被屏蔽，仅 win11 会复现，建议后续修复。
// TODO @ZT：createTime updateTime 被屏蔽，仅 win11 会复现，建议后续修复。
assertPojoEquals(log02, logs.get(0), "createTime", "updateTime");
}

2
zt-module-infra/zt-module-infra-server/src/test/java/com/zt/plat/module/infra/service/logger/ApiErrorLogServiceImplTest.java
View File

@@ -157,7 +157,7 @@ public class ApiErrorLogServiceImplTest extends BaseDbUnitTest {
assertEquals(1, count);
List<ApiErrorLogDO> logs = apiErrorLogMapper.selectList();
assertEquals(1, logs.size());
// TODO @芋艿：createTime updateTime 被屏蔽，仅 win11 会复现，建议后续修复。
// TODO @ZT：createTime updateTime 被屏蔽，仅 win11 会复现，建议后续修复。
assertPojoEquals(log02, logs.get(0), "createTime", "updateTime");
}

4
zt-module-infra/zt-module-infra-server/src/test/resources/application-unit-test.yaml
View File

@@ -44,9 +44,9 @@ mybatis-plus:
--- #################### 监控相关配置 ####################
--- #################### 芋道相关配置 ####################
--- #################### ZT相关配置 ####################
# 芋道配置项，设置当前项目所有自定义的配置
# ZT配置项，设置当前项目所有自定义的配置
zt:
info:
base-package: com.zt.plat.module.infra

2
zt-module-infra/zt-module-infra-server/src/test/resources/codegen/table/category.json
View File

@@ -9,7 +9,7 @@
"businessName" : "demo",
"className" : "InfraCategory",
"classComment" : "分类",
"author" : "芋道源码",
"author" : "ZT源码",
"treeParentColumnId" : 22,
"treeNameColumnId" : 11
},

2
zt-module-infra/zt-module-infra-server/src/test/resources/codegen/table/contact.json
View File

@@ -7,7 +7,7 @@
"businessName" : "demo",
"className" : "InfraStudentContact",
"classComment" : "学生联系人",
"author" : "芋道源码"
"author" : "ZT源码"
},
"columns": [ {
"columnName" : "id",

2
zt-module-infra/zt-module-infra-server/src/test/resources/codegen/table/student.json
View File

@@ -9,7 +9,7 @@
"businessName" : "demo",
"className" : "InfraStudent",
"classComment" : "学生",
"author" : "芋道源码"
"author" : "ZT源码"
},
"columns": [ {
"id" : 100,

2
zt-module-infra/zt-module-infra-server/src/test/resources/codegen/table/teacher.json
View File

@@ -7,7 +7,7 @@
"businessName" : "demo",
"className" : "InfraStudentTeacher",
"classComment" : "学生班主任",
"author" : "芋道源码"
"author" : "ZT源码"
},
"columns": [ {
"columnName" : "id",