diff --git a/busi-back/busi-app-control/src/main/resources/dev/applicationContext.xml b/busi-back/busi-app-control/src/main/resources/dev/applicationContext.xml index f10a0d5..2881cf4 100644 --- a/busi-back/busi-app-control/src/main/resources/dev/applicationContext.xml +++ b/busi-back/busi-app-control/src/main/resources/dev/applicationContext.xml @@ -18,8 +18,8 @@ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> - classpath:redis.properties - classpath:application.properties + file:${XYDL_DIR}/jkpg/redis.properties + file:${XYDL_DIR}/jkpg/application.properties diff --git a/busi-back/busi-app-control/src/main/resources/dev/spring-dubbo.xml b/busi-back/busi-app-control/src/main/resources/dev/spring-dubbo.xml index 8227dbd..cd46f7e 100644 --- a/busi-back/busi-app-control/src/main/resources/dev/spring-dubbo.xml +++ b/busi-back/busi-app-control/src/main/resources/dev/spring-dubbo.xml @@ -6,7 +6,8 @@ http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd"> - + + diff --git a/busi-back/busi-back-control/src/main/resources/dev/applicationContext.xml b/busi-back/busi-back-control/src/main/resources/dev/applicationContext.xml index a17f5cb..ea5fe18 100644 --- a/busi-back/busi-back-control/src/main/resources/dev/applicationContext.xml +++ b/busi-back/busi-back-control/src/main/resources/dev/applicationContext.xml @@ -17,8 +17,8 @@ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> - classpath:redis.properties - classpath:application.properties + file:${XYDL_DIR}/jkpg/redis.properties + file:${XYDL_DIR}/jkpg/application.properties diff --git a/busi-back/busi-back-control/src/main/resources/dev/spring-dubbo.xml b/busi-back/busi-back-control/src/main/resources/dev/spring-dubbo.xml index 8227dbd..a919efe 100644 --- a/busi-back/busi-back-control/src/main/resources/dev/spring-dubbo.xml +++ b/busi-back/busi-back-control/src/main/resources/dev/spring-dubbo.xml @@ -6,7 +6,7 @@ http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd"> - + diff --git a/busi-back/busi-back-serviceImpl/src/main/resources/dev/spring-database.xml b/busi-back/busi-back-serviceImpl/src/main/resources/dev/spring-database.xml index b3afa6c..d299d7f 100644 --- a/busi-back/busi-back-serviceImpl/src/main/resources/dev/spring-database.xml +++ b/busi-back/busi-back-serviceImpl/src/main/resources/dev/spring-database.xml @@ -61,7 +61,8 @@ scope="prototype"> - ${base.service.package} + + com.huatek.busi.service.* @@ -85,8 +86,9 @@ - ${base.mapper.path} - classpath:com/huatek/torch/sql/mapping/*Mapper.xml + + classpath:com/huatek/busi/mapping/*Mapping.xml + classpath:com/huatek/torch/sql/mapping/*Mapper.xml diff --git a/busi-back/busi-back-serviceImpl/src/main/resources/dev/spring-dubbo.xml b/busi-back/busi-back-serviceImpl/src/main/resources/dev/spring-dubbo.xml index e64b076..9f1f79d 100644 --- a/busi-back/busi-back-serviceImpl/src/main/resources/dev/spring-dubbo.xml +++ b/busi-back/busi-back-serviceImpl/src/main/resources/dev/spring-dubbo.xml @@ -10,9 +10,9 @@ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> - classpath:jdbc.properties - classpath:application.properties - classpath:redis.properties + file:${XYDL_DIR}/jkpg/jdbc.properties + file:${XYDL_DIR}/jkpg/application.properties + file:${XYDL_DIR}/jkpg/redis.properties @@ -22,15 +22,17 @@ - + - + + - + + \ No newline at end of file diff --git a/busi-back/busi-back-ws/src/main/resources/dev/applicationContext.xml b/busi-back/busi-back-ws/src/main/resources/dev/applicationContext.xml index 03d8ef7..6ac10cf 100644 --- a/busi-back/busi-back-ws/src/main/resources/dev/applicationContext.xml +++ b/busi-back/busi-back-ws/src/main/resources/dev/applicationContext.xml @@ -20,7 +20,7 @@ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> - classpath:application.properties + file:${XYDL_DIR}/jkpg/application.properties diff --git a/busi-back/busi-back-ws/src/main/resources/dev/spring-dubbo.xml b/busi-back/busi-back-ws/src/main/resources/dev/spring-dubbo.xml index 8227dbd..3f414a6 100644 --- a/busi-back/busi-back-ws/src/main/resources/dev/spring-dubbo.xml +++ b/busi-back/busi-back-ws/src/main/resources/dev/spring-dubbo.xml @@ -6,7 +6,7 @@ http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd"> - + diff --git a/frame-base/frame-base-control/src/main/resources/dev/applicationContext.xml b/frame-base/frame-base-control/src/main/resources/dev/applicationContext.xml index 72ef486..1afb5aa 100644 --- a/frame-base/frame-base-control/src/main/resources/dev/applicationContext.xml +++ b/frame-base/frame-base-control/src/main/resources/dev/applicationContext.xml @@ -18,8 +18,8 @@ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> - classpath:redis.properties - classpath:application.properties + file:${XYDL_DIR}/jkpg/redis.properties + file:${XYDL_DIR}/jkpg/application.properties diff --git a/frame-base/frame-base-control/src/main/resources/dev/spring-dubbo.xml b/frame-base/frame-base-control/src/main/resources/dev/spring-dubbo.xml index a9109d2..793f372 100644 --- a/frame-base/frame-base-control/src/main/resources/dev/spring-dubbo.xml +++ b/frame-base/frame-base-control/src/main/resources/dev/spring-dubbo.xml @@ -6,7 +6,7 @@ http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd"> - + diff --git a/frame-base/frame-base-serviceImpl/src/main/resources/dev/spring-database.xml b/frame-base/frame-base-serviceImpl/src/main/resources/dev/spring-database.xml index 346ff50..398c73b 100644 --- a/frame-base/frame-base-serviceImpl/src/main/resources/dev/spring-database.xml +++ b/frame-base/frame-base-serviceImpl/src/main/resources/dev/spring-database.xml @@ -57,7 +57,7 @@ scope="prototype"> - ${base.service.package} + com.huatek.frame.base.service.* @@ -81,7 +81,7 @@ - ${base.mapper.path} + classpath:com/huatek/frame/base/mapping/*Mapper.xml classpath:com/huatek/torch/sql/mapping/*Mapper.xml diff --git a/frame-base/frame-base-serviceImpl/src/main/resources/dev/spring-dubbo.xml b/frame-base/frame-base-serviceImpl/src/main/resources/dev/spring-dubbo.xml index e1c769e..c0cce74 100644 --- a/frame-base/frame-base-serviceImpl/src/main/resources/dev/spring-dubbo.xml +++ b/frame-base/frame-base-serviceImpl/src/main/resources/dev/spring-dubbo.xml @@ -10,9 +10,9 @@ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> - classpath:jdbc.properties - classpath:application.properties - classpath:redis.properties + file:${XYDL_DIR}/jkpg/jdbc.properties + file:${XYDL_DIR}/jkpg/application.properties + file:${XYDL_DIR}/jkpg/redis.properties @@ -21,13 +21,13 @@ - + - + - + \ No newline at end of file