IdService 和 RandomUtil 放到 common 模块

file/file-service/src/main/java/cn/reghao/tnb/file/app/util/IdService.java → common/src/main/java/cn/reghao/tnb/common/util/IdService.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.util;
+package cn.reghao.tnb.common.util;
 
 import cn.reghao.jutil.jdk.id.SnowFlake;
 import org.springframework.stereotype.Component;

file/file-service/src/main/java/cn/reghao/tnb/file/app/util/RandomUtil.java → common/src/main/java/cn/reghao/tnb/common/util/RandomUtil.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.util;
+package cn.reghao.tnb.common.util;
 
 import java.security.SecureRandom;
 import java.util.Random;

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/service/ImagePostService.java

@@ -15,7 +15,7 @@ import cn.reghao.tnb.content.app.data.model.dto.AlbumImageData;
 import cn.reghao.tnb.content.app.data.model.vo.AlbumCard;
 import cn.reghao.tnb.content.app.data.model.vo.ImageAlbumCard;
 import cn.reghao.tnb.content.app.data.model.vo.ImageData;
-import cn.reghao.tnb.content.app.util.IdService;
+import cn.reghao.tnb.common.util.IdService;
 import cn.reghao.tnb.content.app.vod.db.repository.AlbumRepository;
 import cn.reghao.tnb.content.app.vod.model.po.PostAlbum;
 import cn.reghao.tnb.content.app.vod.model.po.PostItem;

content/content-service/src/main/java/cn/reghao/tnb/content/app/util/IdService.java

@@ -1,35 +0,0 @@
-package cn.reghao.tnb.content.app.util;
-
-import cn.reghao.jutil.jdk.id.SnowFlake;
-import org.springframework.stereotype.Component;
-
-import java.util.UUID;
-
-/**
- * ID 生成服务
- *
- * @author reghao
- * @date 2025-09-05 17:07:53
- */
-@Component
-public class IdService {
-    private final SnowFlake idGenerator;
-    private int dcId = 1;
-    private int machineId = 1;
-
-    public IdService() {
-        this.idGenerator = new SnowFlake(dcId, machineId);
-    }
-
-    public long getLongId() {
-        return idGenerator.nextId();
-    }
-
-    public String getStringId() {
-        return null;
-    }
-
-    public String getFileId() {
-        return UUID.randomUUID().toString().replace("-", "");
-    }
-}

content/content-service/src/main/java/cn/reghao/tnb/content/app/util/RandomUtil.java

@@ -1,38 +0,0 @@
-package cn.reghao.tnb.content.app.util;
-
-import java.security.SecureRandom;
-import java.util.Random;
-
-/**
- * @author reghao
- * @date 2025-08-19 15:21:06
- */
-public class RandomUtil {
-    private final static Random random = new SecureRandom();
-
-    public static int getRandomNumber(int max) {
-        int min = 0;
-        return min + random.nextInt(max - min);
-    }
-
-    /**
-     * 产生两个数之间的随机数
-     *
-     * @param min 最小值
-     * @param max 最大值
-     * @return 随机数
-     */
-    public static int getNumber(int min, int max) {
-        return min + random.nextInt(max - min);
-    }
-
-    /**
-     * 产生0-num的随机数,不包括num
-     *
-     * @param num 最大值
-     * @return 随机数
-     */
-    public static int getNumber(int num) {
-        return random.nextInt(num);
-    }
-}

file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/db/repository/DiskShareRepository.java

@@ -1,7 +1,6 @@
 package cn.reghao.tnb.file.app.zdisk.db.repository;
 
 import cn.reghao.tnb.file.app.zdisk.db.mapper.DiskShareMapper;
-import cn.reghao.tnb.file.app.util.IdService;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 

file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/service/CamRecordService.java

@@ -16,7 +16,7 @@ import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.file.app.zdisk.model.dto.CamRecordDto;
 import cn.reghao.tnb.file.app.zdisk.model.po.CamDevice;
 import cn.reghao.tnb.file.app.zdisk.model.po.CamRecord;
-import cn.reghao.tnb.file.app.util.IdService;
+import cn.reghao.tnb.common.util.IdService;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;
 

file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/service/CamService.java

@@ -5,8 +5,8 @@ import cn.reghao.tnb.account.api.dto.AccountAvatar;
 import cn.reghao.tnb.account.api.iface.AccountQuery;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.common.util.ConstantId;
-import cn.reghao.tnb.file.app.util.IdService;
-import cn.reghao.tnb.file.app.util.RandomUtil;
+import cn.reghao.tnb.common.util.IdService;
+import cn.reghao.tnb.common.util.RandomUtil;
 import cn.reghao.tnb.file.app.zdisk.db.mapper.CamDeviceMapper;
 import cn.reghao.tnb.file.app.zdisk.db.mapper.UserActivityMapper;
 import cn.reghao.tnb.file.app.zdisk.model.constant.AlbumType;

file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/service/DiskAlbumService.java

@@ -20,8 +20,7 @@ import cn.reghao.tnb.file.app.zdisk.model.dto.AlbumCreate;
 import cn.reghao.tnb.file.app.zdisk.model.po.DiskAlbum;
 import cn.reghao.tnb.file.app.zdisk.model.po.DiskAlbumFile;
 import cn.reghao.tnb.file.app.zdisk.model.po.DiskFile;
-import cn.reghao.tnb.file.app.zdisk.model.vo.*;
-import cn.reghao.tnb.file.app.util.IdService;
+import cn.reghao.tnb.common.util.IdService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;

file/file-service/src/main/java/cn/reghao/tnb/file/app/zdisk/service/DiskShareService.java

@@ -17,7 +17,7 @@ import cn.reghao.tnb.file.app.zdisk.model.po.DiskAlbum;
 import cn.reghao.tnb.file.app.zdisk.model.po.DiskShare;
 import cn.reghao.tnb.file.app.zdisk.model.po.DiskShareTo;
 import cn.reghao.tnb.file.app.zdisk.model.vo.DiskShareInfo;
-import cn.reghao.tnb.file.app.util.IdService;
+import cn.reghao.tnb.common.util.IdService;
 import cn.reghao.tnb.user.api.iface.UserService;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;