From 39c3762e13e83492ae98d3ef20f88f85f208bc95 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期四, 24 十月 2024 11:48:11 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/PipIrrSsoApplication.java | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/PipIrrSsoApplication.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/PipIrrSsoApplication.java index 1774e26..97c6891 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/PipIrrSsoApplication.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/PipIrrSsoApplication.java @@ -8,24 +8,24 @@ import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.EnableAspectJAutoProxy; +import org.springframework.context.annotation.FilterType; @SpringBootApplication @EnableAspectJAutoProxy @EnableMultiDataSource @EnableCaching//寮�鍚娇鐢ㄧ紦瀛� -@ComponentScan(basePackages = {"com.dy.common", "com.dy.pipIrrGlobal", "com.dy.sso"}) -@MapperScan(basePackages={"com.dy.pipIrrGlobal.daoBa"}) +@ComponentScan(basePackages = {"com.dy.common", "com.dy.pipIrrGlobal", "com.dy.sso"}, + excludeFilters = { + @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = { + com.dy.common.singleDataSource.DruidDataSourceConfig.class //鎺掗櫎鍗曟暟鎹簮 + }) + } +) +@MapperScan(basePackages={"com.dy.pipIrrGlobal.daoBa", "com.dy.pipIrrGlobal.daoFi"}) @Slf4j public class PipIrrSsoApplication { public static void main(String[] args) { SpringApplication.run(PipIrrSsoApplication.class, args); - log.info("瀹瑰櫒鍚姩鎴愬姛... "); - -// SpringCacheService springCacheService = SpringContextUtil.getBean(SpringCacheService.class); -// springCacheService.query(); - -// MyGuavaCacheService myGuavaCacheService = SpringContextUtil.getBean(MyGuavaCacheService.class); -// myGuavaCacheService.query(); } } -- Gitblit v1.8.0