fix 配置中心

pom.xml

@@ -46,6 +46,9 @@
         <docker.registry.host>http://${docker.registry.url}:2375</docker.registry.host>
         <docker.namespace>ruoyi</docker.namespace>
         <docker.plugin.version>1.2.2</docker.plugin.version>
+
+        <alicloud.version>2021.1</alicloud.version>
+        <spring.cloud-version>2020.0.4</spring.cloud-version>
     </properties>
 
     <!-- 依赖声明 -->
@@ -154,6 +157,8 @@
                 <artifactId>spring-boot-admin-starter-server</artifactId>
                 <version>${spring-boot-admin.version}</version>
             </dependency>
+
+
             <dependency>
                 <groupId>de.codecentric</groupId>
                 <artifactId>spring-boot-admin-starter-client</artifactId>
@@ -227,6 +232,8 @@
                 <version>${ruoyi-vue-plus.version}</version>
             </dependency>
 
+
+
         </dependencies>
     </dependencyManagement>
 

ruoyi-admin/pom.xml

@@ -71,6 +71,7 @@
             <artifactId>ruoyi-demo</artifactId>
         </dependency>
 
+
     </dependencies>
 
     <build>

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

@@ -1,5 +1,6 @@
 package com.ruoyi;
 
+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;
@@ -12,6 +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)
 public class RuoYiApplication
 {
     public static void main(String[] args)

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

@@ -4,6 +4,9 @@ import cn.hutool.captcha.AbstractCaptcha;
 import cn.hutool.captcha.generator.CodeGenerator;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.IdUtil;
+import com.alibaba.nacos.api.annotation.NacosInjected;
+import com.alibaba.nacos.api.config.annotation.NacosValue;
+import com.alibaba.nacos.api.naming.NamingService;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.CaptchaType;
@@ -14,6 +17,10 @@ import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.config.properties.CaptchaProperties;
 import com.ruoyi.system.service.ISysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.context.ApplicationContext;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -27,11 +34,20 @@ import java.util.concurrent.TimeUnit;
  * @author ruoyi
  */
 @RestController
-public class CaptchaController {
+public class CaptchaController implements CommandLineRunner {
 
 	@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;
 
@@ -64,6 +80,17 @@ public class CaptchaController {
 		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());
@@ -81,4 +108,16 @@ public class CaptchaController {
 		}
 	}
 
+    @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/java/com/ruoyi/web/controller/zhdd/JgyDutyCommandContController.java

@@ -7,6 +7,8 @@ import java.util.concurrent.TimeUnit;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
+
+
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

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

@@ -94,12 +94,16 @@ spring:
   # 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

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

@@ -1,7 +1,7 @@
 # 项目相关配置
 ruoyi:
   # 名称
-  name: TOCC-SQ
+  name: YJZH_SQ
   # 版本
   version: ${ruoyi-vue-plus.version}
   # 版权年份

ruoyi-admin/src/main/resources/banner.txt

@@ -1,8 +1,18 @@
 Application Version: ${ruoyi-vue-plus.version}
 Spring Boot Version: ${spring-boot.version}
- _______ ____   _____ _____             _____  ____
-|__   __/ __ \ / ____/ ____|           / ____|/ __ \
-   | | | |  | | |   | |       ______  | (___ | |  | |
-   | | | |  | | |   | |      |______|  \___ \| |  | |
-   | | | |__| | |___| |____            ____) | |__| |
-   |_|  \____/ \_____\_____|          |_____/ \___\_\
+
+
+____     ___      ________________ ____    ____           ____      ____
+`MM(     )M'      `MM'MMMMMMMMMMMP `MM'    `MM'          6MMMMb\   6MMMMb
+ `MM.    d'        MM /       dMP   MM      MM          6M'    `  8P    Y8
+  `MM.  d'         MM        dMP    MM      MM          MM       6M      Mb
+   `MM d'          MM       dMP     MM      MM          YM.      MM      MM
+    `MM'           MM      dMP      MMMMMMMMMM           YMMMMb  MM      MM
+     MM            MM     dMP       MM      MM               `Mb MM      MM
+     MM            MM    dMP        MM      MM                MM MM      MM
+     MM      (8)   MM   dMP         MM      MM                MM YM      M9
+     MM      ((   ,M9  dMP       /  MM      MM          L    ,M9  8b    d8
+    _MM_      YMMMM9  dMMMMMMMMMMM _MM_    _MM_         MYMMMM9    YMMMM9
+                                                                     MM
+                                               MMMMMMMM              YM.
+                                                                      `Mo

ruoyi-framework/pom.xml

@@ -55,6 +55,20 @@
             <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>
@@ -69,8 +83,33 @@
 
         <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>2021.1</version>
+            <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>
         </dependency>
 
     </dependencies>

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

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

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

@@ -97,7 +97,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/register", "/captchaImage").anonymous()
+                .antMatchers("/login", "/register", "/captchaImage","/test").anonymous()
                 .antMatchers(
                         HttpMethod.GET,
                         "/",