diff --git a/aioj-backend-common/pom.xml b/aioj-backend-common/pom.xml index 4e12fb5..871f2ff 100644 --- a/aioj-backend-common/pom.xml +++ b/aioj-backend-common/pom.xml @@ -16,4 +16,10 @@ 17 UTF-8 + + + org.springframework.boot + spring-boot-starter-web + + \ No newline at end of file diff --git a/aioj-backend-gateway/pom.xml b/aioj-backend-gateway/pom.xml index 64f236c..769b8fb 100644 --- a/aioj-backend-gateway/pom.xml +++ b/aioj-backend-gateway/pom.xml @@ -1,7 +1,7 @@ + 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"> 4.0.0 cn.meowrain @@ -15,11 +15,31 @@ 17 17 UTF-8 + 4.3.2 org.springframework.boot spring-boot-starter-webflux + + + org.springframework.cloud + spring-cloud-starter-gateway-server-webflux + 4.3.2 + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + com.alibaba.cloud + spring-cloud-alibaba-sentinel-gateway + \ No newline at end of file diff --git a/aioj-backend-gateway/src/main/java/cn/meowrain/aioj/backend/gateway/AIOJGatewayApplication.java b/aioj-backend-gateway/src/main/java/cn/meowrain/aioj/backend/gateway/AIOJGatewayApplication.java new file mode 100644 index 0000000..2d3e349 --- /dev/null +++ b/aioj-backend-gateway/src/main/java/cn/meowrain/aioj/backend/gateway/AIOJGatewayApplication.java @@ -0,0 +1,11 @@ +package cn.meowrain.aioj.backend.gateway; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class AIOJGatewayApplication { + public static void main(String[] args) { + SpringApplication.run(AIOJGatewayApplication.class, args); + } +} diff --git a/aioj-backend-gateway/src/main/resources/application-dev.yml b/aioj-backend-gateway/src/main/resources/application-dev.yml new file mode 100644 index 0000000..e69de29 diff --git a/aioj-backend-gateway/src/main/resources/application-prod.yml b/aioj-backend-gateway/src/main/resources/application-prod.yml new file mode 100644 index 0000000..e69de29 diff --git a/aioj-backend-gateway/src/main/resources/application.yml b/aioj-backend-gateway/src/main/resources/application.yml new file mode 100644 index 0000000..e3c0c52 --- /dev/null +++ b/aioj-backend-gateway/src/main/resources/application.yml @@ -0,0 +1,30 @@ + +spring: + application: + name: aioj-gateway + config: + import: optional:nacos:application.yaml + cloud: + nacos: + discovery: + password: nacos + username: nacos + server-addr: 10.0.0.10:8848 + config: + server-addr: 10.0.0.10:8848 + enabled: false + gateway: + server: + webflux: + routes: + - id: user + uri: lb://aioj-backend-user-service + predicates: + - Path=/api/user/** + filters: + - StripPrefix=2 +logging: + level: + root: info +server: + port: 8085 diff --git a/aioj-backend-user-service/pom.xml b/aioj-backend-user-service/pom.xml index 2beadcf..3792fbb 100644 --- a/aioj-backend-user-service/pom.xml +++ b/aioj-backend-user-service/pom.xml @@ -18,6 +18,10 @@ + + org.springframework.boot + spring-boot-starter-web + com.github.xiaoymin @@ -40,6 +44,43 @@ spring-boot-starter-oauth2-client + + com.baomidou + mybatis-plus-spring-boot3-starter + + + org.springframework.boot + spring-boot-starter-data-redis + + + org.springframework.session + spring-session-data-redis + + + + org.springframework.boot + spring-boot-starter-cache + + + com.mysql + mysql-connector-j + runtime + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + io.jsonwebtoken diff --git a/aioj-backend-user-service/src/main/java/cn/meowrain/aioj/backend/userservice/dto/chains/UserRegisterRequestParamVerifyChain.java b/aioj-backend-user-service/src/main/java/cn/meowrain/aioj/backend/userservice/dto/chains/UserRegisterRequestParamVerifyChain.java index f8f16b4..e883a98 100644 --- a/aioj-backend-user-service/src/main/java/cn/meowrain/aioj/backend/userservice/dto/chains/UserRegisterRequestParamVerifyChain.java +++ b/aioj-backend-user-service/src/main/java/cn/meowrain/aioj/backend/userservice/dto/chains/UserRegisterRequestParamVerifyChain.java @@ -5,8 +5,8 @@ import cn.meowrain.aioj.backend.framework.errorcode.ErrorCode; import cn.meowrain.aioj.backend.framework.exception.ClientException; import cn.meowrain.aioj.backend.userservice.common.enums.ChainMarkEnums; import cn.meowrain.aioj.backend.userservice.dto.req.UserRegisterRequest; -import com.alibaba.nacos.common.utils.StringUtils; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; @Component diff --git a/aioj-backend-user-service/src/main/resources/application-dev.yml b/aioj-backend-user-service/src/main/resources/application-dev.yml index 4769411..019d5c9 100644 --- a/aioj-backend-user-service/src/main/resources/application-dev.yml +++ b/aioj-backend-user-service/src/main/resources/application-dev.yml @@ -12,5 +12,8 @@ spring: cloud: nacos: discovery: - enabled: false # 🚫 禁用 Nacos 服务发现 - register-enabled: false # 🚫 禁用向 Nacos 注册 \ No newline at end of file + enabled: true + register-enabled: true + server-addr: 10.0.0.10:8848 + username: nacos + password: nacos \ No newline at end of file diff --git a/pom.xml b/pom.xml index cdbceba..e4c269e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,12 @@ 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"> 4.0.0 - + + org.springframework.boot + spring-boot-starter-parent + 3.5.7 + + cn.meowrain ai-oj 1.0-SNAPSHOT @@ -28,45 +33,12 @@ 2025.0.0.0 - - org.springframework.boot - spring-boot-starter-web - - - com.alibaba.cloud - spring-cloud-alibaba-sentinel-gateway - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - org.springframework.boot - spring-boot-starter-cache - - - - - - + - com.baomidou - mybatis-plus-spring-boot3-starter - 3.5.14 - - - org.springframework.boot - spring-boot-starter-data-redis - - - org.springframework.session - spring-session-data-redis + cn.hutool + hutool-all + 5.8.41 @@ -78,40 +50,11 @@ gson 2.9.1 - - - - com.alibaba - easyexcel - 4.0.3 - - - - cn.hutool - hutool-all - 5.8.41 - - - com.mysql - mysql-connector-j - runtime - org.projectlombok lombok true - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-devtools - runtime - true - @@ -157,11 +100,18 @@ 6.5.7 test - - org.springframework.boot - spring-boot-starter-oauth2-resource-server - 3.5.7 + com.baomidou + mybatis-plus-spring-boot3-starter + 3.5.14 + + + + + + com.alibaba + easyexcel + 4.0.3