Merge remote-tracking branch 'origin/dev' into dev

sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysFileServiceImpl.java

@@ -48,7 +48,8 @@ public class SysFileServiceImpl implements SysFileService {
         FileInfo file = new FileInfo();
         StandardMultipartHttpServletRequest req = (StandardMultipartHttpServletRequest) request;
         String photoType = req.getParameter("fileType");
-        String userId = req.getParameter("userId");
+//        String userId = req.getParameter("userId");
+        Long userId = SecurityUtils.getUserId();
         HashMap<String, Object> map = getFile(req);
         List<MultipartFile> items = (List<MultipartFile>) map.get("filePath");
         MultipartFile item = items.get(0);
@@ -61,7 +62,7 @@ public class SysFileServiceImpl implements SysFileService {
                 long size = item.getSize()/1024/1024;
                 file.setFileName(fileName);
                 file.setFileUrl(url);
-                file.setCreator(userId);
+                file.setCreator(userId.toString());
                 file.setType(type);
                 file.setSize(size + "M");
                 file.setWords(words);
@@ -97,7 +98,7 @@ public class SysFileServiceImpl implements SysFileService {
         String tmpName = multipartFile.getOriginalFilename();// 完整路径 IE
         tmpName = tmpName.substring(tmpName.lastIndexOf("\\") + 1);
         tmpName = IdUtil.fastSimpleUUID() + tmpName;
-        String imageFiles="/data/sz/zstp/" + fileType + "/";
+        String imageFiles="/data/sgzb/" + fileType + "/";
         String os = System.getProperty("os.name");
         if(os.toLowerCase().startsWith("win")){
             imageFiles="D://files/" + fileType + "/";