Merge branch 'DEV' into 'Test'

fix 分数显示的bug







See merge request !809

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/data/wrapper/ExerciseCollectionPythonCommunityVOWrapper.java

@@ -59,7 +59,8 @@ public class ExerciseCollectionPythonCommunityVOWrapper {
         for(long caseId: caseIds){
             ExercisePythonCommunityVO exercise = wrapCaseWithoutScore(caseId,userId);
             if(userId != null){
-                exercise.setScore(result == null?0:result.getResults().get(caseId+"").getMaxScore());
+                exercise.setScore(result == null?0:(result.getResults().containsKey(caseId+"")
+                        ?result.getResults().get(caseId+"").getMaxScore():0));
             }
             exerciseList.add(exercise);
         }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/impl/OSSLogicImpl.java

@@ -226,6 +226,7 @@ public class OSSLogicImpl implements OSSLogic {
         String line;
         while ((line = reader.readLine()) != null) {
             sb.append(line);
+            sb.append("\n");
         }
 
         reader.close();