!393 完善 infra 模块的 Service 逻辑的单元测试，单测数量 81，方法行覆盖率 63%，行覆盖率 47%

Merge pull request !393 from 芋道源码/feature/dev-yunai

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java

@@ -1,6 +1,5 @@
 package cn.iocoder.yudao.module.infra.controller.admin.config;
 
-import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
@@ -8,8 +7,8 @@ import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
 import cn.iocoder.yudao.module.infra.controller.admin.config.vo.*;
 import cn.iocoder.yudao.module.infra.convert.config.ConfigConvert;
 import cn.iocoder.yudao.module.infra.dal.dataobject.config.ConfigDO;
-import cn.iocoder.yudao.module.infra.service.config.ConfigService;
 import cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants;
+import cn.iocoder.yudao.module.infra.service.config.ConfigService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -23,6 +22,7 @@ import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
 
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
@@ -76,7 +76,7 @@ public class ConfigController {
             return null;
         }
         if (!config.getVisible()) {
-            throw ServiceExceptionUtil.exception(ErrorCodeConstants.CONFIG_GET_VALUE_ERROR_IF_VISIBLE);
+            throw exception(ErrorCodeConstants.CONFIG_GET_VALUE_ERROR_IF_VISIBLE);
         }
         return success(config.getValue());
     }
