From 875260cf7a813b2f9688a7ba0b4dafa64bd6b19e Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Thu, 02 Nov 2017 15:30:28 +0800
Subject: [PATCH] 测试测试

---
 src/main/resources/application.xml |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/application.xml b/src/main/resources/application.xml
index 4eca950..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">
@@ -37,8 +49,6 @@
         <property name="suffix" value=".jsp" />
     </bean>
 
-
-
     <!--
     &lt;!&ndash; ��������� &ndash;&gt;
     <bean id="taskExecutor" class="org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor">
@@ -48,9 +58,9 @@
         <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"/>
-
 </beans>
\ No newline at end of file

--
Gitblit v1.8.0