diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/PigxAuthApplication.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/PigxAuthApplication.java index a381ea61e..9e77f15f3 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/PigxAuthApplication.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/PigxAuthApplication.java @@ -21,14 +21,16 @@ package com.pig4cloud.pigx.auth; import com.pig4cloud.pigx.common.feign.annotation.EnablePigxFeignClients; import org.springframework.boot.SpringApplication; -import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; /** * @author lengleng * @date 2020-02-08 认证授权中心 */ @EnablePigxFeignClients -@SpringCloudApplication +@EnableDiscoveryClient +@SpringBootApplication public class PigxAuthApplication { public static void main(String[] args) { diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/PigxGatewayApplication.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/PigxGatewayApplication.java index 05b7b914b..4c495958f 100644 --- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/PigxGatewayApplication.java +++ b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/PigxGatewayApplication.java @@ -22,7 +22,8 @@ package com.pig4cloud.pigx.gateway; import com.pig4cloud.pigx.common.gateway.annotation.EnablePigxDynamicRoute; import com.pig4cloud.pigx.common.swagger.annotation.EnablePigxSwagger2; import org.springframework.boot.SpringApplication; -import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; /** * @author lengleng @@ -30,7 +31,8 @@ import org.springframework.cloud.client.SpringCloudApplication; */ @EnablePigxSwagger2 @EnablePigxDynamicRoute -@SpringCloudApplication +@EnableDiscoveryClient +@SpringBootApplication public class PigxGatewayApplication { public static void main(String[] args) { diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/PigxAdminApplication.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/PigxAdminApplication.java index 325dc01c4..bb21ddad0 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/PigxAdminApplication.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/PigxAdminApplication.java @@ -23,7 +23,8 @@ import com.pig4cloud.pigx.common.feign.annotation.EnablePigxFeignClients; import com.pig4cloud.pigx.common.security.annotation.EnablePigxResourceServer; import com.pig4cloud.pigx.common.swagger.annotation.EnablePigxSwagger2; import org.springframework.boot.SpringApplication; -import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; /** * @author lengleng @@ -33,8 +34,9 @@ import org.springframework.cloud.client.SpringCloudApplication; */ @EnablePigxSwagger2 @EnablePigxFeignClients -@SpringCloudApplication @EnablePigxResourceServer +@EnableDiscoveryClient +@SpringBootApplication public class PigxAdminApplication { public static void main(String[] args) { diff --git a/pigx-visual/pigx-bi-platform/src/main/java/com/pig4cloud/pigx/ureport/PigxBiApplication.java b/pigx-visual/pigx-bi-platform/src/main/java/com/pig4cloud/pigx/ureport/PigxBiApplication.java index 36bba6bbe..a3c91c519 100755 --- a/pigx-visual/pigx-bi-platform/src/main/java/com/pig4cloud/pigx/ureport/PigxBiApplication.java +++ b/pigx-visual/pigx-bi-platform/src/main/java/com/pig4cloud/pigx/ureport/PigxBiApplication.java @@ -19,7 +19,8 @@ package com.pig4cloud.pigx.ureport; import com.pig4cloud.pigx.common.feign.annotation.EnablePigxFeignClients; import org.springframework.boot.SpringApplication; -import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; /** * @author lengleng @@ -30,7 +31,8 @@ import org.springframework.cloud.client.SpringCloudApplication; * http://127.0.0.1:5006/ureport/designer */ @EnablePigxFeignClients -@SpringCloudApplication +@EnableDiscoveryClient +@SpringBootApplication public class PigxBiApplication { public static void main(String[] args) { diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/PigxCodeGenApplication.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/PigxCodeGenApplication.java index cab4eda46..5fd996662 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/PigxCodeGenApplication.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/PigxCodeGenApplication.java @@ -22,7 +22,8 @@ import com.pig4cloud.pigx.common.feign.annotation.EnablePigxFeignClients; import com.pig4cloud.pigx.common.security.annotation.EnablePigxResourceServer; import com.pig4cloud.pigx.common.swagger.annotation.EnablePigxSwagger2; import org.springframework.boot.SpringApplication; -import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; /** * @author lengleng @@ -31,8 +32,9 @@ import org.springframework.cloud.client.SpringCloudApplication; @EnableDynamicDataSource @EnablePigxSwagger2 @EnablePigxFeignClients -@SpringCloudApplication +@EnableDiscoveryClient @EnablePigxResourceServer +@SpringBootApplication public class PigxCodeGenApplication { public static void main(String[] args) { diff --git a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/PigxDaemonElasticJobApplication.java b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/PigxDaemonElasticJobApplication.java index 46ed04473..2fb507b61 100644 --- a/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/PigxDaemonElasticJobApplication.java +++ b/pigx-visual/pigx-daemon-elastic-job/src/main/java/com/pig4cloud/pigx/daemon/elastic/PigxDaemonElasticJobApplication.java @@ -22,7 +22,8 @@ import com.pig4cloud.pigx.common.job.annotation.EnablePigxXxlJob; import com.pig4cloud.pigx.common.security.annotation.EnablePigxResourceServer; import com.pig4cloud.pigx.common.swagger.annotation.EnablePigxSwagger2; import org.springframework.boot.SpringApplication; -import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; /** * @author lengleng @@ -31,8 +32,9 @@ import org.springframework.cloud.client.SpringCloudApplication; @EnablePigxXxlJob @EnablePigxSwagger2 @EnablePigxFeignClients -@SpringCloudApplication @EnablePigxResourceServer +@EnableDiscoveryClient +@SpringBootApplication public class PigxDaemonElasticJobApplication { public static void main(String[] args) { diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/PigxDaemonQuartzApplication.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/PigxDaemonQuartzApplication.java index 1e0d67446..5857cc876 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/PigxDaemonQuartzApplication.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/PigxDaemonQuartzApplication.java @@ -4,7 +4,8 @@ import com.pig4cloud.pigx.common.feign.annotation.EnablePigxFeignClients; import com.pig4cloud.pigx.common.security.annotation.EnablePigxResourceServer; import com.pig4cloud.pigx.common.swagger.annotation.EnablePigxSwagger2; import org.springframework.boot.SpringApplication; -import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; /** * @author frwcloud @@ -12,8 +13,9 @@ import org.springframework.cloud.client.SpringCloudApplication; */ @EnablePigxSwagger2 @EnablePigxFeignClients -@SpringCloudApplication @EnablePigxResourceServer +@EnableDiscoveryClient +@SpringBootApplication public class PigxDaemonQuartzApplication { public static void main(String[] args) { diff --git a/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/PigxMonitorApplication.java b/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/PigxMonitorApplication.java index 6db12e333..23389c29a 100644 --- a/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/PigxMonitorApplication.java +++ b/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/PigxMonitorApplication.java @@ -21,14 +21,16 @@ package com.pig4cloud.pigx.monitor; import de.codecentric.boot.admin.server.config.EnableAdminServer; import org.springframework.boot.SpringApplication; -import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; /** * @author lengleng * @date 2019年11月4日 监控中心 */ @EnableAdminServer -@SpringCloudApplication +@EnableDiscoveryClient +@SpringBootApplication public class PigxMonitorApplication { public static void main(String[] args) { diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/PigxMpPlatformApplication.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/PigxMpPlatformApplication.java index 91e78c709..35e7a2ae9 100755 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/PigxMpPlatformApplication.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/PigxMpPlatformApplication.java @@ -21,7 +21,8 @@ import com.pig4cloud.pigx.common.feign.annotation.EnablePigxFeignClients; import com.pig4cloud.pigx.common.security.annotation.EnablePigxResourceServer; import com.pig4cloud.pigx.common.swagger.annotation.EnablePigxSwagger2; import org.springframework.boot.SpringApplication; -import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; /** * @author lengleng @@ -29,8 +30,9 @@ import org.springframework.cloud.client.SpringCloudApplication; */ @EnablePigxSwagger2 @EnablePigxFeignClients -@SpringCloudApplication @EnablePigxResourceServer +@EnableDiscoveryClient +@SpringBootApplication public class PigxMpPlatformApplication { public static void main(String[] args) { diff --git a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/PigxActivitiApplication.java b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/PigxActivitiApplication.java index 927fbd55e..11e6f5cc2 100644 --- a/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/PigxActivitiApplication.java +++ b/pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/PigxActivitiApplication.java @@ -21,7 +21,8 @@ import com.pig4cloud.pigx.common.feign.annotation.EnablePigxFeignClients; import com.pig4cloud.pigx.common.security.annotation.EnablePigxResourceServer; import com.pig4cloud.pigx.common.swagger.annotation.EnablePigxSwagger2; import org.springframework.boot.SpringApplication; -import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; /** * @author lengleng @@ -30,7 +31,8 @@ import org.springframework.cloud.client.SpringCloudApplication; @EnablePigxSwagger2 @EnablePigxFeignClients @EnablePigxResourceServer -@SpringCloudApplication +@EnableDiscoveryClient +@SpringBootApplication public class PigxActivitiApplication { public static void main(String[] args) { diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/PigxPayPlatformApplication.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/PigxPayPlatformApplication.java index d3dbf065e..98238e20e 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/PigxPayPlatformApplication.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/PigxPayPlatformApplication.java @@ -21,7 +21,8 @@ import com.pig4cloud.pigx.common.feign.annotation.EnablePigxFeignClients; import com.pig4cloud.pigx.common.security.annotation.EnablePigxResourceServer; import com.pig4cloud.pigx.common.swagger.annotation.EnablePigxSwagger2; import org.springframework.boot.SpringApplication; -import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; /** * @author lengleng @@ -31,8 +32,9 @@ import org.springframework.cloud.client.SpringCloudApplication; */ @EnablePigxSwagger2 @EnablePigxFeignClients -@SpringCloudApplication +@EnableDiscoveryClient @EnablePigxResourceServer +@SpringBootApplication public class PigxPayPlatformApplication { public static void main(String[] args) { diff --git a/pigx-visual/pigx-tx-manager/src/main/java/com/pig4cloud/pigx/manager/PigxTxManagerApplication.java b/pigx-visual/pigx-tx-manager/src/main/java/com/pig4cloud/pigx/manager/PigxTxManagerApplication.java index f33c983ae..05d8db3a0 100644 --- a/pigx-visual/pigx-tx-manager/src/main/java/com/pig4cloud/pigx/manager/PigxTxManagerApplication.java +++ b/pigx-visual/pigx-tx-manager/src/main/java/com/pig4cloud/pigx/manager/PigxTxManagerApplication.java @@ -18,13 +18,15 @@ package com.pig4cloud.pigx.manager; import org.springframework.boot.SpringApplication; -import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; /** * @author LCN * @author lengleng tx-manager ,进行了代码逻辑和代码规范重构 */ -@SpringCloudApplication +@EnableDiscoveryClient +@SpringBootApplication public class PigxTxManagerApplication { public static void main(String[] args) {