!153 代码合并

Merge pull request !153 from MAC/develop
This commit is contained in:
MAC 2023-10-22 10:08:32 +00:00 committed by Gitee
commit f15c0a3524
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 8 additions and 4 deletions

View File

@ -55,6 +55,7 @@ import java.net.URLDecoder;
import java.util.*;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@ -262,7 +263,8 @@ public class FileController {
List<UserFile> list = userFileService.selectUserFileByLikeRightFilePath(new QiwenFile(userFile.getFilePath(), userFile.getFileName(), true).getPath(), sessionUserBean.getUserId());
for (UserFile newUserFile : list) {
newUserFile.setFilePath(newUserFile.getFilePath().replaceFirst(new QiwenFile(userFile.getFilePath(), userFile.getFileName(), userFile.getIsDir() == 1).getPath(),
String escapedPattern = Pattern.quote(new QiwenFile(userFile.getFilePath(), userFile.getFileName(), userFile.getIsDir() == 1).getPath());
newUserFile.setFilePath(newUserFile.getFilePath().replaceFirst(escapedPattern,
new QiwenFile(userFile.getFilePath(), renameFileDto.getFileName(), userFile.getIsDir() == 1).getPath()));
userFileService.updateById(newUserFile);
}

View File

@ -23,7 +23,7 @@ public class CommonFile {
@TableId(type = IdType.AUTO)
@Column(columnDefinition="varchar(20)")
public String commonFileId;
@Column(columnDefinition="bigint(20) comment '用户文件id'")
@Column(columnDefinition="varchar(20) comment '用户文件id'")
public String userFileId;
// @Column(columnDefinition="int(2) comment '文件权限'")
// public Integer filePermission;

View File

@ -20,7 +20,7 @@ public class RecoveryFile {
@TableId(type = IdType.AUTO)
@Column(columnDefinition="bigint(20)")
private Long recoveryFileId;
@Column(columnDefinition = "bigint(20) comment '用户文件id'")
@Column(columnDefinition = "varchar(20) comment '用户文件id'")
private String userFileId;
@Column(columnDefinition="varchar(25) comment '删除时间'")
private String deleteTime;

View File

@ -11,7 +11,9 @@ import javax.persistence.*;
* 存储信息类
*/
@Data
@Table(name = "storage")
@Table(name = "storage", uniqueConstraints = {
@UniqueConstraint(name = "userid_index", columnNames = {"userId"})
})
@Entity
@TableName("storage")
public class StorageBean {