diff --git a/.idea/libraries/Maven__junit_junit_3_8_1.xml b/.idea/libraries/Maven__junit_junit_3_8_1.xml
deleted file mode 100644
index 71b2993..0000000
--- a/.idea/libraries/Maven__junit_junit_3_8_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml
new file mode 100644
index 0000000..d411041
--- /dev/null
+++ b/.idea/libraries/Maven__junit_junit_4_12.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
new file mode 100644
index 0000000..f58bbc1
--- /dev/null
+++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 61a0ff1..a9a0575 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,11 +1,15 @@
-
-
-
-
+
+
+
+
+
+
+
+
@@ -18,10 +22,10 @@
-
+
-
+
@@ -32,6 +36,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -54,10 +78,12 @@
-
+
+
+
@@ -138,6 +164,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -196,6 +254,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -256,6 +339,11 @@
+
+
+
+
+
@@ -271,30 +359,45 @@
1529588420966
-
+
+
+ 1529592741848
+
+
+
+ 1529592741849
+
+
+
+
+
+
+
-
+
+
+
-
-
+
+
-
+
@@ -313,9 +416,39 @@
+
+
+
+
+
+
+
@@ -357,14 +490,6 @@
-
-
-
-
-
-
-
-
@@ -392,9 +517,20 @@
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -404,6 +540,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/UserActionAnalyzePlatform.iml b/UserActionAnalyzePlatform.iml
index 5072789..8c28597 100644
--- a/UserActionAnalyzePlatform.iml
+++ b/UserActionAnalyzePlatform.iml
@@ -12,7 +12,6 @@
-
@@ -190,5 +189,7 @@
+
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index ef6c666..276f6bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,12 +13,6 @@
-
- junit
- junit
- 3.8.1
- test
-
org.apache.spark
spark-core_2.10
@@ -79,6 +73,13 @@
fastjson
1.1.41
+
+ junit
+ junit
+ 4.12
+ test
+
+
diff --git a/src/main/resources/conf.properties b/src/main/resources/conf.properties
new file mode 100644
index 0000000..f995a3b
--- /dev/null
+++ b/src/main/resources/conf.properties
@@ -0,0 +1,2 @@
+key1=value1
+key2=value2
\ No newline at end of file
diff --git a/src/test/java/cn/edu/hust/conf/ConfigurationManagerTest.java b/src/test/java/cn/edu/hust/conf/ConfigurationManagerTest.java
new file mode 100644
index 0000000..75d3272
--- /dev/null
+++ b/src/test/java/cn/edu/hust/conf/ConfigurationManagerTest.java
@@ -0,0 +1,15 @@
+package cn.edu.hust.conf;
+
+
+import org.junit.Test;
+
+public class ConfigurationManagerTest {
+ /**
+ * 测试配置文件管理类
+ */
+ @Test
+ public void getMethod()
+ {
+ System.out.println(ConfigurationManager.getProperty("key1"));
+ }
+}