Merge branch 'master' of http://gogs.efunbox.cn:3000/Rankin/rankin

rankin-api-web/src/main/java/cn/rankin/apiweb/controller/CourseController.java

@@ -56,16 +56,21 @@ public class CourseController {
         List<LessonVo> data = new ArrayList<>();
         List<LessonVo> lessonVos = courseVo.getList();
         lessonVos.forEach( vo -> {
-            if(StringUtils.isNotBlank(mac)){
-                DownloadInfo downloadInfo = downloadInfoService.findByLessonUserId(userId, vo.getId(), mac);
-                if(null != downloadInfo && DownloadStatus.FINISH_DOWNLOAD == downloadInfo.getDownloadStatus()){
-                    vo.setDownloadStatus(DownloadStatus.FINISH_DOWNLOAD);
-                }else if(null != downloadInfo && DownloadStatus.PROCESS_DOWNLOAD == downloadInfo.getDownloadStatus()){
-                    vo.setDownloadStatus(DownloadStatus.PROCESS_DOWNLOAD);
-                }else if(null != downloadInfo && DownloadStatus.FAIL_DOWNLOAD == downloadInfo.getDownloadStatus()){
-                    vo.setDownloadStatus(DownloadStatus.FAIL_DOWNLOAD);
+            try{
+                if(StringUtils.isNotBlank(mac)){
+                    DownloadInfo downloadInfo = downloadInfoService.findByLessonUserId(userId, vo.getId(), mac);
+                    if(null != downloadInfo && DownloadStatus.FINISH_DOWNLOAD == downloadInfo.getDownloadStatus()){
+                        vo.setDownloadStatus(DownloadStatus.FINISH_DOWNLOAD);
+                    }else if(null != downloadInfo && DownloadStatus.PROCESS_DOWNLOAD == downloadInfo.getDownloadStatus()){
+                        vo.setDownloadStatus(DownloadStatus.PROCESS_DOWNLOAD);
+                    }else if(null != downloadInfo && DownloadStatus.FAIL_DOWNLOAD == downloadInfo.getDownloadStatus()){
+                        vo.setDownloadStatus(DownloadStatus.FAIL_DOWNLOAD);
+                    }
                 }
+            }catch(Exception e){
+                e.printStackTrace();
             }
+
             data.add(vo);
         });
         courseVo.setList(data);

rankin-common-utils/src/main/java/cn/rankin/common/utils/util/HttpUtil.java

@@ -193,9 +193,12 @@ public class HttpUtil {
     public static String getSystemInfo(HttpServletRequest request){
         String systenInfo = null;
         String header = request.getHeader("user-agent");
+        logger.info("获取系统版本信息:"+header);
         if(header == null || header.equals("")){
             return "";
         }
+
+
         //得到用户的操作系统
         if (header.indexOf("NT 6.0") > 0){
             systenInfo = "Windows Vista/Server 2008";

rankin-user-service/src/main/java/cn/rankin/userservice/repository/DownloadInfoRepository.java

@@ -29,7 +29,7 @@ public interface DownloadInfoRepository extends BasicJpaRepository<DownloadInfo,
     int setUpdateByLessonId(String lessonId, BaseStatusEnum status);
 
     @Modifying
-    @Query(value = "update DownloadInfo info set info.downloadStatus = ?3 where info.userId = ?1 AND info.mac = ?2")
+    @Query(value = "update DownloadInfo info set info.downloadStatus = ?3 where info.userId = ?1 AND info.mac = ?2 AND info.downloadStatus = 2")
     int updateDownloadFail(String uid, String mac, int failDownload);
 
     @Query(value = "select info from DownloadInfo info where info.userId = ?1 AND info.lessonId = ?2  AND info.mac = ?3 AND info.downloadStatus = 2 ORDER BY info.gmtCreated DESC ")

rankin-user-service/src/main/java/cn/rankin/userservice/service/CollectionService.java

@@ -71,6 +71,7 @@ public class CollectionService {
     public APIResult<List<Collection>> gets(String userId, Integer size) {
         Collection sample = new Collection();
         sample.setUserId(userId);
+        sample.setStatus(BaseStatusEnum.NORMAL);
         List<Collection> list = collectionRepository.find(sample, 0L, size);
         return APIResult.ok(list);
     }