对应 auth 模块引入的更改

account/account-service/pom.xml

@@ -18,7 +18,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>cn.reghao.jutil</groupId>
+            <groupId>cn.reghao.tnb</groupId>
             <artifactId>auth</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>

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

@@ -13,12 +13,12 @@ import cn.reghao.tnb.account.app.model.vo.AccountToken;
 import cn.reghao.tnb.account.app.security.form.AccountAuthToken;
 import cn.reghao.tnb.account.app.service.PubkeyService;
 import cn.reghao.tnb.account.app.util.AuthConverter;
-import cn.reghao.jutil.auth.JwtUtil;
+import cn.reghao.tnb.auth.JwtUtil;
 import cn.reghao.tnb.account.app.redis.RedisKeys;
-import cn.reghao.jutil.auth.model.RefreshPayload;
+import cn.reghao.tnb.auth.model.RefreshPayload;
 import cn.reghao.tnb.account.app.redis.ds.RedisString;
 import cn.reghao.tnb.account.app.redis.ds.RedisStringObject;
-import cn.reghao.jutil.auth.model.JwtPayload;
+import cn.reghao.tnb.auth.model.JwtPayload;
 import cn.reghao.tnb.common.util.ConstantId;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.web.ServerProperties;

account/account-service/src/main/java/cn/reghao/tnb/account/app/util/AuthConverter.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.account.app.util;
 
 import cn.reghao.tnb.account.app.security.form.AccountAuthToken;
-import cn.reghao.jutil.auth.model.JwtPayload;
+import cn.reghao.tnb.auth.model.JwtPayload;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.AuthorityUtils;
 

file/file-service/pom.xml

@@ -19,7 +19,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>cn.reghao.jutil</groupId>
+            <groupId>cn.reghao.tnb</groupId>
             <artifactId>auth</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>

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

@@ -3,9 +3,9 @@ package cn.reghao.tnb.file.app.service;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.security.RandomString;
 import cn.reghao.tnb.oss.api.constant.ChannelAction;
-import cn.reghao.jutil.auth.model.OssPayload;
+import cn.reghao.tnb.auth.model.OssPayload;
 import cn.reghao.tnb.common.auth.LoginUser;
-import cn.reghao.jutil.auth.JwtUtil;
+import cn.reghao.tnb.auth.JwtUtil;
 import cn.reghao.tnb.file.app.db.mapper.UserKeyMapper;
 import cn.reghao.tnb.file.app.model.dto.KeyAuthDto;
 import cn.reghao.tnb.file.app.model.po.UserKey;

gateway/pom.xml

@@ -18,7 +18,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>cn.reghao.jutil</groupId>
+            <groupId>cn.reghao.tnb</groupId>
             <artifactId>auth</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>

gateway/src/main/java/cn/reghao/tnb/gateway/token/GlobalTokenFilter.java

@@ -2,8 +2,8 @@ package cn.reghao.tnb.gateway.token;
 
 import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.jutil.jdk.security.RsaCryptor;
-import cn.reghao.jutil.auth.JwtUtil;
-import cn.reghao.jutil.auth.model.JwtPayload;
+import cn.reghao.tnb.auth.JwtUtil;
+import cn.reghao.tnb.auth.model.JwtPayload;
 import cn.reghao.tnb.gateway.config.AppProperties;
 import cn.reghao.tnb.gateway.token.model.UserData;
 import cn.reghao.tnb.gateway.token.model.UserLogin;

oss-store/pom.xml

@@ -31,7 +31,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>cn.reghao.jutil</groupId>
+            <groupId>cn.reghao.tnb</groupId>
             <artifactId>auth</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>

oss-store/src/main/java/cn/reghao/tnb/oss/store/config/CacheConfig.java

@@ -33,7 +33,7 @@ public class CacheConfig {
         Caffeine<Object, Object> caffeineCache = Caffeine.newBuilder()
                 .initialCapacity(1000)
                 .maximumSize(10_000)
-                .expireAfterAccess(365, TimeUnit.DAYS);;
+                .expireAfterAccess(365, TimeUnit.DAYS);
         cacheManager.setCaffeine(caffeineCache);
         return cacheManager;
     }

oss-store/src/main/java/cn/reghao/tnb/oss/store/config/inerceptor/TokenFilter.java

@@ -2,8 +2,8 @@ package cn.reghao.tnb.oss.store.config.inerceptor;
 
 import cn.reghao.tnb.oss.store.util.AuthContext;
 import cn.reghao.jutil.web.ServletUtil;
-import cn.reghao.jutil.auth.JwtUtil;
-import cn.reghao.jutil.auth.model.OssPayload;
+import cn.reghao.tnb.auth.JwtUtil;
+import cn.reghao.tnb.auth.model.OssPayload;
 import com.github.benmanes.caffeine.cache.Cache;
 import org.springframework.stereotype.Component;
 

