1.对应 oss-api 和 oss-sdk 的更改

2.添加 cn.reghao.tnb.common.util.ConstantId 记录一些默认值

account/account-service/src/main/java/cn/reghao/tnb/account/app/db/repository/AccountRepository.java

@@ -10,6 +10,7 @@ import cn.reghao.tnb.account.app.model.po.UserAccountRole;
 import cn.reghao.tnb.account.app.model.po.UserAuthority;
 import cn.reghao.tnb.account.app.model.po.UserRegistry;
 import cn.reghao.tnb.common.auth.AccountRole;
+import cn.reghao.tnb.common.util.ConstantId;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Repository;
@@ -26,7 +27,6 @@ import java.util.stream.Collectors;
  */
 @Repository
 public class AccountRepository {
-    private final long startUserId = 10001L;
     private final UserAccountMapper userAccountMapper;
     private final UserRegistryMapper userRegistryMapper;
     private final UserAccountRoleMapper userAccountRoleMapper;
@@ -73,7 +73,7 @@ public class AccountRepository {
         long userId;
         Long maxUserId = userAccountMapper.findMaxUserId();
         if (maxUserId == null) {
-            userId = startUserId;
+            userId = ConstantId.START_USER_ID;
         } else {
             userId = maxUserId + 1;
         }
@@ -81,10 +81,6 @@ public class AccountRepository {
         return userId;
     }
 
-    public long getStartUserId() {
-        return this.startUserId;
-    }
-
     @Cacheable(cacheNames = "tnb:account:info", key = "#userId", unless = "#result == null")
     public AccountInfo getAccountInfo(long userId) {
         AccountInfo accountInfo = userAccountMapper.findAccountInfo(userId);

account/account-service/src/main/java/cn/reghao/tnb/account/app/model/po/UserRegistry.java

@@ -1,8 +1,8 @@
 package cn.reghao.tnb.account.app.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
+import cn.reghao.tnb.common.util.ConstantId;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 /**
@@ -22,9 +22,9 @@ public class UserRegistry extends BaseObject<Integer> {
 
     public UserRegistry() {
         this.enabled = true;
-        this.captchaCode = "tnb23";
+        this.captchaCode = ConstantId.CAPTCHA_CODE;
         this.enableCaptcha = false;
-        this.verifyCode = "220233";
+        this.verifyCode = ConstantId.VERIFY_CODE;
         this.enableVerify = true;
     }
 }

account/account-service/src/main/java/cn/reghao/tnb/account/app/security/form/AccountAuthToken.java

@@ -1,6 +1,7 @@
 package cn.reghao.tnb.account.app.security.form;
 
 import cn.reghao.tnb.account.app.model.po.UserAccount;
+import cn.reghao.tnb.common.util.ConstantId;
 import org.springframework.security.authentication.AbstractAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.SpringSecurityCoreVersion;
@@ -44,7 +45,7 @@ public class AccountAuthToken extends AbstractAuthenticationToken {
         this.loginId = loginId;
         this.loginType = loginType;
         this.rememberMe = rememberMe;
-        this.userId = -1L;
+        this.userId = ConstantId.ANONYMOUS_USER_ID;
         this.principal = principal;
         this.credentials = credentials;
     }

account/account-service/src/main/java/cn/reghao/tnb/account/app/service/impl/AccountRegistryServiceImpl.java

@@ -14,12 +14,12 @@ import cn.reghao.tnb.account.app.model.po.UserAccount;
 import cn.reghao.tnb.account.app.service.AccountRegistryService;
 import cn.reghao.tnb.account.app.service.PubkeyService;
 import cn.reghao.tnb.common.auth.AccountRole;
+import cn.reghao.tnb.common.util.ConstantId;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.PostConstruct;
 import java.util.Set;
 
 /**
@@ -29,7 +29,6 @@ import java.util.Set;
 @Slf4j
 @Service
 public class AccountRegistryServiceImpl implements AccountRegistryService {
-    private final String zhihuAvatar = "//picx.zhimg.com/v2-abed1a8c04700ba7d72b45195223e0ff_xll.jpg";
     private final CodeService codeService;
     private final PasswordEncoder passwordEncoder;
     private final AccountRepository accountRepository;
@@ -84,13 +83,13 @@ public class AccountRegistryServiceImpl implements AccountRegistryService {
         String salt = RandomString.getSalt(64);
         String encodedPassword = passwordEncoder.encode(decryptCredential + salt);
         Set<UserAuthority> authorities = Set.of(new UserAuthority());
-        if (userId == accountRepository.getStartUserId()) {
+        if (userId == ConstantId.START_USER_ID) {
             authorities = Set.of(
                     new UserAuthority(AccountRole.admin.getValue()),
                     new UserAuthority(AccountRole.oss.getValue()));
         }
 
-        UserAccount userAccount = new UserAccount(userId, encodedPassword, salt, zhihuAvatar, authorities);
+        UserAccount userAccount = new UserAccount(userId, encodedPassword, salt, ConstantId.AVATAR_URL, authorities);
         if (StringRegexp.matchEmail(principal)) {
             userAccount.setEmail(principal);
         } else if (StringRegexp.matchMobile(principal)) {
@@ -107,7 +106,7 @@ public class AccountRegistryServiceImpl implements AccountRegistryService {
     @Override
     public UserAccount createAccount(String principal, String password) {
         long userId = accountRepository.getNextUserId();
-        UserAccount userAccount = new UserAccount(userId, zhihuAvatar);
+        UserAccount userAccount = new UserAccount(userId, ConstantId.AVATAR_URL);
         if (StringRegexp.matchEmail(principal)) {
             userAccount.setEmail(principal);
             accountRepository.saveAccount(userAccount);

account/account-service/src/main/java/cn/reghao/tnb/account/app/service/impl/AccountTokenServiceImpl.java

@@ -17,6 +17,7 @@ import cn.reghao.tnb.account.app.redis.RedisKeys;
 import cn.reghao.tnb.account.app.model.vo.RefreshPayload;
 import cn.reghao.tnb.account.app.redis.ds.RedisString;
 import cn.reghao.tnb.account.app.redis.ds.RedisStringObject;
+import cn.reghao.tnb.common.util.ConstantId;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.security.core.Authentication;
@@ -245,7 +246,7 @@ public class AccountTokenServiceImpl implements AccountTokenService {
     @Override
     public long getUserId(int type, String userdata) {
         AccountAuthToken userAuthToken = getAuthToken(type, userdata);
-        return userAuthToken != null ? userAuthToken.getUserId() : -1L;
+        return userAuthToken != null ? userAuthToken.getUserId() : ConstantId.ANONYMOUS_USER_ID;
     }
 
     @Override

account/account-service/src/main/resources/mapper/UserRegistryMapper.xml

@@ -4,9 +4,9 @@
 <mapper namespace="cn.reghao.tnb.account.app.db.mapper.UserRegistryMapper">
     <insert id="save">
         insert into user_registry
-        (`enabled`,`captcha_code`,`enable_captcha`,`verify_code`,`enable_verify`,`domain`)
+        (`enabled`,`captcha_code`,`enable_captcha`,`verify_code`,`enable_verify`)
         values
-        (#{enabled},#{captchaCode},#{enableCaptcha},#{verifyCode},#{enableVerify},#{domain})
+        (#{enabled},#{captchaCode},#{enableCaptcha},#{verifyCode},#{enableVerify})
     </insert>
     
     <update id="update">

common/src/main/java/cn/reghao/tnb/common/util/ConstantId.java

@@ -0,0 +1,17 @@
+package cn.reghao.tnb.common.util;
+
+/**
+ * 一些默认值
+ *
+ * @author reghao
+ * @date 2025-10-21 09:43:59
+ */
+public class ConstantId {
+    public static final int START_CHANNEL_CODE = 101;
+    public static final long START_USER_ID = 10001L;
+    public static final long ANONYMOUS_USER_ID = -1L;
+    public static final String AVATAR_URL = "//picx.zhimg.com/v2-abed1a8c04700ba7d72b45195223e0ff_xll.jpg";
+    public static final String CAPTCHA_CODE = "tnb23";
+    public static final String VERIFY_CODE = "220233";
+    public static final String OSS_DOMAIN = "oss.reghao.cn";
+}

content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/service/ChatMessageService.java

@@ -3,7 +3,7 @@ package cn.reghao.tnb.content.app.chat.service;
 import cn.reghao.file.api.iface.OssService;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import cn.reghao.jutil.tool.id.SnowFlake;
-import cn.reghao.oss.sdk.model.dto.ObjectInfo;
+import cn.reghao.oss.api.dto.ObjectInfo;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.app.chat.db.mapper.*;
 import cn.reghao.tnb.content.app.chat.model.constant.MsgType;

content/content-service/src/main/java/cn/reghao/tnb/content/app/config/web/TokenFilter.java

@@ -3,6 +3,7 @@ package cn.reghao.tnb.content.app.config.web;
 import cn.reghao.jutil.web.ServletUtil;
 import cn.reghao.tnb.common.auth.LoginUser;
 import cn.reghao.tnb.common.auth.UserContext;
+import cn.reghao.tnb.common.util.ConstantId;
 import org.slf4j.MDC;
 import org.springframework.stereotype.Component;
 
@@ -30,13 +31,13 @@ public class TokenFilter implements Filter {
         String requestId = ServletUtil.getHeader("x-request-id");
         MDC.put("request_id", requestId);
 
-        long userId = -1L;
+        long userId = ConstantId.ANONYMOUS_USER_ID;
         String userIdStr = ServletUtil.getHeader("x-user-id");
         if (userIdStr != null) {
             userId = Long.parseLong(userIdStr);
         }
 
-        String loginId = "-1";
+        String loginId = ConstantId.ANONYMOUS_USER_ID + "";
         String loginIdStr = ServletUtil.getHeader("x-login-id");
         if (loginIdStr != null) {
             loginId = loginIdStr;

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/db/mapper/AudioFileMapper.java

@@ -2,8 +2,8 @@ package cn.reghao.tnb.content.app.data.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
 import cn.reghao.tnb.content.app.data.model.po.AudioFile;
-import cn.reghao.oss.sdk.model.dto.media.AudioInfo;
-import cn.reghao.oss.sdk.model.dto.media.AudioUrl;
+import cn.reghao.oss.api.dto.media.AudioInfo;
+import cn.reghao.oss.api.dto.media.AudioUrl;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/db/repository/AudioRepository.java

@@ -2,8 +2,8 @@ package cn.reghao.tnb.content.app.data.db.repository;
 
 import cn.reghao.tnb.content.app.data.db.mapper.AudioFileMapper;
 import cn.reghao.tnb.content.app.data.model.po.AudioFile;
-import cn.reghao.oss.sdk.model.dto.media.AudioInfo;
-import cn.reghao.oss.sdk.model.dto.media.AudioUrl;
+import cn.reghao.oss.api.dto.media.AudioInfo;
+import cn.reghao.oss.api.dto.media.AudioUrl;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/vo/StatusCard.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.data.model.vo;
 
-import cn.reghao.oss.sdk.model.dto.media.ImageUrlDto;
+import cn.reghao.oss.api.dto.media.ImageUrlDto;
 import cn.reghao.tnb.user.api.dto.UserInfo;
 import lombok.Data;
 

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

@@ -11,7 +11,7 @@ import cn.reghao.tnb.content.app.data.db.mapper.AudioPostMapper;
 import cn.reghao.tnb.content.app.data.model.dto.AudioScopeUpdate;
 import cn.reghao.tnb.content.app.data.model.po.AudioPost;
 import cn.reghao.tnb.content.app.data.model.vo.UserAudioCard;
-import cn.reghao.oss.sdk.model.dto.media.AudioInfo;
+import cn.reghao.oss.api.dto.media.AudioInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;

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

@@ -5,7 +5,7 @@ import cn.reghao.jutil.jdk.db.Page;
 import cn.reghao.jutil.jdk.db.PageList;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.web.WebResult;
-import cn.reghao.oss.sdk.model.dto.media.ImageInfo;
+import cn.reghao.oss.api.dto.media.ImageInfo;
 import cn.reghao.tnb.account.api.iface.AccountQuery;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.api.constant.PostScope;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/po/DiskFile.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.content.app.disk.model.po;
 
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.jutil.jdk.db.BaseObject;
-import cn.reghao.oss.sdk.model.constant.ObjectType;
+import cn.reghao.oss.api.constant.ObjectType;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/vo/DiskFileDetail.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.disk.model.vo;
 
-import cn.reghao.oss.sdk.model.dto.ObjectInfo;
+import cn.reghao.oss.api.dto.ObjectInfo;
 import cn.reghao.tnb.content.app.disk.model.po.DiskFile;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/model/vo/FileInfo.java

@@ -1,8 +1,8 @@
 package cn.reghao.tnb.content.app.disk.model.vo;
 
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
-import cn.reghao.oss.sdk.model.constant.ObjectType;
-import cn.reghao.oss.sdk.model.dto.ObjectInfo;
+import cn.reghao.oss.api.constant.ObjectType;
+import cn.reghao.oss.api.dto.ObjectInfo;
 import cn.reghao.tnb.content.app.disk.model.po.DiskFile;
 import lombok.AllArgsConstructor;
 import lombok.Getter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/service/CamRecordService.java

@@ -5,7 +5,7 @@ import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import cn.reghao.jutil.jdk.db.Page;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.ResultStatus;
-import cn.reghao.oss.sdk.model.dto.media.VideoInfo;
+import cn.reghao.oss.api.dto.media.VideoInfo;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.app.disk.db.mapper.CamDeviceMapper;
 import cn.reghao.tnb.content.app.disk.db.mapper.CamRecordMapper;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/service/CamService.java

@@ -4,6 +4,7 @@ import cn.reghao.jutil.jdk.db.Page;
 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.content.app.disk.db.mapper.CamDeviceMapper;
 import cn.reghao.tnb.content.app.disk.db.mapper.UserActivityMapper;
 import cn.reghao.tnb.content.app.disk.model.constant.AlbumType;
@@ -111,7 +112,7 @@ public class CamService {
         List<UserActivity> list = new ArrayList<>();
         while (total-- > 0) {
             UserActivity userActivity = new UserActivity();
-            userActivity.setCreateBy(-1L);
+            userActivity.setCreateBy(ConstantId.ANONYMOUS_USER_ID);
             list.add(userActivity);
         }
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/service/DiskAlbumService.java

@@ -4,7 +4,7 @@ import cn.reghao.file.api.iface.OssService;
 import cn.reghao.jutil.jdk.db.Page;
 import cn.reghao.jutil.jdk.db.PageList;
 import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.oss.sdk.model.constant.ObjectType;
+import cn.reghao.oss.api.constant.ObjectType;
 import cn.reghao.tnb.account.api.dto.AccountAvatar;
 import cn.reghao.tnb.account.api.iface.AccountQuery;
 import cn.reghao.tnb.common.auth.UserContext;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/service/DiskFileService.java

@@ -7,8 +7,8 @@ import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import cn.reghao.jutil.jdk.db.Page;
 import cn.reghao.jutil.jdk.db.PageList;
 import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.oss.sdk.model.constant.ObjectType;
-import cn.reghao.oss.sdk.model.dto.ObjectInfo;
+import cn.reghao.oss.api.constant.ObjectType;
+import cn.reghao.oss.api.dto.ObjectInfo;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.common.util.StringUtil;
 import cn.reghao.tnb.content.app.disk.db.mapper.DiskFileMapper;

content/content-service/src/main/java/cn/reghao/tnb/content/app/disk/service/DiskFolderService.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.content.app.disk.service;
 
 import cn.reghao.jutil.jdk.db.Page;
 import cn.reghao.jutil.jdk.result.Result;
-import cn.reghao.oss.sdk.model.constant.ObjectType;
+import cn.reghao.oss.api.constant.ObjectType;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.app.disk.db.mapper.DiskFileMapper;
 import cn.reghao.tnb.content.app.disk.model.dto.CreateFolder;

content/content-service/src/main/java/cn/reghao/tnb/content/app/mall/service/ProductService.java

@@ -5,7 +5,7 @@ import cn.reghao.jutil.jdk.db.PageList;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
 import cn.reghao.jutil.tool.id.SnowFlake;
-import cn.reghao.oss.sdk.model.dto.media.ImageInfo;
+import cn.reghao.oss.api.dto.media.ImageInfo;
 import cn.reghao.tnb.account.api.iface.AccountQuery;
 import cn.reghao.tnb.content.api.dto.TaobaoItem;
 import cn.reghao.tnb.content.app.mall.db.mapper.ProductMapper;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/controller/VideoPostController.java

@@ -11,7 +11,7 @@ import cn.reghao.tnb.content.app.vod.model.dto.*;
 import cn.reghao.tnb.content.api.dto.UserVideoPost;
 import cn.reghao.tnb.content.app.vod.service.VideoPostQuery;
 import cn.reghao.tnb.content.app.vod.service.VideoPostService;
-import cn.reghao.oss.sdk.model.dto.media.VideoInfo;
+import cn.reghao.oss.api.dto.media.VideoInfo;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.http.MediaType;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/db/mapper/VideoFileMapper.java

@@ -2,8 +2,8 @@ package cn.reghao.tnb.content.app.vod.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
 import cn.reghao.tnb.content.app.vod.model.po.VideoFile;
-import cn.reghao.oss.sdk.model.dto.media.VideoInfo;
-import cn.reghao.oss.sdk.model.dto.media.VideoUrlDto;
+import cn.reghao.oss.api.dto.media.VideoInfo;
+import cn.reghao.oss.api.dto.media.VideoUrlDto;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/db/mapper/VideoPostMapper.java

@@ -11,7 +11,7 @@ import cn.reghao.tnb.content.app.vod.model.po.BannerVideo;
 import cn.reghao.tnb.content.app.vod.model.po.VideoPost;
 import cn.reghao.tnb.content.app.vod.model.vo.*;
 import cn.reghao.tnb.content.app.vod.model.dto.SearchCriteria;
-import cn.reghao.oss.sdk.model.dto.media.VideoInfo;
+import cn.reghao.oss.api.dto.media.VideoInfo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/db/repository/VideoRepository.java

@@ -7,8 +7,8 @@ import cn.reghao.tnb.content.app.vod.db.mapper.VideoStatisticMapper;
 import cn.reghao.tnb.content.app.vod.model.po.VideoFile;
 import cn.reghao.tnb.content.app.vod.model.po.VideoPost;
 import cn.reghao.tnb.content.app.vod.model.po.VideoStatistic;
-import cn.reghao.oss.sdk.model.dto.media.VideoInfo;
-import cn.reghao.oss.sdk.model.dto.media.VideoUrlDto;
+import cn.reghao.oss.api.dto.media.VideoInfo;
+import cn.reghao.oss.api.dto.media.VideoUrlDto;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/dto/CollectData.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.vod.model.dto;
 
 import cn.reghao.jutil.web.validator.ValidEnum;
-import cn.reghao.oss.sdk.model.constant.ObjectType;
+import cn.reghao.oss.api.constant.ObjectType;
 import lombok.Getter;
 
 import javax.validation.constraints.NotBlank;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/PostItem.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.vod.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
-import cn.reghao.oss.sdk.model.dto.media.ImageInfo;
+import cn.reghao.oss.api.dto.media.ImageInfo;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/VideoFile.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.vod.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
-import cn.reghao.oss.sdk.model.dto.media.VideoInfo;
+import cn.reghao.oss.api.dto.media.VideoInfo;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/VideoPost.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.content.app.vod.model.po;
 
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import cn.reghao.jutil.jdk.db.BaseObject;
-import cn.reghao.oss.sdk.model.dto.media.VideoInfo;
+import cn.reghao.oss.api.dto.media.VideoInfo;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.api.constant.PostScope;
 import cn.reghao.tnb.content.api.constant.VideoStatus;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/AdminVodService.java

@@ -5,7 +5,7 @@ import cn.reghao.file.api.iface.FileService;
 import cn.reghao.file.api.iface.OssService;
 import cn.reghao.jutil.jdk.db.PageList;
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
-import cn.reghao.oss.sdk.model.dto.media.VideoUrlDto;
+import cn.reghao.oss.api.dto.media.VideoUrlDto;
 import cn.reghao.tnb.content.api.constant.PostScope;
 import cn.reghao.tnb.content.api.dto.*;
 import cn.reghao.tnb.content.app.vod.db.mapper.SiteNoticeMapper;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/CrawledDataService.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.vod.service;
 
 import cn.reghao.file.api.iface.OssService;
-import cn.reghao.oss.sdk.model.dto.media.VideoInfo;
+import cn.reghao.oss.api.dto.media.VideoInfo;
 import cn.reghao.tnb.content.api.constant.PostScope;
 import cn.reghao.tnb.content.api.dto.VideoFileUpdate;
 import cn.reghao.tnb.content.api.dto.spider.CrawledVideo;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/DanmakuService.java

@@ -5,6 +5,7 @@ import cn.reghao.jutil.tool.id.SnowFlake;
 import cn.reghao.tnb.account.api.constant.TokenType;
 import cn.reghao.tnb.account.api.dto.AuthedAccount;
 import cn.reghao.tnb.account.api.iface.AccountQuery;
+import cn.reghao.tnb.common.util.ConstantId;
 import cn.reghao.tnb.content.api.dto.DanmakuSbtDto;
 import cn.reghao.tnb.content.app.vod.db.mongo.UserDanmakuMongo;
 import cn.reghao.tnb.content.app.vod.model.po.UserDanmaku;
@@ -32,7 +33,7 @@ public class DanmakuService {
     }
 
     public Result submit(DanmakuSbtDto danmakuSbtDto) {
-        long loginUser = -1L;
+        long loginUser = ConstantId.ANONYMOUS_USER_ID;
         String midHash = danmakuSbtDto.getMidHash();
         if (midHash == null) {
             String token = danmakuSbtDto.getToken();

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/VideoPostQuery.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.vod.service;
 
 import cn.reghao.jutil.jdk.db.PageList;
-import cn.reghao.oss.sdk.model.dto.media.VideoInfo;
+import cn.reghao.oss.api.dto.media.VideoInfo;
 import cn.reghao.tnb.content.api.dto.*;
 import cn.reghao.tnb.content.app.vod.model.po.BannerVideo;
 import cn.reghao.tnb.content.app.vod.model.po.VideoPost;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/VideoService.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.vod.service;
 
 import cn.reghao.file.api.iface.OssService;
-import cn.reghao.oss.sdk.model.dto.media.VideoUrlDto;
+import cn.reghao.oss.api.dto.media.VideoUrlDto;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.app.vod.db.repository.VideoRepository;
 import cn.reghao.tnb.content.app.vod.model.po.VideoPost;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/impl/VideoPlayServiceImpl.java

@@ -1,9 +1,10 @@
 package cn.reghao.tnb.content.app.vod.service.impl;
 
 import cn.reghao.file.api.iface.OssService;
-import cn.reghao.oss.sdk.model.dto.media.VideoUrlDto;
+import cn.reghao.oss.api.dto.media.VideoUrlDto;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.common.db.PageScroll;
+import cn.reghao.tnb.common.util.ConstantId;
 import cn.reghao.tnb.content.api.constant.PostScope;
 import cn.reghao.tnb.content.api.dto.VideoRecord;
 import cn.reghao.tnb.content.api.dto.VideoUrl;
@@ -69,7 +70,7 @@ public class VideoPlayServiceImpl implements VideoPlayService {
     public VideoUrls getVideoPlayData(String videoId) {
         double currentTime = 0.0;
         long loginUser = UserContext.getUserId();
-        if (loginUser != -1) {
+        if (loginUser != ConstantId.ANONYMOUS_USER_ID) {
             currentTime = getCurrentTime(loginUser, videoId);
         }
 
@@ -82,12 +83,13 @@ public class VideoPlayServiceImpl implements VideoPlayService {
         String urlType = list.get(0).getType();
         int scope = videoPost.getScope();
         Set<Integer> userScopes = new HashSet<>(contentPermission.getUserScopes());
-        if (loginUser == videoPost.getPublishBy()) {
+        long publishBy = videoPost.getPublishBy();
+        if (loginUser == publishBy) {
             userScopes.add(PostScope.PRIVATE.getCode());
         }
 
         // 判断当前请求是否具备访问 video 需要的权限
-        if (!userScopes.contains(scope)) {
+        if (!userScopes.contains(scope) && loginUser != publishBy) {
             return new VideoUrls();
         }
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/impl/VideoPostQueryImpl.java

@@ -4,8 +4,8 @@ import cn.reghao.file.api.iface.OssService;
 import cn.reghao.jutil.jdk.db.Page;
 import cn.reghao.jutil.jdk.db.PageList;
 import cn.reghao.jutil.web.WebResult;
-import cn.reghao.oss.sdk.model.dto.media.VideoInfo;
-import cn.reghao.oss.sdk.model.dto.media.VideoUrlDto;
+import cn.reghao.oss.api.dto.media.VideoInfo;
+import cn.reghao.oss.api.dto.media.VideoUrlDto;
 import cn.reghao.tnb.account.api.iface.AccountQuery;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.common.util.StringUtil;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/impl/VideoPostServiceImpl.java

@@ -4,9 +4,9 @@ import cn.reghao.file.api.iface.JobService;
 import cn.reghao.file.api.iface.OssService;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.tool.id.IdGenerator;
-import cn.reghao.oss.sdk.model.dto.media.ImageInfo;
-import cn.reghao.oss.sdk.model.dto.media.VideoInfo;
-import cn.reghao.oss.sdk.model.dto.media.VideoUrlDto;
+import cn.reghao.oss.api.dto.media.ImageInfo;
+import cn.reghao.oss.api.dto.media.VideoInfo;
+import cn.reghao.oss.api.dto.media.VideoUrlDto;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.api.constant.PostScope;
 import cn.reghao.tnb.content.api.dto.VideoFilePublish;

content/content-service/src/main/resources/mapper/data/AudioFileMapper.xml

@@ -22,13 +22,13 @@
         from audio_file
         where audio_file_id=#{audioFileId}
     </select>
-    <select id="findAudioInfo" resultType="cn.reghao.oss.sdk.model.dto.media.AudioInfo">
+    <select id="findAudioInfo" resultType="cn.reghao.oss.api.dto.media.AudioInfo">
         select audio_file_id,duration,codec,url
         from audio_file
         where audio_file_id=#{audioFileId}
         order by id desc
     </select>
-    <select id="findAudioUrl" resultType="cn.reghao.oss.sdk.model.dto.media.AudioUrl">
+    <select id="findAudioUrl" resultType="cn.reghao.oss.api.dto.media.AudioUrl">
         select audio_file_id,bit_rate,codec,url
         from audio_file
         where audio_file_id=#{audioFileId}

content/content-service/src/main/resources/mapper/vod/VideoFileMapper.xml

@@ -27,7 +27,7 @@
         select *
         from vod_video_file
     </select>
-    <select id="findVideoInfo" resultType="cn.reghao.oss.sdk.model.dto.media.VideoInfo">
+    <select id="findVideoInfo" resultType="cn.reghao.oss.api.dto.media.VideoInfo">
         select object_id,duration,horizontal,quality,video_codec,audio_codec,url_type,url
         from vod_video_file
         where `deleted`=0 and object_id=#{objectId}
@@ -42,7 +42,7 @@
         from vod_video_file
         where `deleted`=0 and object_id=#{objectId}
     </select>
-    <select id="findVideoUrls" resultType="cn.reghao.oss.sdk.model.dto.media.VideoUrlDto">
+    <select id="findVideoUrls" resultType="cn.reghao.oss.api.dto.media.VideoUrlDto">
         select object_id,channel_code,url_type as type,url,width,height,quality
         from vod_video_file
         where `deleted`=0 and video_id=#{videoId}

content/content-service/src/test/java/cn/reghao/tnb/content/app/disk/service/DiskUnitTest.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.disk.service;
 
-import cn.reghao.oss.sdk.model.constant.ObjectType;
+import cn.reghao.oss.api.constant.ObjectType;
 import cn.reghao.tnb.content.app.disk.model.vo.FileTree;
 import org.junit.Test;
 import org.junit.runner.RunWith;

content/content-service/src/test/java/cn/reghao/tnb/content/app/geo/service/GeoTest.java

@@ -2,8 +2,8 @@ package cn.reghao.tnb.content.app.geo.service;
 
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
 import cn.reghao.jutil.jdk.text.TextFile;
-import cn.reghao.oss.sdk.OssConsoleClient;
-import cn.reghao.oss.sdk.model.OssConsoleConfig;
+//import cn.reghao.oss.sdk.OssConsoleClient;
+//import cn.reghao.oss.sdk.model.OssConsoleConfig;
 import cn.reghao.tnb.content.app.ContentApplication;
 import cn.reghao.tnb.content.app.geo.db.mapper.*;
 import cn.reghao.tnb.content.app.geo.model.po.*;

file/file-api/pom.xml

@@ -17,12 +17,4 @@
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
     </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>cn.reghao.oss</groupId>
-            <artifactId>oss-sdk</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
 </project>

file/file-service/src/main/java/cn/reghao/tnb/file/app/model/constant/UploadChannelType.java → file/file-api/src/main/java/cn/reghao/file/api/constant/UploadChannelType.java

@@ -1,8 +1,8 @@
-package cn.reghao.tnb.file.app.model.constant;
+package cn.reghao.file.api.constant;
 
 import cn.reghao.oss.api.constant.ObjectSize;
-import cn.reghao.oss.sdk.model.constant.ObjectScope;
-import cn.reghao.oss.sdk.model.constant.ObjectType;
+import cn.reghao.oss.api.constant.ObjectScope;
+import cn.reghao.oss.api.constant.ObjectType;
 
 /**
  * @author reghao

file/file-api/src/main/java/cn/reghao/file/api/iface/OssService.java

@@ -1,11 +1,11 @@
 package cn.reghao.file.api.iface;
 
-import cn.reghao.oss.sdk.model.dto.ObjectInfo;
-import cn.reghao.oss.sdk.model.dto.ServerInfo;
-import cn.reghao.oss.sdk.model.dto.media.AudioInfo;
-import cn.reghao.oss.sdk.model.dto.media.ConvertedImageInfo;
-import cn.reghao.oss.sdk.model.dto.media.ImageInfo;
-import cn.reghao.oss.sdk.model.dto.media.VideoInfo;
+import cn.reghao.oss.api.dto.ObjectInfo;
+import cn.reghao.oss.api.dto.ServerInfo;
+import cn.reghao.oss.api.dto.media.AudioInfo;
+import cn.reghao.oss.api.dto.media.ConvertedImageInfo;
+import cn.reghao.oss.api.dto.media.ImageInfo;
+import cn.reghao.oss.api.dto.media.VideoInfo;
 
 /**
  * @author reghao

file/file-service/pom.xml

@@ -23,11 +23,6 @@
             <artifactId>common</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>cn.reghao.oss</groupId>
-            <artifactId>oss-api</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>cn.reghao.tnb.account</groupId>
             <artifactId>account-api</artifactId>

file/file-service/src/main/java/cn/reghao/tnb/file/app/config/OssConsoleClientFactory.java

@@ -1,7 +1,5 @@
 package cn.reghao.tnb.file.app.config;
 
-import cn.reghao.oss.sdk.OssConsoleClient;
-import cn.reghao.oss.sdk.model.OssConsoleConfig;
 import cn.reghao.tnb.file.app.model.po.StoreConfig;
 import org.springframework.stereotype.Component;
 
@@ -11,17 +9,17 @@ import org.springframework.stereotype.Component;
  */
 //@Component
 public class OssConsoleClientFactory {
-    private OssConsoleClient ossConsoleClient;
-    private OssConsoleConfig ossConsoleConfig;
+    /*private OssConsoleClient ossConsoleClient;
+    private OssConsoleConfig ossConsoleConfig;*/
 
     public void init(StoreConfig storeConfig) {
         String endpoint = storeConfig.getEndpoint();
         String accessKeyId = storeConfig.getAccessKeyId();
         String accessKeySecret = storeConfig.getAccessKeySecret();
-        this.ossConsoleConfig = new OssConsoleConfig(endpoint, accessKeyId, accessKeySecret);
+        //this.ossConsoleConfig = new OssConsoleConfig(endpoint, accessKeyId, accessKeySecret);
     }
 
-    public OssConsoleClient getOssConsoleClient() throws Exception {
+    /*public OssConsoleClient getOssConsoleClient() throws Exception {
         if (ossConsoleClient == null) {
             ossConsoleClient = get();
             if (ossConsoleClient == null) {
@@ -40,5 +38,5 @@ public class OssConsoleClientFactory {
         }
 
         return null;
-    }
+    }*/
 }

file/file-service/src/main/java/cn/reghao/tnb/file/app/config/web/TokenFilter.java

@@ -3,6 +3,7 @@ package cn.reghao.tnb.file.app.config.web;
 import cn.reghao.jutil.web.ServletUtil;
 import cn.reghao.tnb.common.auth.LoginUser;
 import cn.reghao.tnb.common.auth.UserContext;
+import cn.reghao.tnb.common.util.ConstantId;
 import org.slf4j.MDC;
 import org.springframework.stereotype.Component;
 
@@ -28,7 +29,7 @@ public class TokenFilter implements Filter {
         String requestId = ServletUtil.getHeader("x-request-id");
         MDC.put("request_id", requestId);
 
-        long userId = -1L;
+        long userId = ConstantId.ANONYMOUS_USER_ID;
         String userIdStr = ServletUtil.getHeader("x-user-id");
         if (userIdStr != null) {
             userId = Long.parseLong(userIdStr);

file/file-service/src/main/java/cn/reghao/tnb/file/app/controller/FileOssController.java

@@ -1,9 +1,9 @@
 package cn.reghao.tnb.file.app.controller;
 
 import cn.reghao.jutil.web.WebResult;
-import cn.reghao.oss.sdk.model.dto.ServerInfo;
+import cn.reghao.oss.api.dto.ServerInfo;
 import cn.reghao.tnb.common.auth.AuthUser;
-import cn.reghao.tnb.file.app.model.constant.UploadChannelType;
+import cn.reghao.file.api.constant.UploadChannelType;
 import cn.reghao.tnb.file.app.rpc.StoreServiceWrapperRouter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;

file/file-service/src/main/java/cn/reghao/tnb/file/app/controller/OssSdkController.java

@@ -3,12 +3,12 @@ package cn.reghao.tnb.file.app.controller;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.web.WebResult;
 import cn.reghao.oss.api.iface.ConsoleService;
-import cn.reghao.oss.sdk.model.dto.ObjectInfo;
-import cn.reghao.oss.sdk.model.dto.ServerInfo;
-import cn.reghao.oss.sdk.model.dto.media.AudioInfo;
-import cn.reghao.oss.sdk.model.dto.media.ConvertedImageInfo;
-import cn.reghao.oss.sdk.model.dto.media.ImageInfo;
-import cn.reghao.oss.sdk.model.dto.media.VideoInfo;
+import cn.reghao.oss.api.dto.ObjectInfo;
+import cn.reghao.oss.api.dto.ServerInfo;
+import cn.reghao.oss.api.dto.media.AudioInfo;
+import cn.reghao.oss.api.dto.media.ConvertedImageInfo;
+import cn.reghao.oss.api.dto.media.ImageInfo;
+import cn.reghao.oss.api.dto.media.VideoInfo;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.file.app.model.dto.KeyAuthDto;
 import cn.reghao.tnb.file.app.rpc.StoreServiceWrapper;

file/file-service/src/main/java/cn/reghao/tnb/file/app/controller/StoreObjectController.java

@@ -4,8 +4,8 @@ import cn.reghao.file.api.iface.FileService;
 import cn.reghao.jutil.jdk.db.PageList;
 import cn.reghao.jutil.web.WebResult;
 import cn.reghao.oss.api.iface.ConsoleService;
-import cn.reghao.oss.sdk.model.dto.ObjectInfo;
-import cn.reghao.oss.sdk.model.dto.ServerInfo;
+import cn.reghao.oss.api.dto.ObjectInfo;
+import cn.reghao.oss.api.dto.ServerInfo;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.file.app.model.vo.FileInfo;
 import cn.reghao.tnb.file.app.model.vo.UserNodeInfo;

file/file-service/src/main/java/cn/reghao/tnb/file/app/controller/UploadChannelController.java

@@ -3,8 +3,8 @@ package cn.reghao.tnb.file.app.controller;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.web.WebResult;
 import cn.reghao.oss.api.constant.ObjectSize;
-import cn.reghao.oss.sdk.model.constant.ObjectScope;
-import cn.reghao.oss.sdk.model.constant.ObjectType;
+import cn.reghao.oss.api.constant.ObjectScope;
+import cn.reghao.oss.api.constant.ObjectType;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.file.app.model.dto.UploadChannelDto;
 import cn.reghao.tnb.common.db.SelectOption;

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

@@ -7,6 +7,7 @@ import cn.reghao.tnb.file.app.db.mapper.UploadChannelMapper;
 import cn.reghao.tnb.file.app.model.po.StoreNode;
 import cn.reghao.tnb.file.app.model.po.StoreVolume;
 import cn.reghao.tnb.file.app.model.po.UploadChannel;
+import cn.reghao.tnb.file.app.service.StoreConfigService;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
@@ -22,13 +23,15 @@ import java.util.stream.Collectors;
 public class StoreRepository {
     private final StoreNodeMapper storeNodeMapper;
     private final StoreVolumeMapper storeVolumeMapper;
-    private UploadChannelMapper uploadChannelMapper;
+    private final UploadChannelMapper uploadChannelMapper;
+    private final StoreConfigService storeConfigService;
 
     public StoreRepository(StoreNodeMapper storeNodeMapper, StoreVolumeMapper storeVolumeMapper,
-                           UploadChannelMapper uploadChannelMapper) {
+                           UploadChannelMapper uploadChannelMapper, StoreConfigService storeConfigService) {
         this.storeNodeMapper = storeNodeMapper;
         this.storeVolumeMapper = storeVolumeMapper;
         this.uploadChannelMapper = uploadChannelMapper;
+        this.storeConfigService = storeConfigService;
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -47,7 +50,13 @@ public class StoreRepository {
     }
 
     @Cacheable(cacheNames = "tnb:file:channel", key = "#ossUser + '_' + #channelName", unless = "#result == null")
+    @Deprecated
     public UploadChannel getUploadChannel(int ossUser, String channelName) {
         return uploadChannelMapper.findByCreateByAndName(ossUser, channelName);
     }
+
+    public UploadChannel getUploadChannel(String channelName) {
+        int ossUser = storeConfigService.getLocalOssUser();
+        return uploadChannelMapper.findByCreateByAndName(ossUser, channelName);
+    }
 }

file/file-service/src/main/java/cn/reghao/tnb/file/app/delay/task/ConvertTask.java

@@ -1,8 +1,7 @@
 package cn.reghao.tnb.file.app.delay.task;
 
 import cn.reghao.jutil.media.FFmpegWrapper;
-import cn.reghao.oss.sdk.OssConsoleClient;
-import cn.reghao.oss.sdk.model.rest.UploadFileRet;
+import cn.reghao.oss.api.rest.UploadFileRet;
 import cn.reghao.tnb.content.api.dto.VideoConvertedDto;
 import cn.reghao.tnb.content.api.iface.AdminVideoService;
 import cn.reghao.tnb.file.app.db.mapper.JobDetailMapper;
@@ -20,14 +19,12 @@ public class ConvertTask implements Runnable {
     private final long jobId;
     private final JobDetailMapper jobDetailMapper;
     private final ConvertTaskInfo convertTaskInfo;
-    private final OssConsoleClient ossConsoleClient;
     private final AdminVideoService adminVideoService;
 
     public ConvertTask(long jobId, JobDetailMapper jobDetailMapper, ConvertTaskInfo convertTaskInfo) {
         this.jobId = jobId;
         this.jobDetailMapper = jobDetailMapper;
         this.convertTaskInfo = convertTaskInfo;
-        this.ossConsoleClient = convertTaskInfo.getOssConsoleClient();
         this.adminVideoService = convertTaskInfo.getAdminVideoService();
     }
 
@@ -43,12 +40,12 @@ public class ConvertTask implements Runnable {
             if (ret == 0) {
                 int channelCode = convertTaskInfo.getChannelCode();
                 File destFile = new File(destPath);
-                UploadFileRet uploadFileRet = ossConsoleClient.postObject(destFile, channelCode);
+                /*UploadFileRet uploadFileRet = ossConsoleClient.postObject(destFile, channelCode);
                 if (uploadFileRet != null) {
                     String uploadId = uploadFileRet.getUploadId();
                     VideoConvertedDto videoConvertedDto = new VideoConvertedDto(videoFileId, channelCode, uploadId, format);
                     adminVideoService.addConvertedVideo(videoConvertedDto);
-                }
+                }*/
             } else {
                 status = JobStatus.Fail.getDesc();
             }

file/file-service/src/main/java/cn/reghao/tnb/file/app/delay/task/ConvertTaskInfo.java

@@ -1,6 +1,5 @@
 package cn.reghao.tnb.file.app.delay.task;
 
-import cn.reghao.oss.sdk.OssConsoleClient;
 import cn.reghao.tnb.content.api.iface.AdminVideoService;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -16,16 +15,14 @@ public class ConvertTaskInfo {
     private int channelCode;
     private String srcPath;
     private String destPath;
-    private OssConsoleClient ossConsoleClient;
     private AdminVideoService adminVideoService;
 
     public ConvertTaskInfo(String videoFileId, int channelCode, String srcPath, String destPath,
-                           OssConsoleClient ossConsoleClient, AdminVideoService adminVideoService) {
+                           AdminVideoService adminVideoService) {
         this.videoFileId = videoFileId;
         this.channelCode = channelCode;
         this.srcPath = srcPath;
         this.destPath = destPath;
-        this.ossConsoleClient = ossConsoleClient;
         this.adminVideoService = adminVideoService;
     }
 }

file/file-service/src/main/java/cn/reghao/tnb/file/app/model/dto/UploadChannelDto.java

@@ -2,8 +2,8 @@ package cn.reghao.tnb.file.app.model.dto;
 
 import cn.reghao.jutil.web.validator.ValidEnum;
 import cn.reghao.oss.api.constant.ObjectSize;
-import cn.reghao.oss.sdk.model.constant.ObjectScope;
-import cn.reghao.oss.sdk.model.constant.ObjectType;
+import cn.reghao.oss.api.constant.ObjectScope;
+import cn.reghao.oss.api.constant.ObjectType;
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.validator.constraints.Length;

file/file-service/src/main/java/cn/reghao/tnb/file/app/model/po/UploadChannel.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.file.app.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
-import cn.reghao.tnb.file.app.model.constant.UploadChannelType;
+import cn.reghao.file.api.constant.UploadChannelType;
 import cn.reghao.tnb.file.app.model.dto.UploadChannelDto;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

file/file-service/src/main/java/cn/reghao/tnb/file/app/model/vo/FileInfo.java

@@ -1,8 +1,8 @@
 package cn.reghao.tnb.file.app.model.vo;
 
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
-import cn.reghao.oss.sdk.model.constant.ObjectType;
-import cn.reghao.oss.sdk.model.dto.ObjectInfo;
+import cn.reghao.oss.api.constant.ObjectType;
+import cn.reghao.oss.api.dto.ObjectInfo;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

file/file-service/src/main/java/cn/reghao/tnb/file/app/rpc/ConsoleServiceImpl.java

@@ -5,7 +5,7 @@ import cn.reghao.oss.api.dto.ObjectChannel;
 import cn.reghao.oss.api.dto.StoreNodeDto;
 import cn.reghao.oss.api.iface.ConsoleService;
 import cn.reghao.oss.api.iface.StoreService;
-import cn.reghao.oss.sdk.model.dto.ServerInfo;
+import cn.reghao.oss.api.dto.ServerInfo;
 import cn.reghao.tnb.file.app.model.po.StoreNode;
 import cn.reghao.tnb.file.app.model.po.UploadChannel;
 import cn.reghao.tnb.file.app.model.po.UserNode;

file/file-service/src/main/java/cn/reghao/tnb/file/app/rpc/FileServiceImpl.java

@@ -3,11 +3,11 @@ package cn.reghao.tnb.file.app.rpc;
 import cn.reghao.file.api.dto.JobInfo;
 import cn.reghao.file.api.iface.FileService;
 import cn.reghao.jutil.jdk.db.PageList;
-import cn.reghao.oss.sdk.model.dto.ServerInfo;
-import cn.reghao.oss.sdk.model.dto.media.ImageInfo;
-import cn.reghao.oss.sdk.model.rest.UploadFileRet;
-import cn.reghao.oss.sdk.OssConsoleClient;
-import cn.reghao.oss.sdk.OssStoreClient;
+//import cn.reghao.oss.api.dto.ServerInfo;
+//import cn.reghao.oss.api.dto.media.ImageInfo;
+//import cn.reghao.oss.sdk.model.rest.UploadFileRet;
+//import cn.reghao.oss.sdk.OssConsoleClient;
+//import cn.reghao.oss.sdk.OssStoreClient;
 import cn.reghao.tnb.file.app.config.AppProperties;
 import cn.reghao.tnb.file.app.config.OssConsoleClientFactory;
 import cn.reghao.tnb.file.app.db.mapper.JobDetailMapper;
@@ -69,7 +69,7 @@ public class FileServiceImpl implements FileService {
     }
 
     private String getImageUrl(int channelCode, File file) throws Exception {
-        OssConsoleClient ossConsoleClient = ossConsoleClientFactory.getOssConsoleClient();
+        /*OssConsoleClient ossConsoleClient = ossConsoleClientFactory.getOssConsoleClient();
         ServerInfo serverInfo = ossConsoleClient.getUploadStore(channelCode);
         if (serverInfo == null) {
             return null;
@@ -85,7 +85,7 @@ public class FileServiceImpl implements FileService {
             if (imageInfo != null) {
                 return imageInfo.getUrl();
             }
-        }
+        }*/
 
         return null;
     }

file/file-service/src/main/java/cn/reghao/tnb/file/app/rpc/JobServiceImpl.java

@@ -2,8 +2,7 @@ package cn.reghao.tnb.file.app.rpc;
 
 import cn.reghao.file.api.iface.JobService;
 import cn.reghao.jutil.tool.id.SnowFlake;
-import cn.reghao.oss.sdk.OssConsoleClient;
-import cn.reghao.oss.sdk.model.dto.ObjectInfo;
+import cn.reghao.oss.api.dto.ObjectInfo;
 import cn.reghao.tnb.content.api.iface.AdminVideoService;
 import cn.reghao.tnb.content.api.iface.MallService;
 import cn.reghao.tnb.file.app.config.OssConsoleClientFactory;
@@ -81,17 +80,17 @@ public class JobServiceImpl implements JobService {
     public long addConvertVideoJob(String videoFileId, int channelCode) {
         long jobId = idGenerator.nextId();
         try {
-            OssConsoleClient ossConsoleClient = ossConsoleClientFactory.getOssConsoleClient();
+            /*OssConsoleClient ossConsoleClient = ossConsoleClientFactory.getOssConsoleClient();
             ObjectInfo objectInfo = ossConsoleClient.getObjectInfo(channelCode, videoFileId);
             if (objectInfo == null) {
                 throw new Exception("not found ObjectInfo by videoFileId " + videoFileId);
             }
 
-            String objectName = objectInfo.getObjectName();
-            String localPath = ossConsoleClient.getObject(objectName, channelCode, baseDir);
+            String objectName = objectInfo.getObjectName();*/
+            String localPath = "ossConsoleClient.getObject(objectName, channelCode, baseDir)";
             String destPath = String.format("%s/%s", baseDir, UUID.randomUUID());
             ConvertTaskInfo convertTaskInfo =
-                    new ConvertTaskInfo(videoFileId, channelCode, localPath, destPath, ossConsoleClient, adminVideoService);
+                    new ConvertTaskInfo(videoFileId, channelCode, localPath, destPath, adminVideoService);
             ConvertTask convertTask = new ConvertTask(jobId, jobDetailMapper, convertTaskInfo);
             long delaySecond = 5;
             DelayJob delayJob = new DelayJob(jobId, convertTask, delaySecond);

file/file-service/src/main/java/cn/reghao/tnb/file/app/rpc/StoreServiceWrapper.java

@@ -2,11 +2,11 @@ package cn.reghao.tnb.file.app.rpc;
 
 import cn.reghao.oss.api.dto.disk.DiskVolume;
 import cn.reghao.oss.api.iface.StoreService;
-import cn.reghao.oss.sdk.model.dto.ObjectInfo;
-import cn.reghao.oss.sdk.model.dto.media.AudioInfo;
-import cn.reghao.oss.sdk.model.dto.media.ConvertedImageInfo;
-import cn.reghao.oss.sdk.model.dto.media.ImageInfo;
-import cn.reghao.oss.sdk.model.dto.media.VideoInfo;
+import cn.reghao.oss.api.dto.ObjectInfo;
+import cn.reghao.oss.api.dto.media.AudioInfo;
+import cn.reghao.oss.api.dto.media.ConvertedImageInfo;
+import cn.reghao.oss.api.dto.media.ImageInfo;
+import cn.reghao.oss.api.dto.media.VideoInfo;
 import cn.reghao.tnb.file.app.db.mapper.StoreNodeMapper;
 import cn.reghao.tnb.file.app.model.po.StoreNode;
 import cn.reghao.tnb.file.app.service.UserNodeService;

file/file-service/src/main/java/cn/reghao/tnb/file/app/rpc/StoreServiceWrapperRouter.java

@@ -2,13 +2,13 @@ package cn.reghao.tnb.file.app.rpc;
 
 import cn.reghao.file.api.iface.OssService;
 import cn.reghao.oss.api.iface.ConsoleService;
-import cn.reghao.oss.sdk.model.constant.ObjectScope;
-import cn.reghao.oss.sdk.model.dto.ObjectInfo;
-import cn.reghao.oss.sdk.model.dto.ServerInfo;
-import cn.reghao.oss.sdk.model.dto.media.AudioInfo;
-import cn.reghao.oss.sdk.model.dto.media.ConvertedImageInfo;
-import cn.reghao.oss.sdk.model.dto.media.ImageInfo;
-import cn.reghao.oss.sdk.model.dto.media.VideoInfo;
+import cn.reghao.oss.api.constant.ObjectScope;
+import cn.reghao.oss.api.dto.ObjectInfo;
+import cn.reghao.oss.api.dto.ServerInfo;
+import cn.reghao.oss.api.dto.media.AudioInfo;
+import cn.reghao.oss.api.dto.media.ConvertedImageInfo;
+import cn.reghao.oss.api.dto.media.ImageInfo;
+import cn.reghao.oss.api.dto.media.VideoInfo;
 import cn.reghao.tnb.file.app.config.AppProperties;
 import cn.reghao.tnb.file.app.db.repository.StoreRepository;
 import cn.reghao.tnb.file.app.model.constant.OssType;

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

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.file.app.service;
 
 import cn.reghao.file.api.iface.OssService;
-import cn.reghao.oss.sdk.model.dto.media.ImageInfo;
+import cn.reghao.oss.api.dto.media.ImageInfo;
 import cn.reghao.tnb.account.api.iface.AccountQuery;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.file.app.model.dto.AvatarUpdate;

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

@@ -4,9 +4,9 @@ import cn.reghao.jutil.jdk.converter.ByteConverter;
 import cn.reghao.jutil.jdk.converter.ByteType;
 import cn.reghao.jutil.jdk.db.PageList;
 import cn.reghao.oss.api.iface.StoreService;
-import cn.reghao.oss.sdk.model.constant.ObjectScope;
-import cn.reghao.oss.sdk.model.constant.ObjectType;
-import cn.reghao.oss.sdk.model.dto.ObjectInfo;
+import cn.reghao.oss.api.constant.ObjectScope;
+import cn.reghao.oss.api.constant.ObjectType;
+import cn.reghao.oss.api.dto.ObjectInfo;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.file.app.model.po.StoreNode;
 import cn.reghao.tnb.file.app.model.vo.FileInfo;

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

@@ -36,13 +36,7 @@ public class StoreConfigService {
     public void addStoreConfig(StoreConfig storeConfig) {
     }
 
-    @Cacheable(cacheNames = "tnb:file:oss_user", key = "#ossType.name", unless = "#result == null")
-    public int getLocalOssUser(OssType ossType) {
-        long ossUser = accountQuery.getByRole(AccountRole.oss.getValue());
-        StoreConfig storeConfig = storeConfigMapper.findByOssType(ossType.getValue());
-        return storeConfig == null ? -1 : Integer.parseInt(storeConfig.getAccessKeyId());
-    }
-
+    @Cacheable(cacheNames = "tnb:file:oss_user", key = "'local_oss_user'", unless = "#result == null")
     public int getLocalOssUser() {
         long ossUser = accountQuery.getByRole(AccountRole.oss.getValue());
         return (int) ossUser;

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

@@ -56,7 +56,7 @@ public class StoreNodeService {
 
             int total = storeNodeMapper.findAll().size();
             if (total == 1) {
-                userNodeService.createUserNode(storeNodeId);
+                userNodeService.initUserNode(storeNodeId);
             }
         } else {
             int storeNodeId = storeNode.getId();

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

@@ -5,11 +5,12 @@ import cn.reghao.jutil.jdk.converter.ByteType;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.ResultStatus;
 import cn.reghao.oss.api.dto.ObjectChannel;
-import cn.reghao.oss.sdk.model.constant.ObjectScope;
-import cn.reghao.oss.sdk.model.constant.ObjectType;
+import cn.reghao.oss.api.constant.ObjectScope;
+import cn.reghao.oss.api.constant.ObjectType;
+import cn.reghao.tnb.common.util.ConstantId;
 import cn.reghao.tnb.file.app.db.mapper.UploadChannelMapper;
 import cn.reghao.tnb.file.app.db.repository.ChannelRepository;
-import cn.reghao.tnb.file.app.model.constant.UploadChannelType;
+import cn.reghao.file.api.constant.UploadChannelType;
 import cn.reghao.tnb.file.app.model.dto.UploadChannelDto;
 import cn.reghao.tnb.file.app.model.po.UploadChannel;
 import cn.reghao.tnb.file.app.model.po.UserNode;
@@ -65,6 +66,13 @@ public class UploadChannelService {
         return Result.success();
     }
 
+    /**
+     * 初始化系统中使用的 UploadChannel
+     *
+     * @param
+     * @return
+     * @date 2025-10-21 09:55:23
+     */
     public void initUploadChannel() throws Exception {
         int ossUser = storeConfigService.getLocalOssUser();
         List<UserNodeInfo> list = userNodeService.getUserNodes(ossUser);
@@ -78,9 +86,8 @@ public class UploadChannelService {
     }
 
     private int getNextChannelCode(long createBy) {
-        int startChannelCode = 101;
         int total = uploadChannelMapper.countByCreateBy(createBy);
-        return startChannelCode + total;
+        return ConstantId.START_CHANNEL_CODE + total;
     }
 
     public void updateChannelStatus(int id) {

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

@@ -2,6 +2,7 @@ package cn.reghao.tnb.file.app.service;
 
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.tnb.common.auth.UserContext;
+import cn.reghao.tnb.common.util.ConstantId;
 import cn.reghao.tnb.file.app.db.mapper.StoreNodeMapper;
 import cn.reghao.tnb.file.app.db.mapper.UploadChannelMapper;
 import cn.reghao.tnb.file.app.db.mapper.UserNodeMapper;
@@ -12,6 +13,7 @@ import cn.reghao.tnb.file.app.model.po.UploadChannel;
 import cn.reghao.tnb.file.app.model.po.UserNode;
 import cn.reghao.tnb.common.db.SelectOption;
 import cn.reghao.tnb.file.app.model.vo.UserNodeInfo;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -21,6 +23,7 @@ import java.util.stream.Collectors;
  * @author reghao
  * @date 2024-02-27 09:49:56
  */
+@Slf4j
 @Service
 public class UserNodeService {
     private final UserNodeMapper userNodeMapper;
@@ -54,9 +57,21 @@ public class UserNodeService {
         return Result.success("node added");
     }
 
-    public void createUserNode(int storeNodeId) {
+    /**
+     * 自动初始化 UserNode
+     *
+     * @param
+     * @return
+     * @date 2025-10-21 09:41:46
+     */
+    public void initUserNode(int storeNodeId) {
         int ossUser = storeConfigService.getLocalOssUser();
-        String domain = "oss.reghao.cn";
+        if (ossUser == -1) {
+            log.error("ossUser not exist, initUserNode failed...");
+            return;
+        }
+
+        String domain = ConstantId.OSS_DOMAIN;
         String secretKey = "";
         String referer = "";
         UserNode userNode = new UserNode(storeNodeId, domain, secretKey, referer, ossUser);

file/pom.xml

@@ -19,4 +19,12 @@
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
     </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.reghao.oss</groupId>
+            <artifactId>oss-api</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
 </project>

search/search-service/src/main/java/cn/reghao/tnb/search/app/config/web/TokenFilter.java

@@ -3,6 +3,7 @@ package cn.reghao.tnb.search.app.config.web;
 import cn.reghao.jutil.web.ServletUtil;
 import cn.reghao.tnb.common.auth.LoginUser;
 import cn.reghao.tnb.common.auth.UserContext;
+import cn.reghao.tnb.common.util.ConstantId;
 import org.slf4j.MDC;
 import org.springframework.stereotype.Component;
 
@@ -30,13 +31,13 @@ public class TokenFilter implements Filter {
         String requestId = ServletUtil.getHeader("x-request-id");
         MDC.put("request_id", requestId);
 
-        long userId = -1L;
+        long userId = ConstantId.ANONYMOUS_USER_ID;
         String userIdStr = ServletUtil.getHeader("x-user-id");
         if (userIdStr != null) {
             userId = Long.parseLong(userIdStr);
         }
 
-        String loginId = "-1";
+        String loginId = ConstantId.ANONYMOUS_USER_ID + "";
         String loginIdStr = ServletUtil.getHeader("x-login-id");
         if (loginIdStr != null) {
             loginId = loginIdStr;

user/user-service/src/main/java/cn/reghao/tnb/user/app/config/web/TokenFilter.java

@@ -3,6 +3,7 @@ package cn.reghao.tnb.user.app.config.web;
 import cn.reghao.jutil.web.ServletUtil;
 import cn.reghao.tnb.common.auth.LoginUser;
 import cn.reghao.tnb.common.auth.UserContext;
+import cn.reghao.tnb.common.util.ConstantId;
 import org.slf4j.MDC;
 import org.springframework.stereotype.Component;
 
@@ -28,7 +29,7 @@ public class TokenFilter implements Filter {
         String requestId = ServletUtil.getHeader("x-request-id");
         MDC.put("request_id", requestId);
 
-        long userId = -1L;
+        long userId = ConstantId.ANONYMOUS_USER_ID;
         String userIdStr = ServletUtil.getHeader("x-user-id");
         if (userIdStr != null) {
             userId = Long.parseLong(userIdStr);