diff --git a/src/main/java/com/huaheng/pc/file/picture/controller/FilePictureController.java b/src/main/java/com/huaheng/pc/file/picture/controller/FilePictureController.java
index 6ead258..22db79c 100644
--- a/src/main/java/com/huaheng/pc/file/picture/controller/FilePictureController.java
+++ b/src/main/java/com/huaheng/pc/file/picture/controller/FilePictureController.java
@@ -9,6 +9,7 @@ import com.huaheng.common.utils.DateUtils;
 import com.huaheng.common.utils.file.FileUploadUtils;
 import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.config.HuaHengConfig;
+import com.huaheng.framework.config.ServerIpConfig;
 import com.huaheng.framework.web.page.PageDomain;
 import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
@@ -32,6 +33,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -112,36 +114,41 @@ public class FilePictureController extends BaseController {
     @Log(title = "保存图片", action = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
-    public AjaxResult addSave(FilePicture filePicture, @RequestParam("picture") MultipartFile picture) {
-        try {
-            long size = picture.getSize();
+    public AjaxResult addSave(FilePicture filePicture,HttpServletRequest request) {
 
-            if (size > 1024 * 1024 * 2) {
-                return AjaxResult.error("文件不能超过2M");
-            }
-
-            String httpBase = "";
-            try {
-                httpBase = addressService.selectAddress(url_prefix_key, ShiroUtils.getWarehouseCode(), "");
-            } catch (Exception e) {
-                return AjaxResult.error("上传文件出错，没有配置address表参数" + url_prefix_key + "对应的url");
-            }
-            String basePath = FileUploadUtils.getFileServerUploadPath();
-            String subPath = "images/" + DateUtils.getDate() + "/";
-            String savePath = basePath + subPath;
-            String fileName = FileUploadUtils.upload(savePath, picture, FileUploadUtils.IMAGE_JPG_EXTENSION);
-            String url = httpBase + subPath + fileName;
-            filePicture.setUrl(url);
-            filePicture.setCreated(new Date());
-            filePicture.setIp(ShiroUtils.getIp());
-            filePicture.setSize(size);
-            filePicture.setName(filePicture.getName());
-            filePicture.setCreatedBy(ShiroUtils.getLoginName());
-            filePictureService.save(filePicture);
-            return AjaxResult.success(filePicture);
-        } catch (Exception e) {
-            return error("图片上传失败:" + e.getMessage());
+        AjaxResult<FilePicture> ajaxResult = uploadFile(request, "picture");
+        if(ajaxResult.hasErr()){
+            return ajaxResult;
         }
+        ajaxResult.getData();
+//        try {
+//            long size = picture.getSize();
+//
+//            if (size > 1024 * 1024 * 2) {
+//                return AjaxResult.error("文件不能超过2M");
+//            }
+//
+//            String httpBase = "";
+//            try {
+//                httpBase = "http://" + ShiroUtils.getIp() + ":" + ServerIpConfig.getPort() + "/wms/files";
+//            } catch (Exception e) {
+//                return AjaxResult.error("上传文件出错，没有配置address表参数" + url_prefix_key + "对应的url");
+//            }
+//            String fileName = FileUploadUtils.upload(HuaHengConfig.getFileserverpath(), picture, 1);
+////            String fileName = FileUploadUtils.upload(savePath, picture, FileUploadUtils.IMAGE_JPG_EXTENSION);
+//            String url = httpBase + fileName;
+//            filePicture.setUrl(url);
+//            filePicture.setCreated(new Date());
+//            filePicture.setIp(ShiroUtils.getIp());
+//            filePicture.setSize(size);
+//            filePicture.setName(filePicture.getName());
+//            filePicture.setCreatedBy(ShiroUtils.getLoginName());
+//            filePictureService.save(filePicture);
+//            return AjaxResult.success(filePicture);
+//        } catch (Exception e) {
+//            return error("图片上传失败:" + e.getMessage());
+//        }
+        return error("图片上传失败:");
     }
 
     /**
@@ -176,9 +183,13 @@ public class FilePictureController extends BaseController {
         if (StringUtils.isEmpty(ids)) {
             return AjaxResult.error("id不能为空");
         }
-        FilePicture filePicture = filePictureService.getById(ids);
-        filePicture.setDeleted(1);
-        filePictureService.updateById(filePicture);
+        List<String> idList = Arrays.asList(ids);
+        for (String id : idList) {
+            FilePicture filePicture = filePictureService.getById(id);
+            filePicture.setDeleted(1);
+            filePictureService.updateById(filePicture);
+        }
+
 //        return toAjax(filePictureService.removeByIds(Arrays.asList(Convert.toIntArray(ids))));
         return AjaxResult.success();
     }
@@ -206,18 +217,12 @@ public class FilePictureController extends BaseController {
             for (MultipartFile picture : fileList) {
                 String fileName = ""; //当前上传文件全名称
                 try {
-                    String httpBase = "";
-                    try {
-                        httpBase = addressService.selectAddress(QuantityConstant.FILE_PICTURE_URL, ShiroUtils.getWarehouseCode(), "");
-                    } catch (Exception e) {
-                        return AjaxResult.error("上传文件出错，没有配置address表参数" + url_prefix_key + "对应的url");
-                    }
+                    String httpBase = "http://" + ShiroUtils.getIp() + ":" + ServerIpConfig.getPort()+"/wms/files/";
                     String basePath = FileUploadUtils.getFileServerUploadPath();
-                    String subPath = "images/" + DateUtils.getDate() + "/";
-                    String savePath = basePath + subPath;
-                    fileName = FileUploadUtils.upload(savePath, picture, FileUploadUtils.IMAGE_JPG_EXTENSION);
-                    String url = httpBase + subPath + fileName;
+                    fileName = FileUploadUtils.upload(basePath, picture, FileUploadUtils.IMAGE_JPG_EXTENSION);
+                    String url = httpBase + fileName;
                     FilePicture filePicture = new FilePicture();
+                    filePicture.setReferType(picture.getContentType());
                     filePicture.setUrl(url);
                     filePicture.setCreated(new Date());
                     filePicture.setIp(ShiroUtils.getIp());