优化图片存储 为ftp版本

Api/src/main/java/com/java110/api/listener/activities/SaveActivitiesListener.java

@@ -65,10 +65,10 @@ public class SaveActivitiesListener extends AbstractServiceApiListener {
             fileDto.setContext(reqJson.getString("headerImg"));
             fileDto.setSuffix("jpeg");
             fileDto.setCommunityId(reqJson.getString("communityId"));
-            if (fileInnerServiceSMOImpl.saveFile(fileDto) < 1) {
-                throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "保存文件出错");
-            }
+            String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
+
             reqJson.put("headerImg", fileDto.getFileId());
+            reqJson.put("fileSaveName", fileName);
 
             businesses.add(addHeaderImg(reqJson, context));
 
@@ -107,7 +107,7 @@ public class SaveActivitiesListener extends AbstractServiceApiListener {
         businessUnit.put("saveWay", "table");
         businessUnit.put("objId", paramInJson.getString("activitiesId"));
         businessUnit.put("fileRealName", paramInJson.getString("headerImg"));
-        businessUnit.put("fileSaveName", paramInJson.getString("headerImg"));
+        businessUnit.put("fileSaveName", paramInJson.getString("fileSaveName"));
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFileRel", businessUnit);
 
         return business;

Api/src/main/java/com/java110/api/listener/activities/UpdateActivitiesListener.java

@@ -76,10 +76,10 @@ public class UpdateActivitiesListener extends AbstractServiceApiListener {
             fileDto.setContext(reqJson.getString("headerImg"));
             fileDto.setSuffix("jpeg");
             fileDto.setCommunityId(reqJson.getString("communityId"));
-            if (fileInnerServiceSMOImpl.saveFile(fileDto) < 1) {
-                throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "保存文件出错");
-            }
+            String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
+
             reqJson.put("headerImg", fileDto.getFileId());
+            reqJson.put("fileSaveName", fileName);
 
             businesses.add(editHeaderImg(reqJson, context));
 
@@ -122,7 +122,7 @@ public class UpdateActivitiesListener extends AbstractServiceApiListener {
             businessUnit.put("saveWay", "table");
             businessUnit.put("objId", paramInJson.getString("activitiesId"));
             businessUnit.put("fileRealName", paramInJson.getString("headerImg"));
-            businessUnit.put("fileSaveName", paramInJson.getString("headerImg"));
+            businessUnit.put("fileSaveName", paramInJson.getString("fileSaveName"));
             business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFileRel", businessUnit);
             return business;
         }

Api/src/main/java/com/java110/api/listener/advert/SaveAdvertListener.java

@@ -147,9 +147,8 @@ public class SaveAdvertListener extends AbstractServiceApiListener {
         fileDto.setContext(photo);
         fileDto.setSuffix("jpeg");
         fileDto.setCommunityId(paramInJson.getString("communityId"));
-        if (fileInnerServiceSMOImpl.saveFile(fileDto) < 1) {
-            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "保存文件出错");
-        }
+        String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
+        paramInJson.put("fileSaveName", fileName);
         paramInJson.put("advertPhotoId", fileDto.getFileId());
         itemTypeCd = "8888";
         url = fileDto.getFileId();
@@ -224,7 +223,7 @@ public class SaveAdvertListener extends AbstractServiceApiListener {
         businessUnit.put("saveWay", "40000".equals(relTypeCd) ? "table" : "ftp");
         businessUnit.put("objId", paramInJson.getString("advertId"));
         businessUnit.put("fileRealName", paramInJson.getString("advertPhotoId"));
-        businessUnit.put("fileSaveName", paramInJson.getString("advertPhotoId"));
+        businessUnit.put("fileSaveName", paramInJson.getString("fileSaveName"));
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFileRel", businessUnit);
 
         return business;

Api/src/main/java/com/java110/api/listener/advert/UpdateAdvertListener.java

@@ -167,10 +167,9 @@ public class UpdateAdvertListener extends AbstractServiceApiListener {
         fileDto.setContext(photo);
         fileDto.setSuffix("jpeg");
         fileDto.setCommunityId(paramInJson.getString("communityId"));
-        if (fileInnerServiceSMOImpl.saveFile(fileDto) < 1) {
-            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "保存文件出错");
-        }
+        String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
         paramInJson.put("advertPhotoId", fileDto.getFileId());
+        paramInJson.put("fileSaveName", fileName);
         itemTypeCd = "8888";
         url = fileDto.getFileId();
 
@@ -244,7 +243,7 @@ public class UpdateAdvertListener extends AbstractServiceApiListener {
         businessUnit.put("saveWay", "40000".equals(relTypeCd) ? "table" : "ftp");
         businessUnit.put("objId", paramInJson.getString("advertId"));
         businessUnit.put("fileRealName", paramInJson.getString("advertPhotoId"));
-        businessUnit.put("fileSaveName", paramInJson.getString("advertPhotoId"));
+        businessUnit.put("fileSaveName", paramInJson.getString("fileSaveName"));
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFileRel", businessUnit);
 
         return business;

Api/src/main/java/com/java110/api/listener/applicationKey/ApplyApplicationKeyListener.java

@@ -91,10 +91,10 @@ public class ApplyApplicationKeyListener extends AbstractServiceApiListener {
                     fileDto.setContext(photos.getJSONObject(photoIndex).getString("photo"));
                     fileDto.setSuffix("jpeg");
                     fileDto.setCommunityId(reqJson.getString("communityId"));
-                    if (fileInnerServiceSMOImpl.saveFile(fileDto) < 1) {
-                        throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "保存文件出错");
-                    }
+                    String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
+
                     reqJson.put("applicationKeyPhotoId", fileDto.getFileId());
+                    reqJson.put("fileSaveName", fileName);
 
                     businesses.add(addPhoto(reqJson, context));
                 }
@@ -134,7 +134,7 @@ public class ApplyApplicationKeyListener extends AbstractServiceApiListener {
         businessUnit.put("saveWay", "table");
         businessUnit.put("objId", paramInJson.getString("applicationKeyId"));
         businessUnit.put("fileRealName", paramInJson.getString("applicationKeyPhotoId"));
-        businessUnit.put("fileSaveName", paramInJson.getString("applicationKeyPhotoId"));
+        businessUnit.put("fileSaveName", paramInJson.getString("fileSaveName"));
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFileRel", businessUnit);
 
         return business;

Api/src/main/java/com/java110/api/listener/applicationKey/SaveApplicationKeyListener.java

@@ -83,10 +83,10 @@ public class SaveApplicationKeyListener extends AbstractServiceApiListener {
             fileDto.setContext(reqJson.getString("photo"));
             fileDto.setSuffix("jpeg");
             fileDto.setCommunityId(reqJson.getString("communityId"));
-            if (fileInnerServiceSMOImpl.saveFile(fileDto) < 1) {
-                throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "保存文件出错");
-            }
+            String fileName =  fileInnerServiceSMOImpl.saveFile(fileDto);
+
             reqJson.put("applicationKeyPhotoId", fileDto.getFileId());
+            reqJson.put("fileSaveName", fileName);
 
             businesses.add(addOwnerPhoto(reqJson, context));
 
@@ -122,7 +122,7 @@ public class SaveApplicationKeyListener extends AbstractServiceApiListener {
         businessUnit.put("saveWay", "table");
         businessUnit.put("objId", paramInJson.getString("applicationKeyId"));
         businessUnit.put("fileRealName", paramInJson.getString("applicationKeyPhotoId"));
-        businessUnit.put("fileSaveName", paramInJson.getString("applicationKeyPhotoId"));
+        businessUnit.put("fileSaveName", paramInJson.getString("fileSaveName"));
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFileRel", businessUnit);
 
         return business;

Api/src/main/java/com/java110/api/listener/applicationKey/UpdateApplicationKeyListener.java

@@ -88,10 +88,9 @@ public class UpdateApplicationKeyListener extends AbstractServiceApiListener {
             fileDto.setContext(reqJson.getString("photo"));
             fileDto.setSuffix("jpeg");
             fileDto.setCommunityId(reqJson.getString("communityId"));
-            if (fileInnerServiceSMOImpl.saveFile(fileDto) < 1) {
-                throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "保存文件出错");
-            }
+            String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
             reqJson.put("applicationKeyPhotoId", fileDto.getFileId());
+            reqJson.put("fileSaveName", fileName);
 
             businesses.add(editApplicationKeyPhoto(reqJson, context));
 
@@ -188,7 +187,7 @@ public class UpdateApplicationKeyListener extends AbstractServiceApiListener {
             businessUnit.put("saveWay", "table");
             businessUnit.put("objId", paramInJson.getString("applicationKeyId"));
             businessUnit.put("fileRealName", paramInJson.getString("applicationKeyPhotoId"));
-            businessUnit.put("fileSaveName", paramInJson.getString("applicationKeyPhotoId"));
+            businessUnit.put("fileSaveName", paramInJson.getString("fileSaveName"));
             business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFileRel", businessUnit);
             return business;
         }

Api/src/main/java/com/java110/api/listener/file/SaveFileListener.java

@@ -48,15 +48,10 @@ public class SaveFileListener extends AbstractServiceApiListener {
 
         fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
 
-        int count = fileInnerServiceSMOImpl.saveFile(fileDto);
-
-
-        if (count < 1) {
-            throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "保存数据失败");
-        }
+        String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
 
         JSONObject outParam = new JSONObject();
-        outParam.put("fileId", fileDto.getFileId());
+        outParam.put("fileId", fileName);
 
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(outParam.toJSONString(), HttpStatus.OK);
 

Api/src/main/java/com/java110/api/listener/machineRecord/SaveMachineRecordListener.java

@@ -36,6 +36,7 @@ public class SaveMachineRecordListener extends AbstractServiceApiListener {
 
     @Autowired
     private IFileInnerServiceSMO fileInnerServiceSMOImpl;
+
     @Override
     protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
         //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
@@ -75,10 +76,9 @@ public class SaveMachineRecordListener extends AbstractServiceApiListener {
             fileDto.setContext(reqJson.getString("photo"));
             fileDto.setSuffix("jpeg");
             fileDto.setCommunityId(communityId);
-            if (fileInnerServiceSMOImpl.saveFile(fileDto) < 1) {
-                throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "保存文件出错");
-            }
+            String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
             reqJson.put("photoId", fileDto.getFileId());
+            reqJson.put("fileSaveName", fileName);
 
             businesses.add(addPhoto(reqJson, context));
 
@@ -120,7 +120,7 @@ public class SaveMachineRecordListener extends AbstractServiceApiListener {
     private JSONObject addMachineRecord(JSONObject paramInJson, DataFlowContext dataFlowContext) {
 
         String machineRecordId = GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineRecordId);
-        paramInJson.put("machineRecordId",machineRecordId);
+        paramInJson.put("machineRecordId", machineRecordId);
         JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
         business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_MACHINE_RECORD);
         business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
@@ -153,7 +153,7 @@ public class SaveMachineRecordListener extends AbstractServiceApiListener {
         businessUnit.put("saveWay", "table");
         businessUnit.put("objId", paramInJson.getString("machineRecordId"));
         businessUnit.put("fileRealName", paramInJson.getString("photoId"));
-        businessUnit.put("fileSaveName", paramInJson.getString("photoId"));
+        businessUnit.put("fileSaveName", paramInJson.getString("fileSaveName"));
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFileRel", businessUnit);
 
         return business;

Api/src/main/java/com/java110/api/listener/machineTranslate/MachineUploadFaceLogListener.java

@@ -151,11 +151,7 @@ public class MachineUploadFaceLogListener extends BaseMachineListener {
         fileDto.setFileName(reqJson.getString("fileId"));
         fileDto.setContext(reqJson.getString("photo"));
         fileDto.setSuffix("jpeg");
-        int saveFlag = fileInnerServiceSMOImpl.saveFile(fileDto);
-        if (saveFlag < 1) {
-            throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "保存文件失败");
-        }
-
+        String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
         JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
         business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FILE_REL);
         business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 2);
@@ -166,7 +162,7 @@ public class MachineUploadFaceLogListener extends BaseMachineListener {
         businessUnit.put("saveWay", "table");
         businessUnit.put("objId", reqJson.getString("userId"));
         businessUnit.put("fileRealName", reqJson.getString("fileId"));
-        businessUnit.put("fileSaveName", reqJson.getString("fileId"));
+        businessUnit.put("fileSaveName", fileName);
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFileRel", businessUnit);
 
         return business;

Api/src/main/java/com/java110/api/listener/owner/ApplicationKeyListener.java

@@ -83,10 +83,9 @@ public class ApplicationKeyListener extends AbstractServiceApiDataFlowListener {
         fileDto.setContext(paramObj.getString("ownerPhoto"));
         fileDto.setSuffix("jpeg");
         fileDto.setCommunityId(paramObj.getString("communityId"));
-        if (fileInnerServiceSMOImpl.saveFile(fileDto) < 1) {
-            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "保存文件出错");
-        }
+        String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
         paramObj.put("ownerPhotoId", fileDto.getFileId());
+        paramObj.put("fileSaveName", fileName);
 
         businesses.add(addOwnerPhoto(paramObj, dataFlowContext));
 
@@ -169,7 +168,7 @@ public class ApplicationKeyListener extends AbstractServiceApiDataFlowListener {
         businessUnit.put("saveWay", "table");
         businessUnit.put("objId", paramInJson.getString("memberId"));
         businessUnit.put("fileRealName", paramInJson.getString("ownerPhotoId"));
-        businessUnit.put("fileSaveName", paramInJson.getString("ownerPhotoId"));
+        businessUnit.put("fileSaveName", paramInJson.getString("fileSaveName"));
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFileRel", businessUnit);
 
         return business;

Api/src/main/java/com/java110/api/listener/owner/EditOwnerListener.java

@@ -93,10 +93,9 @@ public class EditOwnerListener extends AbstractServiceApiDataFlowListener {
             fileDto.setContext(paramObj.getString("ownerPhoto"));
             fileDto.setSuffix("jpeg");
             fileDto.setCommunityId(paramObj.getString("communityId"));
-            if (fileInnerServiceSMOImpl.saveFile(fileDto) < 1) {
-                throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "保存文件出错");
-            }
+            String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
             paramObj.put("ownerPhotoId", fileDto.getFileId());
+            paramObj.put("fileSaveName", fileName);
 
             businesses.add(editOwnerPhoto(paramObj, dataFlowContext));
 
@@ -198,7 +197,7 @@ public class EditOwnerListener extends AbstractServiceApiDataFlowListener {
         JSONObject businessUnit = new JSONObject();
         businessUnit.putAll(BeanConvertUtil.beanCovertMap(fileRelDtos.get(0)));
         businessUnit.put("fileRealName", paramInJson.getString("ownerPhotoId"));
-        businessUnit.put("fileSaveName", paramInJson.getString("ownerPhotoId"));
+        businessUnit.put("fileSaveName", paramInJson.getString("fileSaveName"));
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFileRel", businessUnit);
         return business;
 

Api/src/main/java/com/java110/api/listener/owner/SaveOwnerListener.java

@@ -106,10 +106,9 @@ public class SaveOwnerListener extends AbstractServiceApiDataFlowListener {
             fileDto.setContext(paramObj.getString("ownerPhoto"));
             fileDto.setSuffix("jpeg");
             fileDto.setCommunityId(paramObj.getString("communityId"));
-            if (fileInnerServiceSMOImpl.saveFile(fileDto) < 1) {
-                throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "保存文件出错");
-            }
+            String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
             paramObj.put("ownerPhotoId", fileDto.getFileId());
+            paramObj.put("fileSaveName", fileName);
 
             businesses.add(addOwnerPhoto(paramObj, dataFlowContext));
 
@@ -281,7 +280,7 @@ public class SaveOwnerListener extends AbstractServiceApiDataFlowListener {
         businessUnit.put("saveWay", "table");
         businessUnit.put("objId", paramInJson.getString("memberId"));
         businessUnit.put("fileRealName", paramInJson.getString("ownerPhotoId"));
-        businessUnit.put("fileSaveName", paramInJson.getString("ownerPhotoId"));
+        businessUnit.put("fileSaveName", paramInJson.getString("fileSaveName"));
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFileRel", businessUnit);
 
         return business;

Api/src/main/java/com/java110/api/listener/owner/UploadOwnerPhotoListener.java

@@ -91,10 +91,9 @@ public class UploadOwnerPhotoListener extends AbstractServiceApiListener {
             fileDto.setContext(reqJson.getString("photo"));
             fileDto.setSuffix("jpeg");
             fileDto.setCommunityId(reqJson.getString("communityId"));
-            if (fileInnerServiceSMOImpl.saveFile(fileDto) < 1) {
-                throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "保存文件出错");
-            }
+            String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
             reqJson.put("ownerPhotoId", fileDto.getFileId());
+            reqJson.put("fileSaveName", fileName);
 
             businesses.add(editOwnerPhoto(reqJson, dataFlowContext));
 
@@ -175,7 +174,7 @@ public class UploadOwnerPhotoListener extends AbstractServiceApiListener {
         JSONObject businessUnit = new JSONObject();
         businessUnit.putAll(BeanConvertUtil.beanCovertMap(fileRelDtos.get(0)));
         businessUnit.put("fileRealName", paramInJson.getString("ownerPhotoId"));
-        businessUnit.put("fileSaveName", paramInJson.getString("ownerPhotoId"));
+        businessUnit.put("fileSaveName", paramInJson.getString("fileSaveName"));
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFileRel", businessUnit);
         return business;
 

Api/src/main/java/com/java110/api/listener/user/QueryStaffServiceListener.java

@@ -49,66 +49,6 @@ public class QueryStaffServiceListener extends AbstractServiceApiListener {
         return HttpMethod.GET;
     }
 
-    /**
-     *
-     * @param event
-     */
-
-    public void soService1(ServiceDataFlowEvent event) {
-
-
-        DataFlowContext dataFlowContext = event.getDataFlowContext();
-        AppService service = event.getAppService();
-        /*Map<String,String> headers = dataFlowContext.getRequestHeaders();
-
-        Assert.hasKeyAndValue(headers,"page","请求报文中未包含page节点");
-        Assert.hasKeyAndValue(headers,"rows","请求报文中未包含rows节点");
-        Assert.hasKeyAndValue(headers,"storeId","请求报文中未包含storeId节点");
-
-        ResponseEntity responseEntity= null;
-        AppService appService = DataFlowFactory.getService(dataFlowContext.getAppId(), ServiceCodeConstant.SERVICE_CODE_QUERY_STORE_USERS);
-        if(appService == null){
-            responseEntity = new ResponseEntity<String>("当前没有权限访问"+ServiceCodeConstant.SERVICE_CODE_QUERY_STORE_USERS, HttpStatus.UNAUTHORIZED);
-            dataFlowContext.setResponseEntity(responseEntity);
-            return ;
-        }
-        String requestUrl = appService.getUrl();
-        HttpHeaders header = new HttpHeaders();
-        header.add(CommonConstant.HTTP_SERVICE.toLowerCase(),ServiceCodeConstant.SERVICE_CODE_QUERY_STORE_USERS);
-
-        //先查询商户服务查询员工userId
-        requestUrl = requestUrl + "?page="+headers.get("page")+"&rows="+headers.get("rows")+"&storeId="+headers.get("storeId");
-        dataFlowContext.getRequestHeaders().put("REQUEST_URL",requestUrl);
-        HttpEntity<String> httpEntity = new HttpEntity<String>("", header);
-        doRequest(dataFlowContext,appService,httpEntity);
-        responseEntity = dataFlowContext.getResponseEntity();
-
-        if(responseEntity.getStatusCode() != HttpStatus.OK){
-            return ;
-        }
-
-        //然后根据userId 在用户服务查询用户信息
-        JSONObject staffs = JSONObject.parseObject(responseEntity.getBody().toString());
-
-        JSONArray rows = staffs.getJSONArray("datas");
-
-        appService = DataFlowFactory.getService(dataFlowContext.getAppId(), ServiceCodeConstant.SERVICE_CODE_QUERY_USER_USERINFO);
-        if(appService == null){
-            responseEntity = new ResponseEntity<String>("当前没有权限访问"+ServiceCodeConstant.SERVICE_CODE_QUERY_USER_USERINFO, HttpStatus.UNAUTHORIZED);
-            dataFlowContext.setResponseEntity(responseEntity);
-            return ;
-        }
-
-        for(int rowIndex = 0 ;rowIndex < rows.size();rowIndex ++){
-            JSONObject tmpObj = rows.getJSONObject(rowIndex);
-            queryUserInfoByUserId(dataFlowContext,tmpObj,appService);
-        }
-        dataFlowContext.setResponseEntity(new ResponseEntity(staffs.toJSONString(),HttpStatus.OK));
-
-*/
-
-    }
-
     @Override
     protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson,"page","请求报文中未包含page节点");

Api/src/main/java/com/java110/api/rest/CreatePluginsConfig.java

@@ -0,0 +1,93 @@
+package com.java110.api.rest;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * MyEclipse 8.x安装插件代码生成器
+ * @author Administrator
+ *
+ */
+public class CreatePluginsConfig {
+    private String path;
+
+    public CreatePluginsConfig(String path) {
+        this.path = path;
+    }
+
+    public void print() {
+        List list = getFileList(path);
+        if (list == null) {
+            return;
+        }
+
+        int length = list.size();
+        for (int i = 0; i < length; i++) {
+            String result = "";
+            String thePath = getFormatPath(getString(list.get(i)));
+            File file = new File(thePath);
+            if (file.isDirectory()) {
+                String fileName = file.getName();
+                if (fileName.indexOf("_") < 0) {
+                    continue;
+                }
+                String[] filenames = fileName.split("_");
+                String filename1 = filenames[0];
+                String filename2 = filenames[1];
+                result = filename1 + "," + filename2 + ",file:/" + path + "\\"
+                        + fileName + "\\,4,false";
+                System.out.println(result);
+            } else if (file.isFile()) {
+                String fileName = file.getName();
+                if (fileName.indexOf("_") < 0) {
+                    continue;
+                }
+                String[] filenames = fileName.split("_");
+                String filename1 = filenames[0]+"_"+filenames[1];
+                String filename2 = filenames[2].substring(0, filenames[2].lastIndexOf("."));
+                result = filename1 + "," + filename2 + ",file:/" + path + "\\"
+                        + fileName + ",4,false";
+                System.out.println(result);
+            }
+
+        }
+    }
+
+    public List getFileList(String path) {
+        path = getFormatPath(path);
+        path = path + "/";
+        File filePath = new File(path);
+        if (!filePath.isDirectory()) {
+            return null;
+        }
+        String[] filelist = filePath.list();
+        List filelistFilter = new ArrayList();
+
+        for (int i = 0; i < filelist.length; i++) {
+            String tempfilename = getFormatPath(path + filelist[i]);
+            filelistFilter.add(tempfilename);
+        }
+        return filelistFilter;
+    }
+
+    public String getString(Object object) {
+        if (object == null) {
+            return "";
+        }
+        return String.valueOf(object);
+    }
+
+    public String getFormatPath(String path) {
+        path = path.replaceAll("\\\\", "/");
+        path = path.replaceAll("//", "/");
+        return path;
+    }
+
+    public static void main(String[] args) {
+
+        new CreatePluginsConfig("E:\\plugins").print(); //汉化包插件路径
+        //友情提示：上面E:\\software\\MyEclipse 10\\Common\\language\\plugins是你的myEclipse安装的路径
+
+    }
+}

CommonService/src/main/java/com/java110/common/smo/impl/FileInnerServiceSMOImpl.java

@@ -1,14 +1,19 @@
 package com.java110.common.smo.impl;
 
 import com.java110.common.dao.IFileServiceDao;
+import com.java110.config.properties.code.Java110Properties;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.core.smo.file.IFileInnerServiceSMO;
 import com.java110.dto.file.FileDto;
+import com.java110.utils.util.Base64Convert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.FtpUpload;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
+import sun.misc.BASE64Encoder;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @RestController
@@ -17,17 +22,42 @@ public class FileInnerServiceSMOImpl extends BaseServiceSMO implements IFileInne
     @Autowired
     private IFileServiceDao fileServiceDaoImpl;
 
+    @Autowired
+    private Java110Properties java110Properties;
+
+
     @Override
-    public int saveFile(@RequestBody FileDto fileDto) {
+    public String saveFile(@RequestBody FileDto fileDto) {
+
+        //int saveFileFlag = fileServiceDaoImpl.saveFile(BeanConvertUtil.beanCovertMap(fileDto));
 
-        int saveFileFlag = fileServiceDaoImpl.saveFile(BeanConvertUtil.beanCovertMap(fileDto));
 
-        return saveFileFlag;
+        String fileName = FtpUpload.upload(fileDto.getContext(), java110Properties.getFtpServer(),
+                java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
+                java110Properties.getFtpUserPassword(), java110Properties.getFtpPath());
+
+        return fileName;
     }
 
     @Override
     public List<FileDto> queryFiles(@RequestBody FileDto fileDto) {
-        return BeanConvertUtil.covertBeanList(fileServiceDaoImpl.getFiles(BeanConvertUtil.beanCovertMap(fileDto)), FileDto.class);
+        //return BeanConvertUtil.covertBeanList(fileServiceDaoImpl.getFiles(BeanConvertUtil.beanCovertMap(fileDto)), FileDto.class);
+        List<FileDto> fileDtos = new ArrayList<>();
+        String fileName = fileDto.getFileSaveName();
+        String ftpPath = java110Properties.getFtpPath();
+        if (fileName.contains("/")) {
+            ftpPath += fileName.substring(0, fileName.lastIndexOf("/")+1);
+            fileName = fileName.substring(fileName.lastIndexOf("/")+1, fileName.length());
+        }
+        byte[] fileImg = FtpUpload.downFileByte(ftpPath, fileName, java110Properties.getFtpServer(),
+                java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
+                java110Properties.getFtpUserPassword());
+
+        String context = new BASE64Encoder().encode(fileImg);
+
+        fileDto.setContext(context);
+        fileDtos.add(fileDto);
+        return fileDtos;
     }
 
     public IFileServiceDao getFileServiceDaoImpl() {

java110-bean/src/main/java/com/java110/dto/file/FileDto.java

@@ -15,6 +15,8 @@ public class FileDto  implements Serializable {
 
     private String suffix;
 
+    private String fileSaveName;
+
     public String getFileId() {
         return fileId;
     }
@@ -62,4 +64,12 @@ public class FileDto  implements Serializable {
     public void setSuffix(String suffix) {
         this.suffix = suffix;
     }
+
+    public String getFileSaveName() {
+        return fileSaveName;
+    }
+
+    public void setFileSaveName(String fileSaveName) {
+        this.fileSaveName = fileSaveName;
+    }
 }

java110-core/src/main/java/com/java110/core/smo/file/IFileInnerServiceSMO.java

@@ -22,7 +22,7 @@ public interface IFileInnerServiceSMO {
      * @return true 成功 false 失败
      */
     @RequestMapping(value = "/saveFile", method = RequestMethod.POST)
-    int saveFile(@RequestBody FileDto fileDto);
+    String saveFile(@RequestBody FileDto fileDto);
 
     /**
      * 查询文件信息

java110-utils/src/main/java/com/java110/utils/util/FtpUpload.java

@@ -7,6 +7,7 @@ import org.apache.commons.net.ftp.FTPReply;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.multipart.MultipartFile;
+import sun.misc.BASE64Decoder;
 
 import java.io.*;
 import java.util.UUID;
@@ -26,6 +27,59 @@ public class FtpUpload {
     private final static String localpath = "F:/";//下载到F盘下
     private final static String fileSeparator = System.getProperty("file.separator");
 
+    private final static String DEFAULT_IMG_SUFFIX = ".jpg";
+
+    private final static String IMAGE_DEFAULT_PATH = "img/";
+
+    /*
+     *图片上传工具方法
+     * 默认上传至 img 文件下的当前日期下
+     */
+    public static String upload(String imageBase64, String server, int port,
+                                String userName, String userPassword, String ftpPath) {
+        String fileName = "";
+        try {
+            // request.setCharacterEncoding("utf-8");
+            ftpClient.connect(server, port);
+            ftpClient.login(userName, userPassword);
+            ftpClient.enterLocalPassiveMode();
+            ftpClient.setFileType(FTP.BINARY_FILE_TYPE);
+            ftpPath = ftpPath + IMAGE_DEFAULT_PATH + DateUtil.getNowII() + "/";
+            mkDir(ftpPath);// 创建目录
+            // 设置上传目录 must
+            ftpClient.changeWorkingDirectory(ftpPath);
+            if (FTPReply.isPositiveCompletion(ftpClient.sendCommand("OPTS UTF8", "ON"))) {// 开启服务器对UTF-8的支持，如果服务器支持就用UTF-8编码，否则就使用本地编码（GBK）.
+                LOCAL_CHARSET = "UTF-8";
+            }
+            fileName = UUID.randomUUID().toString() + DEFAULT_IMG_SUFFIX;
+            FTPFile[] fs = ftpClient.listFiles(fileName);
+            if (fs.length == 0) {
+                System.out.println("this file not exist ftp");
+            } else if (fs.length == 1) {
+                System.out.println("this file exist ftp");
+                ftpClient.deleteFile(fs[0].getName());
+            }
+            ByteArrayInputStream is = new ByteArrayInputStream(Base64Convert.base64ToByte(imageBase64));
+            boolean saveFlag = ftpClient.storeFile(fileName, is);
+            is.close();
+            if (!saveFlag) {
+                throw new IllegalArgumentException("存储文件失败");
+            }
+        } catch (Exception e) {
+            logger.error("上传文件失败", e);
+            throw new IllegalArgumentException("上传文件失败");
+        } finally {
+            try {
+                ftpClient.disconnect();
+            } catch (IOException e) {
+                e.printStackTrace();
+                logger.error("关闭ftpClient 失败", e);
+            }
+        }
+        return IMAGE_DEFAULT_PATH + DateUtil.getNowII() + "/" + fileName;
+    }
+
+
     /*
      *文件上传工具方法
      */
@@ -76,17 +130,19 @@ public class FtpUpload {
     /*
      *文件下载工具方法
      */
-    public static byte[] downFileByte(String remotePath, String fileName, String server, int port, String userName, String userPassword) throws Exception {
-        ftpClient.connect(server, port);
-        ftpClient.login(userName, userPassword);
-        ftpClient.enterLocalPassiveMode();
-        if (remotePath != null && !remotePath.equals("")) {
-            ftpClient.changeWorkingDirectory(remotePath);
-            System.out.println("file success");
-        }
+    public static byte[] downFileByte(String remotePath, String fileName, String server, int port, String userName, String userPassword) {
         byte[] return_arraybyte = null;
-        if (ftpClient != null) {
-            try {
+        try {
+            ftpClient.connect(server, port);
+            ftpClient.login(userName, userPassword);
+            ftpClient.enterLocalPassiveMode();
+            if (remotePath != null && !remotePath.equals("")) {
+                ftpClient.changeWorkingDirectory(remotePath);
+                System.out.println("file success");
+            }
+
+            if (ftpClient != null) {
+
                 FTPFile[] files = ftpClient.listFiles();
                 for (FTPFile file : files) {
                     String f = new String(file.getName().getBytes("iso-8859-1"), "utf-8");//防止乱码
@@ -111,11 +167,14 @@ public class FtpUpload {
                         break;
                     }
                 }
-            } catch (Exception e) {
-                e.printStackTrace();
-            } finally {
-                closeConnect();
+
             }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("从ftp读取文件失败", e);
+        } finally {
+            closeConnect();
         }
         return return_arraybyte;
     }