Merge branch 'dev' into test

.gitattributes

@@ -1,2 +1,6 @@
 # Auto detect text files and perform LF normalization
 * text=auto
+
+/target/
+.yml
+.xml

src/main/java/edu/nju/util/LoadConf.java

@@ -30,8 +30,8 @@ public class LoadConf {
             }else if(name.equals("OSS_CONFIG.json")){
                 s="{\n" +
                         "\tOSS_CONFIG:{\n" +
-                        "\t    ACCESS_KEY_ID:\"LTAI4FwTqQ2grekcxanKHnBL\",\n" +
-                        "\t    ACCESS_KEY_SECRET:\"90nz7r8aImh2NhcNh0HAg8xiOJtn5V\",\n" +
+                        "\t    ACCESS_KEY_ID:\"LTAI4FdrT3HsfdR5edBVN7ws\",\n" +
+                        "\t    ACCESS_KEY_SECRET:\"yroxrpm46DzTyzHrLBZzS3MRNIicP6\",\n" +
                         "\t    BUCKET:\"mooctest-site\",\n" +
                         "\t    END_POINT:\"http://oss-cn-shanghai.aliyuncs.com\",\n" +
                         "\t    EXPIRE_TIME:600,\n" +