@@ -93,8 +93,8 @@ public class ConfigController {
     @ApiOperation("导出参数配置")
     @PreAuthorize("@ss.hasPermission('infra:config:export')")
     @OperateLog(type = EXPORT)
-    public void exportSysConfig(@Valid ConfigExportReqVO reqVO,
+    public void exportConfig(@Valid ConfigExportReqVO reqVO,
-                                HttpServletResponse response) throws IOException {
+                             HttpServletResponse response) throws IOException {
         List<ConfigDO> list = configService.getConfigList(reqVO);
         // 拼接数据
         List<ConfigExcelVO> datas = ConfigConvert.INSTANCE.convertList(list);

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenColumnDO.java

@@ -39,27 +39,38 @@ public class CodegenColumnDO extends BaseDO {
 
     /**
      * 字段名
+     *
+     * 关联 {@link TableField#getName()}
      */
     private String columnName;
     /**
      * 数据库字段类型
+     *
      * 关联 {@link TableField.MetaInfo#getJdbcType()}
      */
     private String dataType;
     /**
      * 字段描述
+     *
+     * 关联 {@link TableField#getComment()}
      */
     private String columnComment;
     /**
      * 是否允许为空
+     *
+     * 关联 {@link TableField.MetaInfo#isNullable()}
      */
     private Boolean nullable;
     /**
      * 是否主键
+     *
+     * 关联 {@link TableField#isKeyFlag()}
      */
     private Boolean primaryKey;
     /**
      * 是否自增
+     *
+     * 关联 {@link TableField#isKeyIdentityFlag()}
      */
     private Boolean autoIncrement;
     /**
@@ -71,12 +82,16 @@ public class CodegenColumnDO extends BaseDO {
 
     /**
      * Java 属性类型
-     * <p>
+     *
      * 例如说 String、Boolean 等等
+     *
+     * 关联 {@link TableField#getColumnType()}
      */
     private String javaType;
     /**
      * Java 属性名
+     *
+     * 关联 {@link TableField#getPropertyName()}
      */
     private String javaField;
     /**

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenTableDO.java

@@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.infra.enums.codegen.CodegenSceneEnum;
 import cn.iocoder.yudao.module.infra.enums.codegen.CodegenTemplateTypeEnum;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -44,10 +45,14 @@ public class CodegenTableDO extends BaseDO {
 
     /**
      * 表名称
+     *
+     * 关联 {@link TableInfo#getName()}
      */
     private String tableName;
     /**
      * 表描述
+     *
+     * 关联 {@link TableInfo#getComment()}
      */
     private String tableComment;
     /**

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/job/JobLogMapper.java

@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.infra.dal.mysql.job;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.infra.controller.admin.job.vo.log.JobLogExportReqVO;
 import cn.iocoder.yudao.module.infra.controller.admin.job.vo.log.JobLogPageReqVO;
 import cn.iocoder.yudao.module.infra.dal.dataobject.job.JobLogDO;
@@ -19,24 +19,24 @@ import java.util.List;
 public interface JobLogMapper extends BaseMapperX<JobLogDO> {
 
     default PageResult<JobLogDO> selectPage(JobLogPageReqVO reqVO) {
-        return selectPage(reqVO, new QueryWrapperX<JobLogDO>()
+        return selectPage(reqVO, new LambdaQueryWrapperX<JobLogDO>()
-                .eqIfPresent("job_id", reqVO.getJobId())
+                .eqIfPresent(JobLogDO::getJobId, reqVO.getJobId())
-                .likeIfPresent("handler_name", reqVO.getHandlerName())
+                .likeIfPresent(JobLogDO::getHandlerName, reqVO.getHandlerName())
-                .geIfPresent("begin_time", reqVO.getBeginTime())
+                .geIfPresent(JobLogDO::getBeginTime, reqVO.getBeginTime())
-                .leIfPresent("end_time", reqVO.getEndTime())
+                .leIfPresent(JobLogDO::getEndTime, reqVO.getEndTime())
-                .eqIfPresent("status", reqVO.getStatus())
+                .eqIfPresent(JobLogDO::getStatus, reqVO.getStatus())
-                .orderByDesc("id") // ID 倒序
+                .orderByDesc(JobLogDO::getId) // ID 倒序
         );
     }
 
     default List<JobLogDO> selectList(JobLogExportReqVO reqVO) {
-        return selectList(new QueryWrapperX<JobLogDO>()
+        return selectList(new LambdaQueryWrapperX<JobLogDO>()
-                .eqIfPresent("job_id", reqVO.getJobId())
+                .eqIfPresent(JobLogDO::getJobId, reqVO.getJobId())
-                .likeIfPresent("handler_name", reqVO.getHandlerName())
+                .likeIfPresent(JobLogDO::getHandlerName, reqVO.getHandlerName())
-                .geIfPresent("begin_time", reqVO.getBeginTime())
+                .geIfPresent(JobLogDO::getBeginTime, reqVO.getBeginTime())
-                .leIfPresent("end_time", reqVO.getEndTime())
+                .leIfPresent(JobLogDO::getEndTime, reqVO.getEndTime())
-                .eqIfPresent("status", reqVO.getStatus())
+                .eqIfPresent(JobLogDO::getStatus, reqVO.getStatus())
-                .orderByDesc("id") // ID 倒序
+                .orderByDesc(JobLogDO::getId) // ID 倒序
         );
     }
 

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImpl.java

@@ -76,7 +76,7 @@ public class CodegenServiceImpl implements CodegenService {
 
     private Long createCodegen0(Long userId, Long dataSourceConfigId, TableInfo tableInfo) {
         // 校验导入的表和字段非空
-        checkTableInfo(tableInfo);
+        validateTableInfo(tableInfo);
         // 校验是否已经存在
         if (codegenTableMapper.selectByTableNameAndDataSourceConfigId(tableInfo.getName(),
                 dataSourceConfigId) != null) {
@@ -100,7 +100,7 @@ public class CodegenServiceImpl implements CodegenService {
         return table.getId();
     }
 
-    private void checkTableInfo(TableInfo tableInfo) {
+    private void validateTableInfo(TableInfo tableInfo) {
         if (tableInfo == null) {
             throw exception(CODEGEN_IMPORT_TABLE_NULL);
         }
@@ -149,7 +149,7 @@ public class CodegenServiceImpl implements CodegenService {
 
     private void syncCodegen0(Long tableId, TableInfo tableInfo) {
         // 校验导入的表和字段非空
-        checkTableInfo(tableInfo);
+        validateTableInfo(tableInfo);
         List<TableField> tableFields = tableInfo.getFields();
 
         // 构建 CodegenColumnDO 数组，只同步新增的字段

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/config/ConfigServiceImpl.java

@@ -9,7 +9,6 @@ import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigUpdateReqV
 import cn.iocoder.yudao.module.infra.convert.config.ConfigConvert;
 import cn.iocoder.yudao.module.infra.dal.dataobject.config.ConfigDO;
 import cn.iocoder.yudao.module.infra.dal.mysql.config.ConfigMapper;
-import cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants;
 import cn.iocoder.yudao.module.infra.enums.config.ConfigTypeEnum;
 import com.google.common.annotations.VisibleForTesting;
 import lombok.extern.slf4j.Slf4j;
@@ -20,6 +19,7 @@ import javax.annotation.Resource;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.*;
 
 /**
  * 参数配置 Service 实现类
@@ -35,7 +35,7 @@ public class ConfigServiceImpl implements ConfigService {
     @Override
     public Long createConfig(ConfigCreateReqVO reqVO) {
         // 校验正确性
-        checkCreateOrUpdate(null, reqVO.getKey());
+        validateConfigForCreateOrUpdate(null, reqVO.getKey());
         // 插入参数配置
         ConfigDO config = ConfigConvert.INSTANCE.convert(reqVO);
         config.setType(ConfigTypeEnum.CUSTOM.getType());
@@ -46,19 +46,19 @@ public class ConfigServiceImpl implements ConfigService {
     @Override
     public void updateConfig(ConfigUpdateReqVO reqVO) {
         // 校验正确性
-        checkCreateOrUpdate(reqVO.getId(), null); // 不允许更新 key
+        validateConfigForCreateOrUpdate(reqVO.getId(), null); // 不允许更新 key
         // 更新参数配置
         ConfigDO updateObj = ConfigConvert.INSTANCE.convert(reqVO);
-        configMapper.updateById(updateObj);;
+        configMapper.updateById(updateObj);
     }
 
     @Override
     public void deleteConfig(Long id) {
         // 校验配置存在
-        ConfigDO config = checkConfigExists(id);
+        ConfigDO config = validateConfigExists(id);
         // 内置配置，不允许删除
         if (ConfigTypeEnum.SYSTEM.getType().equals(config.getType())) {
-            throw exception(ErrorCodeConstants.CONFIG_CAN_NOT_DELETE_SYSTEM_TYPE);
+            throw exception(CONFIG_CAN_NOT_DELETE_SYSTEM_TYPE);
         }
         // 删除
         configMapper.deleteById(id);
@@ -84,39 +84,39 @@ public class ConfigServiceImpl implements ConfigService {
         return configMapper.selectList(reqVO);
     }
 
-    private void checkCreateOrUpdate(Long id, String key) {
+    private void validateConfigForCreateOrUpdate(Long id, String key) {
         // 校验自己存在
-        checkConfigExists(id);
+        validateConfigExists(id);
         // 校验参数配置 key 的唯一性
         if (StrUtil.isNotEmpty(key)) {
-            checkConfigKeyUnique(id, key);
+            validateConfigKeyUnique(id, key);
         }
     }
 
     @VisibleForTesting
-    public ConfigDO checkConfigExists(Long id) {
+    public ConfigDO validateConfigExists(Long id) {
         if (id == null) {
             return null;
         }
         ConfigDO config = configMapper.selectById(id);
         if (config == null) {
-            throw exception(ErrorCodeConstants.CONFIG_NOT_EXISTS);
+            throw exception(CONFIG_NOT_EXISTS);
         }
         return config;
     }
 
     @VisibleForTesting
-    public void checkConfigKeyUnique(Long id, String key) {
+    public void validateConfigKeyUnique(Long id, String key) {
         ConfigDO config = configMapper.selectByKey(key);
         if (config == null) {
             return;
         }
         // 如果 id 为空，说明不用比较是否为相同 id 的参数配置
         if (id == null) {
-            throw exception(ErrorCodeConstants.CONFIG_KEY_DUPLICATE);
+            throw exception(CONFIG_KEY_DUPLICATE);
         }
         if (!config.getId().equals(id)) {
-            throw exception(ErrorCodeConstants.CONFIG_KEY_DUPLICATE);
+            throw exception(CONFIG_KEY_DUPLICATE);
         }
     }
 

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigServiceImpl.java

@@ -37,7 +37,7 @@ public class DataSourceConfigServiceImpl implements DataSourceConfigService {
     @Override
     public Long createDataSourceConfig(DataSourceConfigCreateReqVO createReqVO) {
         DataSourceConfigDO dataSourceConfig = DataSourceConfigConvert.INSTANCE.convert(createReqVO);
-        checkConnectionOK(dataSourceConfig);
+        validateConnectionOK(dataSourceConfig);
 
         // 插入
         dataSourceConfigMapper.insert(dataSourceConfig);
@@ -50,7 +50,7 @@ public class DataSourceConfigServiceImpl implements DataSourceConfigService {
         // 校验存在
         validateDataSourceConfigExists(updateReqVO.getId());
         DataSourceConfigDO updateObj = DataSourceConfigConvert.INSTANCE.convert(updateReqVO);
-        checkConnectionOK(updateObj);
+        validateConnectionOK(updateObj);
 
         // 更新
         dataSourceConfigMapper.updateById(updateObj);
@@ -88,7 +88,7 @@ public class DataSourceConfigServiceImpl implements DataSourceConfigService {
         return result;
     }
 
-    private void checkConnectionOK(DataSourceConfigDO config) {
+    private void validateConnectionOK(DataSourceConfigDO config) {
         boolean success = JdbcUtils.isConnectionOK(config.getUrl(), config.getUsername(), config.getPassword());
         if (!success) {
             throw exception(DATA_SOURCE_CONFIG_NOT_OK);

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java

@@ -41,7 +41,7 @@ public class DatabaseTableServiceImpl implements DatabaseTableService {
         return CollUtil.getFirst(getTableList0(dataSourceConfigId, name));
     }
 
-    public List<TableInfo> getTableList0(Long dataSourceConfigId, String name) {
+    private List<TableInfo> getTableList0(Long dataSourceConfigId, String name) {
         // 获得数据源配置
         DataSourceConfigDO config = dataSourceConfigService.getDataSourceConfig(dataSourceConfigId);
         Assert.notNull(config, "数据源({}) 不存在！", dataSourceConfigId);

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileConfigService.java

@@ -8,8 +8,6 @@ import cn.iocoder.yudao.module.infra.controller.admin.file.vo.config.FileConfigU
 import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileConfigDO;
 
 import javax.validation.Valid;
-import java.util.Collection;
-import java.util.List;
 
 /**
  * 文件配置 Service 接口
@@ -60,14 +58,6 @@ public interface FileConfigService {
      */
     FileConfigDO getFileConfig(Long id);
 
-    /**
-     * 获得文件配置列表
-     *
-     * @param ids 编号
-     * @return 文件配置列表
-     */
-    List<FileConfigDO> getFileConfigList(Collection<Long> ids);
-
     /**
      * 获得文件配置分页
      *

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImpl.java

@@ -27,7 +27,6 @@ import org.springframework.validation.annotation.Validated;
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import javax.validation.Validator;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -95,7 +94,7 @@ public class FileConfigServiceImpl implements FileConfigService {
     @Override
     public void updateFileConfig(FileConfigUpdateReqVO updateReqVO) {
         // 校验存在
-        FileConfigDO config = this.validateFileConfigExists(updateReqVO.getId());
+        FileConfigDO config = validateFileConfigExists(updateReqVO.getId());
         // 更新
         FileConfigDO updateObj = FileConfigConvert.INSTANCE.convert(updateReqVO)
                 .setConfig(parseClientConfig(config.getStorage(), updateReqVO.getConfig()));
@@ -108,7 +107,7 @@ public class FileConfigServiceImpl implements FileConfigService {
     @Transactional(rollbackFor = Exception.class)
     public void updateFileConfigMaster(Long id) {
         // 校验存在
-        this.validateFileConfigExists(id);
+        validateFileConfigExists(id);
         // 更新其它为非 master
         fileConfigMapper.updateBatch(new FileConfigDO().setMaster(false));
         // 更新
@@ -138,7 +137,7 @@ public class FileConfigServiceImpl implements FileConfigService {
     @Override
     public void deleteFileConfig(Long id) {
         // 校验存在
-        FileConfigDO config = this.validateFileConfigExists(id);
+        FileConfigDO config = validateFileConfigExists(id);
         if (Boolean.TRUE.equals(config.getMaster())) {
              throw exception(FILE_CONFIG_DELETE_FAIL_MASTER);
         }
@@ -161,11 +160,6 @@ public class FileConfigServiceImpl implements FileConfigService {
         return fileConfigMapper.selectById(id);
     }
 
-    @Override
-    public List<FileConfigDO> getFileConfigList(Collection<Long> ids) {
-        return fileConfigMapper.selectBatchIds(ids);
-    }
-
     @Override
     public PageResult<FileConfigDO> getFileConfigPage(FileConfigPageReqVO pageReqVO) {
         return fileConfigMapper.selectPage(pageReqVO);
@@ -174,7 +168,7 @@ public class FileConfigServiceImpl implements FileConfigService {
     @Override
     public String testFileConfig(Long id) throws Exception {
         // 校验存在
-        this.validateFileConfigExists(id);
+        validateFileConfigExists(id);
         // 上传文件
         byte[] content = ResourceUtil.readBytes("file/erweima.jpg");
         return fileClientFactory.getFileClient(id).upload(content, IdUtil.fastSimpleUUID() + ".jpg", "image/jpeg");

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java

@@ -69,7 +69,7 @@ public class FileServiceImpl implements FileService {
     @Override
     public void deleteFile(Long id) throws Exception {
         // 校验存在
-        FileDO file = this.validateFileExists(id);
+        FileDO file = validateFileExists(id);
 
         // 从文件存储器中删除
         FileClient client = fileConfigService.getFileClient(file.getConfigId());

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/job/JobServiceImpl.java

@@ -69,7 +69,7 @@ public class JobServiceImpl implements JobService {
     public void updateJob(JobUpdateReqVO updateReqVO) throws SchedulerException {
         validateCronExpression(updateReqVO.getCronExpression());
         // 校验存在
-        JobDO job = this.validateJobExists(updateReqVO.getId());
+        JobDO job = validateJobExists(updateReqVO.getId());
         // 只有开启状态，才可以修改.原因是，如果出暂停状态，修改 Quartz Job 时，会导致任务又开始执行
         if (!job.getStatus().equals(JobStatusEnum.NORMAL.getStatus())) {
             throw exception(JOB_UPDATE_ONLY_NORMAL_STATUS);
@@ -92,7 +92,7 @@ public class JobServiceImpl implements JobService {
             throw exception(JOB_CHANGE_STATUS_INVALID);
         }
         // 校验存在
-        JobDO job = this.validateJobExists(id);
+        JobDO job = validateJobExists(id);
         // 校验是否已经为当前状态
         if (job.getStatus().equals(status)) {
             throw exception(JOB_CHANGE_STATUS_EQUALS);
@@ -112,7 +112,7 @@ public class JobServiceImpl implements JobService {
     @Override
     public void triggerJob(Long id) throws SchedulerException {
         // 校验存在
-        JobDO job = this.validateJobExists(id);
+        JobDO job = validateJobExists(id);
 
         // 触发 Quartz 中的 Job
         schedulerManager.triggerJob(job.getId(), job.getHandlerName(), job.getHandlerParam());
@@ -122,7 +122,7 @@ public class JobServiceImpl implements JobService {
     @Transactional(rollbackFor = Exception.class)
     public void deleteJob(Long id) throws SchedulerException {
         // 校验存在
-        JobDO job = this.validateJobExists(id);
+        JobDO job = validateJobExists(id);
         // 更新
         jobMapper.deleteById(id);
 

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImpl.java

@@ -1,6 +1,5 @@
 package cn.iocoder.yudao.module.infra.service.logger;
 
-import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO;
 import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogExportReqVO;
@@ -8,7 +7,6 @@ import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiE
 import cn.iocoder.yudao.module.infra.convert.logger.ApiErrorLogConvert;
 import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiErrorLogDO;
 import cn.iocoder.yudao.module.infra.dal.mysql.logger.ApiErrorLogMapper;
-import cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants;
 import cn.iocoder.yudao.module.infra.enums.logger.ApiErrorLogProcessStatusEnum;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -17,6 +15,10 @@ import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.List;
 
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.API_ERROR_LOG_NOT_FOUND;
+import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.API_ERROR_LOG_PROCESSED;
+
 /**
  * API 错误日志 Service 实现类
  *
@@ -31,8 +33,8 @@ public class ApiErrorLogServiceImpl implements ApiErrorLogService {
 
     @Override
     public void createApiErrorLog(ApiErrorLogCreateReqDTO createDTO) {
-        ApiErrorLogDO apiErrorLog = ApiErrorLogConvert.INSTANCE.convert(createDTO);
+        ApiErrorLogDO apiErrorLog = ApiErrorLogConvert.INSTANCE.convert(createDTO)
-        apiErrorLog.setProcessStatus(ApiErrorLogProcessStatusEnum.INIT.getStatus());
+                .setProcessStatus(ApiErrorLogProcessStatusEnum.INIT.getStatus());
         apiErrorLogMapper.insert(apiErrorLog);
     }
 
@@ -50,10 +52,10 @@ public class ApiErrorLogServiceImpl implements ApiErrorLogService {
     public void updateApiErrorLogProcess(Long id, Integer processStatus, Long processUserId) {
         ApiErrorLogDO errorLog = apiErrorLogMapper.selectById(id);
         if (errorLog == null) {
-            throw ServiceExceptionUtil.exception(ErrorCodeConstants.API_ERROR_LOG_NOT_FOUND);
+            throw exception(API_ERROR_LOG_NOT_FOUND);
         }
         if (!ApiErrorLogProcessStatusEnum.INIT.getStatus().equals(errorLog.getProcessStatus())) {
-            throw ServiceExceptionUtil.exception(ErrorCodeConstants.API_ERROR_LOG_PROCESSED);
+            throw exception(API_ERROR_LOG_PROCESSED);
         }
         // 标记处理
         apiErrorLogMapper.updateById(ApiErrorLogDO.builder().id(id).processStatus(processStatus)

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/test/TestDemoServiceImpl.java

@@ -45,7 +45,7 @@ public class TestDemoServiceImpl implements TestDemoService {
     @CacheEvict(value = "test", key = "#updateReqVO.id")
     public void updateTestDemo(TestDemoUpdateReqVO updateReqVO) {
         // 校验存在
-        this.validateTestDemoExists(updateReqVO.getId());
+        validateTestDemoExists(updateReqVO.getId());
         // 更新
         TestDemoDO updateObj = TestDemoConvert.INSTANCE.convert(updateReqVO);
         testDemoMapper.updateById(updateObj);
@@ -55,7 +55,7 @@ public class TestDemoServiceImpl implements TestDemoService {
     @CacheEvict(value = "test", key = "#id")
     public void deleteTestDemo(Long id) {
         // 校验存在
-        this.validateTestDemoExists(id);
+        validateTestDemoExists(id);
         // 删除
         testDemoMapper.deleteById(id);
     }

yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/service/serviceImpl.vm

@@ -39,7 +39,7 @@ public class ${table.className}ServiceImpl implements ${table.className}Service
     @Override
     public void update${simpleClassName}(${sceneEnum.prefixClass}${table.className}UpdateReqVO updateReqVO) {
         // 校验存在
-        this.validate${simpleClassName}Exists(updateReqVO.getId());
+        validate${simpleClassName}Exists(updateReqVO.getId());
         // 更新
         ${table.className}DO updateObj = ${table.className}Convert.INSTANCE.convert(updateReqVO);
         ${classNameVar}Mapper.updateById(updateObj);
@@ -48,7 +48,7 @@ public class ${table.className}ServiceImpl implements ${table.className}Service
     @Override
     public void delete${simpleClassName}(${primaryColumn.javaType} id) {
         // 校验存在
-        this.validate${simpleClassName}Exists(id);
+        validate${simpleClassName}Exists(id);
         // 删除
         ${classNameVar}Mapper.deleteById(id);
     }

yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/test/serviceTest.vm

@@ -52,7 +52,7 @@ import static org.mockito.Mockito.*;
        #if (${column.listOperation})
        #set ($JavaField = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})##首字母大写
        #if (${column.listOperationCondition} == "BETWEEN")## BETWEEN 的情况
-       reqVO.set${JavaField}((new LocalDateTime[]{}));
+       reqVO.set${JavaField}(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
        #else
        reqVO.set$JavaField(null);
        #end

yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/config/ConfigServiceImplTest.java

@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.infra.service.config;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
-import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
 import cn.iocoder.yudao.framework.test.core.util.RandomUtils;
 import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigCreateReqVO;
@@ -12,17 +11,17 @@ import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigUpdateReqV
 import cn.iocoder.yudao.module.infra.dal.dataobject.config.ConfigDO;
 import cn.iocoder.yudao.module.infra.dal.mysql.config.ConfigMapper;
 import cn.iocoder.yudao.module.infra.enums.config.ConfigTypeEnum;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;
 
 import javax.annotation.Resource;
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.function.Consumer;
 
 import static cn.hutool.core.util.RandomUtil.randomEle;
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
 import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
+import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
@@ -30,7 +29,7 @@ import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.*;
 import static org.junit.jupiter.api.Assertions.*;
 
 @Import(ConfigServiceImpl.class)
-public class ConfigServiceTest extends BaseDbUnitTest {
+public class ConfigServiceImplTest extends BaseDbUnitTest {
 
     @Resource
     private ConfigServiceImpl configService;
@@ -50,7 +49,7 @@ public class ConfigServiceTest extends BaseDbUnitTest {
         // 校验记录的属性是否正确
         ConfigDO config = configMapper.selectById(configId);
         assertPojoEquals(reqVO, config);
-        Assertions.assertEquals(ConfigTypeEnum.CUSTOM.getType(), config.getType());
+        assertEquals(ConfigTypeEnum.CUSTOM.getType(), config.getType());
     }
 
     @Test
@@ -101,40 +100,40 @@ public class ConfigServiceTest extends BaseDbUnitTest {
     }
 
     @Test
-    public void testCheckConfigExists_success() {
+    public void testValidateConfigExists_success() {
         // mock 数据
         ConfigDO dbConfigDO = randomConfigDO();
         configMapper.insert(dbConfigDO);// @Sql: 先插入出一条存在的数据
 
         // 调用成功
-        configService.checkConfigExists(dbConfigDO.getId());
+        configService.validateConfigExists(dbConfigDO.getId());
     }
 
     @Test
-    public void testCheckConfigExist_notExists() {
+    public void testValidateConfigExist_notExists() {
-        assertServiceException(() -> configService.checkConfigExists(randomLongId()), CONFIG_NOT_EXISTS);
+        assertServiceException(() -> configService.validateConfigExists(randomLongId()), CONFIG_NOT_EXISTS);
     }
 
     @Test
-    public void testCheckConfigKeyUnique_success() {
+    public void testValidateConfigKeyUnique_success() {
         // 调用，成功
-        configService.checkConfigKeyUnique(randomLongId(), randomString());
+        configService.validateConfigKeyUnique(randomLongId(), randomString());
     }
 
     @Test
-    public void testCheckConfigKeyUnique_keyDuplicateForCreate() {
+    public void testValidateConfigKeyUnique_keyDuplicateForCreate() {
         // 准备参数
         String key = randomString();
         // mock 数据
         configMapper.insert(randomConfigDO(o -> o.setConfigKey(key)));
 
         // 调用，校验异常
-        assertServiceException(() -> configService.checkConfigKeyUnique(null, key),
+        assertServiceException(() -> configService.validateConfigKeyUnique(null, key),
                 CONFIG_KEY_DUPLICATE);
     }
 
     @Test
-    public void testCheckConfigKeyUnique_keyDuplicateForUpdate() {
+    public void testValidateConfigKeyUnique_keyDuplicateForUpdate() {
         // 准备参数
         Long id = randomLongId();
         String key = randomString();
@@ -142,7 +141,7 @@ public class ConfigServiceTest extends BaseDbUnitTest {
         configMapper.insert(randomConfigDO(o -> o.setConfigKey(key)));
 
         // 调用，校验异常
-        assertServiceException(() -> configService.checkConfigKeyUnique(id, key),
+        assertServiceException(() -> configService.validateConfigKeyUnique(id, key),
                 CONFIG_KEY_DUPLICATE);
     }
 
@@ -157,19 +156,19 @@ public class ConfigServiceTest extends BaseDbUnitTest {
         });
         configMapper.insert(dbConfig);
         // 测试 name 不匹配
-        configMapper.insert(ObjectUtils.cloneIgnoreId(dbConfig, o -> o.setName("土豆")));
+        configMapper.insert(cloneIgnoreId(dbConfig, o -> o.setName("土豆")));
         // 测试 key 不匹配
-        configMapper.insert(ObjectUtils.cloneIgnoreId(dbConfig, o -> o.setConfigKey("tudou")));
+        configMapper.insert(cloneIgnoreId(dbConfig, o -> o.setConfigKey("tudou")));
         // 测试 type 不匹配
-        configMapper.insert(ObjectUtils.cloneIgnoreId(dbConfig, o -> o.setType(ConfigTypeEnum.CUSTOM.getType())));
+        configMapper.insert(cloneIgnoreId(dbConfig, o -> o.setType(ConfigTypeEnum.CUSTOM.getType())));
         // 测试 createTime 不匹配
-        configMapper.insert(ObjectUtils.cloneIgnoreId(dbConfig, o -> o.setCreateTime(buildTime(2021, 1, 1))));
+        configMapper.insert(cloneIgnoreId(dbConfig, o -> o.setCreateTime(buildTime(2021, 1, 1))));
         // 准备参数
         ConfigPageReqVO reqVO = new ConfigPageReqVO();
         reqVO.setName("艿");
         reqVO.setKey("nai");
         reqVO.setType(ConfigTypeEnum.SYSTEM.getType());
-        reqVO.setCreateTime((new LocalDateTime[]{buildTime(2021, 1, 15),buildTime(2021, 2, 15)}));
+        reqVO.setCreateTime(buildBetweenTime(2021, 1, 15, 2021, 2, 15));
 
         // 调用
         PageResult<ConfigDO> pageResult = configService.getConfigPage(reqVO);
@@ -190,19 +189,19 @@ public class ConfigServiceTest extends BaseDbUnitTest {
         });
         configMapper.insert(dbConfig);
         // 测试 name 不匹配
-        configMapper.insert(ObjectUtils.cloneIgnoreId(dbConfig, o -> o.setName("土豆")));
+        configMapper.insert(cloneIgnoreId(dbConfig, o -> o.setName("土豆")));
         // 测试 key 不匹配
-        configMapper.insert(ObjectUtils.cloneIgnoreId(dbConfig, o -> o.setConfigKey("tudou")));
+        configMapper.insert(cloneIgnoreId(dbConfig, o -> o.setConfigKey("tudou")));
         // 测试 type 不匹配
-        configMapper.insert(ObjectUtils.cloneIgnoreId(dbConfig, o -> o.setType(ConfigTypeEnum.CUSTOM.getType())));
+        configMapper.insert(cloneIgnoreId(dbConfig, o -> o.setType(ConfigTypeEnum.CUSTOM.getType())));
         // 测试 createTime 不匹配
-        configMapper.insert(ObjectUtils.cloneIgnoreId(dbConfig, o -> o.setCreateTime(buildTime(2021, 1, 1))));
+        configMapper.insert(cloneIgnoreId(dbConfig, o -> o.setCreateTime(buildTime(2021, 1, 1))));
         // 准备参数
         ConfigExportReqVO reqVO = new ConfigExportReqVO();
         reqVO.setName("艿");
         reqVO.setKey("nai");
         reqVO.setType(ConfigTypeEnum.SYSTEM.getType());
-        reqVO.setCreateTime((new LocalDateTime[]{buildTime(2021, 1, 15),buildTime(2021, 2, 15)}));
+        reqVO.setCreateTime(buildBetweenTime(2021, 1, 15, 2021, 2, 15));
 
         // 调用
         List<ConfigDO> list = configService.getConfigList(reqVO);
@@ -211,6 +210,21 @@ public class ConfigServiceTest extends BaseDbUnitTest {
         assertPojoEquals(dbConfig, list.get(0));
     }
 
+    @Test
+    public void testGetConfig() {
+        // mock 数据
+        ConfigDO dbConfig = randomConfigDO();
+        configMapper.insert(dbConfig);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        Long id = dbConfig.getId();
+
+        // 调用
+        ConfigDO config = configService.getConfig(id);
+        // 断言
+        assertNotNull(config);
+        assertPojoEquals(dbConfig, config);
+    }
+
     @Test
     public void testGetConfigByKey() {
         // mock 数据

yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigServiceImplTest.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.infra.service.db;
 
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.crypto.symmetric.AES;
 import cn.iocoder.yudao.framework.mybatis.core.type.EncryptTypeHandler;
@@ -9,6 +10,7 @@ import cn.iocoder.yudao.module.infra.controller.admin.db.vo.DataSourceConfigCrea
 import cn.iocoder.yudao.module.infra.controller.admin.db.vo.DataSourceConfigUpdateReqVO;
 import cn.iocoder.yudao.module.infra.dal.dataobject.db.DataSourceConfigDO;
 import cn.iocoder.yudao.module.infra.dal.mysql.db.DataSourceConfigMapper;
+import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty;
 import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -18,14 +20,14 @@ import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
 import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.DATA_SOURCE_CONFIG_NOT_EXISTS;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mockStatic;
@@ -57,6 +59,11 @@ public class DataSourceConfigServiceImplTest extends BaseDbUnitTest {
         ReflectUtil.setFieldValue(EncryptTypeHandler.class, "aes", aes);
         when(aes.encryptBase64(anyString())).then((Answer<String>) invocation -> invocation.getArgument(0));
         when(aes.decryptStr(anyString())).then((Answer<String>) invocation -> invocation.getArgument(0));
+
+        // mock DynamicDataSourceProperties
+        when(dynamicDataSourceProperties.getPrimary()).thenReturn("primary");
+        when(dynamicDataSourceProperties.getDatasource()).thenReturn(MapUtil.of("primary",
+                new DataSourceProperty().setUrl("http://localhost:3306").setUsername("yunai").setPassword("tudou")));
     }
 
     @Test
@@ -89,7 +96,6 @@ public class DataSourceConfigServiceImplTest extends BaseDbUnitTest {
                 o.setId(dbDataSourceConfig.getId()); // 设置更新的 ID
             });
             // mock 方法
-//            when(stringEncryptor.encrypt(eq(reqVO.getPassword()))).thenReturn("123456");
             databaseUtilsMock.when(() -> JdbcUtils.isConnectionOK(eq(reqVO.getUrl()),
                     eq(reqVO.getUsername()), eq(reqVO.getPassword()))).thenReturn(true);
 
@@ -142,7 +148,58 @@ public class DataSourceConfigServiceImplTest extends BaseDbUnitTest {
         // 调用
         DataSourceConfigDO result = dataSourceConfigMapper.selectOne(DataSourceConfigDO::getPassword,
                 EncryptTypeHandler.encrypt(dbDataSourceConfig.getPassword()));
-        System.out.println(result);
+        assertPojoEquals(dbDataSourceConfig, result);
+    }
+
+    @Test
+    public void testGetDataSourceConfig_master() {
+        // 准备参数
+        Long id = 0L;
+        // mock 方法
+
+        // 调用
+        DataSourceConfigDO dataSourceConfig = dataSourceConfigService.getDataSourceConfig(id);
+        // 断言
+        assertEquals(id, dataSourceConfig.getId());
+        assertEquals("primary", dataSourceConfig.getName());
+        assertEquals("http://localhost:3306", dataSourceConfig.getUrl());
+        assertEquals("yunai", dataSourceConfig.getUsername());
+        assertEquals("tudou", dataSourceConfig.getPassword());
+    }
+
+    @Test
+    public void testGetDataSourceConfig_normal() {
+        // mock 数据
+        DataSourceConfigDO dbDataSourceConfig = randomPojo(DataSourceConfigDO.class);
+        dataSourceConfigMapper.insert(dbDataSourceConfig);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        Long id = dbDataSourceConfig.getId();
+
+        // 调用
+        DataSourceConfigDO dataSourceConfig = dataSourceConfigService.getDataSourceConfig(id);
+        // 断言
+        assertPojoEquals(dbDataSourceConfig, dataSourceConfig);
+    }
+
+    @Test
+    public void testGetDataSourceConfigList() {
+        // mock 数据
+        DataSourceConfigDO dbDataSourceConfig = randomPojo(DataSourceConfigDO.class);
+        dataSourceConfigMapper.insert(dbDataSourceConfig);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+
+        // 调用
+        List<DataSourceConfigDO> dataSourceConfigList = dataSourceConfigService.getDataSourceConfigList();
+        // 断言
+        assertEquals(2, dataSourceConfigList.size());
+        // master
+        assertEquals(0L, dataSourceConfigList.get(0).getId());
+        assertEquals("primary", dataSourceConfigList.get(0).getName());
+        assertEquals("http://localhost:3306", dataSourceConfigList.get(0).getUrl());
+        assertEquals("yunai", dataSourceConfigList.get(0).getUsername());
+        assertEquals("tudou", dataSourceConfigList.get(0).getPassword());
+        // normal
+        assertPojoEquals(dbDataSourceConfig, dataSourceConfigList.get(1));
     }
 
 }

yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImplTest.java

@@ -0,0 +1,89 @@
+package cn.iocoder.yudao.module.infra.service.db;
+
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+import cn.iocoder.yudao.module.infra.dal.dataobject.db.DataSourceConfigDO;
+import com.baomidou.mybatisplus.generator.config.po.TableField;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.DbColumnType;
+import org.apache.ibatis.type.JdbcType;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Import;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
+
+@Import(DatabaseTableServiceImpl.class)
+public class DatabaseTableServiceImplTest extends BaseDbUnitTest {
+
+    @Resource
+    private DatabaseTableServiceImpl databaseTableService;
+
+    @MockBean
+    private DataSourceConfigService dataSourceConfigService;
+
+    @Test
+    public void testGetTableList() {
+        // 准备参数
+        Long dataSourceConfigId = randomLongId();
+        // mock 方法
+        DataSourceConfigDO dataSourceConfig = new DataSourceConfigDO().setUsername("sa").setPassword("")
+                .setUrl("jdbc:h2:mem:testdb");
+        when(dataSourceConfigService.getDataSourceConfig(eq(dataSourceConfigId)))
+                .thenReturn(dataSourceConfig);
+
+        // 调用
+        List<TableInfo> tables = databaseTableService.getTableList(dataSourceConfigId,
+                "config", "参数");
+        // 断言
+        assertEquals(1, tables.size());
+        assertTableInfo(tables.get(0));
+    }
+
+    @Test
+    public void testGetTable() {
+        // 准备参数
+        Long dataSourceConfigId = randomLongId();
+        // mock 方法
+        DataSourceConfigDO dataSourceConfig = new DataSourceConfigDO().setUsername("sa").setPassword("")
+                .setUrl("jdbc:h2:mem:testdb");
+        when(dataSourceConfigService.getDataSourceConfig(eq(dataSourceConfigId)))
+                .thenReturn(dataSourceConfig);
+
+        // 调用
+        TableInfo tableInfo = databaseTableService.getTable(dataSourceConfigId, "infra_config");
+        // 断言
+        assertTableInfo(tableInfo);
+    }
+
+    private void assertTableInfo(TableInfo tableInfo) {
+        assertEquals("infra_config", tableInfo.getName());
+        assertEquals("参数配置表", tableInfo.getComment());
+        assertEquals(13, tableInfo.getFields().size());
+        // id 字段
+        TableField idField = tableInfo.getFields().get(0);
+        assertEquals("id", idField.getName());
+        assertEquals(JdbcType.BIGINT, idField.getMetaInfo().getJdbcType());
+        assertEquals("编号", idField.getComment());
+        assertFalse(idField.getMetaInfo().isNullable());
+        assertTrue(idField.isKeyFlag());
+        assertTrue(idField.isKeyIdentityFlag());
+        assertEquals(DbColumnType.LONG, idField.getColumnType());
+        assertEquals("id", idField.getPropertyName());
+        // name 字段
+        TableField nameField = tableInfo.getFields().get(3);
+        assertEquals("name", nameField.getName());
+        assertEquals(JdbcType.VARCHAR, nameField.getMetaInfo().getJdbcType());
+        assertEquals("名字", nameField.getComment());
+        assertFalse(nameField.getMetaInfo().isNullable());
+        assertFalse(nameField.isKeyFlag());
+        assertFalse(nameField.isKeyIdentityFlag());
+        assertEquals(DbColumnType.STRING, nameField.getColumnType());
+        assertEquals("name", nameField.getPropertyName());
+    }
+}

yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImplTest.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.file.core.client.FileClient;
 import cn.iocoder.yudao.framework.file.core.client.FileClientConfig;
 import cn.iocoder.yudao.framework.file.core.client.FileClientFactory;
+import cn.iocoder.yudao.framework.file.core.client.local.LocalFileClient;
 import cn.iocoder.yudao.framework.file.core.client.local.LocalFileClientConfig;
 import cn.iocoder.yudao.framework.file.core.enums.FileStorageEnum;
 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
@@ -242,6 +243,30 @@ public class FileConfigServiceImplTest extends BaseDbUnitTest {
         assertEquals("https://www.iocoder.cn", fileConfigService.testFileConfig(id));
     }
 
+    @Test
+    public void testGetFileConfig() {
+        // mock 数据
+        FileConfigDO dbFileConfig = randomFileConfigDO().setMaster(false);
+        fileConfigMapper.insert(dbFileConfig);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        Long id = dbFileConfig.getId();
+
+        // 调用，并断言
+        assertPojoEquals(dbFileConfig, fileConfigService.getFileConfig(id));
+    }
+
+    @Test
+    public void testGetFileClient() {
+        // 准备参数
+        Long id = randomLongId();
+        // mock 获得 Client
+        FileClient fileClient = new LocalFileClient(id, new LocalFileClientConfig());
+        when(fileClientFactory.getFileClient(eq(id))).thenReturn(fileClient);
+
+        // 调用，并断言
+        assertSame(fileClient, fileConfigService.getFileClient(id));
+    }
+
     private FileConfigDO randomFileConfigDO() {
         return randomPojo(FileConfigDO.class).setStorage(randomEle(FileStorageEnum.values()).getStorage())
                 .setConfig(new EmptyFileClientConfig());

yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImplTest.java

@@ -26,7 +26,7 @@ import static org.mockito.ArgumentMatchers.same;
 import static org.mockito.Mockito.*;
 
 @Import({FileServiceImpl.class})
-public class FileServiceTest extends BaseDbUnitTest {
+public class FileServiceImplTest extends BaseDbUnitTest {
 
     @Resource
     private FileService fileService;

yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/job/JobLogServiceImplTest.java

@@ -1,7 +1,6 @@
 package cn.iocoder.yudao.module.infra.service.job;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
 import cn.iocoder.yudao.module.infra.controller.admin.job.vo.log.JobLogExportReqVO;
 import cn.iocoder.yudao.module.infra.controller.admin.job.vo.log.JobLogPageReqVO;
@@ -12,18 +11,20 @@ import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
+import java.time.LocalDateTime;
+import java.util.Collection;
 import java.util.List;
 
-import static cn.hutool.core.util.RandomUtil.randomEle;
 import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
+import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
+import static java.util.Collections.singleton;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @Import(JobLogServiceImpl.class)
-public class JobLogServiceTest extends BaseDbUnitTest {
+public class JobLogServiceImplTest extends BaseDbUnitTest {
 
     @Resource
     private JobLogServiceImpl jobLogService;
@@ -31,66 +32,103 @@ public class JobLogServiceTest extends BaseDbUnitTest {
     private JobLogMapper jobLogMapper;
 
     @Test
-    public void testCreateJobLog_success() {
+    public void testCreateJobLog() {
         // 准备参数
-        JobLogDO reqVO = randomPojo(JobLogDO.class, o -> {
+        JobLogDO reqVO = randomPojo(JobLogDO.class, o -> o.setExecuteIndex(1));
-            o.setExecuteIndex(1);
+
-        });
         // 调用
-        Long jobLogId = jobLogService.createJobLog(reqVO.getJobId(), reqVO.getBeginTime(), reqVO.getHandlerName(), reqVO.getHandlerParam(), reqVO.getExecuteIndex());
+        Long id = jobLogService.createJobLog(reqVO.getJobId(), reqVO.getBeginTime(),
+                reqVO.getHandlerName(), reqVO.getHandlerParam(), reqVO.getExecuteIndex());
         // 断言
-        assertNotNull(jobLogId);
+        assertNotNull(id);
         // 校验记录的属性是否正确
-        JobLogDO job = jobLogMapper.selectById(jobLogId);
+        JobLogDO job = jobLogMapper.selectById(id);
         assertEquals(JobLogStatusEnum.RUNNING.getStatus(), job.getStatus());
     }
 
     @Test
     public void testUpdateJobLogResultAsync_success() {
-        // 准备参数
+        // mock 数据
-        JobLogDO reqVO = randomPojo(JobLogDO.class, o -> {
+        JobLogDO log = randomPojo(JobLogDO.class, o -> {
             o.setExecuteIndex(1);
+            o.setStatus(JobLogStatusEnum.RUNNING.getStatus());
         });
-        JobLogDO log = JobLogDO.builder().jobId(reqVO.getJobId()).handlerName(reqVO.getHandlerName()).handlerParam(reqVO.getHandlerParam()).executeIndex(reqVO.getExecuteIndex())
-                .beginTime(reqVO.getBeginTime()).status(JobLogStatusEnum.RUNNING.getStatus()).build();
         jobLogMapper.insert(log);
-        // 调用
+        // 准备参数
-        jobLogService.updateJobLogResultAsync(log.getId(), reqVO.getBeginTime(), reqVO.getDuration(), true,reqVO.getResult());
+        Long logId = log.getId();
-        // 校验记录的属性是否正确
+        LocalDateTime endTime = randomLocalDateTime();
-        JobLogDO job = jobLogMapper.selectById(log.getId());
+        Integer duration = randomInteger();
-        assertEquals(JobLogStatusEnum.SUCCESS.getStatus(), job.getStatus());
+        boolean success = true;
+        String result = randomString();
 
         // 调用
-        jobLogService.updateJobLogResultAsync(log.getId(), reqVO.getBeginTime(), reqVO.getDuration(), false,reqVO.getResult());
+        jobLogService.updateJobLogResultAsync(logId, endTime, duration, success, result);
         // 校验记录的属性是否正确
-        JobLogDO job2 = jobLogMapper.selectById(log.getId());
+        JobLogDO dbLog = jobLogMapper.selectById(log.getId());
-        assertEquals(JobLogStatusEnum.FAILURE.getStatus(), job2.getStatus());
+        assertEquals(endTime, dbLog.getEndTime());
+        assertEquals(duration, dbLog.getDuration());
+        assertEquals(JobLogStatusEnum.SUCCESS.getStatus(), dbLog.getStatus());
+        assertEquals(result, dbLog.getResult());
     }
 
     @Test
-    public void testGetJobLogListByIds_success() {
+    public void testUpdateJobLogResultAsync_failure() {
         // mock 数据
-        JobLogDO dbJobLog = randomPojo(JobLogDO.class, o -> {
+        JobLogDO log = randomPojo(JobLogDO.class, o -> {
             o.setExecuteIndex(1);
-            o.setStatus(randomEle(JobLogStatusEnum.values()).getStatus()); // 保证 status 的范围
+            o.setStatus(JobLogStatusEnum.RUNNING.getStatus());
         });
-        JobLogDO cloneJobLog = ObjectUtils.cloneIgnoreId(dbJobLog, o -> o.setHandlerName(randomString()));
+        jobLogMapper.insert(log);
+        // 准备参数
+        Long logId = log.getId();
+        LocalDateTime endTime = randomLocalDateTime();
+        Integer duration = randomInteger();
+        boolean success = false;
+        String result = randomString();
+
+        // 调用
+        jobLogService.updateJobLogResultAsync(logId, endTime, duration, success, result);
+        // 校验记录的属性是否正确
+        JobLogDO dbLog = jobLogMapper.selectById(log.getId());
+        assertEquals(endTime, dbLog.getEndTime());
+        assertEquals(duration, dbLog.getDuration());
+        assertEquals(JobLogStatusEnum.FAILURE.getStatus(), dbLog.getStatus());
+        assertEquals(result, dbLog.getResult());
+    }
+
+    @Test
+    public void testGetJobLog() {
+        // mock 数据
+        JobLogDO dbJobLog = randomPojo(JobLogDO.class, o -> o.setExecuteIndex(1));
+        jobLogMapper.insert(dbJobLog);
+        // 准备参数
+        Long id = dbJobLog.getId();
+
+        // 调用
+        JobLogDO jobLog = jobLogService.getJobLog(id);
+        // 断言
+        assertPojoEquals(dbJobLog, jobLog);
+    }
+
+    @Test
+    public void testGetJobLogList() {
+        // mock 数据
+        JobLogDO dbJobLog = randomPojo(JobLogDO.class, o -> o.setExecuteIndex(1));
         jobLogMapper.insert(dbJobLog);
         // 测试 handlerName 不匹配
-        jobLogMapper.insert(cloneJobLog);
+        jobLogMapper.insert(cloneIgnoreId(dbJobLog, o -> {}));
         // 准备参数
-        ArrayList ids = new ArrayList<>();
+        Collection<Long> ids = singleton(dbJobLog.getId());
-        ids.add(dbJobLog.getId());
+
-        ids.add(cloneJobLog.getId());
         // 调用
         List<JobLogDO> list = jobLogService.getJobLogList(ids);
         // 断言
-        assertEquals(2, list.size());
+        assertEquals(1, list.size());
         assertPojoEquals(dbJobLog, list.get(0));
     }
 
     @Test
-    public void testGetJobPage_success() {
+    public void testGetJobPage() {
         // mock 数据
         JobLogDO dbJobLog = randomPojo(JobLogDO.class, o -> {
             o.setExecuteIndex(1);
@@ -101,15 +139,15 @@ public class JobLogServiceTest extends BaseDbUnitTest {
         });
         jobLogMapper.insert(dbJobLog);
         // 测试 jobId 不匹配
-        jobLogMapper.insert(ObjectUtils.cloneIgnoreId(dbJobLog, o -> o.setJobId(randomLongId())));
+        jobLogMapper.insert(cloneIgnoreId(dbJobLog, o -> o.setJobId(randomLongId())));
         // 测试 handlerName 不匹配
-        jobLogMapper.insert(ObjectUtils.cloneIgnoreId(dbJobLog, o -> o.setHandlerName(randomString())));
+        jobLogMapper.insert(cloneIgnoreId(dbJobLog, o -> o.setHandlerName(randomString())));
         // 测试 beginTime 不匹配
-        jobLogMapper.insert(ObjectUtils.cloneIgnoreId(dbJobLog, o -> o.setBeginTime(buildTime(2021, 1, 7))));
+        jobLogMapper.insert(cloneIgnoreId(dbJobLog, o -> o.setBeginTime(buildTime(2021, 1, 7))));
         // 测试 endTime 不匹配
-        jobLogMapper.insert(ObjectUtils.cloneIgnoreId(dbJobLog, o -> o.setEndTime(buildTime(2021, 1, 9))));
+        jobLogMapper.insert(cloneIgnoreId(dbJobLog, o -> o.setEndTime(buildTime(2021, 1, 9))));
         // 测试 status 不匹配
-        jobLogMapper.insert(ObjectUtils.cloneIgnoreId(dbJobLog, o -> o.setStatus(JobLogStatusEnum.FAILURE.getStatus())));
+        jobLogMapper.insert(cloneIgnoreId(dbJobLog, o -> o.setStatus(JobLogStatusEnum.FAILURE.getStatus())));
         // 准备参数
         JobLogPageReqVO reqVo = new JobLogPageReqVO();
         reqVo.setJobId(dbJobLog.getJobId());
@@ -117,6 +155,7 @@ public class JobLogServiceTest extends BaseDbUnitTest {
         reqVo.setBeginTime(dbJobLog.getBeginTime());
         reqVo.setEndTime(dbJobLog.getEndTime());
         reqVo.setStatus(JobLogStatusEnum.SUCCESS.getStatus());
+
         // 调用
         PageResult<JobLogDO> pageResult = jobLogService.getJobLogPage(reqVo);
         // 断言
@@ -126,7 +165,7 @@ public class JobLogServiceTest extends BaseDbUnitTest {
     }
 
     @Test
-    public void testGetJobListForExport_success() {
+    public void testGetJobList_export() {
         // mock 数据
         JobLogDO dbJobLog = randomPojo(JobLogDO.class, o -> {
             o.setExecuteIndex(1);
@@ -137,15 +176,15 @@ public class JobLogServiceTest extends BaseDbUnitTest {
         });
         jobLogMapper.insert(dbJobLog);
         // 测试 jobId 不匹配
-        jobLogMapper.insert(ObjectUtils.cloneIgnoreId(dbJobLog, o -> o.setJobId(randomLongId())));
+        jobLogMapper.insert(cloneIgnoreId(dbJobLog, o -> o.setJobId(randomLongId())));
         // 测试 handlerName 不匹配
-        jobLogMapper.insert(ObjectUtils.cloneIgnoreId(dbJobLog, o -> o.setHandlerName(randomString())));
+        jobLogMapper.insert(cloneIgnoreId(dbJobLog, o -> o.setHandlerName(randomString())));
         // 测试 beginTime 不匹配
-        jobLogMapper.insert(ObjectUtils.cloneIgnoreId(dbJobLog, o -> o.setBeginTime(buildTime(2021, 1, 7))));
+        jobLogMapper.insert(cloneIgnoreId(dbJobLog, o -> o.setBeginTime(buildTime(2021, 1, 7))));
         // 测试 endTime 不匹配
-        jobLogMapper.insert(ObjectUtils.cloneIgnoreId(dbJobLog, o -> o.setEndTime(buildTime(2021, 1, 9))));
+        jobLogMapper.insert(cloneIgnoreId(dbJobLog, o -> o.setEndTime(buildTime(2021, 1, 9))));
         // 测试 status 不匹配
-        jobLogMapper.insert(ObjectUtils.cloneIgnoreId(dbJobLog, o -> o.setStatus(JobLogStatusEnum.FAILURE.getStatus())));
+        jobLogMapper.insert(cloneIgnoreId(dbJobLog, o -> o.setStatus(JobLogStatusEnum.FAILURE.getStatus())));
         // 准备参数
         JobLogExportReqVO reqVo = new JobLogExportReqVO();
         reqVo.setJobId(dbJobLog.getJobId());
@@ -153,6 +192,7 @@ public class JobLogServiceTest extends BaseDbUnitTest {
         reqVo.setBeginTime(dbJobLog.getBeginTime());
         reqVo.setEndTime(dbJobLog.getEndTime());
         reqVo.setStatus(JobLogStatusEnum.SUCCESS.getStatus());
+
         // 调用
         List<JobLogDO> list = jobLogService.getJobLogList(reqVo);
         // 断言

yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/job/JobServiceImplTest.java

@@ -1,14 +1,12 @@
 package cn.iocoder.yudao.module.infra.service.job;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
 import cn.iocoder.yudao.framework.quartz.core.scheduler.SchedulerManager;
 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
 import cn.iocoder.yudao.module.infra.controller.admin.job.vo.job.JobCreateReqVO;
 import cn.iocoder.yudao.module.infra.controller.admin.job.vo.job.JobExportReqVO;
 import cn.iocoder.yudao.module.infra.controller.admin.job.vo.job.JobPageReqVO;
 import cn.iocoder.yudao.module.infra.controller.admin.job.vo.job.JobUpdateReqVO;
-import cn.iocoder.yudao.module.infra.convert.job.JobConvert;
 import cn.iocoder.yudao.module.infra.dal.dataobject.job.JobDO;
 import cn.iocoder.yudao.module.infra.dal.mysql.job.JobMapper;
 import cn.iocoder.yudao.module.infra.enums.job.JobStatusEnum;
@@ -18,22 +16,23 @@ import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import static cn.hutool.core.util.RandomUtil.randomEle;
+import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomString;
 import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.*;
+import static java.util.Collections.singletonList;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
 @Import(JobServiceImpl.class)
-public class JobServiceTest extends BaseDbUnitTest {
+public class JobServiceImplTest extends BaseDbUnitTest {
 
     @Resource
     private JobServiceImpl jobService;
@@ -46,6 +45,7 @@ public class JobServiceTest extends BaseDbUnitTest {
     public void testCreateJob_cronExpressionValid() {
         // 准备参数。Cron 表达式为 String 类型，默认随机字符串。
         JobCreateReqVO reqVO = randomPojo(JobCreateReqVO.class);
+
         // 调用，并断言异常
         assertServiceException(() -> jobService.createJob(reqVO), JOB_CRON_EXPRESSION_VALID);
     }
@@ -54,6 +54,7 @@ public class JobServiceTest extends BaseDbUnitTest {
     public void testCreateJob_jobHandlerExists() throws SchedulerException {
         // 准备参数 指定 Cron 表达式
         JobCreateReqVO reqVO = randomPojo(JobCreateReqVO.class, o -> o.setCronExpression("0 0/1 * * * ? *"));
+
         // 调用
         jobService.createJob(reqVO);
         // 调用，并断言异常
@@ -64,6 +65,7 @@ public class JobServiceTest extends BaseDbUnitTest {
     public void testCreateJob_success() throws SchedulerException {
         // 准备参数 指定 Cron 表达式
         JobCreateReqVO reqVO = randomPojo(JobCreateReqVO.class, o -> o.setCronExpression("0 0/1 * * * ? *"));
+
         // 调用
         Long jobId = jobService.createJob(reqVO);
         // 断言
@@ -73,14 +75,15 @@ public class JobServiceTest extends BaseDbUnitTest {
         assertPojoEquals(reqVO, job);
         assertEquals(JobStatusEnum.NORMAL.getStatus(), job.getStatus());
         // 校验调用
-        verify(schedulerManager, times(1)).addJob(eq(job.getId()), eq(job.getHandlerName()), eq(job.getHandlerParam()), eq(job.getCronExpression()),
+        verify(schedulerManager).addJob(eq(job.getId()), eq(job.getHandlerName()), eq(job.getHandlerParam()),
-                eq(reqVO.getRetryCount()), eq(reqVO.getRetryInterval()));
+                eq(job.getCronExpression()), eq(reqVO.getRetryCount()), eq(reqVO.getRetryInterval()));
     }
 
     @Test
     public void testUpdateJob_jobNotExists(){
         // 准备参数
         JobUpdateReqVO reqVO = randomPojo(JobUpdateReqVO.class, o -> o.setCronExpression("0 0/1 * * * ? *"));
+
         // 调用，并断言异常
         assertServiceException(() -> jobService.updateJob(reqVO), JOB_NOT_EXISTS);
     }
@@ -88,150 +91,136 @@ public class JobServiceTest extends BaseDbUnitTest {
     @Test
     public void testUpdateJob_onlyNormalStatus(){
         // mock 数据
-        JobCreateReqVO createReqVO = randomPojo(JobCreateReqVO.class, o -> o.setCronExpression("0 0/1 * * * ? *"));
+        JobDO job = randomPojo(JobDO.class, o -> o.setStatus(JobStatusEnum.INIT.getStatus()));
-        JobDO job = JobConvert.INSTANCE.convert(createReqVO);
-        job.setStatus(JobStatusEnum.INIT.getStatus());
-        fillJobMonitorTimeoutEmpty(job);
         jobMapper.insert(job);
         // 准备参数
         JobUpdateReqVO updateReqVO = randomPojo(JobUpdateReqVO.class, o -> {
             o.setId(job.getId());
-            o.setName(createReqVO.getName());
+            o.setCronExpression("0 0/1 * * * ? *");
-            o.setCronExpression(createReqVO.getCronExpression());
         });
+
         // 调用，并断言异常
-        assertServiceException(() -> jobService.updateJob(updateReqVO), JOB_UPDATE_ONLY_NORMAL_STATUS);
+        assertServiceException(() -> jobService.updateJob(updateReqVO),
+                JOB_UPDATE_ONLY_NORMAL_STATUS);
     }
 
     @Test
     public void testUpdateJob_success() throws SchedulerException {
         // mock 数据
-        JobCreateReqVO createReqVO = randomPojo(JobCreateReqVO.class, o -> o.setCronExpression("0 0/1 * * * ? *"));
+        JobDO job = randomPojo(JobDO.class, o -> o.setStatus(JobStatusEnum.NORMAL.getStatus()));
-        JobDO job = JobConvert.INSTANCE.convert(createReqVO);
-        job.setStatus(JobStatusEnum.NORMAL.getStatus());
-        fillJobMonitorTimeoutEmpty(job);
         jobMapper.insert(job);
         // 准备参数
         JobUpdateReqVO updateReqVO = randomPojo(JobUpdateReqVO.class, o -> {
             o.setId(job.getId());
-            o.setName(createReqVO.getName());
+            o.setCronExpression("0 0/1 * * * ? *");
-            o.setCronExpression(createReqVO.getCronExpression());
         });
+
         // 调用
         jobService.updateJob(updateReqVO);
         // 校验记录的属性是否正确
         JobDO updateJob = jobMapper.selectById(updateReqVO.getId());
         assertPojoEquals(updateReqVO, updateJob);
         // 校验调用
-        verify(schedulerManager, times(1)).updateJob(eq(job.getHandlerName()), eq(updateReqVO.getHandlerParam()), eq(updateReqVO.getCronExpression()),
+        verify(schedulerManager).updateJob(eq(job.getHandlerName()), eq(updateReqVO.getHandlerParam()),
-                eq(updateReqVO.getRetryCount()), eq(updateReqVO.getRetryInterval()));
+                eq(updateReqVO.getCronExpression()), eq(updateReqVO.getRetryCount()), eq(updateReqVO.getRetryInterval()));
     }
 
     @Test
     public void testUpdateJobStatus_changeStatusInvalid() {
         // 调用，并断言异常
-        assertServiceException(() -> jobService.updateJobStatus(1L, JobStatusEnum.INIT.getStatus()), JOB_CHANGE_STATUS_INVALID);
+        assertServiceException(() -> jobService.updateJobStatus(1L, JobStatusEnum.INIT.getStatus()),
+                JOB_CHANGE_STATUS_INVALID);
     }
 
     @Test
     public void testUpdateJobStatus_changeStatusEquals() {
         // mock 数据
-        JobCreateReqVO createReqVO = randomPojo(JobCreateReqVO.class, o -> o.setCronExpression("0 0/1 * * * ? *"));
+        JobDO job = randomPojo(JobDO.class, o -> o.setStatus(JobStatusEnum.NORMAL.getStatus()));
-        JobDO job = JobConvert.INSTANCE.convert(createReqVO);
-        job.setStatus(JobStatusEnum.NORMAL.getStatus());
-        fillJobMonitorTimeoutEmpty(job);
         jobMapper.insert(job);
+
         // 调用，并断言异常
-        assertServiceException(() -> jobService.updateJobStatus(job.getId(), job.getStatus()), JOB_CHANGE_STATUS_EQUALS);
+        assertServiceException(() -> jobService.updateJobStatus(job.getId(), job.getStatus()),
+                JOB_CHANGE_STATUS_EQUALS);
     }
 
     @Test
-    public void testUpdateJobStatus_NormalToStop_success() throws SchedulerException {
+    public void testUpdateJobStatus_stopSuccess() throws SchedulerException {
         // mock 数据
-        JobCreateReqVO createReqVO = randomPojo(JobCreateReqVO.class, o -> o.setCronExpression("0 0/1 * * * ? *"));
+        JobDO job = randomPojo(JobDO.class, o -> o.setStatus(JobStatusEnum.NORMAL.getStatus()));
-        JobDO job = JobConvert.INSTANCE.convert(createReqVO);
-        job.setStatus(JobStatusEnum.NORMAL.getStatus());
-        fillJobMonitorTimeoutEmpty(job);
         jobMapper.insert(job);
+
         // 调用
         jobService.updateJobStatus(job.getId(), JobStatusEnum.STOP.getStatus());
         // 校验记录的属性是否正确
-        JobDO updateJob = jobMapper.selectById(job.getId());
+        JobDO dbJob = jobMapper.selectById(job.getId());
-        assertEquals(JobStatusEnum.STOP.getStatus(), updateJob.getStatus());
+        assertEquals(JobStatusEnum.STOP.getStatus(), dbJob.getStatus());
         // 校验调用
-        verify(schedulerManager, times(1)).pauseJob(eq(job.getHandlerName()));
+        verify(schedulerManager).pauseJob(eq(job.getHandlerName()));
     }
 
     @Test
-    public void testUpdateJobStatus_StopToNormal_success() throws SchedulerException {
+    public void testUpdateJobStatus_normalSuccess() throws SchedulerException {
         // mock 数据
-        JobCreateReqVO createReqVO = randomPojo(JobCreateReqVO.class, o -> o.setCronExpression("0 0/1 * * * ? *"));
+        JobDO job = randomPojo(JobDO.class, o -> o.setStatus(JobStatusEnum.STOP.getStatus()));
-        JobDO job = JobConvert.INSTANCE.convert(createReqVO);
-        job.setStatus(JobStatusEnum.STOP.getStatus());
-        fillJobMonitorTimeoutEmpty(job);
         jobMapper.insert(job);
+
         // 调用
         jobService.updateJobStatus(job.getId(), JobStatusEnum.NORMAL.getStatus());
         // 校验记录的属性是否正确
-        JobDO updateJob = jobMapper.selectById(job.getId());
+        JobDO dbJob = jobMapper.selectById(job.getId());
-        assertEquals(JobStatusEnum.NORMAL.getStatus(), updateJob.getStatus());
+        assertEquals(JobStatusEnum.NORMAL.getStatus(), dbJob.getStatus());
         // 校验调用
-        verify(schedulerManager, times(1)).resumeJob(eq(job.getHandlerName()));
+        verify(schedulerManager).resumeJob(eq(job.getHandlerName()));
     }
 
     @Test
     public void testTriggerJob_success() throws SchedulerException {
         // mock 数据
-        JobCreateReqVO createReqVO = randomPojo(JobCreateReqVO.class, o -> o.setCronExpression("0 0/1 * * * ? *"));
+        JobDO job = randomPojo(JobDO.class);
-        JobDO job = JobConvert.INSTANCE.convert(createReqVO);
-        job.setStatus(JobStatusEnum.NORMAL.getStatus());
-        fillJobMonitorTimeoutEmpty(job);
         jobMapper.insert(job);
+
         // 调用
         jobService.triggerJob(job.getId());
         // 校验调用
-        verify(schedulerManager, times(1)).triggerJob(eq(job.getId()), eq(job.getHandlerName()), eq(job.getHandlerParam()));
+        verify(schedulerManager).triggerJob(eq(job.getId()),
+                eq(job.getHandlerName()), eq(job.getHandlerParam()));
     }
 
     @Test
     public void testDeleteJob_success() throws SchedulerException {
         // mock 数据
-        JobCreateReqVO createReqVO = randomPojo(JobCreateReqVO.class, o -> o.setCronExpression("0 0/1 * * * ? *"));
+        JobDO job = randomPojo(JobDO.class);
-        JobDO job = JobConvert.INSTANCE.convert(createReqVO);
-        job.setStatus(JobStatusEnum.NORMAL.getStatus());
-        fillJobMonitorTimeoutEmpty(job);
         jobMapper.insert(job);
-        // 调用 UPDATE inf_job SET deleted=1 WHERE id=? AND deleted=0
+
+        // 调用
         jobService.deleteJob(job.getId());
-        // 校验数据不存在了  WHERE id=? AND deleted=0 查询为空正常
+        // 校验不存在
         assertNull(jobMapper.selectById(job.getId()));
         // 校验调用
-        verify(schedulerManager, times(1)).deleteJob(eq(job.getHandlerName()));
+        verify(schedulerManager).deleteJob(eq(job.getHandlerName()));
     }
 
     @Test
-    public void testGetJobListByIds_success() {
+    public void testGetJobList() {
         // mock 数据
         JobDO dbJob = randomPojo(JobDO.class, o -> {
             o.setStatus(randomEle(JobStatusEnum.values()).getStatus()); // 保证 status 的范围
         });
-        JobDO cloneJob = ObjectUtils.cloneIgnoreId(dbJob, o -> o.setHandlerName(randomString()));
         jobMapper.insert(dbJob);
-        // 测试 handlerName 不匹配
+        // 测试 id 不匹配
-        jobMapper.insert(cloneJob);
+        jobMapper.insert(cloneIgnoreId(dbJob, o -> {}));
+
         // 准备参数
-        ArrayList<Long> ids = new ArrayList<>();
+        Collection<Long> ids = singletonList(dbJob.getId());
-        ids.add(dbJob.getId());
-        ids.add(cloneJob.getId());
         // 调用
         List<JobDO> list = jobService.getJobList(ids);
         // 断言
-        assertEquals(2, list.size());
+        assertEquals(1, list.size());
         assertPojoEquals(dbJob, list.get(0));
     }
 
     @Test
-    public void testGetJobPage_success() {
+    public void testGetJobPage() {
         // mock 数据
         JobDO dbJob = randomPojo(JobDO.class, o -> {
             o.setName("定时任务测试");
@@ -240,16 +229,17 @@ public class JobServiceTest extends BaseDbUnitTest {
         });
         jobMapper.insert(dbJob);
         // 测试 name 不匹配
-        jobMapper.insert(ObjectUtils.cloneIgnoreId(dbJob, o -> o.setName("土豆")));
+        jobMapper.insert(cloneIgnoreId(dbJob, o -> o.setName("土豆")));
         // 测试 status 不匹配
-        jobMapper.insert(ObjectUtils.cloneIgnoreId(dbJob, o -> o.setStatus(JobStatusEnum.NORMAL.getStatus())));
+        jobMapper.insert(cloneIgnoreId(dbJob, o -> o.setStatus(JobStatusEnum.NORMAL.getStatus())));
         // 测试 handlerName 不匹配
-        jobMapper.insert(ObjectUtils.cloneIgnoreId(dbJob, o -> o.setHandlerName(randomString())));
+        jobMapper.insert(cloneIgnoreId(dbJob, o -> o.setHandlerName(randomString())));
         // 准备参数
         JobPageReqVO reqVo = new JobPageReqVO();
         reqVo.setName("定时");
         reqVo.setStatus(JobStatusEnum.INIT.getStatus());
         reqVo.setHandlerName("单元");
+
         // 调用
         PageResult<JobDO> pageResult = jobService.getJobPage(reqVo);
         // 断言
@@ -259,7 +249,7 @@ public class JobServiceTest extends BaseDbUnitTest {
     }
 
     @Test
-    public void testGetJobListForExport_success() {
+    public void testGetJobList_export() {
         // mock 数据
         JobDO dbJob = randomPojo(JobDO.class, o -> {
             o.setName("定时任务测试");
@@ -268,16 +258,17 @@ public class JobServiceTest extends BaseDbUnitTest {
         });
         jobMapper.insert(dbJob);
         // 测试 name 不匹配
-        jobMapper.insert(ObjectUtils.cloneIgnoreId(dbJob, o -> o.setName("土豆")));
+        jobMapper.insert(cloneIgnoreId(dbJob, o -> o.setName("土豆")));
         // 测试 status 不匹配
-        jobMapper.insert(ObjectUtils.cloneIgnoreId(dbJob, o -> o.setStatus(JobStatusEnum.NORMAL.getStatus())));
+        jobMapper.insert(cloneIgnoreId(dbJob, o -> o.setStatus(JobStatusEnum.NORMAL.getStatus())));
         // 测试 handlerName 不匹配
-        jobMapper.insert(ObjectUtils.cloneIgnoreId(dbJob, o -> o.setHandlerName(randomString())));
+        jobMapper.insert(cloneIgnoreId(dbJob, o -> o.setHandlerName(randomString())));
         // 准备参数
         JobExportReqVO reqVo = new JobExportReqVO();
         reqVo.setName("定时");
         reqVo.setStatus(JobStatusEnum.INIT.getStatus());
         reqVo.setHandlerName("单元");
+
         // 调用
         List<JobDO> list = jobService.getJobList(reqVo);
         // 断言
@@ -285,10 +276,15 @@ public class JobServiceTest extends BaseDbUnitTest {
         assertPojoEquals(dbJob, list.get(0));
     }
 
-    private static void fillJobMonitorTimeoutEmpty(JobDO job) {
+    @Test
-        if (job.getMonitorTimeout() == null) {
+    public void testGetJob() {
-            job.setMonitorTimeout(0);
+        // mock 数据
-        }
+        JobDO dbJob = randomPojo(JobDO.class);
+        jobMapper.insert(dbJob);
+        // 调用
+        JobDO job = jobService.getJob(dbJob.getId());
+        // 断言
+        assertPojoEquals(dbJob, job);
     }
 
 }

yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogServiceImplTest.java

@@ -1,12 +1,9 @@
 package cn.iocoder.yudao.module.infra.service.logger;
 
-import cn.hutool.core.util.RandomUtil;
 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
-import cn.iocoder.yudao.framework.test.core.util.RandomUtils;
 import cn.iocoder.yudao.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO;
 import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogExportReqVO;
 import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogPageReqVO;
@@ -16,149 +13,121 @@ import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;
 
 import javax.annotation.Resource;
-import java.time.LocalDateTime;
 import java.util.List;
 
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
 import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
+import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @Import(ApiAccessLogServiceImpl.class)
 public class ApiAccessLogServiceImplTest extends BaseDbUnitTest {
 
     @Resource
-    private ApiAccessLogService apiAccessLogService;
+    private ApiAccessLogServiceImpl apiAccessLogService;
 
     @Resource
     private ApiAccessLogMapper apiAccessLogMapper;
 
     @Test
     public void testGetApiAccessLogPage() {
-        // 构造测试数据
+        ApiAccessLogDO apiAccessLogDO = randomPojo(ApiAccessLogDO.class, o -> {
-        long userId = 2233L;
+            o.setUserId(2233L);
-        int userType = UserTypeEnum.ADMIN.getValue();
+            o.setUserType(UserTypeEnum.ADMIN.getValue());
-        String applicationName = "yudao-test";
+            o.setApplicationName("yudao-test");
-        String requestUrl = "foo";
+            o.setRequestUrl("foo");
-        LocalDateTime beginTime = buildTime(2021, 3, 13);
+            o.setBeginTime(buildTime(2021, 3, 13));
-        int duration = 1000;
+            o.setDuration(1000);
-        int resultCode = GlobalErrorCodeConstants.SUCCESS.getCode();
+            o.setResultCode(GlobalErrorCodeConstants.SUCCESS.getCode());
-
-        ApiAccessLogDO infApiAccessLogDO = RandomUtils.randomPojo(ApiAccessLogDO.class, dto -> {
-            dto.setUserId(userId);
-            dto.setUserType(userType);
-            dto.setApplicationName(applicationName);
-            dto.setRequestUrl(requestUrl);
-            dto.setBeginTime(beginTime);
-            dto.setDuration(duration);
-            dto.setResultCode(resultCode);
         });
-        apiAccessLogMapper.insert(infApiAccessLogDO);
+        apiAccessLogMapper.insert(apiAccessLogDO);
-
+        // 测试 userId 不匹配
-        // 下面几个都是不匹配的数据
+        apiAccessLogMapper.insert(cloneIgnoreId(apiAccessLogDO, o -> o.setUserId(3344L)));
-        // userId 不同的
+        // 测试 userType 不匹配
-        apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setUserId(3344L)));
+        apiAccessLogMapper.insert(cloneIgnoreId(apiAccessLogDO, o -> o.setUserType(UserTypeEnum.MEMBER.getValue())));
-        // userType
+        // 测试 applicationName 不匹配
-        apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setUserType(UserTypeEnum.MEMBER.getValue())));
+        apiAccessLogMapper.insert(cloneIgnoreId(apiAccessLogDO, o -> o.setApplicationName("test")));
-        // applicationName 不同的
+        // 测试 requestUrl 不匹配
-        apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setApplicationName("test")));
+        apiAccessLogMapper.insert(cloneIgnoreId(apiAccessLogDO, o -> o.setRequestUrl("bar")));
-        // requestUrl 不同的
+        // 测试 beginTime 不匹配：构造一个早期时间 2021-02-06 00:00:00
-        apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setRequestUrl("bar")));
+        apiAccessLogMapper.insert(cloneIgnoreId(apiAccessLogDO, o -> o.setBeginTime(buildTime(2021, 2, 6))));
-        // 构造一个早期时间 2021-02-06 00:00:00
+        // 测试 duration 不匹配
-        apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setBeginTime(buildTime(2021, 2, 6))));
+        apiAccessLogMapper.insert(cloneIgnoreId(apiAccessLogDO, o -> o.setDuration(100)));
-        // duration 不同的
+        // 测试 resultCode 不匹配
-        apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setDuration(100)));
+        apiAccessLogMapper.insert(cloneIgnoreId(apiAccessLogDO, o -> o.setResultCode(2)));
-        // resultCode 不同的
+        // 准备参数
-        apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setResultCode(2)));
-
-        // 构造调用参数
         ApiAccessLogPageReqVO reqVO = new ApiAccessLogPageReqVO();
-        reqVO.setUserId(userId);
+        reqVO.setUserId(2233L);
-        reqVO.setUserType(userType);
+        reqVO.setUserType(UserTypeEnum.ADMIN.getValue());
-        reqVO.setApplicationName(applicationName);
+        reqVO.setApplicationName("yudao-test");
-        reqVO.setRequestUrl(requestUrl);
+        reqVO.setRequestUrl("foo");
-        reqVO.setBeginTime((new LocalDateTime[]{buildTime(2021, 3, 12),buildTime(2021, 3, 14)}));
+        reqVO.setBeginTime(buildBetweenTime(2021, 3, 13, 2021, 3, 13));
-        reqVO.setDuration(duration);
+        reqVO.setDuration(1000);
-        reqVO.setResultCode(resultCode);
+        reqVO.setResultCode(GlobalErrorCodeConstants.SUCCESS.getCode());
 
-        // 调用service方法
+        // 调用
         PageResult<ApiAccessLogDO> pageResult = apiAccessLogService.getApiAccessLogPage(reqVO);
-
         // 断言，只查到了一条符合条件的
         assertEquals(1, pageResult.getTotal());
         assertEquals(1, pageResult.getList().size());
-        assertPojoEquals(infApiAccessLogDO, pageResult.getList().get(0));
+        assertPojoEquals(apiAccessLogDO, pageResult.getList().get(0));
     }
 
     @Test
     public void testGetApiAccessLogList() {
-        // 构造测试数据
+        ApiAccessLogDO apiAccessLogDO = randomPojo(ApiAccessLogDO.class, o -> {
-        long userId = 2233L;
+            o.setUserId(2233L);
-        int userType = UserTypeEnum.ADMIN.getValue();
+            o.setUserType(UserTypeEnum.ADMIN.getValue());
-        String applicationName = "yudao-test";
+            o.setApplicationName("yudao-test");
-        String requestUrl = "foo";
+            o.setRequestUrl("foo");
-        LocalDateTime beginTime = buildTime(2021, 3, 13);
+            o.setBeginTime(buildTime(2021, 3, 13));
-        int duration = 1000;
+            o.setDuration(1000);
-        int resultCode = GlobalErrorCodeConstants.SUCCESS.getCode();
+            o.setResultCode(GlobalErrorCodeConstants.SUCCESS.getCode());
-
-        ApiAccessLogDO infApiAccessLogDO = RandomUtils.randomPojo(ApiAccessLogDO.class, dto -> {
-            dto.setUserId(userId);
-            dto.setUserType(userType);
-            dto.setApplicationName(applicationName);
-            dto.setRequestUrl(requestUrl);
-            dto.setBeginTime(beginTime);
-            dto.setDuration(duration);
-            dto.setResultCode(resultCode);
         });
-        apiAccessLogMapper.insert(infApiAccessLogDO);
+        apiAccessLogMapper.insert(apiAccessLogDO);
-
+        // 测试 userId 不匹配
-        // 下面几个都是不匹配的数据
+        apiAccessLogMapper.insert(cloneIgnoreId(apiAccessLogDO, o -> o.setUserId(3344L)));
-        // userId 不同的
+        // 测试 userType 不匹配
-        apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setUserId(3344L)));
+        apiAccessLogMapper.insert(cloneIgnoreId(apiAccessLogDO, o -> o.setUserType(UserTypeEnum.MEMBER.getValue())));
-        // userType
+        // 测试 applicationName 不匹配
-        apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setUserType(UserTypeEnum.MEMBER.getValue())));
+        apiAccessLogMapper.insert(cloneIgnoreId(apiAccessLogDO, o -> o.setApplicationName("test")));
-        // applicationName 不同的
+        // 测试 requestUrl 不匹配
-        apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setApplicationName("test")));
+        apiAccessLogMapper.insert(cloneIgnoreId(apiAccessLogDO, o -> o.setRequestUrl("bar")));
-        // requestUrl 不同的
+        // 测试 beginTime 不匹配：构造一个早期时间 2021-02-06 00:00:00
-        apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setRequestUrl("bar")));
+        apiAccessLogMapper.insert(cloneIgnoreId(apiAccessLogDO, o -> o.setBeginTime(buildTime(2021, 2, 6))));
-        // 构造一个早期时间 2021-02-06 00:00:00
+        // 测试 duration 不匹配
-        apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setBeginTime(buildTime(2021, 2, 6))));
+        apiAccessLogMapper.insert(cloneIgnoreId(apiAccessLogDO, o -> o.setDuration(100)));
-        // duration 不同的
+        // 测试 resultCode 不匹配
-        apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setDuration(100)));
+        apiAccessLogMapper.insert(cloneIgnoreId(apiAccessLogDO, o -> o.setResultCode(2)));
-        // resultCode 不同的
+        // 准备参数
-        apiAccessLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiAccessLogDO, logDO -> logDO.setResultCode(2)));
-
-        // 构造调用参数
         ApiAccessLogExportReqVO reqVO = new ApiAccessLogExportReqVO();
-        reqVO.setUserId(userId);
+        reqVO.setUserId(2233L);
-        reqVO.setUserType(userType);
+        reqVO.setUserType(UserTypeEnum.ADMIN.getValue());
-        reqVO.setApplicationName(applicationName);
+        reqVO.setApplicationName("yudao-test");
-        reqVO.setRequestUrl(requestUrl);
+        reqVO.setRequestUrl("foo");
-        reqVO.setBeginTime((new LocalDateTime[]{buildTime(2021, 3, 12),buildTime(2021, 3, 14)}));
+        reqVO.setBeginTime(buildBetweenTime(2021, 3, 13, 2021, 3, 13));
-        reqVO.setDuration(duration);
+        reqVO.setDuration(1000);
-        reqVO.setResultCode(resultCode);
+        reqVO.setResultCode(GlobalErrorCodeConstants.SUCCESS.getCode());
 
-        // 调用service方法
+        // 调用
         List<ApiAccessLogDO> list = apiAccessLogService.getApiAccessLogList(reqVO);
-
         // 断言，只查到了一条符合条件的
         assertEquals(1, list.size());
-        assertPojoEquals(infApiAccessLogDO, list.get(0));
+        assertPojoEquals(apiAccessLogDO, list.get(0));
     }
 
     @Test
-    public void testCreateApiAccessLogAsync() {
+    public void testCreateApiAccessLog() {
         // 准备参数
-        ApiAccessLogCreateReqDTO createDTO = RandomUtils.randomPojo(ApiAccessLogCreateReqDTO.class,
+        ApiAccessLogCreateReqDTO createDTO = randomPojo(ApiAccessLogCreateReqDTO.class);
-                dto -> dto.setUserType(RandomUtil.randomEle(UserTypeEnum.values()).getValue()));
 
         // 调用
         apiAccessLogService.createApiAccessLog(createDTO);
         // 断言
-        ApiAccessLogDO infApiAccessLogDO = apiAccessLogMapper.selectOne(null);
+        ApiAccessLogDO apiAccessLogDO = apiAccessLogMapper.selectOne(null);
-        assertNotNull(infApiAccessLogDO);
+        assertPojoEquals(createDTO, apiAccessLogDO);
-        assertPojoEquals(createDTO, infApiAccessLogDO);
     }
 
-
 }

yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImplTest.java

@@ -1,28 +1,28 @@
 package cn.iocoder.yudao.module.infra.service.logger;
 
-import cn.hutool.core.util.RandomUtil;
 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
-import cn.iocoder.yudao.framework.test.core.util.RandomUtils;
 import cn.iocoder.yudao.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO;
 import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogExportReqVO;
 import cn.iocoder.yudao.module.infra.controller.admin.logger.vo.apierrorlog.ApiErrorLogPageReqVO;
 import cn.iocoder.yudao.module.infra.dal.dataobject.logger.ApiErrorLogDO;
 import cn.iocoder.yudao.module.infra.dal.mysql.logger.ApiErrorLogMapper;
 import cn.iocoder.yudao.module.infra.enums.logger.ApiErrorLogProcessStatusEnum;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;
 
 import javax.annotation.Resource;
-import java.time.LocalDateTime;
 import java.util.List;
 
+import static cn.hutool.core.util.RandomUtil.randomEle;
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
 import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
+import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
 import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.API_ERROR_LOG_NOT_FOUND;
 import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.API_ERROR_LOG_PROCESSED;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -35,161 +35,150 @@ public class ApiErrorLogServiceImplTest extends BaseDbUnitTest {
     private ApiErrorLogServiceImpl apiErrorLogService;
 
     @Resource
-    private ApiErrorLogMapper infApiErrorLogMapper;
+    private ApiErrorLogMapper apiErrorLogMapper;
 
     @Test
     public void testGetApiErrorLogPage() {
-        // 构造测试数据
+        // mock 数据
-        long userId = 2233L;
+        ApiErrorLogDO apiErrorLogDO = randomPojo(ApiErrorLogDO.class, o -> {
-        int userType = UserTypeEnum.ADMIN.getValue();
+            o.setUserId(2233L);
-        String applicationName = "yudao-test";
+            o.setUserType(UserTypeEnum.ADMIN.getValue());
-        String requestUrl = "foo";
+            o.setApplicationName("yudao-test");
-        LocalDateTime beginTime = buildTime(2021, 3, 13);
+            o.setRequestUrl("foo");
-        int progressStatus = ApiErrorLogProcessStatusEnum.INIT.getStatus();
+            o.setExceptionTime(buildTime(2021, 3, 13));
-
+            o.setProcessStatus(ApiErrorLogProcessStatusEnum.INIT.getStatus());
-        ApiErrorLogDO infApiErrorLogDO = RandomUtils.randomPojo(ApiErrorLogDO.class, logDO -> {
-            logDO.setUserId(userId);
-            logDO.setUserType(userType);
-            logDO.setApplicationName(applicationName);
-            logDO.setRequestUrl(requestUrl);
-            logDO.setExceptionTime(beginTime);
-            logDO.setProcessStatus(progressStatus);
         });
-        infApiErrorLogMapper.insert(infApiErrorLogDO);
+        apiErrorLogMapper.insert(apiErrorLogDO);
-
+        // 测试 userId 不匹配
-        // 下面几个都是不匹配的数据
+        apiErrorLogMapper.insert(cloneIgnoreId(apiErrorLogDO, o -> o.setUserId(3344L)));
-        // userId 不同的
+        // 测试 userType 不匹配
-        infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setUserId(3344L)));
+        apiErrorLogMapper.insert(cloneIgnoreId(apiErrorLogDO, logDO -> logDO.setUserType(UserTypeEnum.MEMBER.getValue())));
-        // userType
+        // 测试 applicationName 不匹配
-        infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setUserType(UserTypeEnum.MEMBER.getValue())));
+        apiErrorLogMapper.insert(cloneIgnoreId(apiErrorLogDO, logDO -> logDO.setApplicationName("test")));
-        // applicationName 不同的
+        // 测试 requestUrl 不匹配
-        infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setApplicationName("test")));
+        apiErrorLogMapper.insert(cloneIgnoreId(apiErrorLogDO, logDO -> logDO.setRequestUrl("bar")));
-        // requestUrl 不同的
+        // 测试 exceptionTime 不匹配：构造一个早期时间 2021-02-06 00:00:00
-        infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setRequestUrl("bar")));
+        apiErrorLogMapper.insert(cloneIgnoreId(apiErrorLogDO, logDO -> logDO.setExceptionTime(buildTime(2021, 2, 6))));
-        // 构造一个早期时间 2021-02-06 00:00:00
+        // 测试 progressStatus 不匹配
-        infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setExceptionTime(buildTime(2021, 2, 6))));
+        apiErrorLogMapper.insert(cloneIgnoreId(apiErrorLogDO, logDO -> logDO.setProcessStatus(ApiErrorLogProcessStatusEnum.DONE.getStatus())));
-        // progressStatus 不同的
+        // 准备参数
-        infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setProcessStatus(ApiErrorLogProcessStatusEnum.DONE.getStatus())));
-
-        // 构造调用参数
         ApiErrorLogPageReqVO reqVO = new ApiErrorLogPageReqVO();
-        reqVO.setUserId(userId);
+        reqVO.setUserId(2233L);
-        reqVO.setUserType(userType);
+        reqVO.setUserType(UserTypeEnum.ADMIN.getValue());
-        reqVO.setApplicationName(applicationName);
+        reqVO.setApplicationName("yudao-test");
-        reqVO.setRequestUrl(requestUrl);
+        reqVO.setRequestUrl("foo");
-        reqVO.setExceptionTime((new LocalDateTime[]{buildTime(2021, 3, 12),buildTime(2021, 3, 14)}));
+        reqVO.setExceptionTime(buildBetweenTime(2021, 3, 1, 2021, 3, 31));
-        reqVO.setProcessStatus(progressStatus);
+        reqVO.setProcessStatus(ApiErrorLogProcessStatusEnum.INIT.getStatus());
 
-        // 调用service方法
+        // 调用
         PageResult<ApiErrorLogDO> pageResult = apiErrorLogService.getApiErrorLogPage(reqVO);
-
         // 断言，只查到了一条符合条件的
         assertEquals(1, pageResult.getTotal());
         assertEquals(1, pageResult.getList().size());
-        assertPojoEquals(infApiErrorLogDO, pageResult.getList().get(0));
+        assertPojoEquals(apiErrorLogDO, pageResult.getList().get(0));
     }
 
     @Test
     public void testGetApiErrorLogList() {
-        // 构造测试数据
+        // mock 数据
-        long userId = 2233L;
+        ApiErrorLogDO apiErrorLogDO = randomPojo(ApiErrorLogDO.class, o -> {
-        int userType = UserTypeEnum.ADMIN.getValue();
+            o.setUserId(2233L);
-        String applicationName = "yudao-test";
+            o.setUserType(UserTypeEnum.ADMIN.getValue());
-        String requestUrl = "foo";
+            o.setApplicationName("yudao-test");
-        LocalDateTime beginTime = buildTime(2021, 3, 13);
+            o.setRequestUrl("foo");
-        int progressStatus = ApiErrorLogProcessStatusEnum.INIT.getStatus();
+            o.setExceptionTime(buildTime(2021, 3, 13));
-
+            o.setProcessStatus(ApiErrorLogProcessStatusEnum.INIT.getStatus());
-        ApiErrorLogDO infApiErrorLogDO = RandomUtils.randomPojo(ApiErrorLogDO.class, logDO -> {
-            logDO.setUserId(userId);
-            logDO.setUserType(userType);
-            logDO.setApplicationName(applicationName);
-            logDO.setRequestUrl(requestUrl);
-            logDO.setExceptionTime(beginTime);
-            logDO.setProcessStatus(progressStatus);
         });
-        infApiErrorLogMapper.insert(infApiErrorLogDO);
+        apiErrorLogMapper.insert(apiErrorLogDO);
-
+        // 测试 userId 不匹配
-        // 下面几个都是不匹配的数据
+        apiErrorLogMapper.insert(cloneIgnoreId(apiErrorLogDO, o -> o.setUserId(3344L)));
-        // userId 不同的
+        // 测试 userType 不匹配
-        infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setUserId(3344L)));
+        apiErrorLogMapper.insert(cloneIgnoreId(apiErrorLogDO, logDO -> logDO.setUserType(UserTypeEnum.MEMBER.getValue())));
-        // userType
+        // 测试 applicationName 不匹配
-        infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setUserType(UserTypeEnum.MEMBER.getValue())));
+        apiErrorLogMapper.insert(cloneIgnoreId(apiErrorLogDO, logDO -> logDO.setApplicationName("test")));
-        // applicationName 不同的
+        // 测试 requestUrl 不匹配
-        infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setApplicationName("test")));
+        apiErrorLogMapper.insert(cloneIgnoreId(apiErrorLogDO, logDO -> logDO.setRequestUrl("bar")));
-        // requestUrl 不同的
+        // 测试 exceptionTime 不匹配：构造一个早期时间 2021-02-06 00:00:00
-        infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setRequestUrl("bar")));
+        apiErrorLogMapper.insert(cloneIgnoreId(apiErrorLogDO, logDO -> logDO.setExceptionTime(buildTime(2021, 2, 6))));
-        // 构造一个早期时间 2021-02-06 00:00:00
+        // 测试 progressStatus 不匹配
-        infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setExceptionTime(buildTime(2021, 2, 6))));
+        apiErrorLogMapper.insert(cloneIgnoreId(apiErrorLogDO, logDO -> logDO.setProcessStatus(ApiErrorLogProcessStatusEnum.DONE.getStatus())));
-        // progressStatus 不同的
+        // 准备参数
-        infApiErrorLogMapper.insert(ObjectUtils.cloneIgnoreId(infApiErrorLogDO, logDO -> logDO.setProcessStatus(ApiErrorLogProcessStatusEnum.DONE.getStatus())));
-
-        // 构造调用参数
         ApiErrorLogExportReqVO reqVO = new ApiErrorLogExportReqVO();
-        reqVO.setUserId(userId);
+        reqVO.setUserId(2233L);
-        reqVO.setUserType(userType);
+        reqVO.setUserType(UserTypeEnum.ADMIN.getValue());
-        reqVO.setApplicationName(applicationName);
+        reqVO.setApplicationName("yudao-test");
-        reqVO.setRequestUrl(requestUrl);
+        reqVO.setRequestUrl("foo");
-        reqVO.setExceptionTime((new LocalDateTime[]{buildTime(2021, 3, 12),buildTime(2021, 3, 14)}));
+        reqVO.setExceptionTime(buildBetweenTime(2021, 3, 1, 2021, 3, 31));
-        reqVO.setProcessStatus(progressStatus);
+        reqVO.setProcessStatus(ApiErrorLogProcessStatusEnum.INIT.getStatus());
 
-        // 调用service方法
+        // 调用
         List<ApiErrorLogDO> list = apiErrorLogService.getApiErrorLogList(reqVO);
-
         // 断言，只查到了一条符合条件的
         assertEquals(1, list.size());
-        assertPojoEquals(infApiErrorLogDO, list.get(0));
+        assertPojoEquals(apiErrorLogDO, list.get(0));
-    }
-
-
-    // TODO 芋艿：单元测试，可以拆小一点
-    @Test
-    public void testUpdateApiErrorLogProcess() {
-        // 先构造两条数据，第一条用于抛出异常，第二条用于正常的执行update操作
-        Long processUserId = 2233L;
-
-        ApiErrorLogDO first = RandomUtils.randomPojo(ApiErrorLogDO.class, logDO -> {
-            logDO.setProcessUserId(processUserId);
-            logDO.setUserType(UserTypeEnum.ADMIN.getValue());
-            logDO.setProcessStatus(ApiErrorLogProcessStatusEnum.DONE.getStatus());
-        });
-        infApiErrorLogMapper.insert(first);
-
-        ApiErrorLogDO second = RandomUtils.randomPojo(ApiErrorLogDO.class, logDO -> {
-            logDO.setProcessUserId(1122L);
-            logDO.setUserType(UserTypeEnum.ADMIN.getValue());
-            logDO.setProcessStatus(ApiErrorLogProcessStatusEnum.INIT.getStatus());
-        });
-        infApiErrorLogMapper.insert(second);
-
-        Long firstId = first.getId();
-        Long secondId = second.getId();
-
-        // 执行正常的 update 操作
-        apiErrorLogService.updateApiErrorLogProcess(secondId, ApiErrorLogProcessStatusEnum.DONE.getStatus(), processUserId);
-        ApiErrorLogDO secondSelect = infApiErrorLogMapper.selectOne("id", secondId);
-
-        // id 为 0 查询不到，应该抛出异常 API_ERROR_LOG_NOT_FOUND
-        assertServiceException(() -> apiErrorLogService.updateApiErrorLogProcess(0L, ApiErrorLogProcessStatusEnum.DONE.getStatus(), processUserId), API_ERROR_LOG_NOT_FOUND);
-        // id 为 first 的 progressStatus 为 DONE ，应该抛出 API_ERROR_LOG_PROCESSED
-        assertServiceException(() -> apiErrorLogService.updateApiErrorLogProcess(firstId, ApiErrorLogProcessStatusEnum.DONE.getStatus(), processUserId), API_ERROR_LOG_PROCESSED);
-        // 验证 progressStatus 是否修改成功
-        Assertions.assertEquals(ApiErrorLogProcessStatusEnum.DONE.getStatus(), secondSelect.getProcessStatus());
-        // 验证 progressUserId 是否修改成功
-        Assertions.assertEquals(processUserId, secondSelect.getProcessUserId());
     }
 
     @Test
-    public void testCreateApiErrorLogAsync() {
+    public void testCreateApiErrorLog() {
         // 准备参数
-        ApiErrorLogCreateReqDTO createDTO = RandomUtils.randomPojo(ApiErrorLogCreateReqDTO.class,
+        ApiErrorLogCreateReqDTO createDTO = randomPojo(ApiErrorLogCreateReqDTO.class);
-                dto -> dto.setUserType(RandomUtil.randomEle(UserTypeEnum.values()).getValue()));
 
         // 调用
         apiErrorLogService.createApiErrorLog(createDTO);
         // 断言
-        ApiErrorLogDO infApiErrorLogDO = infApiErrorLogMapper.selectOne(null);
+        ApiErrorLogDO apiErrorLogDO = apiErrorLogMapper.selectOne(null);
-        assertNotNull(infApiErrorLogDO);
+        assertPojoEquals(createDTO, apiErrorLogDO);
-        assertPojoEquals(createDTO, infApiErrorLogDO);
+        assertEquals(ApiErrorLogProcessStatusEnum.INIT.getStatus(), apiErrorLogDO.getProcessStatus());
+    }
+
+    @Test
+    public void testUpdateApiErrorLogProcess_success() {
+        // 准备参数
+        ApiErrorLogDO apiErrorLogDO = randomPojo(ApiErrorLogDO.class,
+                o -> o.setProcessStatus(ApiErrorLogProcessStatusEnum.INIT.getStatus()));
+        apiErrorLogMapper.insert(apiErrorLogDO);
+        // 准备参数
+        Long id = apiErrorLogDO.getId();
+        Integer processStatus = randomEle(ApiErrorLogProcessStatusEnum.values()).getStatus();
+        Long processUserId = randomLongId();
+
+        // 调用
+        apiErrorLogService.updateApiErrorLogProcess(id, processStatus, processUserId);
+        // 断言
+        ApiErrorLogDO dbApiErrorLogDO = apiErrorLogMapper.selectById(apiErrorLogDO.getId());
+        assertEquals(processStatus, dbApiErrorLogDO.getProcessStatus());
+        assertEquals(processUserId, dbApiErrorLogDO.getProcessUserId());
+        assertNotNull(dbApiErrorLogDO.getProcessTime());
+    }
+
+    @Test
+    public void testUpdateApiErrorLogProcess_processed() {
+        // 准备参数
+        ApiErrorLogDO apiErrorLogDO = randomPojo(ApiErrorLogDO.class,
+                o -> o.setProcessStatus(ApiErrorLogProcessStatusEnum.DONE.getStatus()));
+        apiErrorLogMapper.insert(apiErrorLogDO);
+        // 准备参数
+        Long id = apiErrorLogDO.getId();
+        Integer processStatus = randomEle(ApiErrorLogProcessStatusEnum.values()).getStatus();
+        Long processUserId = randomLongId();
+
+        // 调用，并断言异常
+        assertServiceException(() ->
+                apiErrorLogService.updateApiErrorLogProcess(id, processStatus, processUserId),
+                API_ERROR_LOG_PROCESSED);
+    }
+
+    @Test
+    public void testUpdateApiErrorLogProcess_notFound() {
+        // 准备参数
+        Long id = randomLongId();
+        Integer processStatus = randomEle(ApiErrorLogProcessStatusEnum.values()).getStatus();
+        Long processUserId = randomLongId();
+
+        // 调用，并断言异常
+        assertServiceException(() ->
+                apiErrorLogService.updateApiErrorLogProcess(id, processStatus, processUserId),
+                API_ERROR_LOG_NOT_FOUND);
     }
 
 }

yudao-module-infra/yudao-module-infra-biz/src/test/resources/sql/create_tables.sql

@@ -1,9 +1,9 @@
 
 CREATE TABLE IF NOT EXISTS "infra_config" (
-    "id" bigint(20) NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+    "id" bigint(20) NOT NULL GENERATED BY DEFAULT AS IDENTITY COMMENT '编号',
     "category" varchar(50) NOT NULL,
     "type" tinyint NOT NULL,
-    "name" varchar(100) NOT NULL DEFAULT '',
+    "name" varchar(100) NOT NULL DEFAULT '' COMMENT '名字',
     "config_key" varchar(100) NOT NULL DEFAULT '',
     "value" varchar(500) NOT NULL DEFAULT '',
     "visible" bit NOT NULL,

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserProfileController.java

@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.system.controller.admin.user;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
-import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
 import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileRespVO;
@@ -31,6 +30,7 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.List;
 
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.FILE_IS_EMPTY;
@@ -99,7 +99,7 @@ public class UserProfileController {
     @ApiOperation("上传用户个人头像")
     public CommonResult<String> updateUserAvatar(@RequestParam("avatarFile") MultipartFile file) throws Exception {
         if (file.isEmpty()) {
-            throw ServiceExceptionUtil.exception(FILE_IS_EMPTY);
+            throw exception(FILE_IS_EMPTY);
         }
         String avatar = userService.updateUserAvatar(getLoginUserId(), file.getInputStream());
         return success(avatar);

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java

@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.system.service.permission;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuCreateReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuListReqVO;
@@ -31,6 +30,7 @@ import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO.ID_ROOT;
 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
 
@@ -118,7 +118,7 @@ public class MenuServiceImpl implements MenuService {
     public void updateMenu(MenuUpdateReqVO reqVO) {
         // 校验更新的菜单是否存在
         if (menuMapper.selectById(reqVO.getId()) == null) {
-            throw ServiceExceptionUtil.exception(MENU_NOT_EXISTS);
+            throw exception(MENU_NOT_EXISTS);
         }
         // 校验父菜单存在
         validateParentMenu(reqVO.getParentId(), reqVO.getId());
@@ -138,11 +138,11 @@ public class MenuServiceImpl implements MenuService {
     public void deleteMenu(Long menuId) {
         // 校验是否还有子菜单
         if (menuMapper.selectCountByParentId(menuId) > 0) {
-            throw ServiceExceptionUtil.exception(MENU_EXISTS_CHILDREN);
+            throw exception(MENU_EXISTS_CHILDREN);
         }
         // 校验删除的菜单是否存在
         if (menuMapper.selectById(menuId) == null) {
-            throw ServiceExceptionUtil.exception(MENU_NOT_EXISTS);
+            throw exception(MENU_NOT_EXISTS);
         }
         // 标记删除
         menuMapper.deleteById(menuId);
@@ -229,17 +229,17 @@ public class MenuServiceImpl implements MenuService {
         }
         // 不能设置自己为父菜单
         if (parentId.equals(childId)) {
-            throw ServiceExceptionUtil.exception(MENU_PARENT_ERROR);
+            throw exception(MENU_PARENT_ERROR);
         }
         MenuDO menu = menuMapper.selectById(parentId);
         // 父菜单不存在
         if (menu == null) {
-            throw ServiceExceptionUtil.exception(MENU_PARENT_NOT_EXISTS);
+            throw exception(MENU_PARENT_NOT_EXISTS);
         }
         // 父菜单必须是目录或者菜单类型
         if (!MenuTypeEnum.DIR.getType().equals(menu.getType())
             && !MenuTypeEnum.MENU.getType().equals(menu.getType())) {
-            throw ServiceExceptionUtil.exception(MENU_PARENT_NOT_DIR_OR_MENU);
+            throw exception(MENU_PARENT_NOT_DIR_OR_MENU);
         }
     }
 
@@ -260,10 +260,10 @@ public class MenuServiceImpl implements MenuService {
         }
         // 如果 id 为空，说明不用比较是否为相同 id 的菜单
         if (id == null) {
-            throw ServiceExceptionUtil.exception(MENU_NAME_DUPLICATE);
+            throw exception(MENU_NAME_DUPLICATE);
         }
         if (!menu.getId().equals(id)) {
-            throw ServiceExceptionUtil.exception(MENU_NAME_DUPLICATE);
+            throw exception(MENU_NAME_DUPLICATE);
         }
     }
 

yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImplTest.java

@@ -34,6 +34,7 @@ import java.util.Collections;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet;
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
 import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
@@ -310,7 +311,7 @@ public class TenantServiceImplTest extends BaseDbUnitTest {
         reqVO.setContactName("艿");
         reqVO.setContactMobile("1560");
         reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
-        reqVO.setCreateTime(new LocalDateTime[]{buildTime(2020, 12, 1),buildTime(2020, 12, 24)});
+        reqVO.setCreateTime(buildBetweenTime(2020, 12, 1, 2020, 12, 24));
 
         // 调用
         PageResult<TenantDO> pageResult = tenantService.getTenantPage(reqVO);
@@ -347,7 +348,7 @@ public class TenantServiceImplTest extends BaseDbUnitTest {
         reqVO.setContactName("艿");
         reqVO.setContactMobile("1560");
         reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
-        reqVO.setCreateTime(new LocalDateTime[]{buildTime(2020, 12, 1),buildTime(2020, 12, 24)});
+        reqVO.setCreateTime(buildBetweenTime(2020, 12, 1, 2020, 12, 24));
 
         // 调用
         List<TenantDO> list = tenantService.getTenantList(reqVO);
@@ -356,7 +357,6 @@ public class TenantServiceImplTest extends BaseDbUnitTest {
         assertPojoEquals(dbTenant, list.get(0));
     }
 
-
     @Test
     public void testGetTenantByName() {
         // mock 数据