修改接入的那nacos-config，使用springcloud的

将配置文件都从nacos中读取

README.md

@@ -95,3 +95,7 @@ redis:
 ip: 10.11.96.37
 端口: 6379
 密码：superman
+
+应用服务器：
+10.11.96.40
+登录: root/Lw123456

pom.xml

@@ -13,7 +13,7 @@
 
     <properties>
         <ruoyi-vue-plus.version>3.1.0</ruoyi-vue-plus.version>
-        <spring-boot.version>2.5.4</spring-boot.version>
+        <spring-boot.version>2.3.5.RELEASE</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
@@ -47,7 +47,7 @@
         <docker.namespace>ruoyi</docker.namespace>
         <docker.plugin.version>1.2.2</docker.plugin.version>
 
-        <alicloud.version>2021.1</alicloud.version>
+        <alicloud.version>2.2.3.RELEASE</alicloud.version>
         <spring.cloud-version>2020.0.4</spring.cloud-version>
     </properties>
 

ruoyi-admin/src/main/resources/application-dev.yml → ruoyi-admin/nacos/yjzh-sq-dev.yaml

@@ -91,19 +91,6 @@ spring:
     # 是否开启ssl
     ssl: false
 
-  # nacos
-  cloud:
-    nacos:
-      server-addr: nacos.xt.wenhq.top:8083
-      discovery:
-        server-addr: nacos.xt.wenhq.top:8083
-        namespace: public
-
-    compatibility-verifier:
-      enabled: false
-nacos:
-  config:
-    server-addr: nacos.xt.wenhq.top:8083
 redisson:
   # 线程池数量
   threads: 16
@@ -137,4 +124,3 @@ redisson:
     dnsMonitoringInterval: 5000
 
 
-

ruoyi-admin/src/main/resources/application-prod.yml → ruoyi-admin/nacos/yjzh-sq-prod.yaml

@@ -86,15 +86,6 @@ spring:
     # 是否开启ssl
     ssl: false
 
-  # nacos
-  cloud:
-    nacos:
-      discovery:
-        server-addr: nacos.xt.wenhq.top:8083
-        namespace: public
-    compatibility-verifier:
-      enabled: false
-
 redisson:
   # 线程池数量
   threads: 16

ruoyi-admin/src/main/resources/application-test.yml → ruoyi-admin/nacos/yjzh-sq-test.yaml

@@ -86,19 +86,6 @@ spring:
     # 是否开启ssl
     ssl: false
 
-  # nacos
-  cloud:
-    nacos:
-      server-addr: 10.11.96.37:8083
-      discovery:
-        server-addr: 10.11.96.37:8083
-        namespace: public
-
-    compatibility-verifier:
-      enabled: false
-nacos:
-  config:
-    server-addr: nacos.xt.wenhq.top:8083
 redisson:
   # 线程池数量
   threads: 16

ruoyi-admin/src/main/resources/application.yml → ruoyi-admin/nacos/yjzh-sq.yaml

@@ -19,8 +19,8 @@ spring:
   messages:
     # 国际化资源文件路径
     basename: i18n/messages
-  profiles:
-    active: dev
+#  profiles:
+#    active: dev
   # 文件上传
   servlet:
     multipart:

ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -1,6 +1,6 @@
 package com.ruoyi;
 
-import com.alibaba.nacos.spring.context.annotation.config.NacosPropertySource;
+//import com.alibaba.nacos.spring.context.annotation.config.NacosPropertySource;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -13,7 +13,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
 @SpringBootApplication
 @EnableDiscoveryClient
-@NacosPropertySource(dataId = "YJZH_SQ-dev.properties",groupId = "1685c502-a710-455b-b9e5-c7301f6d01cd",autoRefreshed = true)
+//@NacosPropertySource(dataId = "YJZH_SQ-dev.properties",groupId = "1685c502-a710-455b-b9e5-c7301f6d01cd",autoRefreshed = true)
 public class RuoYiApplication
 {
     public static void main(String[] args)

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java

@@ -34,20 +34,12 @@ import java.util.concurrent.TimeUnit;
  * @author ruoyi
  */
 @RestController
-public class CaptchaController implements CommandLineRunner {
+@RefreshScope
+public class CaptchaController {
 
 	@Autowired
 	private CaptchaProperties captchaProperties;
 
-//    @NacosInjected
-//    private NamingService namingService;
-
-    @NacosValue(value = "${yjzh.name:ini}",autoRefreshed = true)
-    private String applicationName;
-
-    @NacosValue(value = "${yjzh.port:0}",autoRefreshed = true)
-    private Integer serverPort;
-
 	@Autowired
 	private ISysConfigService configService;
 
@@ -80,17 +72,6 @@ public class CaptchaController implements CommandLineRunner {
 		return AjaxResult.success(ajax);
 	}
 
-	@Autowired
-    ApplicationContext context;
-
-	@GetMapping("/test")
-    public AjaxResult getTest(){
-        Map<String, Object> ajax = new HashMap<>();
-        ajax.put("data", applicationName);
-
-        return AjaxResult.success(ajax);
-
-    }
 	private String getCodeResult(String capStr) {
 		int numberLength = captchaProperties.getNumberLength();
 		int a = Convert.toInt(StringUtils.substring(capStr, 0, numberLength).trim());
@@ -108,16 +89,4 @@ public class CaptchaController implements CommandLineRunner {
 		}
 	}
 
-    @Override
-    public void run(String... args) throws Exception {
-
-//	    try{
-//            namingService.registerInstance(applicationName+"ss", "127.0.0.1", serverPort.intValue());
-//        }catch (Exception ee){
-//
-//        }
-//	    namingService.registerInstance(applicationName+"ss", "127.0.0.1", serverPort.intValue());
-//        namingService.registerInstance(applicationName+"1", "127.0.0.1", serverPort.intValue(),"验证码1");
-
-    }
 }

ruoyi-admin/src/main/resources/bootstrap-dev.yml

@@ -0,0 +1,30 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        # Nacos 认证用户
+        username: nacos
+        # Nacos 认证密码
+        password: nacos
+        # 命名空间 常用场景之一是不同环境的配置的区分隔离，例如开发测试环境和生产环境的资源（如配置、服务）隔离等
+        namespace:
+        # 配置中心地址
+        server-addr: nacos.xt.wenhq.top:8083
+        # 配置对应的分组
+        group: DEFAULT_GROUP
+        # 配置文件后缀
+        file-extension: yaml
+        prefix: yjzh-sq
+        # 支持多个共享 Data Id 的配置，优先级小于extension-configs,自定义 Data Id 配置 属性是个集合，内部由 Config POJO 组成。Config 有 3 个属性，分别是 dataId, group 以及 refresh
+        #shared-configs[0]:
+          #data-id: @prefix.name@-common.yaml # 配置文件名-Data Id
+          #group: @config.group@   # 默认为DEFAULT_GROUP
+          #refresh: false   # 是否动态刷新，默认为false
+        # 配置文件默认使用nacos
+        enabled: true
+      discovery:
+        namespace:
+        server-addr: nacos.xt.wenhq.top:8083
+
+    compatibility-verifier:
+      enabled: false

ruoyi-admin/src/main/resources/bootstrap-prod.yml

@@ -0,0 +1,30 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        # Nacos 认证用户
+        username: nacos
+        # Nacos 认证密码
+        password: nacos
+        # 命名空间 常用场景之一是不同环境的配置的区分隔离，例如开发测试环境和生产环境的资源（如配置、服务）隔离等
+        namespace:
+        # 配置中心地址
+        server-addr:
+        # 配置对应的分组
+        group:
+        # 配置文件后缀
+        file-extension: yaml
+        prefix: yjzh-sq
+        # 支持多个共享 Data Id 的配置，优先级小于extension-configs,自定义 Data Id 配置 属性是个集合，内部由 Config POJO 组成。Config 有 3 个属性，分别是 dataId, group 以及 refresh
+        #shared-configs[0]:
+          #data-id: @prefix.name@-common.yaml # 配置文件名-Data Id
+          #group: @config.group@   # 默认为DEFAULT_GROUP
+          #refresh: false   # 是否动态刷新，默认为false
+        # 配置文件默认使用nacos
+        enabled: true
+      discovery:
+        namespace:
+        server-addr:
+
+    compatibility-verifier:
+      enabled: false

ruoyi-admin/src/main/resources/bootstrap-test.yml

@@ -0,0 +1,30 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        # Nacos 认证用户
+        username: nacos
+        # Nacos 认证密码
+        password: nacos
+        # 命名空间 常用场景之一是不同环境的配置的区分隔离，例如开发测试环境和生产环境的资源（如配置、服务）隔离等
+        namespace:
+        # 配置中心地址
+        server-addr: 10.11.96.37:8848
+        # 配置对应的分组
+        group: DEFAULT_GROUP
+        # 配置文件后缀
+        file-extension: yaml
+        prefix: yjzh-sq
+        # 支持多个共享 Data Id 的配置，优先级小于extension-configs,自定义 Data Id 配置 属性是个集合，内部由 Config POJO 组成。Config 有 3 个属性，分别是 dataId, group 以及 refresh
+        #shared-configs[0]:
+          #data-id: @prefix.name@-common.yaml # 配置文件名-Data Id
+          #group: @config.group@   # 默认为DEFAULT_GROUP
+          #refresh: false   # 是否动态刷新，默认为false
+        # 配置文件默认使用nacos
+        enabled: true
+      discovery:
+        namespace:
+        server-addr: 10.11.96.37:8848
+
+    compatibility-verifier:
+      enabled: false

ruoyi-admin/src/main/resources/bootstrap.yml

@@ -0,0 +1,3 @@
+spring:
+  profiles:
+    active: dev

ruoyi-framework/pom.xml

@@ -55,20 +55,6 @@
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-dependencies</artifactId>
-            <version>${spring.cloud-version}</version>
-            <type>pom</type>
-            <scope>import</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-bootstrap</artifactId>
-            <version>3.0.4</version>
-        </dependency>
-
         <!-- 阿里数据库连接池 -->
         <dependency>
             <groupId>com.alibaba</groupId>
@@ -81,35 +67,29 @@
             <artifactId>ruoyi-system</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-            <version>${alicloud.version}</version>
-            <type>pom</type>
-            <scope>import</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.cloud</groupId>
-                    <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-alibaba-dependencies</artifactId>-->
+<!--            <version>${alicloud.version}</version>-->
+<!--            <type>pom</type>-->
+<!--            <scope>import</scope>-->
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.springframework.cloud</groupId>-->
+<!--                    <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
             <version>${alicloud.version}</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>com.alibaba.cloud</groupId>-->
-<!--            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->
-<!--            <version>${alicloud.version}</version>-->
-<!--        </dependency>-->
-
         <dependency>
-            <groupId>com.alibaba.boot</groupId>
-            <artifactId>nacos-config-spring-boot-starter</artifactId>
-            <version>0.2.1</version>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+            <version>${alicloud.version}</version>
         </dependency>
 
     </dependencies>

ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java

@@ -46,8 +46,8 @@ public class ResourcesConfig implements WebMvcConfigurer
         CorsConfiguration config = new CorsConfiguration();
         config.setAllowCredentials(true);
         // 设置访问源地址
-//        config.addAllowedOrigin("*");
-		config.addAllowedOriginPattern("*");
+        config.addAllowedOrigin("*");
+//		config.addAllowedOriginPattern("*");
         // 设置访问源请求头
         config.addAllowedHeader("*");
         // 设置访问源请求方法

sql/ry_postgresql.sql

@@ -346,7 +346,6 @@ insert into sys_menu
 values ('110', '定时任务', '2', '2', 'job', 'monitor/job/index', 1, 0, 'C', '0', '0', 'monitor:job:list', 'job', 'admin', now(), '', null, '定时任务菜单');
 insert into sys_menu
 values ('111', '数据监控', '2', '3', 'druid', 'monitor/druid/index', 1, 0, 'C', '0', '0', 'monitor:druid:list', 'druid', 'admin', now(), '', null, '数据监控菜单');
-#
 insert into sys_menu values('112',  '服务监控', '2',   '4', 'server',     'monitor/server/index',     1, 0, 'C', '0', '0', 'monitor:server:list',     'server',        'admin', now(), '', null, '服务监控菜单');
 insert into sys_menu
 values ('113', '缓存监控', '2', '5', 'cache', 'monitor/cache/index', 1, 0, 'C', '0', '0', 'monitor:cache:list', 'redis', 'admin', now(), '', null, '缓存监控菜单');