Index: ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
===================================================================
diff -u -r23469 -r23962
--- ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 23469)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 23962)
@@ -30,6 +30,7 @@
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.testng.AbstractTransactionalTestNGSpringContextTests;
 
 import test.forgon.constant.Constants;
@@ -110,14 +111,14 @@
 /**
  * @author Angus
  * 
- * Spring的配置文件硬编码为读gzfdzl（广州复大肿瘤）文件夹的配置，
- * 需要改进为读取jdbc.properties文件中project的配置。Terry Kwan，2016-07-10
+ * 通过classpath类路径下的:spring/test/applicationContext-test.xml文件，加载spring的配置文件。
+ * 读取jdbc.properties文件中project的配置，来决定相关项目的spring配置文件的加载。
+ * 采用了@TestPropertySource注解指定property文件
+ * Terry Kwan，2018-08-11
  * 
  */
-@ContextConfiguration(locations={"classpath:spring/*.xml", "classpath:spring/security/*.xml",
-"classpath:spring/test/*.xml",
-"classpath:spring/projects/gzfdzl/*.xml" })
-//@ContextConfiguration(locations={"classpath:applicationContext-test.xml"})
+@ContextConfiguration(locations={"classpath:spring/test/applicationContext-test.xml"})
+@TestPropertySource("classpath:jdbc.properties")
 public class AbstractCSSDTest extends
 AbstractTransactionalTestNGSpringContextTests{
 
Index: ssts-web/src/main/resources/spring/test/applicationContext-test.xml
===================================================================
diff -u -r23822 -r23962
--- ssts-web/src/main/resources/spring/test/applicationContext-test.xml	(.../applicationContext-test.xml)	(revision 23822)
+++ ssts-web/src/main/resources/spring/test/applicationContext-test.xml	(.../applicationContext-test.xml)	(revision 23962)
@@ -4,6 +4,10 @@
     xsi:schemaLocation="http://www.springframework.org/schema/beans 
     http://www.springframework.org/schema/beans/spring-beans.xsd" default-autowire="byName">
 
+	<import resource="classpath:spring/*.xml"/>
+	<import resource="classpath:spring/security/*.xml"/>
+    <import resource="classpath:spring/projects/${project}/*.xml"/>
+
 	<bean id="dataGenerater" class="test.forgon.disinfectsystem.invoicemanager.service.DataGenerater">
         
     </bean>