diff --git a/kicc-auth/src/main/java/com/cloud/kicc/auth/KiccAuthApplication.java b/kicc-auth/src/main/java/com/cloud/kicc/auth/KiccAuthApplication.java index 936ac66c..86b768e4 100644 --- a/kicc-auth/src/main/java/com/cloud/kicc/auth/KiccAuthApplication.java +++ b/kicc-auth/src/main/java/com/cloud/kicc/auth/KiccAuthApplication.java @@ -1,6 +1,7 @@ package com.cloud.kicc.auth; import com.cloud.kicc.common.core.annotation.EnableKiccJacksonAutoConvert; +import com.cloud.kicc.common.data.annotation.EnableKiccDataRepository; import com.cloud.kicc.common.feign.annotation.EnableKiccFeignClients; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -17,6 +18,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @EnableKiccFeignClients @SpringBootApplication @EnableKiccJacksonAutoConvert +@EnableKiccDataRepository public class KiccAuthApplication { public static void main(String[] args) { diff --git a/kicc-common-demo/kicc-common-demo-mq/kicc-message-consumer/src/main/java/com/cloud/kicc/mq/KiccDemoMessageConsumerServer.java b/kicc-common-demo/kicc-common-demo-mq/kicc-message-consumer/src/main/java/com/cloud/kicc/mq/KiccDemoMessageConsumerServer.java index c712f90f..c46de9a2 100644 --- a/kicc-common-demo/kicc-common-demo-mq/kicc-message-consumer/src/main/java/com/cloud/kicc/mq/KiccDemoMessageConsumerServer.java +++ b/kicc-common-demo/kicc-common-demo-mq/kicc-message-consumer/src/main/java/com/cloud/kicc/mq/KiccDemoMessageConsumerServer.java @@ -1,5 +1,6 @@ package com.cloud.kicc.mq; +import com.cloud.kicc.common.data.annotation.EnableKiccDataRepository; import com.cloud.kicc.common.rocketmq.channel.KiccSink; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -17,6 +18,7 @@ import org.springframework.cloud.stream.annotation.EnableBinding; */ @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class}) @EnableBinding({KiccSink.class}) +@EnableKiccDataRepository public class KiccDemoMessageConsumerServer { public static void main(String[] args) { diff --git a/kicc-common-demo/kicc-common-demo-mq/kicc-message-producer/src/main/java/com/cloud/kicc/mq/KiccDemoMessageProducerServer.java b/kicc-common-demo/kicc-common-demo-mq/kicc-message-producer/src/main/java/com/cloud/kicc/mq/KiccDemoMessageProducerServer.java index d587cb7e..b925e863 100644 --- a/kicc-common-demo/kicc-common-demo-mq/kicc-message-producer/src/main/java/com/cloud/kicc/mq/KiccDemoMessageProducerServer.java +++ b/kicc-common-demo/kicc-common-demo-mq/kicc-message-producer/src/main/java/com/cloud/kicc/mq/KiccDemoMessageProducerServer.java @@ -1,5 +1,6 @@ package com.cloud.kicc.mq; +import com.cloud.kicc.common.data.annotation.EnableKiccDataRepository; import com.cloud.kicc.common.rocketmq.channel.KiccSource; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -17,6 +18,7 @@ import org.springframework.cloud.stream.annotation.EnableBinding; */ @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class}) @EnableBinding({KiccSource.class}) +@EnableKiccDataRepository public class KiccDemoMessageProducerServer { public static void main(String[] args) { diff --git a/kicc-common-demo/kicc-common-demo-seata/kicc-seata-order/src/main/java/com/cloud/kicc/order/KiccDemoSeataOrderServer.java b/kicc-common-demo/kicc-common-demo-seata/kicc-seata-order/src/main/java/com/cloud/kicc/order/KiccDemoSeataOrderServer.java index 54680677..53759303 100644 --- a/kicc-common-demo/kicc-common-demo-seata/kicc-seata-order/src/main/java/com/cloud/kicc/order/KiccDemoSeataOrderServer.java +++ b/kicc-common-demo/kicc-common-demo-seata/kicc-seata-order/src/main/java/com/cloud/kicc/order/KiccDemoSeataOrderServer.java @@ -1,5 +1,6 @@ package com.cloud.kicc.order; +import com.cloud.kicc.common.data.annotation.EnableKiccDataRepository; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -12,6 +13,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * @Date: 2022/3/11 */ @SpringBootApplication +@EnableKiccDataRepository public class KiccDemoSeataOrderServer { public static void main(String[] args) { diff --git a/kicc-common-demo/kicc-common-demo-seata/kicc-seata-point/src/main/java/com/cloud/kicc/point/KiccDemoSeataPointServer.java b/kicc-common-demo/kicc-common-demo-seata/kicc-seata-point/src/main/java/com/cloud/kicc/point/KiccDemoSeataPointServer.java index fd9e59b4..713aae49 100644 --- a/kicc-common-demo/kicc-common-demo-seata/kicc-seata-point/src/main/java/com/cloud/kicc/point/KiccDemoSeataPointServer.java +++ b/kicc-common-demo/kicc-common-demo-seata/kicc-seata-point/src/main/java/com/cloud/kicc/point/KiccDemoSeataPointServer.java @@ -1,5 +1,6 @@ package com.cloud.kicc.point; +import com.cloud.kicc.common.data.annotation.EnableKiccDataRepository; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -12,6 +13,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * @Date: 2022/3/11 */ @SpringBootApplication +@EnableKiccDataRepository public class KiccDemoSeataPointServer { public static void main(String[] args) { diff --git a/kicc-common-demo/kicc-common-demo-seata/kicc-seata-user/src/main/java/com/cloud/kicc/user/KiccDemoSeataUserServer.java b/kicc-common-demo/kicc-common-demo-seata/kicc-seata-user/src/main/java/com/cloud/kicc/user/KiccDemoSeataUserServer.java index 38e55484..6dd28d1b 100644 --- a/kicc-common-demo/kicc-common-demo-seata/kicc-seata-user/src/main/java/com/cloud/kicc/user/KiccDemoSeataUserServer.java +++ b/kicc-common-demo/kicc-common-demo-seata/kicc-seata-user/src/main/java/com/cloud/kicc/user/KiccDemoSeataUserServer.java @@ -1,5 +1,6 @@ package com.cloud.kicc.user; +import com.cloud.kicc.common.data.annotation.EnableKiccDataRepository; import com.cloud.kicc.common.feign.annotation.EnableKiccFeignClients; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -14,6 +15,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; */ @SpringBootApplication @EnableKiccFeignClients +@EnableKiccDataRepository public class KiccDemoSeataUserServer { public static void main(String[] args) { diff --git a/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/annotation/EnableKiccDataRepository.java b/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/annotation/EnableKiccDataRepository.java new file mode 100644 index 00000000..b2b4ae49 --- /dev/null +++ b/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/annotation/EnableKiccDataRepository.java @@ -0,0 +1,24 @@ +package com.cloud.kicc.common.data.annotation; + +import com.cloud.kicc.common.data.config.MybatisConfiguration; +import com.cloud.kicc.common.data.config.RedisTemplateConfiguration; +import org.springframework.context.annotation.Import; + +import java.lang.annotation.*; + +/** + *
+ * 开启数据存储和访问层 + *
+ * + * @Author: wangxiang4 + * @Since: 2023/9/15 + */ +@Target({ ElementType.TYPE }) +@Retention(RetentionPolicy.RUNTIME) +@Documented +@Inherited +@Import({ MybatisConfiguration.class, RedisTemplateConfiguration.class }) +public @interface EnableKiccDataRepository { + +} diff --git a/kicc-common/kicc-common-data/src/main/resources/META-INF/spring.factories b/kicc-common/kicc-common-data/src/main/resources/META-INF/spring.factories index b96956f9..ab43764e 100644 --- a/kicc-common/kicc-common-data/src/main/resources/META-INF/spring.factories +++ b/kicc-common/kicc-common-data/src/main/resources/META-INF/spring.factories @@ -1,3 +1 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.cloud.kicc.common.data.config.MybatisConfiguration,\ - com.cloud.kicc.common.data.config.RedisTemplateConfiguration +org.springframework.boot.autoconfigure.EnableAutoConfiguration= diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/KiccCommonApplication.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/KiccCommonApplication.java index 9e48c369..212b681c 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/KiccCommonApplication.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/KiccCommonApplication.java @@ -1,6 +1,7 @@ package com.cloud.kicc.commonbiz; import com.cloud.kicc.common.core.annotation.EnableKiccJacksonAutoConvert; +import com.cloud.kicc.common.data.annotation.EnableKiccDataRepository; import com.cloud.kicc.common.feign.annotation.EnableKiccFeignClients; import com.cloud.kicc.common.job.annotation.EnableKiccXxlJob; import com.cloud.kicc.common.security.annotation.EnableKiccResourceServer; @@ -22,6 +23,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication @EnableKiccJacksonAutoConvert @EnableKiccXxlJob +@EnableKiccDataRepository public class KiccCommonApplication { public static void main(String[] args) { diff --git a/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/KiccMonitorApplication.java b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/KiccMonitorApplication.java index 73165b52..ac6dc766 100644 --- a/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/KiccMonitorApplication.java +++ b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/KiccMonitorApplication.java @@ -1,6 +1,7 @@ package com.cloud.kicc.monitor; import com.cloud.kicc.common.core.annotation.EnableKiccJacksonAutoConvert; +import com.cloud.kicc.common.data.annotation.EnableKiccDataRepository; import com.cloud.kicc.common.feign.annotation.EnableKiccFeignClients; import com.cloud.kicc.common.security.annotation.EnableKiccResourceServer; import com.cloud.kicc.common.swagger.annotation.EnableKiccSwagger2; @@ -20,6 +21,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @EnableKiccFeignClients @SpringBootApplication @EnableKiccJacksonAutoConvert +@EnableKiccDataRepository public class KiccMonitorApplication { public static void main(String[] args) { diff --git a/kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/KiccReportApplication.java b/kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/KiccReportApplication.java index d6cfcc52..e426c099 100644 --- a/kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/KiccReportApplication.java +++ b/kicc-platform/kicc-platform-biz/kicc-report-biz/src/main/java/com/cloud/kicc/report/KiccReportApplication.java @@ -1,6 +1,7 @@ package com.cloud.kicc.report; import com.cloud.kicc.common.core.annotation.EnableKiccJacksonAutoConvert; +import com.cloud.kicc.common.data.annotation.EnableKiccDataRepository; import com.cloud.kicc.common.feign.annotation.EnableKiccFeignClients; import com.cloud.kicc.common.security.annotation.EnableKiccResourceServer; import com.cloud.kicc.common.swagger.annotation.EnableKiccSwagger2; @@ -20,6 +21,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @EnableKiccFeignClients @SpringBootApplication @EnableKiccJacksonAutoConvert +@EnableKiccDataRepository public class KiccReportApplication { public static void main(String[] args) { diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/KiccSystemApplication.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/KiccSystemApplication.java index 737cb76d..d7e5dacf 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/KiccSystemApplication.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/KiccSystemApplication.java @@ -1,6 +1,7 @@ package com.cloud.kicc.system; import com.cloud.kicc.common.core.annotation.EnableKiccJacksonAutoConvert; +import com.cloud.kicc.common.data.annotation.EnableKiccDataRepository; import com.cloud.kicc.common.datasource.annotation.EnableDynamicDataSource; import com.cloud.kicc.common.feign.annotation.EnableKiccFeignClients; import com.cloud.kicc.common.security.annotation.EnableKiccResourceServer; @@ -22,6 +23,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication @EnableKiccJacksonAutoConvert @EnableDynamicDataSource +@EnableKiccDataRepository public class KiccSystemApplication { public static void main(String[] args) { diff --git a/kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/java/com/cloud/kicc/template/KiccTemplateApplication.java b/kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/java/com/cloud/kicc/template/KiccTemplateApplication.java index a69b531f..5248a873 100644 --- a/kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/java/com/cloud/kicc/template/KiccTemplateApplication.java +++ b/kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/java/com/cloud/kicc/template/KiccTemplateApplication.java @@ -1,6 +1,7 @@ package com.cloud.kicc.template; import com.cloud.kicc.common.core.annotation.EnableKiccJacksonAutoConvert; +import com.cloud.kicc.common.data.annotation.EnableKiccDataRepository; import com.cloud.kicc.common.feign.annotation.EnableKiccFeignClients; import com.cloud.kicc.common.security.annotation.EnableKiccResourceServer; import com.cloud.kicc.common.swagger.annotation.EnableKiccSwagger2; @@ -21,6 +22,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @EnableKiccFeignClients @SpringBootApplication @EnableKiccJacksonAutoConvert +@EnableKiccDataRepository public class KiccTemplateApplication { public static void main(String[] args) { diff --git a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/KiccWorkflowApplication.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/KiccWorkflowApplication.java index 4b83e754..76732c35 100644 --- a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/KiccWorkflowApplication.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/KiccWorkflowApplication.java @@ -1,6 +1,7 @@ package com.cloud.kicc.workflow; import com.cloud.kicc.common.core.annotation.EnableKiccJacksonAutoConvert; +import com.cloud.kicc.common.data.annotation.EnableKiccDataRepository; import com.cloud.kicc.common.feign.annotation.EnableKiccFeignClients; import com.cloud.kicc.common.security.annotation.EnableKiccResourceServer; import com.cloud.kicc.common.swagger.annotation.EnableKiccSwagger2; @@ -20,6 +21,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @EnableKiccFeignClients @SpringBootApplication @EnableKiccJacksonAutoConvert +@EnableKiccDataRepository public class KiccWorkflowApplication { public static void main(String[] args) {