调整 account-service 模块结构

account/account-service/pom.xml

@@ -22,7 +22,6 @@
             <artifactId>auth</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
-
         <dependency>
             <groupId>cn.reghao.tnb</groupId>
             <artifactId>common</artifactId>
@@ -44,7 +43,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
@@ -59,18 +57,9 @@
             <artifactId>spring-security-oauth2</artifactId>
             <version>2.5.0.RELEASE</version>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.session</groupId>
-            <artifactId>spring-session-data-redis</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-cache</artifactId>
+            <artifactId>spring-boot-starter-freemarker</artifactId>
         </dependency>
 
         <dependency>
@@ -90,19 +79,21 @@
         </dependency>
 
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
-
         <dependency>
-            <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-ui</artifactId>
-            <version>1.7.0</version>
+            <groupId>org.springframework.session</groupId>
+            <artifactId>spring-session-data-redis</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-freemarker</artifactId>
+            <artifactId>spring-boot-starter-cache</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
 
         <dependency>
@@ -113,6 +104,12 @@
             <groupId>org.springframework.amqp</groupId>
             <artifactId>spring-rabbit</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-ui</artifactId>
+            <version>1.7.0</version>
+        </dependency>
     </dependencies>
 
     <profiles>

account/account-service/src/main/java/cn/reghao/tnb/account/app/util/RabbitProducer.java → account/account-service/src/main/java/cn/reghao/tnb/account/app/config/rabbitmq/RabbitProducer.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.util;
+package cn.reghao.tnb.account.app.config.rabbitmq;
 
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
 import cn.reghao.tnb.account.app.model.vo.RtmpPlay;

account/account-service/src/main/java/cn/reghao/tnb/account/app/redis/RedisConfig.java → account/account-service/src/main/java/cn/reghao/tnb/account/app/config/redis/RedisConfig.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.redis;
+package cn.reghao.tnb.account.app.config.redis;
 
 import org.springframework.cache.annotation.CachingConfigurerSupport;
 import org.springframework.context.annotation.Bean;

account/account-service/src/main/java/cn/reghao/tnb/account/app/redis/RedisKeys.java → account/account-service/src/main/java/cn/reghao/tnb/account/app/config/redis/RedisKeys.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.redis;
+package cn.reghao.tnb.account.app.config.redis;
 
 import cn.reghao.tnb.common.web.ServletUtil;
 

account/account-service/src/main/java/cn/reghao/tnb/account/app/redis/ds/RedisOps.java → account/account-service/src/main/java/cn/reghao/tnb/account/app/config/redis/ds/RedisOps.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.redis.ds;
+package cn.reghao.tnb.account.app.config.redis.ds;
 
 import org.springframework.data.redis.core.RedisOperations;
 import org.springframework.data.redis.core.RedisTemplate;

account/account-service/src/main/java/cn/reghao/tnb/account/app/redis/ds/RedisString.java → account/account-service/src/main/java/cn/reghao/tnb/account/app/config/redis/ds/RedisString.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.redis.ds;
+package cn.reghao.tnb.account.app.config.redis.ds;
 
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;

account/account-service/src/main/java/cn/reghao/tnb/account/app/redis/ds/RedisStringObject.java → account/account-service/src/main/java/cn/reghao/tnb/account/app/config/redis/ds/RedisStringObject.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.redis.ds;
+package cn.reghao.tnb.account.app.config.redis.ds;
 
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;

account/account-service/src/main/java/cn/reghao/tnb/account/app/controller/AccountRtmpController.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.account.app.controller;
 
 import cn.reghao.tnb.account.app.model.vo.RtmpPlay;
 import cn.reghao.tnb.account.app.model.vo.RtmpRecord;
-import cn.reghao.tnb.account.app.util.RabbitProducer;
+import cn.reghao.tnb.account.app.config.rabbitmq.RabbitProducer;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;

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

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.util;
+package cn.reghao.tnb.account.app.security;
 
 import cn.reghao.tnb.account.app.security.form.AccountAuthToken;
 import cn.reghao.tnb.auth.model.JwtPayload;

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

