解决冲突

cftech-common/src/main/java/com/cftech/core/util/SystemConfig.java

@@ -14,10 +14,10 @@ public class SystemConfig {
 		try {
 //			inputStream = SystemConfig.class.newInstance().getClass()
 //					.getClassLoader().getResourceAsStream("");
-			p.load(new InputStreamReader(SystemConfig.class.getClassLoader().getResourceAsStream("/common.properties"), "utf-8"));
+			p.load(new InputStreamReader(SystemConfig.class.getClassLoader().getResourceAsStream("/common-test.properties"), "utf-8"));
 
 			inputStreamRedis = SystemConfig.class.newInstance().getClass()
-					.getClassLoader().getResourceAsStream("/redis-config.properties");
+					.getClassLoader().getResourceAsStream("/redis-config-test.properties");
 			r.load(inputStreamRedis);
 		} catch (Exception e) {
 			e.printStackTrace();