diff --git a/.idea/encodings.xml b/.idea/encodings.xml index af260a6..c6acba9 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -6,6 +6,13 @@ + + + + + + + @@ -16,6 +23,11 @@ + + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index 9319b69..efe95dd 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -9,7 +9,9 @@ diff --git a/aioj-backend-auth/pom.xml b/aioj-backend-auth/pom.xml index 0006c6b..297d88d 100644 --- a/aioj-backend-auth/pom.xml +++ b/aioj-backend-auth/pom.xml @@ -80,7 +80,7 @@ --> cn.meowrain - aioj-backend-common + aioj-backend-common-starter 1.0-SNAPSHOT compile diff --git a/aioj-backend-auth/src/main/java/cn/meowrain/aioj/backend/auth/clients/UserClient.java b/aioj-backend-auth/src/main/java/cn/meowrain/aioj/backend/auth/clients/UserClient.java index 6b77060..a98d5d4 100644 --- a/aioj-backend-auth/src/main/java/cn/meowrain/aioj/backend/auth/clients/UserClient.java +++ b/aioj-backend-auth/src/main/java/cn/meowrain/aioj/backend/auth/clients/UserClient.java @@ -1,7 +1,7 @@ package cn.meowrain.aioj.backend.auth.clients; import cn.meowrain.aioj.backend.auth.dto.resp.UserAuthRespDTO; -import cn.meowrain.aioj.backend.framework.web.Result; +import cn.meowrain.aioj.backend.framework.core.web.Result; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; diff --git a/aioj-backend-auth/src/main/java/cn/meowrain/aioj/backend/auth/dto/chains/context/UserLoginRequestParamVerifyContext.java b/aioj-backend-auth/src/main/java/cn/meowrain/aioj/backend/auth/dto/chains/context/UserLoginRequestParamVerifyContext.java index ac4dbe4..2513a48 100644 --- a/aioj-backend-auth/src/main/java/cn/meowrain/aioj/backend/auth/dto/chains/context/UserLoginRequestParamVerifyContext.java +++ b/aioj-backend-auth/src/main/java/cn/meowrain/aioj/backend/auth/dto/chains/context/UserLoginRequestParamVerifyContext.java @@ -1,7 +1,7 @@ package cn.meowrain.aioj.backend.auth.dto.chains.context; import cn.meowrain.aioj.backend.auth.dto.req.UserLoginRequestDTO; -import cn.meowrain.aioj.backend.framework.designpattern.chains.CommonChainContext; +import cn.meowrain.aioj.backend.framework.core.designpattern.chains.CommonChainContext; import org.springframework.stereotype.Component; @Component diff --git a/aioj-backend-auth/src/main/java/cn/meowrain/aioj/backend/auth/service/impl/AuthServiceImpl.java b/aioj-backend-auth/src/main/java/cn/meowrain/aioj/backend/auth/service/impl/AuthServiceImpl.java index 0113b09..8a8b026 100644 --- a/aioj-backend-auth/src/main/java/cn/meowrain/aioj/backend/auth/service/impl/AuthServiceImpl.java +++ b/aioj-backend-auth/src/main/java/cn/meowrain/aioj/backend/auth/service/impl/AuthServiceImpl.java @@ -12,9 +12,9 @@ import cn.meowrain.aioj.backend.auth.dto.resp.UserAuthRespDTO; import cn.meowrain.aioj.backend.auth.dto.resp.UserLoginResponseDTO; import cn.meowrain.aioj.backend.auth.service.AuthService; import cn.meowrain.aioj.backend.auth.utils.JwtUtil; -import cn.meowrain.aioj.backend.framework.errorcode.ErrorCode; -import cn.meowrain.aioj.backend.framework.exception.ServiceException; -import cn.meowrain.aioj.backend.framework.web.Result; +import cn.meowrain.aioj.backend.framework.core.errorcode.ErrorCode; +import cn.meowrain.aioj.backend.framework.core.exception.ServiceException; +import cn.meowrain.aioj.backend.framework.core.web.Result; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.StringRedisTemplate; diff --git a/aioj-backend-common/aioj-backend-common-bom/pom.xml b/aioj-backend-common/aioj-backend-common-bom/pom.xml new file mode 100644 index 0000000..65f0598 --- /dev/null +++ b/aioj-backend-common/aioj-backend-common-bom/pom.xml @@ -0,0 +1,87 @@ + + + 4.0.0 + aioj-backend-common-bom + cn.meowrain.aioj + pom + ${revision} + + aioj-common-bom + 依赖管理 + + 17 + 17 + UTF-8 + 1.0.0 + 3.5.14 + 3.5.7 + 2025.0.0.0 + 9.5.0 + + + + + + cn.hutool + hutool-bom + 5.8.41 + pom + import + + + + com.baomidou + mybatis-plus-bom + ${mybatis-plus.version} + pom + import + + + com.mysql + mysql-connector-j + ${mysql.version} + + + + + + com.alibaba + easyexcel + 4.0.3 + + + + + + com.github.xiaoymin + knife4j-openapi3-jakarta-spring-boot-starter + 4.5.0 + + + + + + + org.springframework.boot + spring-boot-starter-oauth2-client + 3.5.7 + + + + org.springframework.security + spring-security-test + 6.5.7 + test + + + + + org.springframework.boot + spring-boot-starter-security + 3.5.7 + + + + \ No newline at end of file diff --git a/aioj-backend-common/aioj-backend-common-core/pom.xml b/aioj-backend-common/aioj-backend-common-core/pom.xml new file mode 100644 index 0000000..6c54934 --- /dev/null +++ b/aioj-backend-common/aioj-backend-common-core/pom.xml @@ -0,0 +1,30 @@ + + + 4.0.0 + + cn.meowrain + aioj-backend-common + 1.0-SNAPSHOT + + + aioj-backend-common-core + + jar + aioj 公共工具类核心包 + + + 17 + 17 + UTF-8 + + + + + + cn.hutool + hutool-core + + + \ No newline at end of file diff --git a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/banner/EnvironmentBanner.java b/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/banner/EnvironmentBanner.java similarity index 97% rename from aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/banner/EnvironmentBanner.java rename to aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/banner/EnvironmentBanner.java index 26307ea..c803d01 100644 --- a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/banner/EnvironmentBanner.java +++ b/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/banner/EnvironmentBanner.java @@ -1,4 +1,4 @@ -package cn.meowrain.aioj.backend.framework.banner; +package cn.meowrain.aioj.backend.framework.core.banner; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/config/WebAutoConfiguration.java b/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/config/WebAutoConfiguration.java similarity index 64% rename from aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/config/WebAutoConfiguration.java rename to aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/config/WebAutoConfiguration.java index f54e9e5..8b5be6d 100644 --- a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/config/WebAutoConfiguration.java +++ b/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/config/WebAutoConfiguration.java @@ -1,6 +1,7 @@ -package cn.meowrain.aioj.backend.framework.config; +package cn.meowrain.aioj.backend.framework.core.config; -import cn.meowrain.aioj.backend.framework.exception.handler.GlobalExceptionHandler; + +import cn.meowrain.aioj.backend.framework.core.exception.handler.GlobalExceptionHandler; import org.springframework.context.annotation.Bean; /** diff --git a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/designpattern/chains/AbstractChianHandler.java b/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/designpattern/chains/AbstractChianHandler.java similarity index 82% rename from aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/designpattern/chains/AbstractChianHandler.java rename to aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/designpattern/chains/AbstractChianHandler.java index f6d93da..87e68d9 100644 --- a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/designpattern/chains/AbstractChianHandler.java +++ b/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/designpattern/chains/AbstractChianHandler.java @@ -1,4 +1,4 @@ -package cn.meowrain.aioj.backend.framework.designpattern.chains; +package cn.meowrain.aioj.backend.framework.core.designpattern.chains; import org.springframework.core.Ordered; diff --git a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/designpattern/chains/CommonChainContext.java b/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/designpattern/chains/CommonChainContext.java similarity index 97% rename from aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/designpattern/chains/CommonChainContext.java rename to aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/designpattern/chains/CommonChainContext.java index aef1774..b5aaf90 100644 --- a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/designpattern/chains/CommonChainContext.java +++ b/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/designpattern/chains/CommonChainContext.java @@ -1,4 +1,4 @@ -package cn.meowrain.aioj.backend.framework.designpattern.chains; +package cn.meowrain.aioj.backend.framework.core.designpattern.chains; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeansException; diff --git a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/errorcode/ErrorCode.java b/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/errorcode/ErrorCode.java similarity index 93% rename from aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/errorcode/ErrorCode.java rename to aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/errorcode/ErrorCode.java index ec33820..3b1ad6a 100644 --- a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/errorcode/ErrorCode.java +++ b/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/errorcode/ErrorCode.java @@ -1,4 +1,4 @@ -package cn.meowrain.aioj.backend.framework.errorcode; +package cn.meowrain.aioj.backend.framework.core.errorcode; public enum ErrorCode implements IErrorCode { SUCCESS("0", "ok"), diff --git a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/errorcode/IErrorCode.java b/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/errorcode/IErrorCode.java similarity index 55% rename from aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/errorcode/IErrorCode.java rename to aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/errorcode/IErrorCode.java index 920843c..378c115 100644 --- a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/errorcode/IErrorCode.java +++ b/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/errorcode/IErrorCode.java @@ -1,4 +1,4 @@ -package cn.meowrain.aioj.backend.framework.errorcode; +package cn.meowrain.aioj.backend.framework.core.errorcode; public interface IErrorCode { String code(); diff --git a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/exception/AbstractException.java b/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/exception/AbstractException.java similarity index 84% rename from aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/exception/AbstractException.java rename to aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/exception/AbstractException.java index f6341a0..dec72ea 100644 --- a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/exception/AbstractException.java +++ b/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/exception/AbstractException.java @@ -1,6 +1,6 @@ -package cn.meowrain.aioj.backend.framework.exception; +package cn.meowrain.aioj.backend.framework.core.exception; -import cn.meowrain.aioj.backend.framework.errorcode.IErrorCode; +import cn.meowrain.aioj.backend.framework.core.errorcode.IErrorCode; import lombok.Getter; import org.springframework.util.StringUtils; diff --git a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/exception/ClientException.java b/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/exception/ClientException.java similarity index 74% rename from aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/exception/ClientException.java rename to aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/exception/ClientException.java index c93d39f..a6a717b 100644 --- a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/exception/ClientException.java +++ b/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/exception/ClientException.java @@ -1,7 +1,7 @@ -package cn.meowrain.aioj.backend.framework.exception; +package cn.meowrain.aioj.backend.framework.core.exception; -import cn.meowrain.aioj.backend.framework.errorcode.ErrorCode; -import cn.meowrain.aioj.backend.framework.errorcode.IErrorCode; +import cn.meowrain.aioj.backend.framework.core.errorcode.ErrorCode; +import cn.meowrain.aioj.backend.framework.core.errorcode.IErrorCode; import lombok.ToString; /** diff --git a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/exception/RemoteException.java b/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/exception/RemoteException.java similarity index 75% rename from aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/exception/RemoteException.java rename to aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/exception/RemoteException.java index a4b82fb..0d53cf8 100644 --- a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/exception/RemoteException.java +++ b/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/exception/RemoteException.java @@ -1,7 +1,7 @@ -package cn.meowrain.aioj.backend.framework.exception; +package cn.meowrain.aioj.backend.framework.core.exception; -import cn.meowrain.aioj.backend.framework.errorcode.ErrorCode; -import cn.meowrain.aioj.backend.framework.errorcode.IErrorCode; +import cn.meowrain.aioj.backend.framework.core.errorcode.ErrorCode; +import cn.meowrain.aioj.backend.framework.core.errorcode.IErrorCode; import lombok.ToString; /** diff --git a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/exception/ServiceException.java b/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/exception/ServiceException.java similarity index 74% rename from aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/exception/ServiceException.java rename to aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/exception/ServiceException.java index 9350f26..c3c39a6 100644 --- a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/exception/ServiceException.java +++ b/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/exception/ServiceException.java @@ -1,7 +1,7 @@ -package cn.meowrain.aioj.backend.framework.exception; +package cn.meowrain.aioj.backend.framework.core.exception; -import cn.meowrain.aioj.backend.framework.errorcode.ErrorCode; -import cn.meowrain.aioj.backend.framework.errorcode.IErrorCode; +import cn.meowrain.aioj.backend.framework.core.errorcode.ErrorCode; +import cn.meowrain.aioj.backend.framework.core.errorcode.IErrorCode; import lombok.ToString; /** diff --git a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/exception/handler/GlobalExceptionHandler.java b/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/exception/handler/GlobalExceptionHandler.java similarity index 91% rename from aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/exception/handler/GlobalExceptionHandler.java rename to aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/exception/handler/GlobalExceptionHandler.java index d4c940f..f4cf6e9 100644 --- a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/exception/handler/GlobalExceptionHandler.java +++ b/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/exception/handler/GlobalExceptionHandler.java @@ -1,10 +1,9 @@ -package cn.meowrain.aioj.backend.framework.exception.handler; +package cn.meowrain.aioj.backend.framework.core.exception.handler; -import cn.meowrain.aioj.backend.framework.exception.AbstractException; -import cn.meowrain.aioj.backend.framework.web.Result; -import cn.meowrain.aioj.backend.framework.web.Results; +import cn.meowrain.aioj.backend.framework.core.exception.AbstractException; +import cn.meowrain.aioj.backend.framework.core.web.Result; +import cn.meowrain.aioj.backend.framework.core.web.Results; import jakarta.servlet.http.HttpServletRequest; -import lombok.experimental.StandardException; import lombok.extern.slf4j.Slf4j; import org.springframework.util.StringUtils; import org.springframework.validation.BindingResult; diff --git a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/web/Result.java b/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/web/Result.java similarity index 94% rename from aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/web/Result.java rename to aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/web/Result.java index 87e9a2b..d7fa08a 100644 --- a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/web/Result.java +++ b/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/web/Result.java @@ -1,4 +1,4 @@ -package cn.meowrain.aioj.backend.framework.web; +package cn.meowrain.aioj.backend.framework.core.web; import lombok.Data; import lombok.experimental.Accessors; diff --git a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/web/Results.java b/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/web/Results.java similarity index 91% rename from aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/web/Results.java rename to aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/web/Results.java index 8ef3960..060211e 100644 --- a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/web/Results.java +++ b/aioj-backend-common/aioj-backend-common-core/src/main/java/cn/meowrain/aioj/backend/framework/core/web/Results.java @@ -1,7 +1,8 @@ -package cn.meowrain.aioj.backend.framework.web; +package cn.meowrain.aioj.backend.framework.core.web; -import cn.meowrain.aioj.backend.framework.errorcode.ErrorCode; -import cn.meowrain.aioj.backend.framework.exception.AbstractException; + +import cn.meowrain.aioj.backend.framework.core.errorcode.ErrorCode; +import cn.meowrain.aioj.backend.framework.core.exception.AbstractException; import java.util.Optional; diff --git a/aioj-backend-common/aioj-backend-common-log/pom.xml b/aioj-backend-common/aioj-backend-common-log/pom.xml new file mode 100644 index 0000000..7aa5505 --- /dev/null +++ b/aioj-backend-common/aioj-backend-common-log/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + cn.meowrain + aioj-backend-common + 1.0-SNAPSHOT + + + aioj-backend-common-log + + + 17 + 17 + UTF-8 + + + \ No newline at end of file diff --git a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/annotation/SysLog.java b/aioj-backend-common/aioj-backend-common-log/src/main/java/cn/meowrain/aioj/backend/framework/log/annotation/SysLog.java similarity index 85% rename from aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/annotation/SysLog.java rename to aioj-backend-common/aioj-backend-common-log/src/main/java/cn/meowrain/aioj/backend/framework/log/annotation/SysLog.java index 69d8d5b..b66b43e 100644 --- a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/annotation/SysLog.java +++ b/aioj-backend-common/aioj-backend-common-log/src/main/java/cn/meowrain/aioj/backend/framework/log/annotation/SysLog.java @@ -1,4 +1,4 @@ -package cn.meowrain.aioj.backend.framework.annotation; +package cn.meowrain.aioj.backend.framework.log.annotation; import java.lang.annotation.*; diff --git a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/aspect/SysLogAspect.java b/aioj-backend-common/aioj-backend-common-log/src/main/java/cn/meowrain/aioj/backend/framework/log/aspect/SysLogAspect.java similarity index 87% rename from aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/aspect/SysLogAspect.java rename to aioj-backend-common/aioj-backend-common-log/src/main/java/cn/meowrain/aioj/backend/framework/log/aspect/SysLogAspect.java index 217b170..438916e 100644 --- a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/aspect/SysLogAspect.java +++ b/aioj-backend-common/aioj-backend-common-log/src/main/java/cn/meowrain/aioj/backend/framework/log/aspect/SysLogAspect.java @@ -1,13 +1,12 @@ -package cn.meowrain.aioj.backend.framework.aspect; +package cn.meowrain.aioj.backend.framework.log.aspect; import cn.hutool.core.util.StrUtil; -import cn.meowrain.aioj.backend.framework.annotation.SysLog; +import cn.meowrain.aioj.backend.framework.log.annotation.SysLog; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.reflect.MethodSignature; import org.springframework.expression.EvaluationContext; diff --git a/aioj-backend-common/aioj-backend-common-log/src/main/java/cn/meowrain/aioj/backend/framework/log/utils/SysLogUtils.java b/aioj-backend-common/aioj-backend-common-log/src/main/java/cn/meowrain/aioj/backend/framework/log/utils/SysLogUtils.java new file mode 100644 index 0000000..c7a2901 --- /dev/null +++ b/aioj-backend-common/aioj-backend-common-log/src/main/java/cn/meowrain/aioj/backend/framework/log/utils/SysLogUtils.java @@ -0,0 +1,9 @@ +package cn.meowrain.aioj.backend.framework.log.utils; + +import cn.meowrain.aioj.backend.framework.log.event.SysLogEventSource; + +public final class SysLogUtils { + public static SysLogEventSource getSysLog() { + + } +} diff --git a/aioj-backend-common/aioj-backend-common-mybatis/pom.xml b/aioj-backend-common/aioj-backend-common-mybatis/pom.xml new file mode 100644 index 0000000..1b54eaf --- /dev/null +++ b/aioj-backend-common/aioj-backend-common-mybatis/pom.xml @@ -0,0 +1,44 @@ + + + 4.0.0 + + cn.meowrain + aioj-backend-common + 1.0-SNAPSHOT + + + aioj-backend-common-mybatis + jar + + aioj mybatis 封装 + + + 17 + 17 + UTF-8 + + + + + cn.hutool + hutool-core + + + + com.baomidou + mybatis-plus-spring + + + + com.mysql + mysql-connector-j + + + + com.github.xiaoymin + knife4j-openapi3-jakarta-spring-boot-starter + + + \ No newline at end of file diff --git a/aioj-backend-common/aioj-backend-common-starter/pom.xml b/aioj-backend-common/aioj-backend-common-starter/pom.xml new file mode 100644 index 0000000..1ba3521 --- /dev/null +++ b/aioj-backend-common/aioj-backend-common-starter/pom.xml @@ -0,0 +1,33 @@ + + + 4.0.0 + + cn.meowrain + aioj-backend-common + 1.0-SNAPSHOT + + pom + + aioj-backend-common-starter + + + 17 + 17 + UTF-8 + + + + + cn.meowrain + aioj-backend-common-core + 1.0-SNAPSHOT + + + cn.meowrain + aioj-backend-common-log + 1.0-SNAPSHOT + + + \ No newline at end of file diff --git a/aioj-backend-common/pom.xml b/aioj-backend-common/pom.xml index 871f2ff..8cf6122 100644 --- a/aioj-backend-common/pom.xml +++ b/aioj-backend-common/pom.xml @@ -10,16 +10,30 @@ aioj-backend-common + pom + + aioj-backend-common-log + aioj-backend-common-core + aioj-backend-common-starter + aioj-backend-common-mybatis + aioj-backend-common-bom + 17 17 UTF-8 - - - org.springframework.boot - spring-boot-starter-web - - + + + + + cn.meowrain.aioj + aioj-backend-common-bom + 1.0.0 + pom + import + + + \ No newline at end of file diff --git a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/annotation/AuthCheck.java b/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/annotation/AuthCheck.java deleted file mode 100644 index 637491d..0000000 --- a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/annotation/AuthCheck.java +++ /dev/null @@ -1,12 +0,0 @@ -package cn.meowrain.aioj.backend.framework.annotation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Target(ElementType.METHOD) -@Retention(RetentionPolicy.RUNTIME) -public @interface AuthCheck { - String mustRole() default ""; -} diff --git a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/log/utils/SysLogUtils.java b/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/log/utils/SysLogUtils.java deleted file mode 100644 index ea0128b..0000000 --- a/aioj-backend-common/src/main/java/cn/meowrain/aioj/backend/framework/log/utils/SysLogUtils.java +++ /dev/null @@ -1,4 +0,0 @@ -package cn.meowrain.aioj.backend.framework.log.utils; - -public class SysLogUtils { -} diff --git a/aioj-backend-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/aioj-backend-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 2dc59e3..0000000 --- a/aioj-backend-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -cn.meowrain.aioj.backend.framework.config.WebAutoConfiguration \ No newline at end of file diff --git a/aioj-backend-common/src/main/resources/banner.txt b/aioj-backend-common/src/main/resources/banner.txt deleted file mode 100644 index c64715c..0000000 --- a/aioj-backend-common/src/main/resources/banner.txt +++ /dev/null @@ -1,19 +0,0 @@ - █████████ █████ ███████ █████ - ███░░░░░███ ░░███ ███░░░░░███ ░░███ - ░███ ░███ ░███ ███ ░░███ ░███ - ░███████████ ░███ ░███ ░███ ░███ - ░███░░░░░███ ░███ ░███ ░███ ░███ - ░███ ░███ ░███ ░░███ ███ ███ ░███ - █████ █████ █████ ░░░███████░ ░░████████ -░░░░░ ░░░░░ ░░░░░ ░░░░░░░ ░░░░░░░░ - - -🚀 AIOJ - ${spring.application.name} -🌍 Environment : ${spring.profiles.active} -☕ Java Version : ${java.version} -🔥 Started At : ${application.startup.time} -❤️ Service Running: http://${server.address:127.0.0.1}:${server.port}${server.servlet.context-path} -✨API Document: http://127.0.0.1:${server.port}/doc.html - - - diff --git a/aioj-backend-gateway/pom.xml b/aioj-backend-gateway/pom.xml index 5cbd9a0..f8efddb 100644 --- a/aioj-backend-gateway/pom.xml +++ b/aioj-backend-gateway/pom.xml @@ -18,6 +18,11 @@ 4.3.2 + + cn.meowrain + aioj-backend-common-starter + 1.0-SNAPSHOT + org.springframework.boot spring-boot-starter-webflux diff --git a/aioj-backend-gateway/src/main/resources/application.yml b/aioj-backend-gateway/src/main/resources/application.yml index f542820..f471913 100644 --- a/aioj-backend-gateway/src/main/resources/application.yml +++ b/aioj-backend-gateway/src/main/resources/application.yml @@ -14,3 +14,7 @@ spring: uri: lb://user-service predicates: - Path=/api/v1/user/** +aioj: + log: + enabled: true + max-length: 20000 diff --git a/aioj-backend-client/pom.xml b/aioj-backend-upms/aioj-backend-upms-api/pom.xml similarity index 86% rename from aioj-backend-client/pom.xml rename to aioj-backend-upms/aioj-backend-upms-api/pom.xml index 820b431..5aee90b 100644 --- a/aioj-backend-client/pom.xml +++ b/aioj-backend-upms/aioj-backend-upms-api/pom.xml @@ -5,11 +5,11 @@ 4.0.0 cn.meowrain - ai-oj + aioj-backend-upms 1.0-SNAPSHOT - aioj-backend-client + aioj-backend-upms-api 17 diff --git a/aioj-backend-upms/aioj-backend-upms-biz/pom.xml b/aioj-backend-upms/aioj-backend-upms-biz/pom.xml new file mode 100644 index 0000000..554f4cf --- /dev/null +++ b/aioj-backend-upms/aioj-backend-upms-biz/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + cn.meowrain + aioj-backend-upms + 1.0-SNAPSHOT + + + aioj-backend-upms-biz + + + 17 + 17 + UTF-8 + + + \ No newline at end of file diff --git a/aioj-backend-upms/pom.xml b/aioj-backend-upms/pom.xml new file mode 100644 index 0000000..ce2311f --- /dev/null +++ b/aioj-backend-upms/pom.xml @@ -0,0 +1,25 @@ + + + 4.0.0 + + cn.meowrain + ai-oj + 1.0-SNAPSHOT + + + aioj-backend-upms + pom + + aioj-backend-upms-api + aioj-backend-upms-biz + + + + 17 + 17 + UTF-8 + + + \ No newline at end of file diff --git a/aioj-backend-user-service/pom.xml b/aioj-backend-user-service/pom.xml index bb27d4e..b0d4202 100644 --- a/aioj-backend-user-service/pom.xml +++ b/aioj-backend-user-service/pom.xml @@ -18,6 +18,11 @@ + + cn.meowrain + aioj-backend-common-starter + 1.0-SNAPSHOT + org.springframework.boot spring-boot-starter-web @@ -27,16 +32,6 @@ com.github.xiaoymin knife4j-openapi3-jakarta-spring-boot-starter - - cn.meowrain - aioj-backend-common - 1.0-SNAPSHOT - - - - com.baomidou - mybatis-plus-spring-boot3-starter - org.springframework.boot spring-boot-starter-data-redis diff --git a/aioj-backend-user-service/src/main/java/cn/meowrain/aioj/backend/userservice/config/FrameworkConfiguration.java b/aioj-backend-user-service/src/main/java/cn/meowrain/aioj/backend/userservice/config/FrameworkConfiguration.java index acdb4c0..37cd73f 100644 --- a/aioj-backend-user-service/src/main/java/cn/meowrain/aioj/backend/userservice/config/FrameworkConfiguration.java +++ b/aioj-backend-user-service/src/main/java/cn/meowrain/aioj/backend/userservice/config/FrameworkConfiguration.java @@ -6,7 +6,7 @@ import org.springframework.context.annotation.Configuration; @Configuration @ComponentScans({ - @ComponentScan("cn.meowrain.aioj.backend.framework.banner") + @ComponentScan("cn.meowrain.aioj.backend.framework.core.banner") }) public class FrameworkConfiguration { diff --git a/aioj-backend-user-service/src/main/java/cn/meowrain/aioj/backend/userservice/controller/UserController.java b/aioj-backend-user-service/src/main/java/cn/meowrain/aioj/backend/userservice/controller/UserController.java index d1b87e4..9bb7a94 100644 --- a/aioj-backend-user-service/src/main/java/cn/meowrain/aioj/backend/userservice/controller/UserController.java +++ b/aioj-backend-user-service/src/main/java/cn/meowrain/aioj/backend/userservice/controller/UserController.java @@ -1,7 +1,7 @@ package cn.meowrain.aioj.backend.userservice.controller; -import cn.meowrain.aioj.backend.framework.web.Result; -import cn.meowrain.aioj.backend.framework.web.Results; +import cn.meowrain.aioj.backend.framework.core.web.Result; +import cn.meowrain.aioj.backend.framework.core.web.Results; import cn.meowrain.aioj.backend.userservice.dto.req.UserRegisterRequestDTO; import cn.meowrain.aioj.backend.userservice.dto.resp.UserAuthRespDTO; import cn.meowrain.aioj.backend.userservice.service.UserService; diff --git a/aioj-backend-user-service/src/main/java/cn/meowrain/aioj/backend/userservice/dto/chains/context/UserRegisterRequestParamVerifyContext.java b/aioj-backend-user-service/src/main/java/cn/meowrain/aioj/backend/userservice/dto/chains/context/UserRegisterRequestParamVerifyContext.java index f2931af..415b9b3 100644 --- a/aioj-backend-user-service/src/main/java/cn/meowrain/aioj/backend/userservice/dto/chains/context/UserRegisterRequestParamVerifyContext.java +++ b/aioj-backend-user-service/src/main/java/cn/meowrain/aioj/backend/userservice/dto/chains/context/UserRegisterRequestParamVerifyContext.java @@ -1,6 +1,6 @@ package cn.meowrain.aioj.backend.userservice.dto.chains.context; -import cn.meowrain.aioj.backend.framework.designpattern.chains.CommonChainContext; +import cn.meowrain.aioj.backend.framework.core.designpattern.chains.CommonChainContext; import cn.meowrain.aioj.backend.userservice.dto.req.UserRegisterRequestDTO; import org.springframework.stereotype.Component; diff --git a/aioj-backend-user-service/src/main/java/cn/meowrain/aioj/backend/userservice/service/impl/UserServiceImpl.java b/aioj-backend-user-service/src/main/java/cn/meowrain/aioj/backend/userservice/service/impl/UserServiceImpl.java index e69f9e6..e7ec38b 100644 --- a/aioj-backend-user-service/src/main/java/cn/meowrain/aioj/backend/userservice/service/impl/UserServiceImpl.java +++ b/aioj-backend-user-service/src/main/java/cn/meowrain/aioj/backend/userservice/service/impl/UserServiceImpl.java @@ -1,9 +1,9 @@ package cn.meowrain.aioj.backend.userservice.service.impl; import cn.hutool.crypto.digest.BCrypt; -import cn.meowrain.aioj.backend.framework.errorcode.ErrorCode; -import cn.meowrain.aioj.backend.framework.exception.ClientException; -import cn.meowrain.aioj.backend.framework.exception.ServiceException; +import cn.meowrain.aioj.backend.framework.core.errorcode.ErrorCode; +import cn.meowrain.aioj.backend.framework.core.exception.ClientException; +import cn.meowrain.aioj.backend.framework.core.exception.ServiceException; import cn.meowrain.aioj.backend.userservice.common.enums.ChainMarkEnums; import cn.meowrain.aioj.backend.userservice.dao.entity.User; import cn.meowrain.aioj.backend.userservice.dao.mapper.UserMapper; diff --git a/aioj-backend-user-service/src/main/resources/application.yml b/aioj-backend-user-service/src/main/resources/application.yml index 2834695..068e481 100644 --- a/aioj-backend-user-service/src/main/resources/application.yml +++ b/aioj-backend-user-service/src/main/resources/application.yml @@ -28,4 +28,8 @@ knife4j: mybatis-plus: configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - mapper-locations: classpath*:/mapper/**/*.xml \ No newline at end of file + mapper-locations: classpath*:/mapper/**/*.xml +aioj: + log: + enabled: true + max-length: 20000 \ No newline at end of file diff --git a/pom.xml b/pom.xml index ad03473..a81600c 100644 --- a/pom.xml +++ b/pom.xml @@ -21,9 +21,9 @@ aioj-backend-judge-service aioj-backend-user-service aioj-backend-question-service - aioj-backend-client aioj-backend-ai-service aioj-backend-auth + aioj-backend-upms 17 @@ -37,12 +37,6 @@ org.springframework.boot spring-boot-starter-aop - - - cn.hutool - hutool-all - 5.8.41 - org.apache.commons @@ -61,6 +55,14 @@ + + cn.meowrain.aioj + aioj-backend-common-bom + 1.0.0 + pom + import + + org.springframework.boot spring-boot-dependencies @@ -68,6 +70,7 @@ pom import + com.alibaba.cloud spring-cloud-alibaba-dependencies @@ -75,47 +78,6 @@ pom import - - - com.github.xiaoymin - knife4j-openapi3-jakarta-spring-boot-starter - 4.5.0 - - - - org.springframework.boot - spring-boot-starter-security - 3.5.7 - - - - - - - org.springframework.boot - spring-boot-starter-oauth2-client - 3.5.7 - - - - org.springframework.security - spring-security-test - 6.5.7 - test - - - com.baomidou - mybatis-plus-spring-boot3-starter - 3.5.14 - - - - - - com.alibaba - easyexcel - 4.0.3 -