@@ -6,12 +6,12 @@ import cn.reghao.tnb.common.util.StringRegexp;
 import cn.reghao.tnb.account.app.model.constant.VerifyChannel;
 import cn.reghao.tnb.account.app.model.dto.VerifyCodeDto;
 import cn.reghao.tnb.account.app.db.repository.AccountRepository;
-import cn.reghao.tnb.account.app.util.RabbitProducer;
+import cn.reghao.tnb.account.app.config.rabbitmq.RabbitProducer;
 import cn.reghao.tnb.account.app.model.po.UserAccount;
 import cn.reghao.tnb.account.app.model.po.UserRegistry;
 import cn.reghao.jutil.jdk.media.CaptchaUtil;
-import cn.reghao.tnb.account.app.redis.RedisKeys;
-import cn.reghao.tnb.account.app.redis.ds.RedisString;
+import cn.reghao.tnb.account.app.config.redis.RedisKeys;
+import cn.reghao.tnb.account.app.config.redis.ds.RedisString;
 import cn.reghao.tnb.message.api.constant.NotifyType;
 import cn.reghao.tnb.message.api.dto.msg.VerifyMessage;
 import lombok.extern.slf4j.Slf4j;

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

@@ -3,8 +3,8 @@ package cn.reghao.tnb.account.app.service;
 import cn.reghao.jutil.jdk.security.RandomString;
 import cn.reghao.jutil.jdk.security.RsaCryptor;
 import cn.reghao.tnb.account.api.dto.RsaPubkey;
-import cn.reghao.tnb.account.app.redis.RedisKeys;
-import cn.reghao.tnb.account.app.redis.ds.RedisString;
+import cn.reghao.tnb.account.app.config.redis.RedisKeys;
+import cn.reghao.tnb.account.app.config.redis.ds.RedisString;
 import org.springframework.stereotype.Service;
 
 import java.security.NoSuchAlgorithmException;

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

@@ -7,17 +7,17 @@ import cn.reghao.tnb.account.app.db.mapper.UserLoginMapper;
 import cn.reghao.tnb.account.app.model.constant.LoginPlat;
 import cn.reghao.tnb.account.app.model.po.UserLogin;
 import cn.reghao.tnb.account.app.service.AccountTokenService;
-import cn.reghao.tnb.account.app.redis.ds.RedisOps;
+import cn.reghao.tnb.account.app.config.redis.ds.RedisOps;
 import cn.reghao.tnb.common.web.ServletUtil;
 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.tnb.account.app.security.AuthConverter;
 import cn.reghao.tnb.auth.JwtUtil;
-import cn.reghao.tnb.account.app.redis.RedisKeys;
+import cn.reghao.tnb.account.app.config.redis.RedisKeys;
 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.tnb.account.app.config.redis.ds.RedisString;
+import cn.reghao.tnb.account.app.config.redis.ds.RedisStringObject;
 import cn.reghao.tnb.auth.model.JwtPayload;
 import cn.reghao.tnb.common.util.ConstantId;
 import lombok.extern.slf4j.Slf4j;

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

@@ -5,13 +5,13 @@ import cn.reghao.jutil.jdk.web.result.Result;
 import cn.reghao.tnb.account.app.service.AccountTokenService;
 import cn.reghao.tnb.account.app.service.LoginAttemptService;
 import cn.reghao.tnb.account.app.model.vo.LoginRecordVo;
-import cn.reghao.tnb.account.app.redis.ds.RedisOps;
+import cn.reghao.tnb.account.app.config.redis.ds.RedisOps;
 import cn.reghao.tnb.account.app.security.form.AccountAuthToken;
-import cn.reghao.tnb.account.app.redis.RedisKeys;
+import cn.reghao.tnb.account.app.config.redis.RedisKeys;
 import cn.reghao.tnb.common.web.ServletUtil;
 import cn.reghao.tnb.account.app.db.mapper.UserLoginMapper;
 import cn.reghao.tnb.account.app.model.po.UserLogin;
-import cn.reghao.tnb.account.app.redis.ds.RedisString;
+import cn.reghao.tnb.account.app.config.redis.ds.RedisString;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.web.authentication.preauth.PreAuthenticatedCredentialsNotFoundException;
 import org.springframework.stereotype.Service;