diff --git a/yudao-gateway/src/main/resources/application.yaml b/yudao-gateway/src/main/resources/application.yaml index 0e1ed711f..f6b4879c5 100644 --- a/yudao-gateway/src/main/resources/application.yaml +++ b/yudao-gateway/src/main/resources/application.yaml @@ -31,6 +31,19 @@ spring: - Path=/app-api/system/** filters: - RewritePath=/app-api/system/v3/api-docs, /v3/api-docs + ## remote-server 服务 + - id: remote-admin-api # 路由的编号 + uri: grayLb://remote-server + predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组 + - Path=/admin-api/remote/** + filters: + - RewritePath=/admin-api/remote/v3/api-docs, /v3/api-docs # 配置,保证转发到 /v3/api-docs + - id: remote-app-api # 路由的编号 + uri: grayLb://remote-server + predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组 + - Path=/app-api/remote/** + filters: + - RewritePath=/app-api/remote/v3/api-docs, /v3/api-docs ## infra-server 服务 - id: infra-admin-api # 路由的编号 uri: grayLb://infra-server @@ -188,6 +201,9 @@ knife4j: - name: system-server service-name: system-server url: /admin-api/system/v3/api-docs + - name: remote-server + service-name: remote-server + url: /admin-api/remote/v3/api-docs - name: infra-server service-name: infra-server url: /admin-api/infra/v3/api-docs diff --git a/yudao-module-remote/yudao-module-remote-api/src/main/java/cn/iocoder/cloud/module/remote/enums/ApiConstants.java b/yudao-module-remote/yudao-module-remote-api/src/main/java/cn/iocoder/cloud/module/remote/enums/ApiConstants.java index 38f53bbe5..7cceac1f5 100644 --- a/yudao-module-remote/yudao-module-remote-api/src/main/java/cn/iocoder/cloud/module/remote/enums/ApiConstants.java +++ b/yudao-module-remote/yudao-module-remote-api/src/main/java/cn/iocoder/cloud/module/remote/enums/ApiConstants.java @@ -14,9 +14,9 @@ public class ApiConstants { * * 注意,需要保证和 spring.application.name 保持一致 */ - public static final String NAME = "system-server"; + public static final String NAME = "remote-server"; - public static final String PREFIX = RpcConstants.RPC_API_PREFIX + "/system"; + public static final String PREFIX = RpcConstants.RPC_API_PREFIX + "/remote"; public static final String VERSION = "1.0.0"; diff --git a/yudao-module-remote/yudao-module-remote-biz/pom.xml b/yudao-module-remote/yudao-module-remote-biz/pom.xml index d3aee38af..2cb3d3ca1 100644 --- a/yudao-module-remote/yudao-module-remote-biz/pom.xml +++ b/yudao-module-remote/yudao-module-remote-biz/pom.xml @@ -90,6 +90,66 @@ + + cn.iocoder.cloud + yudao-spring-boot-starter-redis + + + + + cn.iocoder.cloud + yudao-spring-boot-starter-rpc + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + cn.iocoder.cloud + yudao-spring-boot-starter-mq + + + + + + + + + + + cn.iocoder.cloud + yudao-spring-boot-starter-excel + + + + org.springframework.boot + spring-boot-starter-mail + + + + + cn.iocoder.cloud + yudao-spring-boot-starter-monitor + + + + org.springframework.cloud + spring-cloud-starter-bootstrap + 3.1.8 + + + + diff --git a/yudao-module-remote/yudao-module-remote-biz/src/main/java/cn/iocoder/yudao/module/remote/controller/login/LoginController.java b/yudao-module-remote/yudao-module-remote-biz/src/main/java/cn/iocoder/yudao/module/remote/controller/admin/login/LoginController.java similarity index 94% rename from yudao-module-remote/yudao-module-remote-biz/src/main/java/cn/iocoder/yudao/module/remote/controller/login/LoginController.java rename to yudao-module-remote/yudao-module-remote-biz/src/main/java/cn/iocoder/yudao/module/remote/controller/admin/login/LoginController.java index f9154a715..857b7c5f5 100644 --- a/yudao-module-remote/yudao-module-remote-biz/src/main/java/cn/iocoder/yudao/module/remote/controller/login/LoginController.java +++ b/yudao-module-remote/yudao-module-remote-biz/src/main/java/cn/iocoder/yudao/module/remote/controller/admin/login/LoginController.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.remote.controller.login; +package cn.iocoder.yudao.module.remote.controller.admin.login; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.remote.service.login.LoginService; diff --git a/yudao-module-remote/yudao-module-remote-biz/src/main/java/cn/iocoder/yudao/module/remote/framework/security/config/SecurityConfiguration.java b/yudao-module-remote/yudao-module-remote-biz/src/main/java/cn/iocoder/yudao/module/remote/framework/security/config/SecurityConfiguration.java index 465b2696a..a203c4569 100644 --- a/yudao-module-remote/yudao-module-remote-biz/src/main/java/cn/iocoder/yudao/module/remote/framework/security/config/SecurityConfiguration.java +++ b/yudao-module-remote/yudao-module-remote-biz/src/main/java/cn/iocoder/yudao/module/remote/framework/security/config/SecurityConfiguration.java @@ -1,19 +1,19 @@ package cn.iocoder.yudao.module.remote.framework.security.config; +import cn.iocoder.cloud.module.remote.enums.ApiConstants; import cn.iocoder.yudao.framework.security.config.AuthorizeRequestsCustomizer; -import cn.iocoder.yudao.module.system.enums.ApiConstants; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configurers.AuthorizeHttpRequestsConfigurer; /** - * System 模块的 Security 配置 + * remote 模块的 Security 配置 */ -@Configuration(proxyBeanMethods = false, value = "systemSecurityConfiguration") +@Configuration(proxyBeanMethods = false, value = "remoteSecurityConfiguration") public class SecurityConfiguration { - @Bean("systemAuthorizeRequestsCustomizer") + @Bean("RemoteAuthorizeRequestsCustomizer") public AuthorizeRequestsCustomizer authorizeRequestsCustomizer() { return new AuthorizeRequestsCustomizer() {