ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-09-09 20:57:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 升级依赖并适配

Browse Source 
1.X-File-Storage 2.1.0 适配
2.Crane4j 2.5.0 不需要做任何额外的配置来引入 crane4j，crane4j 将借助 SpringBoot 的自动装配自动加载必要的组件
This commit is contained in:
Charles7c
2024-02-03 21:12:57 +08:00
parent 45307a8054
commit c9cda12b7d
8 changed files with 37 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/config/FileRecorderImpl.java
View File

@@ -16,19 +16,15 @@
package top.charles7c.continew.admin.system.config;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.x.file.storage.core.FileInfo;
import org.dromara.x.file.storage.core.recorder.FileRecorder;
import org.springframework.stereotype.Component;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.EscapeUtil;
import cn.hutool.core.util.StrUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.x.file.storage.core.FileInfo;
import org.dromara.x.file.storage.core.recorder.FileRecorder;
import org.dromara.x.file.storage.core.upload.FilePartInfo;
import org.springframework.stereotype.Component;
import top.charles7c.continew.admin.common.util.helper.LoginHelper;
import top.charles7c.continew.admin.system.enums.FileTypeEnum;
import top.charles7c.continew.admin.system.mapper.FileMapper;
@@ -37,6 +33,8 @@ import top.charles7c.continew.admin.system.model.entity.FileDO;
import top.charles7c.continew.admin.system.model.entity.StorageDO;
import top.charles7c.continew.starter.core.constant.StringConstants;
import java.util.Optional;
/**
* 文件记录实现类
*
@@ -100,4 +98,16 @@ public class FileRecorderImpl implements FileRecorder {
.oneOpt()
.orElse(null));
}
@Override
public void update(FileInfo fileInfo) {
/* 不使用分片功能则无需重写 */ }
@Override
public void saveFilePart(FilePartInfo filePartInfo) {
/* 不使用分片功能则无需重写 */ }
@Override
public void deleteFilePartByUploadId(String s) {
/* 不使用分片功能则无需重写 */}
}

4
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/FileServiceImpl.java
View File

@@ -24,7 +24,7 @@ import lombok.extern.slf4j.Slf4j;
import org.dromara.x.file.storage.core.FileInfo;
import org.dromara.x.file.storage.core.FileStorageService;
import org.dromara.x.file.storage.core.ProgressListener;
import org.dromara.x.file.storage.core.UploadPretreatment;
import org.dromara.x.file.storage.core.upload.UploadPretreatment;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import top.charles7c.continew.admin.system.enums.StorageTypeEnum;
@@ -91,7 +91,7 @@ public class FileServiceImpl extends BaseServiceImpl<FileMapper, FileDO, FileRes
}
@Override
public void progress(long progressSize, long allSize) {
public void progress(long progressSize, Long allSize) {
log.info("已上传 [{}]，总大小 [{}]", progressSize, allSize);
}

2
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/RoleDeptServiceImpl.java
View File

@@ -75,7 +75,7 @@ public class RoleDeptServiceImpl implements RoleDeptService {
}
@Override
@ContainerMethod(namespace = ContainerConstants.ROLE_DEPT_ID_LIST, type = MappingType.NONE)
@ContainerMethod(namespace = ContainerConstants.ROLE_DEPT_ID_LIST, type = MappingType.ORDER_OF_KEYS)
public List<Long> listDeptIdByRoleId(Long roleId) {
return roleDeptMapper.selectDeptIdByRoleId(roleId);
}

2
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserRoleServiceImpl.java
View File

@@ -69,7 +69,7 @@ public class UserRoleServiceImpl implements UserRoleService {
}
@Override
@ContainerMethod(namespace = ContainerConstants.USER_ROLE_ID_LIST, type = MappingType.NONE)
@ContainerMethod(namespace = ContainerConstants.USER_ROLE_ID_LIST, type = MappingType.ORDER_OF_KEYS)
public List<Long> listRoleIdByUserId(Long userId) {
return userRoleMapper.selectRoleIdByUserId(userId);
}