diff --git a/jero-boot/jero-boot-module-demo/pom.xml b/jero-boot/jero-boot-module-demo/pom.xml index 061b1136..ca40f0b3 100644 --- a/jero-boot/jero-boot-module-demo/pom.xml +++ b/jero-boot/jero-boot-module-demo/pom.xml @@ -16,10 +16,11 @@ com.jero.boot jero-boot-base-core - + jero-cloud-feign-config + + --> \ No newline at end of file diff --git a/jero-boot/jero-boot-starter/pom.xml b/jero-boot/jero-boot-starter/pom.xml index 791649d5..c6cbaa63 100644 --- a/jero-boot/jero-boot-starter/pom.xml +++ b/jero-boot/jero-boot-starter/pom.xml @@ -16,7 +16,6 @@ - jero-boot-starter-cloud jero-boot-starter-job jero-boot-starter-lock jero-boot-starter-rabbitmq diff --git a/jero-boot/jero-boot-starter/jero-boot-starter-cloud/nacos/jero-dev.yaml b/jero-boot/jero-cloud-module/jero-cloud-feign-config/nacos/jero-dev.yaml similarity index 100% rename from jero-boot/jero-boot-starter/jero-boot-starter-cloud/nacos/jero-dev.yaml rename to jero-boot/jero-cloud-module/jero-cloud-feign-config/nacos/jero-dev.yaml diff --git a/jero-boot/jero-boot-starter/jero-boot-starter-cloud/nacos/jero-gateway-router.json b/jero-boot/jero-cloud-module/jero-cloud-feign-config/nacos/jero-gateway-router.json similarity index 100% rename from jero-boot/jero-boot-starter/jero-boot-starter-cloud/nacos/jero-gateway-router.json rename to jero-boot/jero-cloud-module/jero-cloud-feign-config/nacos/jero-gateway-router.json diff --git a/jero-boot/jero-boot-starter/jero-boot-starter-cloud/nacos/jero.yaml b/jero-boot/jero-cloud-module/jero-cloud-feign-config/nacos/jero.yaml similarity index 100% rename from jero-boot/jero-boot-starter/jero-boot-starter-cloud/nacos/jero.yaml rename to jero-boot/jero-cloud-module/jero-cloud-feign-config/nacos/jero.yaml diff --git a/jero-boot/jero-boot-starter/jero-boot-starter-cloud/pom.xml b/jero-boot/jero-cloud-module/jero-cloud-feign-config/pom.xml similarity index 93% rename from jero-boot/jero-boot-starter/jero-boot-starter-cloud/pom.xml rename to jero-boot/jero-cloud-module/jero-cloud-feign-config/pom.xml index 3e4db375..55f6d8a0 100644 --- a/jero-boot/jero-boot-starter/jero-boot-starter-cloud/pom.xml +++ b/jero-boot/jero-cloud-module/jero-cloud-feign-config/pom.xml @@ -3,12 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - jero-boot-starter + jero-cloud-module com.jero.boot 2.4.2 4.0.0 - jero-boot-starter-cloud + + jero-cloud-feign-config diff --git a/jero-boot/jero-boot-starter/jero-boot-starter-cloud/src/main/java/com/jero/config/FeignConfig.java b/jero-boot/jero-cloud-module/jero-cloud-feign-config/src/main/java/com/jero/config/FeignConfig.java similarity index 100% rename from jero-boot/jero-boot-starter/jero-boot-starter-cloud/src/main/java/com/jero/config/FeignConfig.java rename to jero-boot/jero-cloud-module/jero-cloud-feign-config/src/main/java/com/jero/config/FeignConfig.java diff --git a/jero-boot/jero-boot-starter/jero-boot-starter-cloud/src/main/java/com/jero/starter/cloud/config/PersonBeanConfiguration.java b/jero-boot/jero-cloud-module/jero-cloud-feign-config/src/main/java/com/jero/starter/cloud/config/PersonBeanConfiguration.java similarity index 100% rename from jero-boot/jero-boot-starter/jero-boot-starter-cloud/src/main/java/com/jero/starter/cloud/config/PersonBeanConfiguration.java rename to jero-boot/jero-cloud-module/jero-cloud-feign-config/src/main/java/com/jero/starter/cloud/config/PersonBeanConfiguration.java diff --git a/jero-boot/jero-boot-starter/jero-boot-starter-cloud/src/main/java/com/jero/starter/cloud/feign/IJeroFeignService.java b/jero-boot/jero-cloud-module/jero-cloud-feign-config/src/main/java/com/jero/starter/cloud/feign/IJeroFeignService.java similarity index 100% rename from jero-boot/jero-boot-starter/jero-boot-starter-cloud/src/main/java/com/jero/starter/cloud/feign/IJeroFeignService.java rename to jero-boot/jero-cloud-module/jero-cloud-feign-config/src/main/java/com/jero/starter/cloud/feign/IJeroFeignService.java diff --git a/jero-boot/jero-boot-starter/jero-boot-starter-cloud/src/main/java/com/jero/starter/cloud/feign/impl/JeroFeignService.java b/jero-boot/jero-cloud-module/jero-cloud-feign-config/src/main/java/com/jero/starter/cloud/feign/impl/JeroFeignService.java similarity index 100% rename from jero-boot/jero-boot-starter/jero-boot-starter-cloud/src/main/java/com/jero/starter/cloud/feign/impl/JeroFeignService.java rename to jero-boot/jero-cloud-module/jero-cloud-feign-config/src/main/java/com/jero/starter/cloud/feign/impl/JeroFeignService.java diff --git a/jero-boot/jero-boot-starter/jero-boot-starter-cloud/src/main/resources/bootstrap.yml b/jero-boot/jero-cloud-module/jero-cloud-feign-config/src/main/resources/bootstrap.yml similarity index 100% rename from jero-boot/jero-boot-starter/jero-boot-starter-cloud/src/main/resources/bootstrap.yml rename to jero-boot/jero-cloud-module/jero-cloud-feign-config/src/main/resources/bootstrap.yml diff --git a/jero-boot/jero-cloud-module/jero-cloud-gateway/pom.xml b/jero-boot/jero-cloud-module/jero-cloud-gateway/pom.xml index e3ebeddf..55a155ff 100644 --- a/jero-boot/jero-cloud-module/jero-cloud-gateway/pom.xml +++ b/jero-boot/jero-cloud-module/jero-cloud-gateway/pom.xml @@ -14,7 +14,7 @@ com.jero.boot - jero-boot-starter-cloud + jero-cloud-feign-config com.jero.boot diff --git a/jero-boot/jero-cloud-module/jero-cloud-system-start/pom.xml b/jero-boot/jero-cloud-module/jero-cloud-system-start/pom.xml index ed155992..c4d66033 100644 --- a/jero-boot/jero-cloud-module/jero-cloud-system-start/pom.xml +++ b/jero-boot/jero-cloud-module/jero-cloud-system-start/pom.xml @@ -12,10 +12,10 @@ System项目微服务启动 - + com.jero.boot - jero-boot-starter-cloud + jero-cloud-feign-config diff --git a/jero-boot/jero-cloud-module/jero-cloud-system-start/src/main/java/com/jero/modules/cloud/feign/controller/JeroTestFeignController.java b/jero-boot/jero-cloud-module/jero-cloud-system-start/src/main/java/com/jero/modules/cloud/feign/controller/JeroTestFeignController.java index c7a6d1e1..832aab6a 100644 --- a/jero-boot/jero-cloud-module/jero-cloud-system-start/src/main/java/com/jero/modules/cloud/feign/controller/JeroTestFeignController.java +++ b/jero-boot/jero-cloud-module/jero-cloud-system-start/src/main/java/com/jero/modules/cloud/feign/controller/JeroTestFeignController.java @@ -2,6 +2,7 @@ package com.jero.modules.cloud.feign.controller; import cn.hutool.core.util.RandomUtil; +import com.jero.starter.cloud.feign.impl.JeroFeignService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.jero.boot.starter.rabbitmq.client.RabbitMqClient; @@ -10,7 +11,6 @@ import com.jero.common.base.BaseMap; import com.jero.modules.cloud.constant.CloudConstant; import com.jero.modules.cloud.feign.feign.JeroTestClient; import com.jero.modules.cloud.feign.feign.JeroTestClientDyn; -import com.jero.starter.cloud.feign.impl.JeroFeignService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/jero-boot/jero-cloud-module/pom.xml b/jero-boot/jero-cloud-module/pom.xml index d98e9048..7246cac0 100644 --- a/jero-boot/jero-cloud-module/pom.xml +++ b/jero-boot/jero-cloud-module/pom.xml @@ -16,6 +16,7 @@ jero-cloud-gateway jero-cloud-monitor jero-cloud-xxljob + jero-cloud-feign-config \ No newline at end of file diff --git a/jero-boot/pom.xml b/jero-boot/pom.xml index 164313c7..6b1eccb9 100644 --- a/jero-boot/pom.xml +++ b/jero-boot/pom.xml @@ -51,12 +51,14 @@ jero-boot-base jero-boot-module-demo jero-boot-module-system - - - jero-boot-starter - jero-cloud-module + jero-boot-starter + jero-boot-single-startup - + + + @@ -164,7 +166,7 @@ com.jero.boot - jero-boot-starter-cloud + jero-cloud-feign-config ${jero.version}