diff --git a/ruoyi-site/ruoyi-sso-server/pom.xml b/ruoyi-site/ruoyi-sso-server/pom.xml index 57e51aa02..8cd2e8059 100644 --- a/ruoyi-site/ruoyi-sso-server/pom.xml +++ b/ruoyi-site/ruoyi-sso-server/pom.xml @@ -68,10 +68,11 @@ - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - + + + + + @@ -113,10 +114,10 @@ dubbo-spring-boot-starter - - - - + + org.apache.dubbo + dubbo-nacos-spring-boot-starter + diff --git a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/properties/CaptchaProperties.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/properties/CaptchaProperties.java index 01fcb78de..12a6e9bbd 100644 --- a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/properties/CaptchaProperties.java +++ b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/properties/CaptchaProperties.java @@ -4,7 +4,6 @@ import lombok.Data; import org.dromara.sso.enums.CaptchaCategory; import org.dromara.sso.enums.CaptchaType; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.context.annotation.Configuration; /** @@ -14,7 +13,6 @@ import org.springframework.context.annotation.Configuration; */ @Data @Configuration -@RefreshScope @ConfigurationProperties(prefix = "security.captcha") public class CaptchaProperties { diff --git a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/properties/UserPasswordProperties.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/properties/UserPasswordProperties.java index 3703232ff..2577fb4c5 100644 --- a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/properties/UserPasswordProperties.java +++ b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/properties/UserPasswordProperties.java @@ -2,7 +2,6 @@ package org.dromara.sso.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.context.annotation.Configuration; /** @@ -12,7 +11,6 @@ import org.springframework.context.annotation.Configuration; */ @Data @Configuration -@RefreshScope @ConfigurationProperties(prefix = "user.password") public class UserPasswordProperties { diff --git a/ruoyi-site/ruoyi-sso-server/src/main/resources/application-local.yml b/ruoyi-site/ruoyi-sso-server/src/main/resources/application-local.yml index 25d14fd1e..585a6af59 100644 --- a/ruoyi-site/ruoyi-sso-server/src/main/resources/application-local.yml +++ b/ruoyi-site/ruoyi-sso-server/src/main/resources/application-local.yml @@ -32,16 +32,8 @@ dubbo: retries: 0 # 初始化检查 check: false -spring: - cloud: - nacos: - # nacos 服务地址 - server-addr: http://127.0.0.1:8848 - discovery: - # 注册组 - group: DUBBO_GROUP - namespace: c5c00044-93e6-4e66-8060-3f39aa7ab82b +spring: # Redis配置 (SSO模式一和模式二使用Redis来同步会话) data: redis: