wuxw лет назад: 3
Родитель
Сommit
b6c32edf2c

+ 5 - 5
java110-core/src/main/java/com/java110/core/client/FileUploadTemplate.java

@@ -29,23 +29,23 @@ public class FileUploadTemplate {
 
     public String saveFile(InputStream inputStream,String fileName){
 
-        fileName = ROOT_PATH+ fileName;
+        String newfileName = ROOT_PATH+ fileName;
 
         String ossSwitch = MappingCache.getValue(OSSUtil.DOMAIN, OSSUtil.OSS_SWITCH);
 
         if (OSSUtil.OSS_SWITCH_OSS.equals(ossSwitch)) {
-            fileName = ossUploadTemplate.upload(inputStream, fileName);
+            newfileName = ossUploadTemplate.upload(inputStream, newfileName);
         } else if (COSUtil.COS_SWITCH_COS.equals(ossSwitch)) {
-            fileName = cosUploadTemplate.upload(inputStream, fileName);
+            newfileName = cosUploadTemplate.upload(inputStream, newfileName);
         } else {
             String ftpServer = MappingCache.getValue(FtpUploadTemplate.FTP_DOMAIN, FtpUploadTemplate.FTP_SERVER);
             int ftpPort = Integer.parseInt(MappingCache.getValue(FtpUploadTemplate.FTP_DOMAIN, FtpUploadTemplate.FTP_PORT));
             String ftpUserName = MappingCache.getValue(FtpUploadTemplate.FTP_DOMAIN, FtpUploadTemplate.FTP_USERNAME);
             String ftpUserPassword = MappingCache.getValue(FtpUploadTemplate.FTP_DOMAIN, FtpUploadTemplate.FTP_USERPASSWORD);
 
-            fileName = ftpUploadTemplate.upload(inputStream, ftpServer,
+            newfileName = ftpUploadTemplate.upload(inputStream, ftpServer,
                     ftpPort, ftpUserName,
-                    ftpUserPassword, fileName);
+                    ftpUserPassword, newfileName);
         }
 
         String imgUrl = MappingCache.getValue("IMG_PATH");

+ 1 - 1
java110-db/src/main/resources/mapper/job/UserDownloadFileV1ServiceDaoImplMapper.xml

@@ -20,7 +20,7 @@
         select t.name,t.download_id,t.download_id downloadId,t.download_user_id,t.download_user_id
         downloadUserId,t.status_cd,t.status_cd statusCd,t.state,t.temp_url,t.temp_url
         tempUrl,t.community_id,t.community_id communityId,t.download_user_name,t.download_user_name
-        downloadUserName,t.file_type,t.file_type fileType,td.name stateName,td1.name fileTypeName,t.create_time,t.remark
+        downloadUserName,t.file_type,t.file_type fileType,td.name stateName,td1.name fileTypeName,t.create_time createTime,t.remark
         from user_download_file t
         left join t_dict td on t.state = td.status_cd and td.table_name = 'user_download_file' and td.table_columns = 'state'
         left join t_dict td1 on t.file_type = td1.status_cd and td1.table_name = 'user_download_file' and td1.table_columns = 'file_type'