对应 account 模块更名的修改

content/content-api/src/main/java/cn/reghao/tnb/content/api/dto/spider/CrawledVideo.java

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.api.dto.spider;
 
-import cn.reghao.tnb.account.api.dto.CrawledUser;
+import cn.reghao.tnb.auth.api.dto.CrawledUser;
 import lombok.*;
 
 import jakarta.validation.constraints.NotBlank;

content/content-service/pom.xml

@@ -45,8 +45,8 @@
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>cn.reghao.tnb.account</groupId>
-            <artifactId>account-api</artifactId>
+            <groupId>cn.reghao.tnb.auth</groupId>
+            <artifactId>auth-api</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
@@ -190,6 +190,11 @@
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-registry-prometheus</artifactId>
         </dependency>-->
+
+        <dependency>
+            <groupId>org.redisson</groupId>
+            <artifactId>redisson-spring-boot-starter</artifactId>
+            <version>3.43.0</version> </dependency>
     </dependencies>
 
     <profiles>

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

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.chat.service;
 
 import cn.reghao.file.api.iface.OssService;
-import cn.reghao.tnb.account.api.iface.AccountQuery;
+import cn.reghao.tnb.auth.api.iface.AccountQuery;
 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/data/controller/ImageQueryController.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.content.app.data.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
 import cn.reghao.tnb.common.web.WebResult;
-import cn.reghao.tnb.account.api.iface.AccountQuery;
+import cn.reghao.tnb.auth.api.iface.AccountQuery;
 import cn.reghao.tnb.content.app.data.model.vo.AlbumCard;
 import cn.reghao.tnb.content.app.data.service.ImagePostService;
 import io.swagger.v3.oas.annotations.tags.Tag;

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

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

content/content-service/src/main/java/cn/reghao/tnb/content/app/exam/service/MarkService.java

@@ -2,8 +2,8 @@ package cn.reghao.tnb.content.app.exam.service;
 
 import cn.reghao.jutil.jdk.web.db.Page;
 import cn.reghao.jutil.jdk.web.db.PageList;
-import cn.reghao.tnb.account.api.dto.AccountInfo;
-import cn.reghao.tnb.account.api.iface.AccountQuery;
+import cn.reghao.tnb.auth.api.dto.AccountInfo;
+import cn.reghao.tnb.auth.api.iface.AccountQuery;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.app.exam.db.mapper.*;
 import cn.reghao.tnb.content.app.exam.model.constant.QuestionType;

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

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.mall.feign;
 
-import cn.reghao.tnb.account.api.iface.AccountQuery;
+import cn.reghao.tnb.auth.api.iface.AccountQuery;
 import cn.reghao.tnb.user.api.dto.UserInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;

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

@@ -1,6 +1,6 @@
 package cn.reghao.tnb.content.app.mall.feign;
 
-import cn.reghao.tnb.account.api.iface.AccountQuery;
+import cn.reghao.tnb.auth.api.iface.AccountQuery;
 import cn.reghao.tnb.user.api.dto.UserInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;

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

@@ -6,7 +6,7 @@ import cn.reghao.jutil.jdk.web.result.Result;
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
 import cn.reghao.jutil.jdk.string.SnowFlake;
 import cn.reghao.oss.api.dto.media.ImageInfo;
-import cn.reghao.tnb.account.api.iface.AccountQuery;
+import cn.reghao.tnb.auth.api.iface.AccountQuery;
 import cn.reghao.tnb.content.api.dto.TaobaoItem;
 import cn.reghao.tnb.content.app.mall.db.mapper.ProductMapper;
 import cn.reghao.tnb.content.app.mall.db.repository.MallRepository;

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

@@ -4,8 +4,7 @@ import cn.reghao.file.api.dto.JobInfo;
 import cn.reghao.jutil.jdk.web.db.PageList;
 import cn.reghao.tnb.common.web.ServletUtil;
 import cn.reghao.tnb.common.web.WebResult;
-import cn.reghao.tnb.account.api.dto.AccountRegistry;
-import cn.reghao.tnb.account.api.iface.AdminAccountService;
+import cn.reghao.tnb.auth.api.iface.AdminAccountService;
 import cn.reghao.tnb.content.api.dto.UserVideoPost;
 import cn.reghao.tnb.content.api.dto.VideoRegion;
 import cn.reghao.tnb.content.api.dto.VideoSearch;

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

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.content.app.vod.controller;
 
 import cn.reghao.tnb.common.web.WebResult;
-import cn.reghao.tnb.account.api.iface.AccountQuery;
+import cn.reghao.tnb.auth.api.iface.AccountQuery;
 import cn.reghao.tnb.content.app.vod.model.vo.UserContentData;
 import cn.reghao.tnb.content.app.vod.service.AdminVodService;
 import cn.reghao.tnb.content.app.vod.service.ContentService;

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

@@ -2,7 +2,7 @@ package cn.reghao.tnb.content.app.vod.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
 import cn.reghao.tnb.common.web.WebResult;
