diff --git a/pom.xml b/pom.xml index 8301316b2..c04e1f8f9 100644 --- a/pom.xml +++ b/pom.xml @@ -62,6 +62,7 @@ 3.11.0 3.1.2 1.3.0 + 3.3.0 @@ -395,6 +396,37 @@ ${revision} + + + org.apache.dubbo + dubbo-spring-boot-starter + ${dubbo.version} + + + + + + org.apache.dubbo + dubbo-nacos-spring-boot-starter + ${dubbo.version} + + + + diff --git a/ruoyi-modules/ruoyi-sso-server/pom.xml b/ruoyi-modules/ruoyi-sso-server/pom.xml index e385b6346..f82c1abd8 100644 --- a/ruoyi-modules/ruoyi-sso-server/pom.xml +++ b/ruoyi-modules/ruoyi-sso-server/pom.xml @@ -80,12 +80,38 @@ ${revision} + + + org.dromara + ruoyi-api-system + ${revision} + + cn.dev33 sa-token-sso 1.38.0 + + + + cn.dev33 + sa-token-sso + 1.38.0 + + + + + org.apache.dubbo + dubbo-spring-boot-starter + + + + org.apache.dubbo + dubbo-nacos-spring-boot-starter + + diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/com/pj/SaSsoServerApplication.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/com/pj/SaSsoServerApplication.java index b0f29bb52..40a3558b7 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/com/pj/SaSsoServerApplication.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/com/pj/SaSsoServerApplication.java @@ -4,6 +4,7 @@ import cn.dev33.satoken.sso.SaSsoManager; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +@EnableDubbo @SpringBootApplication public class SaSsoServerApplication { diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/resources/application.yml b/ruoyi-modules/ruoyi-sso-server/src/main/resources/application.yml index 2d05ac855..2f895dac3 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/resources/application.yml +++ b/ruoyi-modules/ruoyi-sso-server/src/main/resources/application.yml @@ -9,11 +9,6 @@ spring: server-addr: http://127.0.0.1:8848 namespace: c5c00044-93e6-4e66-8060-3f39aa7ab82b group: ${spring.profiles.active} - openfeign: - okhttp: - enabled: true - httpclient: - connection-timeout: 5000 # Redis配置 (SSO模式一和模式二使用Redis来同步会话) data: redis: @@ -82,3 +77,48 @@ security: - /*/api-docs/** - /sso/signout +# 内置配置 不允许修改 如需修改请在 nacos 上写相同配置覆盖 +dubbo: + application: + logger: slf4j + # 元数据中心 local 本地 remote 远程 这里使用远程便于其他服务获取 + metadataType: remote + # 可选值 interface、instance、all,默认是 all,即接口级地址、应用级地址都注册 + register-mode: instance + service-discovery: + # FORCE_INTERFACE,只消费接口级地址,如无地址则报错,单订阅 2.x 地址 + # APPLICATION_FIRST,智能决策接口级/应用级地址,双订阅 + # FORCE_APPLICATION,只消费应用级地址,如无地址则报错,单订阅 3.x 地址 + migration: FORCE_APPLICATION + # 注册中心配置 + registry: + address: nacos://127.0.0.1:8848 + group: DUBBO_GROUP + username: ${spring.cloud.nacos.username} + password: ${spring.cloud.nacos.password} + parameters: + namespace: c5c00044-93e6-4e66-8060-3f39aa7ab82b + metadata-report: + address: redis://${spring.data.redis.host}:${spring.data.redis.port} + group: DUBBO_GROUP + username: dubbo + password: ${spring.data.redis.password} + # 集群开关 + cluster: false + parameters: + namespace: ${spring.profiles.active} + database: ${spring.data.redis.database} + timeout: ${spring.data.redis.timeout} + # 集群地址 cluster 为 true 生效 + backup: 127.0.0.1:6379,127.0.0.1:6381 + # 消费者相关配置 + consumer: + # 结果缓存(LRU算法) + # 会有数据不一致问题 建议在注解局部开启 + cache: false + # 支持校验注解 + validation: jvalidationNew + # 调用重试 不包括第一次 0为不需要重试 + retries: 0 + # 初始化检查 + check: false diff --git a/ruoyi-modules/ruoyi-system-saas/pom.xml b/ruoyi-modules/ruoyi-system-saas/pom.xml index 9b4ecac4d..4455bc68b 100644 --- a/ruoyi-modules/ruoyi-system-saas/pom.xml +++ b/ruoyi-modules/ruoyi-system-saas/pom.xml @@ -12,7 +12,7 @@ ruoyi-system-saas - system-tenant 系统模块 + system-saas 系统模块 @@ -100,6 +100,17 @@ ruoyi-common-sse + + + org.apache.dubbo + dubbo-spring-boot-starter + + + + org.apache.dubbo + dubbo-nacos-spring-boot-starter + +