From 43d81456014338d53aefc3ec81a9eafa38bf8a3f Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 02 Nov 2017 05:13:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/application.xml | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/application.xml b/src/main/resources/application.xml
index 8905828..479dc5a 100644
--- a/src/main/resources/application.xml
+++ b/src/main/resources/application.xml
@@ -10,8 +10,20 @@
http://www.springframework.org/schema/mvc
http://www.springframework.org/schema/mvc/spring-mvc.xsd">
- <context:component-scan base-package="com.moral.monitor.controller"/>
- <context:component-scan base-package="com.moral.monitor.service"/>
+ <!--<context:component-scan base-package="com.moral.monitor.controller"/>-->
+ <!--<context:component-scan base-package="com.moral.monitor.service"/>-->
+
+ <context:component-scan base-package="com.moral.monitor.*"/>
+ <bean id="PropertiesConfigurer"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="locations">
+ <list>
+ <value>classpath:log4j.properties</value>
+ <value>classpath:redis-config.properties</value>
+ <value>classpath:mongodb-config.properties</value>
+ </list>
+ </property>
+ </bean>
<mvc:annotation-driven>
<mvc:message-converters register-defaults="true">
@@ -46,6 +58,8 @@
<property name="queueCapacity" value="1000000"/>
</bean>-->
+ <import resource="redis.xml"/>
+ <import resource="mongodb.xml"/>
<import resource="database.xml"/>
<import resource="rabbitmq.xml"/>
<import resource="quartz.xml"/>
--
Gitblit v1.8.0