auth/auth-server-java
auth
/
auth-server-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: auth:edd1465d46ac31b494aa1c2bc3aec2f8fd9204f8
Branches Tags
auth:master
auth:dev
auth:master-v2
auth:master-v1
auth:v4.0.2
auth:v4.0.1
auth:v4.0.0
auth:v3.0.1
auth:v3.0.0
..
compare: auth:fb140baeaaeeeebb232caec8924850c3c665afa7
Branches Tags
auth:master
auth:dev
auth:master-v2
auth:master-v1
auth:v4.0.2
auth:v4.0.1
auth:v4.0.0
auth:v3.0.1
auth:v3.0.0

No commits in common. "edd1465d46ac31b494aa1c2bc3aec2f8fd9204f8" and "fb140baeaaeeeebb232caec8924850c3c665afa7" have entirely different histories.
edd1465d46 ... fb140baeaa

3 changed files with 2858 additions and 7541 deletions
Show Stats Expand all files Collapse all files

4
auth-core/src/main/java/cn/bunny/services/domain/system/i18n/dto/I18nUpdateByFileDto.java
View File

@ -28,8 +28,4 @@ public class I18nUpdateByFileDto {
@NotBlank(message = "多语言key不能为空") @NotBlank(message = "多语言key不能为空")
private String fileType; private String fileType;
@Schema(name = "append", title = "文件类型/json/excel")
@NotNull(message = "是否追加")
private Boolean append = true;
} }

10392
auth_admin.sql
View File

File diff suppressed because it is too large Load Diff

3
service/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java
View File

@ -219,7 +219,6 @@ public class I18nServiceImpl extends ServiceImpl<I18nMapper, I18n> implements I1
String type = dto.getType(); String type = dto.getType();
MultipartFile file = dto.getFile(); MultipartFile file = dto.getFile();
String fileType = dto.getFileType(); String fileType = dto.getFileType();
Boolean append = dto.getAppend();
// 判断是否有这个语言的key // 判断是否有这个语言的key
List<I18nType> i18nTypeList = i18nTypeMapper.selectList(Wrappers.<I18nType>lambdaQuery().eq(I18nType::getTypeName, type)); List<I18nType> i18nTypeList = i18nTypeMapper.selectList(Wrappers.<I18nType>lambdaQuery().eq(I18nType::getTypeName, type));
@ -236,7 +235,7 @@ public class I18nServiceImpl extends ServiceImpl<I18nMapper, I18n> implements I1
List<Long> ids = i18nList.stream().map(BaseEntity::getId).toList(); List<Long> ids = i18nList.stream().map(BaseEntity::getId).toList();
// 删除这个类型下所有的多语言 // 删除这个类型下所有的多语言
if (!ids.isEmpty() && !append) removeByIds(ids); if (!ids.isEmpty()) removeByIds(ids);
// 存入内容 // 存入内容
if (fileType.equals(FileType.JSON)) { if (fileType.equals(FileType.JSON)) {