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

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

Browse Source 
# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
This commit is contained in:
chenbowen
2025-12-02 15:10:24 +08:00
parent e2c3702ae5 b7ad25e91c
commit 4f95272ca8
22 changed files with 63 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,13 +15,13 @@ import com.zt.plat.module.infra.framework.file.core.client.FileClientFactory;
import com.zt.plat.module.infra.framework.file.core.client.local.LocalFileClient;
import com.zt.plat.module.infra.framework.file.core.client.local.LocalFileClientConfig;
import com.zt.plat.module.infra.framework.file.core.enums.FileStorageEnum;
import jakarta.annotation.Resource;
import jakarta.validation.Validator;
import lombok.Data;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.annotation.Import;
import jakarta.annotation.Resource;
import jakarta.validation.Validator;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Map;
@@ -92,7 +92,7 @@ public class FileConfigServiceImplTest extends BaseDbUnitTest {
o.setId(dbFileConfig.getId()); // 设置更新的 ID
o.setStorage(FileStorageEnum.LOCAL.getStorage());
Map<String, Object> config = MapUtil.<String, Object>builder().put("basePath", "/yunai2")
.put("domain", "https://doc.iocoder.cn").build();
.put("domain", "http://172.16.46.63:30888").build();
o.setConfig(config);
});
@@ -102,7 +102,7 @@ public class FileConfigServiceImplTest extends BaseDbUnitTest {
FileConfigDO fileConfig = fileConfigMapper.selectById(reqVO.getId()); // 获取最新的
assertPojoEquals(reqVO, fileConfig, "config");
assertEquals("/yunai2", ((LocalFileClientConfig) fileConfig.getConfig()).getBasePath());
assertEquals("https://doc.iocoder.cn", ((LocalFileClientConfig) fileConfig.getConfig()).getDomain());
assertEquals("http://172.16.46.63:30888", ((LocalFileClientConfig) fileConfig.getConfig()).getDomain());
// 验证 cache
assertNull(fileConfigService.getClientCache().getIfPresent(fileConfig.getId()));
}