Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

cloud-model/src/main/java/com/hssx/cloudmodel/controller/ProjectFileController.java

@@ -80,7 +80,7 @@ public class ProjectFileController {
     @RequestMapping("/list")
     @ResponseBody
     public HttpRespMsg list(UserVO userVO){
-        HttpRespMsg msg = projectFileService.getFileList(userVO);
+        HttpRespMsg msg = projectFileService.getFileList(userVO,path);
         return msg;
     }
 

cloud-model/src/main/java/com/hssx/cloudmodel/service/ProjectFileService.java

@@ -24,7 +24,7 @@ public interface ProjectFileService extends IService<ProjectFile> {
 
     HttpRespMsg dowloadFile(ProjectFile projectFile, String token,String downLoadpath,HttpServletResponse response,String path) throws FileNotFoundException, UnsupportedEncodingException;
 
-    HttpRespMsg getFileList(UserVO userVO);
+    HttpRespMsg getFileList(UserVO userVO,String path);
 
     HttpRespMsg delFile(ProjectFile projectFile);
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/ProjectFileServiceImpl.java

@@ -202,10 +202,13 @@ public class ProjectFileServiceImpl extends ServiceImpl<ProjectFileMapper, Proje
         }
 
     @Override
-    public HttpRespMsg getFileList(UserVO userVO) {
+    public HttpRespMsg getFileList(UserVO userVO,String path) {
         HttpRespMsg msg = new HttpRespMsg();
         User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
         List<ProjectFile> list = projectFileMapper.selectList(new QueryWrapper<ProjectFile>().eq("project_id", userVO.getProjectId()).orderByDesc("id"));
+        for (ProjectFile projectFile : list) {
+            projectFile.setUrl(path+projectFile.getUrl().substring("/upload/".length()));
+        }
         msg.data = list;
         return msg;
     }