完善ftp配置

java110-core/src/main/java/com/java110/core/client/FtpUploadTemplate.java

@@ -32,6 +32,15 @@ public class FtpUploadTemplate {
     private final static String DEFAULT_IMG_SUFFIX = ".jpg";
     private final static String IMAGE_DEFAULT_PATH = "img/";
 
+
+    public final static String FTP_DOMAIN = "FTP_DOMAIN";
+    public final static String FTP_SERVER = "FTP_SERVER";
+    public final static String FTP_PORT = "FTP_PORT";
+    public final static String FTP_USERNAME = "FTP_USERNAME";
+    public final static String FTP_USERPASSWORD = "FTP_USERPASSWORD";
+    public final static String FTP_PATH = "FTP_PATH";
+
+
     /*
      *图片上传工具方法
      * 默认上传至 img 文件下的当前日期下

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

@@ -43,10 +43,18 @@ public class FileInnerServiceSMOImpl extends BaseServiceSMO implements IFileInne
         //int saveFileFlag = fileServiceDaoImpl.saveFile(BeanConvertUtil.beanCovertMap(fileDto));
         String fileName = "";
         String ossSwitch = MappingCache.getValue(OSSUtil.DOMAIN, OSSUtil.OSS_SWITCH);
+
+
+        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);
+        String ftpPath = MappingCache.getValue( FtpUploadTemplate.FTP_DOMAIN, FtpUploadTemplate.FTP_PATH);
+
         if (StringUtil.isEmpty(ossSwitch) || !OSSUtil.OSS_SWITCH_OSS.equals(ossSwitch)) {
-            fileName = ftpUploadTemplate.upload(fileDto.getContext(), java110Properties.getFtpServer(),
-                    java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
-                    java110Properties.getFtpUserPassword(), java110Properties.getFtpPath());
+            fileName = ftpUploadTemplate.upload(fileDto.getContext(), ftpServer,
+                    ftpPort, ftpUserName,
+                    ftpUserPassword, ftpPath);
         } else {
             fileName = ossUploadTemplate.upload(fileDto.getContext(), java110Properties.getFtpServer(),
                     java110Properties.getFtpPort(), java110Properties.getFtpUserName(),