oss-store/src/main/java/cn/reghao/tnb/oss/store/controller/ObjectGetController.java

@@ -8,10 +8,10 @@ import cn.reghao.tnb.oss.api.dto.ObjectMeta;
 import cn.reghao.tnb.oss.store.db.repository.ObjectRepository;
 import cn.reghao.tnb.oss.store.service.ConsoleServiceWrapper;
 import cn.reghao.tnb.oss.store.service.GetObjectService;
-import cn.reghao.jutil.auth.JwtUtil;;
+import cn.reghao.tnb.auth.JwtUtil;
 import cn.reghao.tnb.oss.store.util.ObjectUtil;
 import cn.reghao.tnb.oss.store.util.SignatureUtil;
-import cn.reghao.jutil.auth.model.OssPayload;
+import cn.reghao.tnb.auth.model.OssPayload;
 import com.github.benmanes.caffeine.cache.Cache;
 import org.springframework.web.bind.annotation.*;
 

oss-store/src/main/java/cn/reghao/tnb/oss/store/controller/ObjectMultipartUploadController.java

@@ -2,9 +2,9 @@ package cn.reghao.tnb.oss.store.controller;
 
 import cn.reghao.jutil.web.ServletUtil;
 import cn.reghao.tnb.oss.api.dto.ObjectChannel;
-import cn.reghao.jutil.auth.model.OssPayload;
+import cn.reghao.tnb.auth.model.OssPayload;
 import cn.reghao.tnb.oss.store.util.AuthContext;
-import cn.reghao.jutil.auth.JwtUtil;;
+import cn.reghao.tnb.auth.JwtUtil;
 import cn.reghao.tnb.oss.api.rest.UploadFilePart;
 import cn.reghao.tnb.oss.api.rest.UploadFileRet;
 import cn.reghao.tnb.oss.api.rest.UploadedPart;

oss-store/src/main/java/cn/reghao/tnb/oss/store/controller/ObjectUploadController.java

@@ -6,13 +6,12 @@ import cn.reghao.tnb.oss.store.util.AuthContext;
 import cn.reghao.tnb.oss.api.rest.UploadFileRet;
 import cn.reghao.tnb.oss.store.model.vo.ObjectProp;
 import cn.reghao.tnb.oss.store.model.vo.ObjectResult;
-import cn.reghao.tnb.oss.store.service.*;
-import cn.reghao.jutil.auth.JwtUtil;;
+import cn.reghao.tnb.auth.JwtUtil;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.jutil.jdk.security.DigestUtil;
 import cn.reghao.jutil.web.ServletUtil;
-import cn.reghao.jutil.auth.model.OssPayload;
+import cn.reghao.tnb.auth.model.OssPayload;
 import com.github.benmanes.caffeine.cache.Cache;
 import org.apache.commons.io.FileUtils;
 import org.springframework.http.HttpStatus;

oss-store/src/main/java/cn/reghao/tnb/oss/store/rpc/StoreServiceImpl.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.oss.store.rpc;
 
 import cn.reghao.jutil.jdk.db.PageList;
-import cn.reghao.jutil.auth.model.OssPayload;
+import cn.reghao.tnb.auth.model.OssPayload;
 import cn.reghao.jutil.jdk.security.RandomString;
 import cn.reghao.tnb.oss.api.constant.ChannelAction;
 import cn.reghao.tnb.oss.api.constant.ObjectScope;
@@ -11,7 +11,7 @@ import cn.reghao.tnb.oss.api.dto.media.AudioInfo;
 import cn.reghao.tnb.oss.api.dto.media.ConvertedImageInfo;
 import cn.reghao.tnb.oss.api.dto.media.ImageInfo;
 import cn.reghao.tnb.oss.api.dto.media.VideoInfo;
-import cn.reghao.jutil.auth.JwtUtil;;
+import cn.reghao.tnb.auth.JwtUtil;
 import cn.reghao.tnb.oss.store.db.repository.ObjectRepository;
 import cn.reghao.tnb.oss.store.model.po.FileMeta;
 import cn.reghao.tnb.oss.api.dto.ObjectMeta;

oss-store/src/main/java/cn/reghao/tnb/oss/store/service/SignService.java

@@ -1,10 +1,10 @@
 package cn.reghao.tnb.oss.store.service;
 
 import cn.reghao.jutil.jdk.security.RandomString;
-import cn.reghao.jutil.auth.JwtUtil;;
+import cn.reghao.tnb.auth.JwtUtil;
 import cn.reghao.tnb.oss.store.util.SignatureUtil;
 import cn.reghao.tnb.oss.api.constant.ChannelAction;
-import cn.reghao.jutil.auth.model.OssPayload;
+import cn.reghao.tnb.auth.model.OssPayload;
 import com.github.benmanes.caffeine.cache.Cache;
 import org.springframework.stereotype.Service;