Merge remote-tracking branch 'origin/master'

signal-control-service/pom.xml

@@ -35,7 +35,7 @@
         <dependency>
             <groupId>net.wanji</groupId>
             <artifactId>signal-feign-service</artifactId>
-            <version>0.0.1</version>
+            <version>0.0.2</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

signal-control-service/src/main/java/net/wanji/web/SignalApplication.java

@@ -3,7 +3,6 @@ package net.wanji.web;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -16,7 +15,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableTransactionManagement
 @EnableScheduling
 @EnableAsync
-@EnableFeignClients(basePackages = "net.wanji.feign.service")
+//@EnableFeignClients(basePackages = "net.wanji.feign.service")
 public class SignalApplication {
 
     public static void main(String[] args) {

signal-control-service/src/main/resources/application.yml

@@ -6,7 +6,7 @@ spring:
       accept_case_insensitive_properties: true
   main:
     allow-circular-references: true
-    allow-bean-definition-overriding: true
+#    allow-bean-definition-overriding: true
   mvc:
     pathmatch:
       matching-strategy: ant_path_matcher

signal-feign-service/pom.xml

@@ -8,7 +8,7 @@
     </parent>
     <artifactId>signal-feign-service</artifactId>
     <name>signal-feign-service</name>
-    <version>0.0.1</version>
+    <version>0.0.2</version>
 
     <dependencies>
         <dependency>

signal-feign-service/src/main/java/net/wanji/feign/config/FeignClientsConfig.java

@@ -10,7 +10,7 @@ import org.springframework.context.annotation.Configuration;
  * @date 2023/01/09 15:23
  */
 @Configuration(value = "FeignClientsConfig")
-//@EnableFeignClients(basePackages = "net.wanji.feign")
+@EnableFeignClients(basePackages = "net.wanji.feign")
 public class FeignClientsConfig {
 
     @Value("${utc.service.url}")

signal-feign-service/src/main/resources/META-INF/spring.factories

-#org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-#net.wanji.feign.config.FeignClientsConfig
\ No newline at end of file
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+net.wanji.feign.config.FeignClientsConfig
\ No newline at end of file