进行一些调整

Author: Ghost-chu

src/main/java/com/ghostchu/tracker/sapling/dto/RegFormDTO.java

@@ -19,8 +19,7 @@ public class RegFormDTO {
     @Email(message = "邮箱格式不正确")
     private String email;
 
-    @Pattern(regexp = "^(?=.*[A-Za-z])(?=.*\\d)[A-Za-z\\d]{8,}$",
-            message = "密码必须至少8个字符，包含字母和数字")
+    @Size(min = 3, max = 64, message = "密码长度需在3-64个字符之间")
     private String password;
     private String confirmPassword;
     private String inviteCode;

src/main/java/com/ghostchu/tracker/sapling/service/impl/TorrentsServiceImpl.java

@@ -96,7 +96,13 @@ public TorrentsVO toVO(Torrents torrent) {
 
     @Override
     public boolean isTorrentExists(byte[] infoHash) {
-        return baseMapper.selectCount(new QueryWrapper<Torrents>().eq("hash_v1", infoHash).or().eq("hash_v2", infoHash)) > 0;
+        return baseMapper.selectCount(new QueryWrapper<Torrents>()
+                .eq("hash_v1", infoHash)
+                .and(q -> q.eq("deleted_at", null))
+                .or()
+                .eq("hash_v2", infoHash)
+                .and(q -> q.eq("deleted_at", null))
+        ) > 0;
     }
 
     @Override
@@ -185,8 +191,13 @@ public Torrents updateTorrent(Long id, Long userId, Long categoryId, String titl
     public Torrents getTorrentByInfoHash(byte[] infoHash) {
         return getOne(new QueryWrapper<Torrents>()
                 .eq("hash_v1", infoHash)
+                .and(q -> q.eq("deleted_at", null))
+                .or()
+                .eq("hash_v2_short", infoHash)
+                .and(q -> q.eq("deleted_at", null))
                 .or()
-                .eq("hash_v2_short", infoHash));
+                .eq("hash_v2", infoHash)
+                .and(q -> q.eq("deleted_at", null)));
     }
 
     @Override
@@ -211,6 +222,9 @@ public Torrents deleteTorrent(long id, long deleteBy) {
     })
     public Torrents unDeleteTorrent(long id) {
         Torrents torrents = baseMapper.selectById(id);
+        if(isTorrentExists(torrents.getHashV1()) || isTorrentExists(torrents.getHashV2())) {
+            throw new IllegalArgumentException("反删除操作失败，种子已经反删除或者已有相同 InfoHash 值的种子存在");
+        }
         torrents.setDeletedAt(null);
         if (baseMapper.updateById(torrents) == 0) {
             throw new IllegalArgumentException("反删除操作失败，种子已经反删除或者已有相同 InfoHash 值的种子存在");

src/main/java/com/ghostchu/tracker/sapling/util/HtmlSanitizer.java

@@ -15,7 +15,7 @@ public class HtmlSanitizer {
             .allowElements("ul", "ol", "li")
 
             // 允许链接和图片
-            .allowElements("mapper", "img")
+            .allowElements("mapper", "img", "a")
             .allowAttributes("href", "title").onElements("mapper")
             .allowAttributes("src", "alt", "title", "width", "height").onElements("img")
             .allowUrlProtocols("http", "https", "mailto", "data")