-import cn.reghao.tnb.account.api.iface.AccountQuery;
+import cn.reghao.tnb.auth.api.iface.AccountQuery;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.common.db.PageScroll;

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

@@ -6,7 +6,7 @@ import cn.reghao.jutil.jdk.web.db.PageList;
 import cn.reghao.jutil.jdk.web.result.Result;
 import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.jutil.jdk.string.SnowFlake;
-import cn.reghao.tnb.account.api.iface.AccountQuery;
+import cn.reghao.tnb.auth.api.iface.AccountQuery;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.common.db.SelectOption;
 import cn.reghao.tnb.content.api.constant.AlbumAction;

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

@@ -2,9 +2,9 @@ package cn.reghao.tnb.content.app.vod.service;
 
 import cn.reghao.file.api.iface.OssService;
 import cn.reghao.oss.api.dto.media.VideoInfo;
-import cn.reghao.tnb.account.api.dto.AccountInfo;
-import cn.reghao.tnb.account.api.dto.CrawledUser;
-import cn.reghao.tnb.account.api.iface.AccountQuery;
+import cn.reghao.tnb.auth.api.dto.AccountInfo;
+import cn.reghao.tnb.auth.api.dto.CrawledUser;
+import cn.reghao.tnb.auth.api.iface.AccountQuery;
 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/impl/VideoPostQueryImpl.java

@@ -6,7 +6,7 @@ import cn.reghao.jutil.jdk.web.db.PageList;
 import cn.reghao.tnb.common.web.WebResult;
 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.auth.api.iface.AccountQuery;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.common.util.StringUtil;
 import cn.reghao.tnb.content.api.constant.PostScope;

message/message-service/pom.xml

@@ -29,8 +29,8 @@
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>cn.reghao.tnb.account</groupId>
-            <artifactId>account-api</artifactId>
+            <groupId>cn.reghao.tnb.auth</groupId>
+            <artifactId>auth-api</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
 

message/message-service/src/main/java/cn/reghao/tnb/message/app/service/UserMessageService.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.message.app.service;
 
 import cn.reghao.jutil.jdk.string.SnowFlake;
-import cn.reghao.tnb.account.api.iface.AccountQuery;
+import cn.reghao.tnb.auth.api.iface.AccountQuery;
 import cn.reghao.tnb.common.auth.AccountRole;
 import cn.reghao.tnb.common.util.ConstantId;
 import cn.reghao.tnb.message.api.dto.UserMessageDto;

message/message-service/src/main/java/cn/reghao/tnb/message/app/ws/chat/ChatConnection.java

@@ -2,9 +2,9 @@ package cn.reghao.tnb.message.app.ws.chat;
 
 import cn.reghao.jutil.jdk.serializer.JdkSerializer;
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
-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.auth.api.constant.TokenType;
+import cn.reghao.tnb.auth.api.dto.AuthedAccount;
+import cn.reghao.tnb.auth.api.iface.AccountQuery;
 import cn.reghao.tnb.message.api.dto.PushMsg;
 import cn.reghao.tnb.message.api.dto.event.EventMsg;
 import cn.reghao.tnb.message.api.model.EventType;

message/message-service/src/main/java/cn/reghao/tnb/message/app/ws/chat/ChatService.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.message.app.ws.chat;
 
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
-import cn.reghao.tnb.account.api.iface.AccountQuery;
+import cn.reghao.tnb.auth.api.iface.AccountQuery;
 import cn.reghao.tnb.message.api.model.EventType;
 import cn.reghao.tnb.message.api.model.resp.EventMessageResp;
 import cn.reghao.tnb.message.api.model.resp.EvtLoginResp;
@@ -11,10 +11,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Component;
 import org.springframework.web.socket.TextMessage;
-import org.springframework.web.socket.WebSocketSession;
 
 import java.io.IOException;
-import java.util.List;
 
 /**
  * @author reghao

message/message-service/src/main/java/cn/reghao/tnb/message/app/ws/media/MediaService.java

@@ -2,9 +2,9 @@ package cn.reghao.tnb.message.app.ws.media;
 
 import cn.reghao.jutil.jdk.serializer.JdkSerializer;
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
-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.auth.api.constant.TokenType;
+import cn.reghao.tnb.auth.api.dto.AuthedAccount;
+import cn.reghao.tnb.auth.api.iface.AccountQuery;
 import cn.reghao.tnb.message.api.dto.MediaProgress;
 import cn.reghao.tnb.message.api.model.EventType;
 import cn.reghao.tnb.message.api.model.resp.EventMessageResp;
@@ -27,7 +27,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * @author reghao

message/message-service/src/main/resources/application.yml

@@ -22,11 +22,6 @@ spring:
   mvc:
     pathmatch:
       matching-strategy: ant_path_matcher
-mybatis:
-  configuration:
-    map-underscore-to-camel-case: true
-  mapper-locations: classpath*:mapper/**/**.xml
-  type-aliases-package: cn.reghao.tnb.account.app.model.po
 hystrix:
   dashboard:
     proxy-stream-allow-list: "127.0.0.1"