liubo пре 3 година
родитељ
комит
1c57760cdf

+ 2 - 2
zd-auth/src/main/java/com/zd/auth/ZdAuthApplication.java

@@ -1,6 +1,6 @@
 package com.zd.auth;
 
-import com.zd.common.core.annotation.EnableRyFeignClients;
+import com.zd.common.core.annotation.EnableZdFeignClients;
 import com.zd.common.core.launch.ZdStartApplication;
 import com.zd.model.constant.ApplicationConstants;
 import com.zd.model.constant.BaseConstants;
@@ -13,7 +13,7 @@ import org.springframework.context.annotation.ComponentScan;
  *
  * @author zd
  */
-@EnableRyFeignClients
+@EnableZdFeignClients
 @ComponentScan(basePackages = BaseConstants.BASE_PACKAGE)
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
 public class ZdAuthApplication {

+ 1 - 1
zd-common/common-core/src/main/java/com/zd/common/core/annotation/EnableRyFeignClients.java

@@ -13,7 +13,7 @@ import java.lang.annotation.*;
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @EnableFeignClients
-public @interface EnableRyFeignClients {
+public @interface EnableZdFeignClients {
     String[] value() default {};
 
     String[] basePackages() default {"com.zd"};

+ 2 - 2
zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/ZdAirbottleApplication.java

@@ -2,7 +2,7 @@ package com.zd.airbottle;
 
 import com.alibaba.nacos.spring.context.annotation.config.NacosPropertySource;
 import com.zd.common.core.annotation.EnableCustomConfig;
-import com.zd.common.core.annotation.EnableRyFeignClients;
+import com.zd.common.core.annotation.EnableZdFeignClients;
 import com.zd.common.core.launch.ZdStartApplication;
 import com.zd.model.constant.ApplicationConstants;
 import com.zd.model.constant.BaseConstants;
@@ -17,7 +17,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  * @date 2022/5/9
  */
 @EnableCustomConfig
-@EnableRyFeignClients
+@EnableZdFeignClients
 @SpringBootApplication
 @EnableScheduling
 @NacosPropertySource(dataId = "zd-airbottle", autoRefreshed = true)

+ 2 - 3
zd-modules/zd-algorithm/src/main/java/com/zd/alg/AlgorithmApplication.java

@@ -4,12 +4,11 @@ package com.zd.alg;
 import com.zd.alg.forward.config.AlgorithmYml;
 import com.zd.alg.forward.properties.FireProperties;
 import com.zd.common.core.annotation.EnableCustomConfig;
-import com.zd.common.core.annotation.EnableRyFeignClients;
+import com.zd.common.core.annotation.EnableZdFeignClients;
 import com.zd.common.core.launch.ZdStartApplication;
 import com.zd.common.mqtt.model.MqttProperties;
 import com.zd.model.constant.ApplicationConstants;
 import com.zd.model.constant.BaseConstants;
-import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.ServletComponentScan;
@@ -20,7 +19,7 @@ import org.springframework.context.ConfigurableApplicationContext;
  */
 @ServletComponentScan("com.zd.alg.iot.vmp.conf")
 @EnableCustomConfig
-@EnableRyFeignClients
+@EnableZdFeignClients
 @SpringBootApplication(scanBasePackages = BaseConstants.BASE_PACKAGE)
 @EnableConfigurationProperties({MqttProperties.class, AlgorithmYml.class, FireProperties.class})
 public class AlgorithmApplication {

+ 2 - 4
zd-modules/zd-base/src/main/java/com/zd/base/BaseApplicaion.java

@@ -2,18 +2,16 @@ package com.zd.base;
 
 
 import com.zd.common.core.annotation.EnableCustomConfig;
-import com.zd.common.core.annotation.EnableRyFeignClients;
+import com.zd.common.core.annotation.EnableZdFeignClients;
 import com.zd.common.core.launch.ZdStartApplication;
 import com.zd.model.constant.ApplicationConstants;
 import com.zd.model.constant.BaseConstants;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @EnableCustomConfig
-@EnableRyFeignClients
+@EnableZdFeignClients
 @SpringBootApplication
 @EnableScheduling
 @ComponentScan(basePackages = BaseConstants.BASE_PACKAGE)

+ 2 - 2
zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/ZdBottleApplication.java

@@ -1,7 +1,7 @@
 package com.zd.bottle;
 
 import com.zd.common.core.annotation.EnableCustomConfig;
-import com.zd.common.core.annotation.EnableRyFeignClients;
+import com.zd.common.core.annotation.EnableZdFeignClients;
 import com.zd.common.core.launch.ZdStartApplication;
 import com.zd.model.constant.ApplicationConstants;
 import com.zd.model.constant.BaseConstants;
@@ -16,7 +16,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  * @since  2022/9/8
  */
 @EnableCustomConfig
-@EnableRyFeignClients
+@EnableZdFeignClients
 @SpringBootApplication(scanBasePackages = BaseConstants.BASE_PACKAGE)
 @EnableScheduling
 //@NacosPropertySource(dataId = "zd-bottle", autoRefreshed = true)

+ 2 - 3
zd-modules/zd-chemical/src/main/java/com/zd/chemical/ZdChemicalApplication.java

@@ -5,14 +5,13 @@ import com.zd.chemical.domain.HxpClassifyConfig;
 import com.zd.chemical.service.IHxpChemicalClassifyService;
 import com.zd.chemical.service.IHxpClassifyConfigService;
 import com.zd.common.core.annotation.EnableCustomConfig;
-import com.zd.common.core.annotation.EnableRyFeignClients;
+import com.zd.common.core.annotation.EnableZdFeignClients;
 import com.zd.common.core.launch.ZdStartApplication;
 import com.zd.model.constant.ApplicationConstants;
 import com.zd.model.constant.BaseConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
-import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
 
@@ -21,7 +20,7 @@ import java.util.List;
 import java.util.Optional;
 
 @EnableCustomConfig
-@EnableRyFeignClients
+@EnableZdFeignClients
 @SpringBootApplication
 @ComponentScan(basePackages = BaseConstants.BASE_PACKAGE)
 public class ZdChemicalApplication implements ApplicationRunner {

+ 2 - 4
zd-modules/zd-exam/src/main/java/com/zd/exam/ZdExamApplication.java

@@ -1,17 +1,15 @@
 package com.zd.exam;
 
 import com.zd.common.core.annotation.EnableCustomConfig;
-import com.zd.common.core.annotation.EnableRyFeignClients;
+import com.zd.common.core.annotation.EnableZdFeignClients;
 import com.zd.common.core.launch.ZdStartApplication;
 import com.zd.model.constant.ApplicationConstants;
 import com.zd.model.constant.BaseConstants;
-import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.stereotype.Component;
 
 @EnableCustomConfig
-@EnableRyFeignClients
+@EnableZdFeignClients
 @SpringBootApplication
 @ComponentScan(basePackages = BaseConstants.BASE_PACKAGE)
 public class ZdExamApplication {

+ 2 - 2
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/ZdLaboratoryApplication.java

@@ -1,7 +1,7 @@
 package com.zd.laboratory;
 
 import com.zd.common.core.annotation.EnableCustomConfig;
-import com.zd.common.core.annotation.EnableRyFeignClients;
+import com.zd.common.core.annotation.EnableZdFeignClients;
 import com.zd.common.core.launch.ZdStartApplication;
 import com.zd.model.constant.ApplicationConstants;
 import com.zd.model.constant.BaseConstants;
@@ -15,7 +15,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  * @author zd
  */
 @EnableCustomConfig
-@EnableRyFeignClients
+@EnableZdFeignClients
 @SpringBootApplication
 @EnableScheduling
 @ComponentScan(basePackages = BaseConstants.BASE_PACKAGE)

+ 2 - 2
zd-modules/zd-modules-system/src/main/java/com/zd/system/ZdSystemApplication.java

@@ -1,7 +1,7 @@
 package com.zd.system;
 
 import com.zd.common.core.annotation.EnableCustomConfig;
-import com.zd.common.core.annotation.EnableRyFeignClients;
+import com.zd.common.core.annotation.EnableZdFeignClients;
 import com.zd.common.core.launch.ZdStartApplication;
 import com.zd.model.constant.ApplicationConstants;
 import com.zd.model.constant.BaseConstants;
@@ -15,7 +15,7 @@ import org.springframework.context.annotation.ComponentScan;
  */
 
 @EnableCustomConfig
-@EnableRyFeignClients
+@EnableZdFeignClients
 @SpringBootApplication
 @ComponentScan(basePackages = BaseConstants.BASE_PACKAGE)
 public class ZdSystemApplication {