account 模块更名为 auth, account-api 更改为 auth-api

admin/src/main/java/cn/reghao/tnb/admin/service/RouteService.java

@@ -45,7 +45,7 @@ public class RouteService {
     }
 
     public void updateRoute() {
-        String upstreamUrl = "lb://account-service";
+        String upstreamUrl = "lb://auth-service";
         RouteAdd routeAdd = new RouteAdd();
         routeAdd.setRouteId("test-route");
         routeAdd.setUpstreamUrl(upstreamUrl);

account/account-api/pom.xml → auth/auth-api/pom.xml

@@ -3,13 +3,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>account</artifactId>
+        <artifactId>auth</artifactId>
         <groupId>cn.reghao.tnb</groupId>
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <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>
 </project>

account/account-api/src/main/java/cn/reghao/tnb/account/api/constant/TokenType.java → auth/auth-api/src/main/java/cn/reghao/tnb/auth/api/constant/TokenType.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.api.constant;
+package cn.reghao.tnb.auth.api.constant;
 
 /**
  * token 类型

account/account-api/src/main/java/cn/reghao/tnb/account/api/dto/AccountAvatar.java → auth/auth-api/src/main/java/cn/reghao/tnb/auth/api/dto/AccountAvatar.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.api.dto;
+package cn.reghao.tnb.auth.api.dto;
 
 import lombok.Getter;
 

account/account-api/src/main/java/cn/reghao/tnb/account/api/dto/AccountInfo.java → auth/auth-api/src/main/java/cn/reghao/tnb/auth/api/dto/AccountInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.api.dto;
+package cn.reghao.tnb.auth.api.dto;
 
 import lombok.*;
 

account/account-api/src/main/java/cn/reghao/tnb/account/api/dto/AccountRegistry.java → auth/auth-api/src/main/java/cn/reghao/tnb/auth/api/dto/AccountRegistry.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.api.dto;
+package cn.reghao.tnb.auth.api.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

account/account-api/src/main/java/cn/reghao/tnb/account/api/dto/AccountRegistryStatus.java → auth/auth-api/src/main/java/cn/reghao/tnb/auth/api/dto/AccountRegistryStatus.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.api.dto;
+package cn.reghao.tnb.auth.api.dto;
 
 import lombok.Getter;
 import lombok.Setter;

account/account-api/src/main/java/cn/reghao/tnb/account/api/dto/AuthedAccount.java → auth/auth-api/src/main/java/cn/reghao/tnb/auth/api/dto/AuthedAccount.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.api.dto;
+package cn.reghao.tnb.auth.api.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

account/account-api/src/main/java/cn/reghao/tnb/account/api/dto/CrawledUser.java → auth/auth-api/src/main/java/cn/reghao/tnb/auth/api/dto/CrawledUser.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.api.dto;
+package cn.reghao.tnb.auth.api.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

account/account-api/src/main/java/cn/reghao/tnb/account/api/dto/OAuthAccountInfo.java → auth/auth-api/src/main/java/cn/reghao/tnb/auth/api/dto/OAuthAccountInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.api.dto;
+package cn.reghao.tnb.auth.api.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

account/account-api/src/main/java/cn/reghao/tnb/account/api/dto/RsaPubkey.java → auth/auth-api/src/main/java/cn/reghao/tnb/auth/api/dto/RsaPubkey.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.api.dto;
+package cn.reghao.tnb.auth.api.dto;
 
 import lombok.*;
 

account/account-api/src/main/java/cn/reghao/tnb/account/api/iface/AccountQuery.java → auth/auth-api/src/main/java/cn/reghao/tnb/auth/api/iface/AccountQuery.java

@@ -1,6 +1,9 @@
-package cn.reghao.tnb.account.api.iface;
+package cn.reghao.tnb.auth.api.iface;
 
-import cn.reghao.tnb.account.api.dto.*;
+import cn.reghao.tnb.auth.api.dto.AccountAvatar;
+import cn.reghao.tnb.auth.api.dto.AccountInfo;
+import cn.reghao.tnb.auth.api.dto.AuthedAccount;
+import cn.reghao.tnb.auth.api.dto.CrawledUser;
 
 import java.util.List;
 

account/account-api/src/main/java/cn/reghao/tnb/account/api/iface/AdminAccountService.java → auth/auth-api/src/main/java/cn/reghao/tnb/auth/api/iface/AdminAccountService.java

@@ -1,9 +1,9 @@
-package cn.reghao.tnb.account.api.iface;
+package cn.reghao.tnb.auth.api.iface;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
-import cn.reghao.tnb.account.api.dto.AccountInfo;
-import cn.reghao.tnb.account.api.dto.AccountRegistry;
-import cn.reghao.tnb.account.api.dto.AccountRegistryStatus;
+import cn.reghao.tnb.auth.api.dto.AccountInfo;
+import cn.reghao.tnb.auth.api.dto.AccountRegistry;
+import cn.reghao.tnb.auth.api.dto.AccountRegistryStatus;
 
 /**
  * @author reghao

account/account-service/pom.xml → auth/auth-service/pom.xml

@@ -3,14 +3,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>account</artifactId>
+        <artifactId>auth</artifactId>
         <groupId>cn.reghao.tnb</groupId>
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>cn.reghao.tnb.account</groupId>
-    <artifactId>account-service</artifactId>
+    <groupId>cn.reghao.tnb.auth</groupId>
+    <artifactId>auth-service</artifactId>
 
     <properties>
         <java.version>21</java.version>
@@ -28,8 +28,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>

account/account-service/src/main/java/cn/reghao/tnb/account/app/AccountApplication.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/AuthApplication.java

@@ -1,13 +1,13 @@
-package cn.reghao.tnb.account.app;
+package cn.reghao.tnb.auth.app;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
 
 @SpringBootApplication
-@ComponentScan({"cn.reghao.tnb.account", "cn.reghao.tnb.common"})
-public class AccountApplication {
+@ComponentScan({"cn.reghao.tnb.auth", "cn.reghao.tnb.common"})
+public class AuthApplication {
     public static void main(String[] args) {
-        SpringApplication.run(AccountApplication.class, args);
+        SpringApplication.run(AuthApplication.class, args);
     }
 }

account/account-service/src/main/java/cn/reghao/tnb/account/app/config/BeansConfig.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/config/BeansConfig.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.config;
+package cn.reghao.tnb.auth.app.config;
 
 import cn.reghao.jutil.jdk.string.IDObfuscation;
 import org.springframework.context.annotation.Bean;

account/account-service/src/main/java/cn/reghao/tnb/account/app/config/CacheConfig.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/config/CacheConfig.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.config;
+package cn.reghao.tnb.auth.app.config;
 
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.EnableCaching;

account/account-service/src/main/java/cn/reghao/tnb/account/app/config/ContextStartup.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/config/ContextStartup.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.config;
+package cn.reghao.tnb.auth.app.config;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

account/account-service/src/main/java/cn/reghao/tnb/account/app/config/SpringDocConfig.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/config/SpringDocConfig.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.config;
+package cn.reghao.tnb.auth.app.config;
 
 import io.swagger.v3.oas.models.ExternalDocumentation;
 import io.swagger.v3.oas.models.OpenAPI;

account/account-service/src/main/java/cn/reghao/tnb/account/app/config/mysql/DataSourceConfig.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/config/mysql/DataSourceConfig.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.config.mysql;
+package cn.reghao.tnb.auth.app.config.mysql;
 
 import org.apache.ibatis.plugin.Interceptor;
 import org.apache.ibatis.session.SqlSessionFactory;

account/account-service/src/main/java/cn/reghao/tnb/account/app/config/mysql/PageListInterceptor.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/config/mysql/PageListInterceptor.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.config.mysql;
+package cn.reghao.tnb.auth.app.config.mysql;
 
 import cn.reghao.jutil.jdk.web.db.Page;
 import org.apache.ibatis.binding.MapperMethod;

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

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.account.app.config.rabbitmq;
+package cn.reghao.tnb.auth.app.config.rabbitmq;
 
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
-import cn.reghao.tnb.account.app.model.vo.RtmpPlay;
+import cn.reghao.tnb.auth.app.model.vo.RtmpPlay;
 import cn.reghao.tnb.message.api.dto.msg.LoginMessage;
 import cn.reghao.tnb.message.api.dto.msg.RtmpMessage;
 import cn.reghao.tnb.message.api.dto.msg.VerifyMessage;

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

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.config.redis;
+package cn.reghao.tnb.auth.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/config/redis/RedisKeys.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/config/redis/RedisKeys.java

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

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

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.config.redis.ds;
+package cn.reghao.tnb.auth.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/config/redis/ds/RedisString.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/config/redis/ds/RedisString.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.config.redis.ds;
+package cn.reghao.tnb.auth.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/config/redis/ds/RedisStringObject.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/config/redis/ds/RedisStringObject.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.config.redis.ds;
+package cn.reghao.tnb.auth.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/config/spring/BeanConfig.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/config/spring/BeanConfig.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.config.spring;
+package cn.reghao.tnb.auth.app.config.spring;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

account/account-service/src/main/java/cn/reghao/tnb/account/app/config/spring/SpringLifecycle.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/config/spring/SpringLifecycle.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.account.app.config.spring;
+package cn.reghao.tnb.auth.app.config.spring;
 
-import cn.reghao.tnb.account.app.service.AccountRegistryService;
-import cn.reghao.tnb.account.app.service.PubkeyService;
+import cn.reghao.tnb.auth.app.service.AccountRegistryService;
+import cn.reghao.tnb.auth.app.service.PubkeyService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.boot.ApplicationArguments;

account/account-service/src/main/java/cn/reghao/tnb/account/app/config/web/AccountInterceptor.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/config/web/AccountInterceptor.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.account.app.config.web;
+package cn.reghao.tnb.auth.app.config.web;
 
-import cn.reghao.tnb.account.app.security.form.AccountAuthToken;
-import cn.reghao.tnb.account.app.service.AccountTokenService;
+import cn.reghao.tnb.auth.app.security.form.AccountAuthToken;
+import cn.reghao.tnb.auth.app.service.AccountTokenService;
 import cn.reghao.tnb.common.web.ServletUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.lang.Nullable;

account/account-service/src/main/java/cn/reghao/tnb/account/app/config/web/CorsFilter.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/config/web/CorsFilter.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.config.web;
+package cn.reghao.tnb.auth.app.config.web;
 
 import jakarta.servlet.*;
 import jakarta.servlet.http.HttpServletRequest;

account/account-service/src/main/java/cn/reghao/tnb/account/app/config/web/WebConfig.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/config/web/WebConfig.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.config.web;
+package cn.reghao.tnb.auth.app.config.web;
 
 import org.apache.tomcat.util.http.Rfc6265CookieProcessor;
 import org.apache.tomcat.util.http.SameSiteCookies;

account/account-service/src/main/java/cn/reghao/tnb/account/app/controller/AccountAuthController.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/controller/AccountAuthController.java

@@ -1,9 +1,9 @@
-package cn.reghao.tnb.account.app.controller;
+package cn.reghao.tnb.auth.app.controller;
 
 import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
-import cn.reghao.tnb.account.app.model.vo.AccountToken;
-import cn.reghao.tnb.account.app.service.AccountTokenService;
+import cn.reghao.tnb.auth.app.model.vo.AccountToken;
+import cn.reghao.tnb.auth.app.service.AccountTokenService;
 import com.google.gson.JsonObject;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;

account/account-service/src/main/java/cn/reghao/tnb/account/app/controller/AccountCodeController.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/controller/AccountCodeController.java

@@ -1,11 +1,11 @@
-package cn.reghao.tnb.account.app.controller;
+package cn.reghao.tnb.auth.app.controller;
 
 import cn.reghao.jutil.jdk.web.result.Result;
 import cn.reghao.tnb.common.web.WebResult;
-import cn.reghao.tnb.account.app.model.dto.VerifyCodeDto;
-import cn.reghao.tnb.account.api.dto.RsaPubkey;
-import cn.reghao.tnb.account.app.service.CodeService;
-import cn.reghao.tnb.account.app.service.PubkeyService;
+import cn.reghao.tnb.auth.app.model.dto.VerifyCodeDto;
+import cn.reghao.tnb.auth.api.dto.RsaPubkey;
+import cn.reghao.tnb.auth.app.service.CodeService;
+import cn.reghao.tnb.auth.app.service.PubkeyService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.http.MediaType;

account/account-service/src/main/java/cn/reghao/tnb/account/app/controller/AccountOAuthController.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/controller/AccountOAuthController.java

@@ -1,9 +1,9 @@
-package cn.reghao.tnb.account.app.controller;
+package cn.reghao.tnb.auth.app.controller;
 
 import cn.reghao.tnb.common.web.WebResult;
-import cn.reghao.tnb.account.app.model.dto.OAuthAppDto;
-import cn.reghao.tnb.account.app.model.po.oauth.ClientDetails;
-import cn.reghao.tnb.account.app.service.OAuthAppService;
+import cn.reghao.tnb.auth.app.model.dto.OAuthAppDto;
+import cn.reghao.tnb.auth.app.model.po.oauth.ClientDetails;
+import cn.reghao.tnb.auth.app.service.OAuthAppService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.http.MediaType;

account/account-service/src/main/java/cn/reghao/tnb/account/app/controller/AccountProfileController.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/controller/AccountProfileController.java

@@ -1,10 +1,10 @@
-package cn.reghao.tnb.account.app.controller;
+package cn.reghao.tnb.auth.app.controller;
 
 import cn.reghao.jutil.jdk.web.result.Result;
 import cn.reghao.tnb.common.web.WebResult;
-import cn.reghao.tnb.account.app.model.dto.PasswordUpdateDto;
-import cn.reghao.tnb.account.app.model.dto.UserEmailUpdate;
-import cn.reghao.tnb.account.app.service.AccountProfileService;
+import cn.reghao.tnb.auth.app.model.dto.PasswordUpdateDto;
+import cn.reghao.tnb.auth.app.model.dto.UserEmailUpdate;
+import cn.reghao.tnb.auth.app.service.AccountProfileService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.http.MediaType;

account/account-service/src/main/java/cn/reghao/tnb/account/app/controller/AccountRecordController.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/controller/AccountRecordController.java

@@ -1,10 +1,10 @@
-package cn.reghao.tnb.account.app.controller;
+package cn.reghao.tnb.auth.app.controller;
 
 import cn.reghao.tnb.common.web.WebResult;
-import cn.reghao.tnb.account.app.model.vo.LoginRecordVo;
-import cn.reghao.tnb.account.app.security.form.AccountAuthToken;
-import cn.reghao.tnb.account.app.service.AccountTokenService;
-import cn.reghao.tnb.account.app.service.LoginAttemptService;
+import cn.reghao.tnb.auth.app.model.vo.LoginRecordVo;
+import cn.reghao.tnb.auth.app.security.form.AccountAuthToken;
+import cn.reghao.tnb.auth.app.service.AccountTokenService;
+import cn.reghao.tnb.auth.app.service.LoginAttemptService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.http.MediaType;

account/account-service/src/main/java/cn/reghao/tnb/account/app/controller/AccountRegistryController.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/controller/AccountRegistryController.java

@@ -1,12 +1,12 @@
-package cn.reghao.tnb.account.app.controller;
+package cn.reghao.tnb.auth.app.controller;
 
 import cn.reghao.jutil.jdk.web.result.Result;
 import cn.reghao.tnb.common.web.WebResult;
-import cn.reghao.tnb.account.app.model.dto.AccountRegisterDto;
-import cn.reghao.tnb.account.app.model.dto.PasswordResetDto;
-import cn.reghao.tnb.account.app.model.po.UserRegistry;
-import cn.reghao.tnb.account.app.service.AccountRegistryService;
-import cn.reghao.tnb.account.app.service.AccountProfileService;
+import cn.reghao.tnb.auth.app.model.dto.AccountRegisterDto;
+import cn.reghao.tnb.auth.app.model.dto.PasswordResetDto;
+import cn.reghao.tnb.auth.app.model.po.UserRegistry;
+import cn.reghao.tnb.auth.app.service.AccountRegistryService;
+import cn.reghao.tnb.auth.app.service.AccountProfileService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.http.MediaType;

account/account-service/src/main/java/cn/reghao/tnb/account/app/controller/AccountResourceController.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/controller/AccountResourceController.java

@@ -1,12 +1,12 @@
-package cn.reghao.tnb.account.app.controller;
+package cn.reghao.tnb.auth.app.controller;
 
 import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.util.StringRegexp;
-import cn.reghao.tnb.account.api.dto.AccountInfo;
-import cn.reghao.tnb.account.api.dto.OAuthAccountInfo;
-import cn.reghao.tnb.account.api.iface.AccountQuery;
-import cn.reghao.tnb.account.app.db.mapper.UserAccountMapper;
-import cn.reghao.tnb.account.app.service.AccountTokenService;
+import cn.reghao.tnb.auth.api.dto.AccountInfo;
+import cn.reghao.tnb.auth.api.dto.OAuthAccountInfo;
+import cn.reghao.tnb.auth.api.iface.AccountQuery;
+import cn.reghao.tnb.auth.app.db.mapper.UserAccountMapper;
+import cn.reghao.tnb.auth.app.service.AccountTokenService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.extern.slf4j.Slf4j;

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

@@ -1,8 +1,8 @@
-package cn.reghao.tnb.account.app.controller;
+package cn.reghao.tnb.auth.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.config.rabbitmq.RabbitProducer;
+import cn.reghao.tnb.auth.app.model.vo.RtmpPlay;
+import cn.reghao.tnb.auth.app.model.vo.RtmpRecord;
+import cn.reghao.tnb.auth.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/controller/AdminAccountController.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/controller/AdminAccountController.java

@@ -1,9 +1,9 @@
-package cn.reghao.tnb.account.app.controller;
+package cn.reghao.tnb.auth.app.controller;
 
 import cn.reghao.tnb.common.web.WebResult;
-import cn.reghao.tnb.account.api.dto.AccountRegistry;
-import cn.reghao.tnb.account.api.dto.AccountRegistryStatus;
-import cn.reghao.tnb.account.api.iface.AdminAccountService;
+import cn.reghao.tnb.auth.api.dto.AccountRegistry;
+import cn.reghao.tnb.auth.api.dto.AccountRegistryStatus;
+import cn.reghao.tnb.auth.api.iface.AdminAccountService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.http.MediaType;

account/account-service/src/main/java/cn/reghao/tnb/account/app/db/mapper/UserAccountMapper.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/db/mapper/UserAccountMapper.java

@@ -1,9 +1,8 @@
-package cn.reghao.tnb.account.app.db.mapper;
+package cn.reghao.tnb.auth.app.db.mapper;
 
 import cn.reghao.jutil.jdk.web.db.BaseMapper;
-import cn.reghao.jutil.jdk.web.db.Page;
-import cn.reghao.tnb.account.api.dto.AccountInfo;
-import cn.reghao.tnb.account.app.model.po.UserAccount;
+import cn.reghao.tnb.auth.api.dto.AccountInfo;
+import cn.reghao.tnb.auth.app.model.po.UserAccount;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

account/account-service/src/main/java/cn/reghao/tnb/account/app/db/mapper/UserLoginMapper.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/db/mapper/UserLoginMapper.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.account.app.db.mapper;
+package cn.reghao.tnb.auth.app.db.mapper;
 
 import cn.reghao.jutil.jdk.web.db.BaseMapper;
-import cn.reghao.tnb.account.app.model.po.UserLogin;
+import cn.reghao.tnb.auth.app.model.po.UserLogin;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

account/account-service/src/main/java/cn/reghao/tnb/account/app/db/mapper/UserRegistryMapper.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/db/mapper/UserRegistryMapper.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.account.app.db.mapper;
+package cn.reghao.tnb.auth.app.db.mapper;
 
 import cn.reghao.jutil.jdk.web.db.BaseMapper;
-import cn.reghao.tnb.account.app.model.po.UserRegistry;
+import cn.reghao.tnb.auth.app.model.po.UserRegistry;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

account/account-service/src/main/java/cn/reghao/tnb/account/app/db/mapper/UserRoleMapper.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/db/mapper/UserRoleMapper.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.account.app.db.mapper;
+package cn.reghao.tnb.auth.app.db.mapper;
 
 import cn.reghao.jutil.jdk.web.db.BaseMapper;
-import cn.reghao.tnb.account.app.model.po.UserRole;
+import cn.reghao.tnb.auth.app.model.po.UserRole;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

account/account-service/src/main/java/cn/reghao/tnb/account/app/db/mapper/oauth/ClientDetailsMapper.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/db/mapper/oauth/ClientDetailsMapper.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.account.app.db.mapper.oauth;
+package cn.reghao.tnb.auth.app.db.mapper.oauth;
 
 import cn.reghao.jutil.jdk.web.db.BaseMapper;
-import cn.reghao.tnb.account.app.model.po.oauth.ClientDetails;
+import cn.reghao.tnb.auth.app.model.po.oauth.ClientDetails;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

account/account-service/src/main/java/cn/reghao/tnb/account/app/db/mapper/oauth/UserOauthAppMapper.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/db/mapper/oauth/UserOauthAppMapper.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.account.app.db.mapper.oauth;
+package cn.reghao.tnb.auth.app.db.mapper.oauth;
 
 import cn.reghao.jutil.jdk.web.db.BaseMapper;
-import cn.reghao.tnb.account.app.model.po.oauth.UserOauthApp;
+import cn.reghao.tnb.auth.app.model.po.oauth.UserOauthApp;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

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

@@ -1,14 +1,14 @@
-package cn.reghao.tnb.account.app.db.repository;
-
-import cn.reghao.tnb.account.api.dto.AccountInfo;
-import cn.reghao.tnb.account.app.db.mapper.UserAccountMapper;
-import cn.reghao.tnb.account.app.db.mapper.UserRoleMapper;
-import cn.reghao.tnb.account.app.db.mapper.UserRegistryMapper;
-import cn.reghao.tnb.account.app.model.po.UserAccount;
-import cn.reghao.tnb.account.app.model.po.UserRole;
-import cn.reghao.tnb.account.app.model.po.UserAuthority;
-import cn.reghao.tnb.account.app.model.po.UserRegistry;
-import cn.reghao.tnb.account.app.model.vo.LoginAccount;
+package cn.reghao.tnb.auth.app.db.repository;
+
+import cn.reghao.tnb.auth.api.dto.AccountInfo;
+import cn.reghao.tnb.auth.app.db.mapper.UserAccountMapper;
+import cn.reghao.tnb.auth.app.db.mapper.UserRoleMapper;
+import cn.reghao.tnb.auth.app.db.mapper.UserRegistryMapper;
+import cn.reghao.tnb.auth.app.model.po.UserAccount;
+import cn.reghao.tnb.auth.app.model.po.UserRole;
+import cn.reghao.tnb.auth.app.model.po.UserAuthority;
+import cn.reghao.tnb.auth.app.model.po.UserRegistry;
+import cn.reghao.tnb.auth.app.model.vo.LoginAccount;
 import cn.reghao.tnb.common.auth.AccountRole;
 import cn.reghao.tnb.common.util.ConstantId;
 import org.springframework.cache.annotation.CacheEvict;

account/account-service/src/main/java/cn/reghao/tnb/account/app/model/constant/LoginPlat.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/model/constant/LoginPlat.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.model.constant;
+package cn.reghao.tnb.auth.app.model.constant;
 
 /**
  * 登入平台类型

account/account-service/src/main/java/cn/reghao/tnb/account/app/model/constant/LoginType.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/model/constant/LoginType.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.model.constant;
+package cn.reghao.tnb.auth.app.model.constant;
 
 /**
  * 登入类型

account/account-service/src/main/java/cn/reghao/tnb/account/app/model/constant/VerifyChannel.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/model/constant/VerifyChannel.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.model.constant;
+package cn.reghao.tnb.auth.app.model.constant;
 
 import java.util.HashMap;
 import java.util.Map;

account/account-service/src/main/java/cn/reghao/tnb/account/app/model/dto/AccountLoginDto.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/model/dto/AccountLoginDto.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.account.app.model.dto;
+package cn.reghao.tnb.auth.app.model.dto;
 
-import cn.reghao.tnb.account.app.model.constant.LoginPlat;
-import cn.reghao.tnb.account.app.model.constant.LoginType;
+import cn.reghao.tnb.auth.app.model.constant.LoginPlat;
+import cn.reghao.tnb.auth.app.model.constant.LoginType;
 import cn.reghao.jutil.jdk.web.validator.ValidEnum;
 import lombok.Getter;
 import lombok.Setter;

account/account-service/src/main/java/cn/reghao/tnb/account/app/model/dto/AccountRegisterDto.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/model/dto/AccountRegisterDto.java

@@ -1,6 +1,6 @@
-package cn.reghao.tnb.account.app.model.dto;
+package cn.reghao.tnb.auth.app.model.dto;
 
-import cn.reghao.tnb.account.app.model.constant.LoginPlat;
+import cn.reghao.tnb.auth.app.model.constant.LoginPlat;
 import lombok.Getter;
 import lombok.Setter;
 

account/account-service/src/main/java/cn/reghao/tnb/account/app/model/dto/OAuthAppDto.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/model/dto/OAuthAppDto.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.model.dto;
+package cn.reghao.tnb.auth.app.model.dto;
 
 import lombok.Getter;
 import lombok.Setter;

account/account-service/src/main/java/cn/reghao/tnb/account/app/model/dto/PasswordResetDto.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/model/dto/PasswordResetDto.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.model.dto;
+package cn.reghao.tnb.auth.app.model.dto;
 
 import lombok.Getter;
 import lombok.Setter;

account/account-service/src/main/java/cn/reghao/tnb/account/app/model/dto/PasswordUpdateDto.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/model/dto/PasswordUpdateDto.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.model.dto;
+package cn.reghao.tnb.auth.app.model.dto;
 
 import lombok.Getter;
 import lombok.Setter;

account/account-service/src/main/java/cn/reghao/tnb/account/app/model/dto/UserEmailUpdate.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/model/dto/UserEmailUpdate.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.model.dto;
+package cn.reghao.tnb.auth.app.model.dto;
 
 import lombok.Getter;
 import lombok.Setter;

account/account-service/src/main/java/cn/reghao/tnb/account/app/model/dto/VerifyCodeDto.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/model/dto/VerifyCodeDto.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.account.app.model.dto;
+package cn.reghao.tnb.auth.app.model.dto;
 
 import cn.reghao.jutil.jdk.web.validator.ValidEnum;
-import cn.reghao.tnb.account.app.model.constant.VerifyChannel;
+import cn.reghao.tnb.auth.app.model.constant.VerifyChannel;
 import lombok.Getter;
 import lombok.Setter;
 

account/account-service/src/main/java/cn/reghao/tnb/account/app/model/po/UserAccount.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/model/po/UserAccount.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.model.po;
+package cn.reghao.tnb.auth.app.model.po;
 
 import cn.reghao.jutil.jdk.web.db.BaseObject;
 import cn.reghao.tnb.common.util.ConstantId;

account/account-service/src/main/java/cn/reghao/tnb/account/app/model/po/UserAuthority.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/model/po/UserAuthority.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.model.po;
+package cn.reghao.tnb.auth.app.model.po;
 
 import cn.reghao.tnb.common.auth.AccountRole;
 import org.springframework.security.core.GrantedAuthority;

account/account-service/src/main/java/cn/reghao/tnb/account/app/model/po/UserLogin.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/model/po/UserLogin.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.model.po;
+package cn.reghao.tnb.auth.app.model.po;
 
 import cn.reghao.jutil.jdk.web.db.BaseObject;
 import lombok.*;

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

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.model.po;
+package cn.reghao.tnb.auth.app.model.po;
 
 import cn.reghao.jutil.jdk.web.db.BaseObject;
 import cn.reghao.tnb.common.util.ConstantId;

account/account-service/src/main/java/cn/reghao/tnb/account/app/model/po/UserRole.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/model/po/UserRole.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.model.po;
+package cn.reghao.tnb.auth.app.model.po;
 
 import cn.reghao.jutil.jdk.web.db.BaseObject;
 import lombok.Getter;

account/account-service/src/main/java/cn/reghao/tnb/account/app/model/po/oauth/ClientDetails.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/model/po/oauth/ClientDetails.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.model.po.oauth;
+package cn.reghao.tnb.auth.app.model.po.oauth;
 
 import cn.reghao.jutil.jdk.web.db.BaseObject;
 import lombok.Getter;

account/account-service/src/main/java/cn/reghao/tnb/account/app/model/po/oauth/UserOauthApp.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/model/po/oauth/UserOauthApp.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.model.po.oauth;
+package cn.reghao.tnb.auth.app.model.po.oauth;
 
 import cn.reghao.jutil.jdk.web.db.BaseObject;
 import lombok.AllArgsConstructor;

account/account-service/src/main/java/cn/reghao/tnb/account/app/model/vo/AccountLoginRet.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/model/vo/AccountLoginRet.java

@@ -1,6 +1,5 @@
-package cn.reghao.tnb.account.app.model.vo;
+package cn.reghao.tnb.auth.app.model.vo;
 
-import cn.reghao.tnb.account.api.dto.AccountInfo;
 import lombok.Getter;
 
 import java.io.Serializable;

account/account-service/src/main/java/cn/reghao/tnb/account/app/model/vo/AccountToken.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/model/vo/AccountToken.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.model.vo;
+package cn.reghao.tnb.auth.app.model.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

account/account-service/src/main/java/cn/reghao/tnb/account/app/model/vo/LoginAccount.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/model/vo/LoginAccount.java

@@ -1,6 +1,6 @@
-package cn.reghao.tnb.account.app.model.vo;
+package cn.reghao.tnb.auth.app.model.vo;
 
-import cn.reghao.tnb.account.api.dto.AccountInfo;
+import cn.reghao.tnb.auth.api.dto.AccountInfo;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

account/account-service/src/main/java/cn/reghao/tnb/account/app/model/vo/LoginRecordVo.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/model/vo/LoginRecordVo.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.model.vo;
+package cn.reghao.tnb.auth.app.model.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

account/account-service/src/main/java/cn/reghao/tnb/account/app/model/vo/RefreshPayload.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/model/vo/RefreshPayload.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.model.vo;
+package cn.reghao.tnb.auth.app.model.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

account/account-service/src/main/java/cn/reghao/tnb/account/app/model/vo/RtmpPlay.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/model/vo/RtmpPlay.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.model.vo;
+package cn.reghao.tnb.auth.app.model.vo;
 
 import lombok.Getter;
 import lombok.Setter;

account/account-service/src/main/java/cn/reghao/tnb/account/app/model/vo/RtmpRecord.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/model/vo/RtmpRecord.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.model.vo;
+package cn.reghao.tnb.auth.app.model.vo;
 
 import lombok.Getter;
 import lombok.Setter;

account/account-service/src/main/java/cn/reghao/tnb/account/app/rpc/AccountQueryImpl.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/rpc/AccountQueryImpl.java

@@ -1,12 +1,15 @@
-package cn.reghao.tnb.account.app.rpc;
+package cn.reghao.tnb.auth.app.rpc;
 
 import cn.reghao.jutil.jdk.string.IDObfuscation;
-import cn.reghao.tnb.account.api.dto.*;
-import cn.reghao.tnb.account.api.iface.AccountQuery;
-import cn.reghao.tnb.account.app.db.repository.AccountRepository;
-import cn.reghao.tnb.account.app.model.po.UserAccount;
-import cn.reghao.tnb.account.app.security.form.AccountAuthToken;
-import cn.reghao.tnb.account.app.service.AccountTokenService;
+import cn.reghao.tnb.auth.api.dto.AccountAvatar;
+import cn.reghao.tnb.auth.api.dto.AccountInfo;
+import cn.reghao.tnb.auth.api.dto.AuthedAccount;
+import cn.reghao.tnb.auth.api.dto.CrawledUser;
+import cn.reghao.tnb.auth.api.iface.AccountQuery;
+import cn.reghao.tnb.auth.app.db.repository.AccountRepository;
+import cn.reghao.tnb.auth.app.model.po.UserAccount;
+import cn.reghao.tnb.auth.app.security.form.AccountAuthToken;
+import cn.reghao.tnb.auth.app.service.AccountTokenService;
 import cn.reghao.tnb.common.util.ConstantId;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.security.core.GrantedAuthority;

account/account-service/src/main/java/cn/reghao/tnb/account/app/rpc/AdminAccountServiceImpl.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/rpc/AdminAccountServiceImpl.java

@@ -1,13 +1,13 @@
-package cn.reghao.tnb.account.app.rpc;
+package cn.reghao.tnb.auth.app.rpc;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
-import cn.reghao.tnb.account.api.dto.AccountInfo;
-import cn.reghao.tnb.account.api.dto.AccountRegistry;
-import cn.reghao.tnb.account.api.dto.AccountRegistryStatus;
-import cn.reghao.tnb.account.api.iface.AdminAccountService;
-import cn.reghao.tnb.account.app.db.repository.AccountRepository;
-import cn.reghao.tnb.account.app.model.po.UserRegistry;
-import cn.reghao.tnb.account.app.service.AccountRegistryService;
+import cn.reghao.tnb.auth.api.dto.AccountInfo;
+import cn.reghao.tnb.auth.api.dto.AccountRegistry;
+import cn.reghao.tnb.auth.api.dto.AccountRegistryStatus;
+import cn.reghao.tnb.auth.api.iface.AdminAccountService;
+import cn.reghao.tnb.auth.app.db.repository.AccountRepository;
+import cn.reghao.tnb.auth.app.model.po.UserRegistry;
+import cn.reghao.tnb.auth.app.service.AccountRegistryService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.stereotype.Service;

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

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

account/account-service/src/main/java/cn/reghao/tnb/account/app/security/MyAuthenticationEntryPoint.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/security/MyAuthenticationEntryPoint.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.security;
+package cn.reghao.tnb.auth.app.security;
 
 import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.web.ServletUtil;

account/account-service/src/main/java/cn/reghao/tnb/account/app/security/OAuth2AuthorizationConfig.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/security/OAuth2AuthorizationConfig.java

@@ -1,16 +1,14 @@
-package cn.reghao.tnb.account.app.security;
+package cn.reghao.tnb.auth.app.security;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.http.HttpMethod;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer;
 import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter;
-import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer;
 import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer;
 import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer;
 import org.springframework.security.oauth2.provider.approval.ApprovalStore;

account/account-service/src/main/java/cn/reghao/tnb/account/app/security/OAuth2ResourceConfig.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/security/OAuth2ResourceConfig.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.security;
+package cn.reghao.tnb.auth.app.security;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;

account/account-service/src/main/java/cn/reghao/tnb/account/app/security/WebSecurityConfig.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/security/WebSecurityConfig.java

@@ -1,12 +1,12 @@
-package cn.reghao.tnb.account.app.security;
-
-import cn.reghao.tnb.account.app.security.filter.LoginRedirectFilter;
-import cn.reghao.tnb.account.app.security.form.ThirdPartyAuthFilter;
-import cn.reghao.tnb.account.app.security.form.AccountAuthFilter;
-import cn.reghao.tnb.account.app.security.form.AccountAuthProvider;
-import cn.reghao.tnb.account.app.security.session.MySecurityContextRepository;
-import cn.reghao.tnb.account.app.security.session.MySessionAuthenticationStrategy;
-import cn.reghao.tnb.account.app.service.AccountLoginService;
+package cn.reghao.tnb.auth.app.security;
+
+import cn.reghao.tnb.auth.app.security.filter.LoginRedirectFilter;
+import cn.reghao.tnb.auth.app.security.form.ThirdPartyAuthFilter;
+import cn.reghao.tnb.auth.app.security.form.AccountAuthFilter;
+import cn.reghao.tnb.auth.app.security.form.AccountAuthProvider;
+import cn.reghao.tnb.auth.app.security.session.MySecurityContextRepository;
+import cn.reghao.tnb.auth.app.security.session.MySessionAuthenticationStrategy;
+import cn.reghao.tnb.auth.app.service.AccountLoginService;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.access.hierarchicalroles.RoleHierarchy;

account/account-service/src/main/java/cn/reghao/tnb/account/app/security/encoder/Md5PasswordEncoder.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/security/encoder/Md5PasswordEncoder.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.security.encoder;
+package cn.reghao.tnb.auth.app.security.encoder;
 
 import cn.reghao.jutil.jdk.security.Md5Cryptor;
 import org.springframework.security.crypto.password.PasswordEncoder;

account/account-service/src/main/java/cn/reghao/tnb/account/app/security/encoder/Sha256PasswordEncoder.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/security/encoder/Sha256PasswordEncoder.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.security.encoder;
+package cn.reghao.tnb.auth.app.security.encoder;
 
 import cn.reghao.jutil.jdk.security.Sha256Cryptor;
 import org.springframework.security.crypto.password.PasswordEncoder;

account/account-service/src/main/java/cn/reghao/tnb/account/app/security/exception/AccountLoginException.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/security/exception/AccountLoginException.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.security.exception;
+package cn.reghao.tnb.auth.app.security.exception;
 
 import org.springframework.security.core.AuthenticationException;
 

account/account-service/src/main/java/cn/reghao/tnb/account/app/security/filter/LoginRedirectFilter.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/security/filter/LoginRedirectFilter.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.security.filter;
+package cn.reghao.tnb.auth.app.security.filter;
 
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;

account/account-service/src/main/java/cn/reghao/tnb/account/app/security/form/AccountAuthFilter.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/security/form/AccountAuthFilter.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.account.app.security.form;
+package cn.reghao.tnb.auth.app.security.form;
 
-import cn.reghao.tnb.account.app.model.dto.AccountLoginDto;
-import cn.reghao.tnb.account.app.service.AccountLoginService;
+import cn.reghao.tnb.auth.app.model.dto.AccountLoginDto;
+import cn.reghao.tnb.auth.app.service.AccountLoginService;
 import cn.reghao.tnb.common.web.ServletUtil;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;

account/account-service/src/main/java/cn/reghao/tnb/account/app/security/form/AccountAuthProvider.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/security/form/AccountAuthProvider.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.account.app.security.form;
+package cn.reghao.tnb.auth.app.security.form;
 
-import cn.reghao.tnb.account.app.model.constant.LoginType;
-import cn.reghao.tnb.account.app.service.AccountLoginService;
+import cn.reghao.tnb.auth.app.model.constant.LoginType;
+import cn.reghao.tnb.auth.app.service.AccountLoginService;
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.DisabledException;
 import org.springframework.security.core.Authentication;

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

@@ -1,6 +1,6 @@
-package cn.reghao.tnb.account.app.security.form;
+package cn.reghao.tnb.auth.app.security.form;
 
-import cn.reghao.tnb.account.app.model.po.UserAccount;
+import cn.reghao.tnb.auth.app.model.po.UserAccount;
 import cn.reghao.tnb.common.util.ConstantId;
 import org.springframework.security.authentication.AbstractAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;

account/account-service/src/main/java/cn/reghao/tnb/account/app/security/form/ThirdPartyAuthFilter.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/security/form/ThirdPartyAuthFilter.java

@@ -1,8 +1,8 @@
-package cn.reghao.tnb.account.app.security.form;
+package cn.reghao.tnb.auth.app.security.form;
 
 import cn.reghao.tnb.common.web.ServletUtil;
-import cn.reghao.tnb.account.app.model.constant.LoginPlat;
-import cn.reghao.tnb.account.app.model.constant.LoginType;
+import cn.reghao.tnb.auth.app.model.constant.LoginPlat;
+import cn.reghao.tnb.auth.app.model.constant.LoginType;
 import org.springframework.security.authentication.DisabledException;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;

account/account-service/src/main/java/cn/reghao/tnb/account/app/security/handler/AuthFailureHandlerImpl.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/security/handler/AuthFailureHandlerImpl.java

@@ -1,9 +1,9 @@
-package cn.reghao.tnb.account.app.security.handler;
+package cn.reghao.tnb.auth.app.security.handler;
 
 import cn.reghao.jutil.jdk.web.result.Result;
 import cn.reghao.tnb.common.web.WebResult;
-import cn.reghao.tnb.account.app.security.exception.AccountLoginException;
-import cn.reghao.tnb.account.app.service.LoginAttemptService;
+import cn.reghao.tnb.auth.app.security.exception.AccountLoginException;
+import cn.reghao.tnb.auth.app.service.LoginAttemptService;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.authentication.AuthenticationFailureHandler;
 import org.springframework.stereotype.Component;

account/account-service/src/main/java/cn/reghao/tnb/account/app/security/handler/AuthSuccessHandlerImpl.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/security/handler/AuthSuccessHandlerImpl.java

@@ -1,16 +1,15 @@
-package cn.reghao.tnb.account.app.security.handler;
+package cn.reghao.tnb.auth.app.security.handler;
 
-import cn.reghao.tnb.account.app.model.vo.LoginAccount;
+import cn.reghao.tnb.auth.app.model.vo.LoginAccount;
 import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.web.ServletUtil;
-import cn.reghao.tnb.account.api.iface.AccountQuery;
-import cn.reghao.tnb.account.app.db.repository.AccountRepository;
-import cn.reghao.tnb.account.app.model.constant.LoginPlat;
-import cn.reghao.tnb.account.api.dto.AccountInfo;
-import cn.reghao.tnb.account.app.model.vo.AccountLoginRet;
-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.AccountTokenService;
+import cn.reghao.tnb.auth.api.iface.AccountQuery;
+import cn.reghao.tnb.auth.app.db.repository.AccountRepository;
+import cn.reghao.tnb.auth.app.model.constant.LoginPlat;
+import cn.reghao.tnb.auth.app.model.vo.AccountLoginRet;
+import cn.reghao.tnb.auth.app.model.vo.AccountToken;
+import cn.reghao.tnb.auth.app.security.form.AccountAuthToken;
+import cn.reghao.tnb.auth.app.service.AccountTokenService;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
 import org.springframework.security.web.savedrequest.SavedRequest;

account/account-service/src/main/java/cn/reghao/tnb/account/app/security/handler/LogoutHandlerImpl.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/security/handler/LogoutHandlerImpl.java

@@ -1,6 +1,6 @@
-package cn.reghao.tnb.account.app.security.handler;
+package cn.reghao.tnb.auth.app.security.handler;
 
-import cn.reghao.tnb.account.app.service.AccountTokenService;
+import cn.reghao.tnb.auth.app.service.AccountTokenService;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.logout.LogoutHandler;
 import org.springframework.stereotype.Component;

account/account-service/src/main/java/cn/reghao/tnb/account/app/security/handler/LogoutSuccessHandlerImpl.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/security/handler/LogoutSuccessHandlerImpl.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.security.handler;
+package cn.reghao.tnb.auth.app.security.handler;
 
 import cn.reghao.tnb.common.web.WebResult;
 import org.springframework.security.core.Authentication;

account/account-service/src/main/java/cn/reghao/tnb/account/app/security/session/MySecurityContextRepository.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/security/session/MySecurityContextRepository.java

@@ -1,9 +1,9 @@
-package cn.reghao.tnb.account.app.security.session;
+package cn.reghao.tnb.auth.app.security.session;
 
 import cn.reghao.tnb.common.web.ServletUtil;
-import cn.reghao.tnb.account.api.constant.TokenType;
-import cn.reghao.tnb.account.app.security.form.AccountAuthToken;
-import cn.reghao.tnb.account.app.service.AccountTokenService;
+import cn.reghao.tnb.auth.api.constant.TokenType;
+import cn.reghao.tnb.auth.app.security.form.AccountAuthToken;
+import cn.reghao.tnb.auth.app.service.AccountTokenService;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.web.context.HttpRequestResponseHolder;

account/account-service/src/main/java/cn/reghao/tnb/account/app/security/session/MySessionAuthenticationStrategy.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/security/session/MySessionAuthenticationStrategy.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.account.app.security.session;
+package cn.reghao.tnb.auth.app.security.session;
 
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.session.SessionRegistry;

account/account-service/src/main/java/cn/reghao/tnb/account/app/security/session/RedisHttpSessionListener.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/security/session/RedisHttpSessionListener.java

@@ -1,6 +1,6 @@
-package cn.reghao.tnb.account.app.security.session;
+package cn.reghao.tnb.auth.app.security.session;
 
-import cn.reghao.tnb.account.app.service.AccountTokenService;
+import cn.reghao.tnb.auth.app.service.AccountTokenService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.event.EventListener;

account/account-service/src/main/java/cn/reghao/tnb/account/app/service/AccountLoginService.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/service/AccountLoginService.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.account.app.service;
+package cn.reghao.tnb.auth.app.service;
 
-import cn.reghao.tnb.account.app.model.dto.AccountLoginDto;
-import cn.reghao.tnb.account.app.security.form.AccountAuthToken;
+import cn.reghao.tnb.auth.app.model.dto.AccountLoginDto;
+import cn.reghao.tnb.auth.app.security.form.AccountAuthToken;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.validation.annotation.Validated;

account/account-service/src/main/java/cn/reghao/tnb/account/app/service/AccountProfileService.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/service/AccountProfileService.java

@@ -1,13 +1,15 @@
-package cn.reghao.tnb.account.app.service;
+package cn.reghao.tnb.auth.app.service;
 
 import cn.reghao.jutil.jdk.web.result.Result;
 import cn.reghao.jutil.jdk.security.RandomString;
-import cn.reghao.tnb.account.app.model.constant.VerifyChannel;
-import cn.reghao.tnb.account.app.db.mapper.UserAccountMapper;
-import cn.reghao.tnb.account.app.db.repository.AccountRepository;
-import cn.reghao.tnb.account.app.model.dto.*;
-import cn.reghao.tnb.account.app.model.po.UserAccount;
-import cn.reghao.tnb.account.app.security.form.AccountAuthToken;
+import cn.reghao.tnb.auth.app.model.constant.VerifyChannel;
+import cn.reghao.tnb.auth.app.db.mapper.UserAccountMapper;
+import cn.reghao.tnb.auth.app.db.repository.AccountRepository;
+import cn.reghao.tnb.auth.app.model.dto.PasswordResetDto;
+import cn.reghao.tnb.auth.app.model.dto.PasswordUpdateDto;
+import cn.reghao.tnb.auth.app.model.dto.UserEmailUpdate;
+import cn.reghao.tnb.auth.app.model.po.UserAccount;
+import cn.reghao.tnb.auth.app.security.form.AccountAuthToken;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 

account/account-service/src/main/java/cn/reghao/tnb/account/app/service/AccountRegistryService.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/service/AccountRegistryService.java

@@ -1,9 +1,9 @@
-package cn.reghao.tnb.account.app.service;
+package cn.reghao.tnb.auth.app.service;
 
 import cn.reghao.jutil.jdk.web.result.Result;
-import cn.reghao.tnb.account.app.model.dto.AccountRegisterDto;
-import cn.reghao.tnb.account.app.model.po.UserAccount;
-import cn.reghao.tnb.account.app.model.po.UserRegistry;
+import cn.reghao.tnb.auth.app.model.dto.AccountRegisterDto;
+import cn.reghao.tnb.auth.app.model.po.UserAccount;
+import cn.reghao.tnb.auth.app.model.po.UserRegistry;
 
 /**
  * @author reghao

account/account-service/src/main/java/cn/reghao/tnb/account/app/service/AccountTokenService.java → auth/auth-service/src/main/java/cn/reghao/tnb/auth/app/service/AccountTokenService.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.account.app.service;
+package cn.reghao.tnb.auth.app.service;
 
-import cn.reghao.tnb.account.app.model.vo.AccountToken;
-import cn.reghao.tnb.account.app.security.form.AccountAuthToken;
+import cn.reghao.tnb.auth.app.model.vo.AccountToken;
+import cn.reghao.tnb.auth.app.security.form.AccountAuthToken;
 import org.springframework.security.core.Authentication;
 
 /**