Merge remote-tracking branch 'origin/master'

apply-net/src/main/java/com/winsun/controller/PackageNewClothes.java

@@ -478,7 +478,7 @@ public class PackageNewClothes {
      * @param file
      * @return
      */
-    @RequestMapping(value = "uploadPictures", method = RequestMethod.POST)
+    @RequestMapping(value = "uploadPictures/{partner}", method = RequestMethod.POST)
     public ResponseData<String>uploadPictures(@RequestParam(value = "file") MultipartFile file,@RequestParam("partner") String partner) {
         Date date = new Date();
         String originalFilename = file.getOriginalFilename();

common/src/main/java/com/winsun/utils/XbkUtil.java

 package com.winsun.utils;
 
 import com.alibaba.fastjson.JSONObject;
-import com.winsun.auth.core.common.model.ResponseData;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 
@@ -28,21 +27,18 @@ public class XbkUtil {
         mapParm.put("eventTime", tablename);
         String s = MD5Utils.md5(tablename + "gzxy951753@.123");
         mapParm.put("sign", s.toUpperCase());
-        JSONObject jsonObject = httpDoPost(map, mapParm, type);
-        return jsonObject;
-    }
-
-    public static JSONObject httpDoPost(Map<String, Object> map, Map<String, Object> mapParm, String type){
         mapParm.put("param", map);
         JSONObject json = new JSONObject(mapParm);
         JSONObject jsonObject = null;
-        try { jsonObject = HttpHelper.doPost("http://enter.gd189.cn:9090/o2oweb/outMain/service.do", json.toString());
+        try {
+            jsonObject = HttpHelper.doPost("http://enter.gd189.cn:9090/o2oweb/outMain/service.do", json.toString());
         }catch (Exception e){
             log.info(type+"调取接口异常",e.getMessage());
         }
         return jsonObject;
     }
 
+
     /**
      * 小白下单接口 JT0002
      *