优化文件上传 目录问题

service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportRoomFeeSMOImpl.java

@@ -112,11 +112,11 @@ public class ImportRoomFeeSMOImpl extends DefaultAbstractComponentSMO implements
             if (StringUtil.isEmpty(ossSwitch) || !OSSUtil.OSS_SWITCH_OSS.equals(ossSwitch)) {
                 fileName = ftpUploadTemplate.upload(uploadFile, java110Properties.getFtpServer(),
                         java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
-                        java110Properties.getFtpUserPassword(), java110Properties.getFtpPath());
+                        java110Properties.getFtpUserPassword(), "hc/");
             } else {
                 fileName = ossUploadTemplate.upload(uploadFile, java110Properties.getFtpServer(),
                         java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
-                        java110Properties.getFtpUserPassword(), java110Properties.getFtpPath());
+                        java110Properties.getFtpUserPassword(), "hc/");
             }
             ResponseEntity<String> responseEntity = new ResponseEntity<String>(fileName, HttpStatus.OK);
             return responseEntity;

service-api/src/main/java/com/java110/api/smo/file/impl/UploadVedioSMOImpl.java

@@ -48,18 +48,18 @@ public class UploadVedioSMOImpl extends DefaultAbstractComponentSMO implements I
 
 //        String fileName = ftpUploadTemplate.upload(uploadFile, java110Properties.getFtpServer(),
 //                java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
-//                java110Properties.getFtpUserPassword(), java110Properties.getFtpPath());
+//                java110Properties.getFtpUserPassword(), "hc/");
 //
         String fileName = "";
         String ossSwitch = MappingCache.getValue(OSSUtil.DOMAIN, OSSUtil.OSS_SWITCH);
         if (StringUtil.isEmpty(ossSwitch) || !OSSUtil.OSS_SWITCH_OSS.equals(ossSwitch)) {
             fileName = ftpUploadTemplate.upload(uploadFile, java110Properties.getFtpServer(),
                     java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
-                    java110Properties.getFtpUserPassword(), java110Properties.getFtpPath());
+                    java110Properties.getFtpUserPassword(), "hc/");
         } else {
             fileName = ossUploadTemplate.upload(uploadFile, java110Properties.getFtpServer(),
                     java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
-                    java110Properties.getFtpUserPassword(), java110Properties.getFtpPath());
+                    java110Properties.getFtpUserPassword(), "hc/");
         }
         JSONObject outParam = new JSONObject();
         outParam.put("fileName", uploadFile.getOriginalFilename());

service-common/src/main/java/com/java110/common/smo/impl/FileInnerServiceSMOImpl.java

@@ -63,7 +63,7 @@ public class FileInnerServiceSMOImpl extends BaseServiceSMO implements IFileInne
             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);
-            //String ftpPath = java110Properties.getFtpPath();
+            //String ftpPath = "hc/";
 
             fileName = ftpUploadTemplate.upload(fileDto.getContext(), ftpServer,
                         ftpPort, ftpUserName,
@@ -77,7 +77,7 @@ public class FileInnerServiceSMOImpl extends BaseServiceSMO implements IFileInne
         //return BeanConvertUtil.covertBeanList(fileServiceDaoImpl.getFiles(BeanConvertUtil.beanCovertMap(fileDto)), FileDto.class);
         List<FileDto> fileDtos = new ArrayList<>();
         String fileName = fileDto.getFileSaveName();
-        String ftpPath = java110Properties.getFtpPath();
+        String ftpPath = "hc/";
         String suffix = fileName.substring(fileName.lastIndexOf(".") + 1);
         if (fileName.contains("/")) {
             ftpPath += fileName.substring(0, fileName.lastIndexOf("/") + 1);

service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeMoneyAdapt.java

@@ -212,7 +212,7 @@ public class ReturnPayFeeMoneyAdapt extends DatabusAdaptImpl {
         List<FileDto> fileDtos = new ArrayList<>();
 
         byte[] context = null;
-        String ftpPath = MappingCache.getValue(FtpUploadTemplate.FTP_DOMAIN, FtpUploadTemplate.FTP_PATH);
+        String ftpPath = "hc/";
 
         String ossSwitch = MappingCache.getValue(OSSUtil.DOMAIN, OSSUtil.OSS_SWITCH);
         if (StringUtil.isEmpty(ossSwitch) || !OSSUtil.OSS_SWITCH_OSS.equals(ossSwitch)) {

springboot/src/main/java/com/java110/boot/smo/assetImport/impl/ImportRoomFeeSMOImpl.java

@@ -111,11 +111,11 @@ public class ImportRoomFeeSMOImpl extends DefaultAbstractComponentSMO implements
             if (StringUtil.isEmpty(ossSwitch) || !OSSUtil.OSS_SWITCH_OSS.equals(ossSwitch)) {
                 fileName = ftpUploadTemplate.upload(uploadFile, java110Properties.getFtpServer(),
                         java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
-                        java110Properties.getFtpUserPassword(), java110Properties.getFtpPath());
+                        java110Properties.getFtpUserPassword(), "hc/");
             } else {
                 fileName = ossUploadTemplate.upload(uploadFile, java110Properties.getFtpServer(),
                         java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
-                        java110Properties.getFtpUserPassword(), java110Properties.getFtpPath());
+                        java110Properties.getFtpUserPassword(), "hc/");
             }
             ResponseEntity<String> responseEntity = new ResponseEntity<String>(fileName, HttpStatus.OK);
             return responseEntity;

springboot/src/main/java/com/java110/boot/smo/file/impl/UploadVedioSMOImpl.java

@@ -47,18 +47,18 @@ public class UploadVedioSMOImpl extends DefaultAbstractComponentSMO implements I
 
 //        String fileName = ftpUploadTemplate.upload(uploadFile, java110Properties.getFtpServer(),
 //                java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
-//                java110Properties.getFtpUserPassword(), java110Properties.getFtpPath());
+//                java110Properties.getFtpUserPassword(), "hc/");
 //
         String fileName = "";
         String ossSwitch = MappingCache.getValue(OSSUtil.DOMAIN, OSSUtil.OSS_SWITCH);
         if (StringUtil.isEmpty(ossSwitch) || !OSSUtil.OSS_SWITCH_OSS.equals(ossSwitch)) {
             fileName = ftpUploadTemplate.upload(uploadFile, java110Properties.getFtpServer(),
                     java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
-                    java110Properties.getFtpUserPassword(), java110Properties.getFtpPath());
+                    java110Properties.getFtpUserPassword(), "hc/");
         } else {
             fileName = ossUploadTemplate.upload(uploadFile, java110Properties.getFtpServer(),
                     java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
-                    java110Properties.getFtpUserPassword(), java110Properties.getFtpPath());
+                    java110Properties.getFtpUserPassword(), "hc/");
         }
         JSONObject outParam = new JSONObject();
         outParam.put("fileName", uploadFile.getOriginalFilename());