diff --git a/dc3-center/dc3-auth/src/main/java/com/dc3/center/auth/AuthApplication.java b/dc3-center/dc3-auth/src/main/java/com/dc3/center/auth/AuthApplication.java index 76537253c..0cb676547 100644 --- a/dc3-center/dc3-auth/src/main/java/com/dc3/center/auth/AuthApplication.java +++ b/dc3-center/dc3-auth/src/main/java/com/dc3/center/auth/AuthApplication.java @@ -13,8 +13,8 @@ package com.dc3.center.auth; -import com.dc3.config.autoconfigure.Dc3Application; -import com.dc3.config.boot.SpringApplication; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.AdviceMode; import org.springframework.transaction.annotation.EnableTransactionManagement; @@ -24,7 +24,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; * * @author pnoker */ -@Dc3Application +@SpringBootApplication @EnableTransactionManagement @EnableCaching(mode = AdviceMode.ASPECTJ) public class AuthApplication { diff --git a/dc3-center/dc3-data/src/main/java/com/dc3/center/data/DataApplication.java b/dc3-center/dc3-data/src/main/java/com/dc3/center/data/DataApplication.java index 57ce0cc96..4bacb97f0 100644 --- a/dc3-center/dc3-data/src/main/java/com/dc3/center/data/DataApplication.java +++ b/dc3-center/dc3-data/src/main/java/com/dc3/center/data/DataApplication.java @@ -13,15 +13,15 @@ package com.dc3.center.data; -import com.dc3.config.autoconfigure.Dc3Application; -import com.dc3.config.boot.SpringApplication; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; /** * 消息中心中心服务启动入口 * * @author pnoker */ -@Dc3Application +@SpringBootApplication public class DataApplication { public static void main(String[] args) { SpringApplication.run(DataApplication.class, args); diff --git a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/ManagerApplication.java b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/ManagerApplication.java index 5ae2f86e2..5a686baa5 100644 --- a/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/ManagerApplication.java +++ b/dc3-center/dc3-manager/src/main/java/com/dc3/center/manager/ManagerApplication.java @@ -13,8 +13,8 @@ package com.dc3.center.manager; -import com.dc3.config.autoconfigure.Dc3Application; -import com.dc3.config.boot.SpringApplication; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.AdviceMode; import org.springframework.transaction.annotation.EnableTransactionManagement; @@ -24,7 +24,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; * * @author pnoker */ -@Dc3Application +@SpringBootApplication @EnableTransactionManagement @EnableCaching(mode = AdviceMode.ASPECTJ) public class ManagerApplication { diff --git a/dc3-center/dc3-monitor/src/main/java/com/dc3/center/monitor/MonitorApplication.java b/dc3-center/dc3-monitor/src/main/java/com/dc3/center/monitor/MonitorApplication.java index d222bf07a..3a815de77 100644 --- a/dc3-center/dc3-monitor/src/main/java/com/dc3/center/monitor/MonitorApplication.java +++ b/dc3-center/dc3-monitor/src/main/java/com/dc3/center/monitor/MonitorApplication.java @@ -13,8 +13,8 @@ package com.dc3.center.monitor; -import com.dc3.config.autoconfigure.Dc3Application; -import com.dc3.config.boot.SpringApplication; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; import de.codecentric.boot.admin.server.config.EnableAdminServer; /** @@ -22,7 +22,7 @@ import de.codecentric.boot.admin.server.config.EnableAdminServer; * * @author pnoker */ -@Dc3Application +@SpringBootApplication @EnableAdminServer public class MonitorApplication { diff --git a/dc3-center/dc3-register/src/main/java/com/dc3/center/register/RegisterApplication.java b/dc3-center/dc3-register/src/main/java/com/dc3/center/register/RegisterApplication.java index 75c673d55..cc2d9e27a 100644 --- a/dc3-center/dc3-register/src/main/java/com/dc3/center/register/RegisterApplication.java +++ b/dc3-center/dc3-register/src/main/java/com/dc3/center/register/RegisterApplication.java @@ -13,8 +13,8 @@ package com.dc3.center.register; -import com.dc3.config.autoconfigure.Dc3Application; -import com.dc3.config.boot.SpringApplication; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer; /** @@ -22,7 +22,7 @@ import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer; * * @author pnoker */ -@Dc3Application +@SpringBootApplication @EnableEurekaServer public class RegisterApplication { diff --git a/dc3-common/dc3-profiles/pom.xml b/dc3-common/dc3-profiles/pom.xml index ad2e1bc4b..42d592f6e 100644 --- a/dc3-common/dc3-profiles/pom.xml +++ b/dc3-common/dc3-profiles/pom.xml @@ -48,12 +48,6 @@ spring-boot-starter-actuator - - - com.dc3 - dc3-boot-starter - - com.github.ben-manes.caffeine diff --git a/dc3-common/dc3-sdk/pom.xml b/dc3-common/dc3-sdk/pom.xml index 28bac5854..e3cd9633e 100644 --- a/dc3-common/dc3-sdk/pom.xml +++ b/dc3-common/dc3-sdk/pom.xml @@ -79,12 +79,6 @@ spring-boot-starter-quartz - - - com.dc3 - dc3-boot-starter - - com.github.ben-manes.caffeine diff --git a/dc3-driver/dc3-driver-edge-gateway/src/main/java/com/dc3/driver/EdgeGatewayDriverApplication.java b/dc3-driver/dc3-driver-edge-gateway/src/main/java/com/dc3/driver/EdgeGatewayDriverApplication.java index 9603dce13..e6f1a67a2 100644 --- a/dc3-driver/dc3-driver-edge-gateway/src/main/java/com/dc3/driver/EdgeGatewayDriverApplication.java +++ b/dc3-driver/dc3-driver-edge-gateway/src/main/java/com/dc3/driver/EdgeGatewayDriverApplication.java @@ -13,15 +13,15 @@ package com.dc3.driver; -import com.dc3.config.autoconfigure.Dc3Application; -import com.dc3.config.boot.SpringApplication; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cache.annotation.EnableCaching; /** * @author pnoker */ @EnableCaching -@Dc3Application +@SpringBootApplication public class EdgeGatewayDriverApplication { public static void main(String[] args) { diff --git a/dc3-driver/dc3-driver-listening-virtual/src/main/java/com/dc3/driver/ListeningVirtualDriverApplication.java b/dc3-driver/dc3-driver-listening-virtual/src/main/java/com/dc3/driver/ListeningVirtualDriverApplication.java index cbcdbbb03..9d6c3ef27 100644 --- a/dc3-driver/dc3-driver-listening-virtual/src/main/java/com/dc3/driver/ListeningVirtualDriverApplication.java +++ b/dc3-driver/dc3-driver-listening-virtual/src/main/java/com/dc3/driver/ListeningVirtualDriverApplication.java @@ -13,15 +13,15 @@ package com.dc3.driver; -import com.dc3.config.autoconfigure.Dc3Application; -import com.dc3.config.boot.SpringApplication; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cache.annotation.EnableCaching; /** * @author pnoker */ @EnableCaching -@Dc3Application +@SpringBootApplication public class ListeningVirtualDriverApplication { public static void main(String[] args) { diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/dc3/driver/ModbusTcpDriverApplication.java b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/dc3/driver/ModbusTcpDriverApplication.java index e64d26c88..bc3eae2d0 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/dc3/driver/ModbusTcpDriverApplication.java +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/java/com/dc3/driver/ModbusTcpDriverApplication.java @@ -13,15 +13,15 @@ package com.dc3.driver; -import com.dc3.config.autoconfigure.Dc3Application; -import com.dc3.config.boot.SpringApplication; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cache.annotation.EnableCaching; /** * @author pnoker */ @EnableCaching -@Dc3Application +@SpringBootApplication public class ModbusTcpDriverApplication { public static void main(String[] args) { diff --git a/dc3-driver/dc3-driver-mqtt/src/main/java/com/dc3/driver/MqttDriverApplication.java b/dc3-driver/dc3-driver-mqtt/src/main/java/com/dc3/driver/MqttDriverApplication.java index 00b24eb5a..5387e0418 100644 --- a/dc3-driver/dc3-driver-mqtt/src/main/java/com/dc3/driver/MqttDriverApplication.java +++ b/dc3-driver/dc3-driver-mqtt/src/main/java/com/dc3/driver/MqttDriverApplication.java @@ -13,15 +13,15 @@ package com.dc3.driver; -import com.dc3.config.autoconfigure.Dc3Application; -import com.dc3.config.boot.SpringApplication; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cache.annotation.EnableCaching; /** * @author pnoker */ @EnableCaching -@Dc3Application +@SpringBootApplication public class MqttDriverApplication { public static void main(String[] args) { diff --git a/dc3-driver/dc3-driver-opc-da/src/main/java/com/dc3/driver/OpcDaApplication.java b/dc3-driver/dc3-driver-opc-da/src/main/java/com/dc3/driver/OpcDaApplication.java index 2c6c3f632..073fdddac 100644 --- a/dc3-driver/dc3-driver-opc-da/src/main/java/com/dc3/driver/OpcDaApplication.java +++ b/dc3-driver/dc3-driver-opc-da/src/main/java/com/dc3/driver/OpcDaApplication.java @@ -13,15 +13,15 @@ package com.dc3.driver; -import com.dc3.config.autoconfigure.Dc3Application; -import com.dc3.config.boot.SpringApplication; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cache.annotation.EnableCaching; /** * @author pnoker */ @EnableCaching -@Dc3Application +@SpringBootApplication public class OpcDaApplication { public static void main(String[] args) { diff --git a/dc3-driver/dc3-driver-opc-ua/src/main/java/com/dc3/driver/OpcUaApplication.java b/dc3-driver/dc3-driver-opc-ua/src/main/java/com/dc3/driver/OpcUaApplication.java index 85bf9bd9c..eb8e363e1 100644 --- a/dc3-driver/dc3-driver-opc-ua/src/main/java/com/dc3/driver/OpcUaApplication.java +++ b/dc3-driver/dc3-driver-opc-ua/src/main/java/com/dc3/driver/OpcUaApplication.java @@ -13,15 +13,15 @@ package com.dc3.driver; -import com.dc3.config.autoconfigure.Dc3Application; -import com.dc3.config.boot.SpringApplication; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cache.annotation.EnableCaching; /** * @author pnoker */ @EnableCaching -@Dc3Application +@SpringBootApplication public class OpcUaApplication { public static void main(String[] args) { diff --git a/dc3-driver/dc3-driver-plcs7/src/main/java/com/dc3/driver/PlcS7DriverApplication.java b/dc3-driver/dc3-driver-plcs7/src/main/java/com/dc3/driver/PlcS7DriverApplication.java index 78e4d90dd..fbc5876e6 100644 --- a/dc3-driver/dc3-driver-plcs7/src/main/java/com/dc3/driver/PlcS7DriverApplication.java +++ b/dc3-driver/dc3-driver-plcs7/src/main/java/com/dc3/driver/PlcS7DriverApplication.java @@ -13,15 +13,15 @@ package com.dc3.driver; -import com.dc3.config.autoconfigure.Dc3Application; -import com.dc3.config.boot.SpringApplication; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cache.annotation.EnableCaching; /** * @author pnoker */ @EnableCaching -@Dc3Application +@SpringBootApplication public class PlcS7DriverApplication { public static void main(String[] args) { diff --git a/dc3-driver/dc3-driver-virtual/src/main/java/com/dc3/driver/VirtualDriverApplication.java b/dc3-driver/dc3-driver-virtual/src/main/java/com/dc3/driver/VirtualDriverApplication.java index d08073202..de042cb4a 100644 --- a/dc3-driver/dc3-driver-virtual/src/main/java/com/dc3/driver/VirtualDriverApplication.java +++ b/dc3-driver/dc3-driver-virtual/src/main/java/com/dc3/driver/VirtualDriverApplication.java @@ -13,15 +13,15 @@ package com.dc3.driver; -import com.dc3.config.autoconfigure.Dc3Application; -import com.dc3.config.boot.SpringApplication; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cache.annotation.EnableCaching; /** * @author pnoker */ @EnableCaching -@Dc3Application +@SpringBootApplication public class VirtualDriverApplication { public static void main(String[] args) { diff --git a/dc3-gateway/src/main/java/com/dc3/gateway/GatewayApplication.java b/dc3-gateway/src/main/java/com/dc3/gateway/GatewayApplication.java index b86600759..72903816c 100644 --- a/dc3-gateway/src/main/java/com/dc3/gateway/GatewayApplication.java +++ b/dc3-gateway/src/main/java/com/dc3/gateway/GatewayApplication.java @@ -13,8 +13,8 @@ package com.dc3.gateway; -import com.dc3.config.autoconfigure.Dc3Application; -import com.dc3.config.boot.SpringApplication; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cache.annotation.EnableCaching; /** @@ -23,7 +23,7 @@ import org.springframework.cache.annotation.EnableCaching; * @author pnoker */ @EnableCaching -@Dc3Application +@SpringBootApplication public class GatewayApplication { public static void main(String[] args) { diff --git a/dc3-transfer/dc3-rtmp/src/main/java/com/dc3/transfer/rtmp/RtmpApplication.java b/dc3-transfer/dc3-rtmp/src/main/java/com/dc3/transfer/rtmp/RtmpApplication.java index d2f2ef755..74cfe3312 100644 --- a/dc3-transfer/dc3-rtmp/src/main/java/com/dc3/transfer/rtmp/RtmpApplication.java +++ b/dc3-transfer/dc3-rtmp/src/main/java/com/dc3/transfer/rtmp/RtmpApplication.java @@ -13,8 +13,8 @@ package com.dc3.transfer.rtmp; -import com.dc3.config.autoconfigure.Dc3Application; -import com.dc3.config.boot.SpringApplication; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.AdviceMode; import org.springframework.transaction.annotation.EnableTransactionManagement; @@ -24,7 +24,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; * * @author pnoker */ -@Dc3Application +@SpringBootApplication @EnableTransactionManagement @EnableCaching(mode = AdviceMode.ASPECTJ) public class RtmpApplication { diff --git a/pom.xml b/pom.xml index c1817e832..b359b8ab7 100644 --- a/pom.xml +++ b/pom.xml @@ -192,17 +192,6 @@ compile - - - com.dc3 - dc3-boot-starter - ${project.version} - - com.dc3 @@ -243,8 +232,8 @@ - spring-plugin - spring-plugin + aliyun-spring-plugin + Aliyun Apache Maven Spring Plugin Packages https://maven.aliyun.com/repository/spring-plugin true @@ -257,7 +246,7 @@ - aliyun-nexus + aliyun-central Aliyun Apache Maven Packages https://maven.aliyun.com/repository/central @@ -267,42 +256,6 @@ false - - - gitee-pnoker - Gitee Pnoker Apache Maven Packages - https://gitee.com/pnoker/maven/raw/master - - true - - - false - - - - - github-pnoker - GitHub Pnoker Apache Maven Packages - https://raw.github.com/pnoker/maven/master - - true - - - false - - - - - github-dc3 - GitHub DC3 Apache Maven Packages - https://maven.pkg.github.com/pnoker/iot-dc3 - - true - - - false - -