Merge remote-tracking branch 'origin/master'

src/main/java/com/uas/platform/b2b/controller/BrandController.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.controller;
 
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import com.uas.sso.support.Page;
 import com.uas.platform.b2b.model.BrandInfo;
 import com.uas.platform.b2b.service.BrandService;
@@ -12,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
 /**
@@ -57,7 +58,7 @@ public class BrandController {
 	 */
 	@RequestMapping(value = "/ByName/{name}", method = RequestMethod.GET)
 	public BrandInfo getByName(@PathVariable("name") String name) throws Exception {
-		name = URLDecoder.decode(name, "utf-8");
+		name = URLDecoderUtils.decode(name, "utf-8");
 		BrandInfo brand =  brandService.findByName(name, name);
 		if (brand.getUuid() == null) {
 			throw new IllegalOperatorException("此品牌不存在，请重新输入或选择正确的品牌");

src/main/java/com/uas/platform/b2b/controller/DeputyOrderController.java

@@ -2,6 +2,7 @@ package com.uas.platform.b2b.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import com.uas.platform.b2b.manage.service.MasterService;
 import com.uas.platform.b2b.model.AccessToken;
 import com.uas.platform.b2b.model.DeputyEnterprise;
@@ -689,8 +690,8 @@ public class DeputyOrderController {
             }
 			JSONObject jsonObject = JSONObject.parseObject(res.getContent());
 			if (jsonObject != null) {
-				String nodeStr = URLDecoder.decode(jsonObject.getString("nodes"), "UTF-8");
-				String proStr = URLDecoder.decode(jsonObject.getString("processs"), "UTF-8");
+				String nodeStr = URLDecoderUtils.decode(jsonObject.getString("nodes"), "UTF-8");
+				String proStr = URLDecoderUtils.decode(jsonObject.getString("processs"), "UTF-8");
 				List<UasNodes> nodes = JSONObject.parseArray(nodeStr, UasNodes.class);
 				List<UasProcess> process = JSONObject.parseArray(proStr, UasProcess.class);
 				List<UasProcess> pros = new ArrayList<UasProcess>();

src/main/java/com/uas/platform/b2b/controller/PublicQueryController.java

@@ -2,6 +2,7 @@ package com.uas.platform.b2b.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.UserDao;
 import com.uas.platform.b2b.erp.model.EnterpriseNameAndUU;
@@ -26,7 +27,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.*;
 
 /**
@@ -237,7 +238,7 @@ public class PublicQueryController {
 	@RequestMapping(value = "/erpRegister", method = RequestMethod.POST)
 	@ResponseBody
 	public Map<String, Object> register(String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		Map<String, Object> infos = new HashMap<String, Object>();
 		// 需要把字符串转成Object
 		Enterprise newEnterprise = FlexJsonUtils.fromJson(jsonStr, Enterprise.class);

src/main/java/com/uas/platform/b2b/controller/SaleApCheckController.java

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import com.uas.platform.b2b.model.ApcheckKeyWord;
 import com.uas.platform.b2b.model.ErpProdIODetail;
 import com.uas.platform.b2b.model.ErpProdIo;
@@ -48,7 +49,6 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.io.*;
-import java.net.*;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -211,7 +211,7 @@ public class SaleApCheckController {
     @RequestMapping(value = "/customer", method = RequestMethod.GET)
     public SPage<Vendor> getCustomers(PageParams params, String keyword, String checkDate, String searchFilter) throws InterruptedException, UnsupportedEncodingException {
         LOGGER.log("应收对账单", "获取客户信息", "获取所有符合条件的客户");
-        SearchFilter filter = JSONObject.parseObject(URLDecoder.decode(searchFilter, "UTF-8"), SearchFilter.class);
+        SearchFilter filter = JSONObject.parseObject(URLDecoderUtils.decode(searchFilter, "UTF-8"), SearchFilter.class);
         return purchaseApCheckService.getCustomerInfo(params, keyword, checkDate, filter.getFromDate(), filter.getEndDate());
     }
 
@@ -223,7 +223,7 @@ public class SaleApCheckController {
 	 */
 	@RequestMapping(value = "/operation/save", method = RequestMethod.POST)
 	public ModelMap saveApCheck(@RequestBody String json) throws UnsupportedEncodingException {
-		json = URLDecoder.decode(json, "UTF-8");
+		json = URLDecoderUtils.decode(json, "UTF-8");
 		PurchaseApCheck apCheck = FlexJsonUtils.fromJson(json, PurchaseApCheck.class);
 		return purchaseApCheckService.checkCount(apCheck);
 	}
@@ -288,9 +288,9 @@ public class SaleApCheckController {
 	@RequestMapping(value = "/info/search", method = RequestMethod.GET)
 	public SPage<PurchaseApCheck> getPurchaseApChecks(PageParams params, String searchFilter) throws UnsupportedEncodingException {
 		LOGGER.log("应收对账单", "作为买家，获取全部应收对账单");
-		searchFilter = URLDecoder.decode(searchFilter, "UTF-8");
+		searchFilter = URLDecoderUtils.decode(searchFilter, "UTF-8");
 		if (!StringUtils.isEmpty(params.getSorting())) {
-			params.setSorting(URLDecoder.decode(params.getSorting(), "UTF-8"));
+			params.setSorting(URLDecoderUtils.decode(params.getSorting(), "UTF-8"));
 		}
 		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
 		if (StringUtils.isEmpty(filter.getKeyword())) {

src/main/java/com/uas/platform/b2b/core/util/PathUtils.java

@@ -2,7 +2,7 @@ package com.uas.platform.b2b.core.util;
 
 import java.io.File;
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 
 /**
  * 路径
@@ -58,7 +58,7 @@ public class PathUtils {
 		Class<?> objClass = ContextUtils.getApplicationContext().getClass();
 		String strRealPath = objClass.getClassLoader().getResource("").getFile();
 		try {
-			strRealPath = URLDecoder.decode(strRealPath, "UTF-8");
+			strRealPath = URLDecoderUtils.decode(strRealPath, "UTF-8");
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
 		}

src/main/java/com/uas/platform/b2b/core/util/URLDecoderUtils.java

@@ -0,0 +1,38 @@
+package com.uas.platform.b2b.core.util;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+
+/**
+ * URLDecoder 方法的封装
+ * @author suntg
+ * @date 2019年3月1日14:06:44
+ */
+public class URLDecoderUtils {
+
+    /**
+     * decode 封装，避免特殊字符出错
+     * @param s
+     * @param enc
+     * @return
+     * @throws UnsupportedEncodingException
+     */
+    public static String decode(String s, String enc) throws UnsupportedEncodingException {
+        // 保留正常内容的%
+        s = s.replaceAll("%(?![0-9a-fA-F]{2})", "%25");
+        // 保留正常内容的+
+        s = s.replaceAll("\\+", "%2B");
+        return URLDecoder.decode(s, enc);
+    }
+
+    /**
+     * 用utf-8 decode 封装，避免特殊字符出错
+     * @param s
+     * @return
+     * @throws UnsupportedEncodingException
+     */
+    public static String decodeUTF8(String s) throws UnsupportedEncodingException {
+        return decode(s, "UTF-8");
+    }
+
+}

src/main/java/com/uas/platform/b2b/data/support/DS.java

@@ -2,7 +2,7 @@ package com.uas.platform.b2b.data.support;
 
 public class DS {
 
-	private static final String defaultDriver = "oracle.jdbc.driver.OracleDriver";
+	private static final String defaultDriver = "oracle.jdbc.OracleDriver";
 
 	private String id;
 	private String driverClassName;

src/main/java/com/uas/platform/b2b/erp/controller/APCheckController.java

@@ -1,7 +1,7 @@
 package com.uas.platform.b2b.erp.controller;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,7 +58,7 @@ public class APCheckController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public void onApCheckSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		saleAPCheckService.onApCheckSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		saleAPCheckService.onApCheckSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 	
 	/**
@@ -69,7 +69,7 @@ public class APCheckController {
 	@RequestMapping(value="/reply",method = RequestMethod.POST)
 	@ResponseBody
 	public void getReply(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<APCheck> apChecks = FlexJsonUtils.fromJsonArray(jsonStr, APCheck.class);
 		saleAPCheckService.saveApChecks(apCheckService.convertAPChecks(apChecks));
 		logger.log("应收对账单", "上传客户应收对账单", apChecks.size());

src/main/java/com/uas/platform/b2b/erp/controller/ARCheckController.java

@@ -2,7 +2,7 @@ package com.uas.platform.b2b.erp.controller;
 
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,7 +47,7 @@ public class ARCheckController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public void save(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<ARCheck> arChecks = FlexJsonUtils.fromJsonArray(jsonStr, ARCheck.class);
 		saleARCheckService.save(arCheckService.convertARChecks(arChecks));
 		logger.log("应付对账单", "上传客户应付对账单", arChecks.size());
@@ -75,7 +75,7 @@ public class ARCheckController {
 	@RequestMapping(value = "/reply", method = RequestMethod.POST)
 	@ResponseBody
 	public void reply(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<ARCheckReply> replies = FlexJsonUtils.fromJsonArray(jsonStr, ARCheckReply.class);
 		saleARCheckService.reply(arCheckService.convertSaleReplies(replies));
 		logger.log("应付对账单", "上传供应商回复", replies.size());
@@ -90,7 +90,7 @@ public class ARCheckController {
 	@RequestMapping(value = "/reply/back", method = RequestMethod.POST)
 	@ResponseBody
 	public void onReplySuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		saleARCheckService.uploadReplySuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		saleARCheckService.uploadReplySuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 }

src/main/java/com/uas/platform/b2b/erp/controller/BarAcceptNotifyDownController.java

@@ -1,7 +1,7 @@
 package com.uas.platform.b2b.erp.controller;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,7 +64,7 @@ public class BarAcceptNotifyDownController {
 	@RequestMapping(value="/sendnotify",method = RequestMethod.POST)
 	@ResponseBody
 	public void downBANotifySuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		barSendNotifyService.onUploadSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		barSendNotifyService.onUploadSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 	
 	/**
@@ -88,6 +88,6 @@ public class BarAcceptNotifyDownController {
 	@RequestMapping(value="/packagesuccess",method = RequestMethod.POST)
 	@ResponseBody
 	public void downBarPackageDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		barPackageService.onUploadSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		barPackageService.onUploadSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 }

src/main/java/com/uas/platform/b2b/erp/controller/BarcodeSetController.java

@@ -1,7 +1,7 @@
 package com.uas.platform.b2b.erp.controller;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +43,7 @@ public class BarcodeSetController {
 	@RequestMapping(value = "/codeSet", method = RequestMethod.POST)
 	@ResponseBody
 	public void saveBarcodeSet(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<BarcodeSet> codeSets = FlexJsonUtils.fromJsonArray(jsonStr, BarcodeSet.class);
 		b2bCodeSetService.saveOrUpdate(barcodeSetService.convertBarcodeSet(codeSets));
 		logger.log("条码产生规则表", "保存条码产生规则表", codeSets.size());

src/main/java/com/uas/platform/b2b/erp/controller/CheckTransController.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
 /**
@@ -49,7 +49,7 @@ public class CheckTransController {
      */
     @RequestMapping(value = "/inquiry", method = RequestMethod.POST)
     public List<Inquiry> getInquiryB2bId(@RequestParam("data") String data) throws UnsupportedEncodingException {
-        String jsonStr = URLDecoder.decode(data, "UTF-8");
+        String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
         List<Inquiry> inquiryList = FlexJsonUtils.fromJsonArray(jsonStr, Inquiry.class);
         logger.log("单据传输检测", "采购询价单", inquiryList.size());
         return inquiryService.getB2bId(inquiryList);
@@ -64,7 +64,7 @@ public class CheckTransController {
      */
     @RequestMapping(value = "/purchase", method = RequestMethod.POST)
     public List<Purchase> getPurchaseB2bId(@RequestParam("data") String data) throws UnsupportedEncodingException {
-        String jsonStr = URLDecoder.decode(data, "UTF-8");
+        String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
         List<Purchase> purchaseList = FlexJsonUtils.fromJsonArray(jsonStr, Purchase.class);
         logger.log("单据传输检测", "采购订单", purchaseList.size());
         return purchaseService.getB2bId(purchaseList);
@@ -79,7 +79,7 @@ public class CheckTransController {
      */
     @RequestMapping(value = "/notify", method = RequestMethod.POST)
     public List<PurchaseNotify> getPurchaseNotifyB2bId(@RequestParam("data") String data) throws UnsupportedEncodingException {
-        String jsonStr = URLDecoder.decode(data, "UTF-8");
+        String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
         List<PurchaseNotify> notifyList = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseNotify.class);
         logger.log("单据传输检测", "送货提醒", notifyList.size());
         return purchaseNotifyService.getB2bId(notifyList);

src/main/java/com/uas/platform/b2b/erp/controller/DeputyOrderDownController.java

@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -79,7 +79,7 @@ public class DeputyOrderDownController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public void downloadStatus(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		String[] idStr = jsonStr.split(",");
 		for (String id : idStr) {
 			if (id != null) {
@@ -102,7 +102,7 @@ public class DeputyOrderDownController {
 	@RequestMapping(value = "/payCompany", method = RequestMethod.POST)
 	@ResponseBody
 	public void saveOrUpdatePayCompany(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		DeputyPaymentCompany company = JSON.parseObject(jsonStr, DeputyPaymentCompany.class);
 		DeputyPaymentCompany deCompany = new DeputyPaymentCompany();
 		// 先判断维护企业是不是代采企业
@@ -155,7 +155,7 @@ public class DeputyOrderDownController {
 	@RequestMapping(value = "/repetitions", method = RequestMethod.POST)
 	@ResponseBody
 	public void downRepetitions(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<DeputyOrdersLog> logs = JSON.parseArray(jsonStr, DeputyOrdersLog.class);
 		if (!CollectionUtils.isEmpty(logs)) {
 			for (DeputyOrdersLog log : logs) {
@@ -181,7 +181,7 @@ public class DeputyOrderDownController {
 	@RequestMapping(value = "/transferLogs", method = RequestMethod.POST)
 	@ResponseBody
 	public void transferLogs(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<DeputyOrdersLog> logs = JSON.parseArray(jsonStr, DeputyOrdersLog.class);
 		if (!CollectionUtils.isEmpty(logs)) {
 			for (DeputyOrdersLog log : logs) {
@@ -210,7 +210,7 @@ public class DeputyOrderDownController {
 	@RequestMapping(value = "/notAgreed/back", method = RequestMethod.POST)
 	@ResponseBody
 	public void notAgreedBills(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String codeStr = URLDecoder.decode(data, "UTF-8");
+		String codeStr = URLDecoderUtils.decode(data, "UTF-8");
 		logger.log("代采订单驳回", "代采订单驳回尝试传回B2B：" + codeStr, 1);
 		List<DeputyOrder> orders = JSONObject.parseArray(codeStr, DeputyOrder.class);
 		List<DeputyOrder> deOrders = new ArrayList<DeputyOrder>();
@@ -245,7 +245,7 @@ public class DeputyOrderDownController {
 	@RequestMapping(value = "/agreed/back", method = RequestMethod.POST)
 	@ResponseBody
 	public void agreedBills(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String codeStr = URLDecoder.decode(data, "UTF-8");
+		String codeStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<DeputyOrder> orders = JSONObject.parseArray(codeStr, DeputyOrder.class);
 		List<DeputyOrder> deOrders = new ArrayList<DeputyOrder>();
 		if (!CollectionUtils.isEmpty(orders)) {
@@ -288,7 +288,7 @@ public class DeputyOrderDownController {
 	@RequestMapping(value = "/deletelogs/back", method = RequestMethod.POST)
 	@ResponseBody
 	public void updateDeleteLogs(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		String[] idStr = jsonStr.split(",");
 		for (String id : idStr) {
 			if (id != null) {

src/main/java/com/uas/platform/b2b/erp/controller/InquiryController.java

@@ -18,7 +18,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 import java.util.Map;
 
@@ -54,7 +54,7 @@ public class InquiryController {
     @RequestMapping(method = RequestMethod.POST)
     @ResponseBody
     public List<Inquiry> saveInquiries(@RequestParam("data") String data) throws Exception {
-        String jsonStr = URLDecoder.decode(data, "UTF-8");
+        String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
         List<Inquiry> inquiries = FlexJsonUtils.fromJsonArray(jsonStr, Inquiry.class);
         purchaseInquiryService.saveList(inquiryService.convertInquiry(inquiries));
         logger.log("询价单", "上传询价单", inquiries.size());
@@ -84,7 +84,7 @@ public class InquiryController {
 	@RequestMapping(value = "/checking", method = RequestMethod.POST)
 	@ResponseBody
 	public void checkInquiry(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseInquiryService.check(ArrayUtils.convertStringToNumberArray(URLDecoder.decode(data, "UTF-8"), Long.class));
+		purchaseInquiryService.check(ArrayUtils.convertStringToNumberArray(URLDecoderUtils.decode(data, "UTF-8"), Long.class));
 	}
 
 	/**
@@ -96,7 +96,7 @@ public class InquiryController {
 	@RequestMapping(value = "/reCheck", method = RequestMethod.POST)
 	@ResponseBody
 	public void reCheckInquiry(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseInquiryService.reCheck(ArrayUtils.convertStringToNumberArray(URLDecoder.decode(data, "UTF-8"), Long.class));
+		purchaseInquiryService.reCheck(ArrayUtils.convertStringToNumberArray(URLDecoderUtils.decode(data, "UTF-8"), Long.class));
 	}
 
 	/**
@@ -121,7 +121,7 @@ public class InquiryController {
 	@RequestMapping(value = "/reply/back", method = RequestMethod.POST)
 	@ResponseBody
 	public void onReplySuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseInquiryService.onReplyUploadSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseInquiryService.onReplyUploadSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 	/**
@@ -133,7 +133,7 @@ public class InquiryController {
 	@RequestMapping(value = "/reply/decide", method = RequestMethod.POST)
 	@ResponseBody
 	public void onReplyDecide(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<InquiryDecide> decides = FlexJsonUtils.fromJsonArray(jsonStr, InquiryDecide.class);
 		purchaseInquiryService.onReplyDecide(inquiryService.convertInquiryDecide(decides));
 		logger.log("询价单", "修改询价单报价信息状态", decides.size());
@@ -148,7 +148,7 @@ public class InquiryController {
 	@RequestMapping(value = "/invalid", method = RequestMethod.POST)
 	@ResponseBody
 	public void onReplyInvalid(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<Inquiry> inquiries = FlexJsonUtils.fromJsonArray(jsonStr, Inquiry.class);
 		purchaseInquiryService.onReplyInvalid(inquiries);
 		logger.log("询价单", "作废询价单", inquiries.size());
@@ -162,7 +162,7 @@ public class InquiryController {
 	@RequestMapping(value = "/attach", method = RequestMethod.POST)
 	@ResponseBody
 	public void uploadAttach(String data, FileUpload uploadItem) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		Map<String, Map<String, Object>> fileList = FlexJsonUtils.fromJson(jsonStr);
 		List<Attach> attachs = attachService.uploadZipAndSave(uploadItem, "inquiry", "客户采购询价单附件", fileList);
 		purchaseInquiryService.saveAttach(attachs);
@@ -178,7 +178,7 @@ public class InquiryController {
 	@RequestMapping(value = "/qutoInquiry", method = RequestMethod.POST)
     @ResponseBody
     public void uploadQutoInquiry(@RequestParam("data") String data) throws UnsupportedEncodingException {
-        String jsonStr = URLDecoder.decode(data, "UTF-8");
+        String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
         List<InquiryDetail> details = FlexJsonUtils.fromJsonArray(jsonStr, InquiryDetail.class);
         inquiryService.save(details);
     }

src/main/java/com/uas/platform/b2b/erp/controller/InquiryDownController.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
 /**
@@ -60,7 +60,7 @@ public class InquiryDownController {
 	@RequestMapping(value = "/back", method = RequestMethod.POST)
 	@ResponseBody
 	public void onReplySuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		saleQuotationService.onQuotationUploadSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		saleQuotationService.onQuotationUploadSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 
@@ -73,7 +73,7 @@ public class InquiryDownController {
 	@RequestMapping(value = "/invalid", method = RequestMethod.POST)
 	@ResponseBody
 	public void onReplyInvalid(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<Inquiry> inquiries = FlexJsonUtils.fromJsonArray(jsonStr, Inquiry.class);
 		saleQuotationService.onReplyInvalid(inquiries);
 		logger.log("主动报价单", "作废主动报价询价单", inquiries.size());
@@ -88,7 +88,7 @@ public class InquiryDownController {
 	@RequestMapping(value = "/decide", method = RequestMethod.POST)
 	@ResponseBody
 	public void onReplyDecide(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<InquiryDecide> decides = FlexJsonUtils.fromJsonArray(jsonStr, InquiryDecide.class);
 		saleQuotationService.onReplyDecide(inquiryService.convertQuotationDecide(decides));
 		logger.log("主动报价单", "修改主动报价单的状态", decides.size());
@@ -103,7 +103,7 @@ public class InquiryDownController {
 	@RequestMapping(value = "/checking", method = RequestMethod.POST)
 	@ResponseBody
 	public void checkInquiry(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		saleQuotationService.check(ArrayUtils.convertStringToNumberArray(URLDecoder.decode(data, "UTF-8"), Long.class));
+		saleQuotationService.check(ArrayUtils.convertStringToNumberArray(URLDecoderUtils.decode(data, "UTF-8"), Long.class));
 	}
 
 	/**
@@ -116,6 +116,6 @@ public class InquiryDownController {
 	@ResponseBody
 	public void reCheckInquiry(@RequestParam("data") String data) throws UnsupportedEncodingException {
 		saleQuotationService
-				.recheck(ArrayUtils.convertStringToNumberArray(URLDecoder.decode(data, "UTF-8"), Long.class));
+				.recheck(ArrayUtils.convertStringToNumberArray(URLDecoderUtils.decode(data, "UTF-8"), Long.class));
 	}
 }

src/main/java/com/uas/platform/b2b/erp/controller/InquiryMouldController.java

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 import java.util.Map;
 
@@ -56,7 +56,7 @@ public class InquiryMouldController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public void saveInquiries(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<InquiryMould> inquirieymoulds = FlexJsonUtils.fromJsonArray(jsonStr, InquiryMould.class);
 		purchaseInquiryMouldService.save(inquiryMouldService.convertInquiryMould(inquirieymoulds));
 		logger.log("模具询价单", "上传模具询价单", inquirieymoulds.size());
@@ -72,7 +72,7 @@ public class InquiryMouldController {
 	@ResponseBody
 	public void checkInquiryMould(@RequestParam("data") String data) throws UnsupportedEncodingException {
 		purchaseInquiryMouldService
-				.check(ArrayUtils.convertStringToNumberArray(URLDecoder.decode(data, "UTF-8"), Long.class));
+				.check(ArrayUtils.convertStringToNumberArray(URLDecoderUtils.decode(data, "UTF-8"), Long.class));
 	}
 
 	/**
@@ -85,7 +85,7 @@ public class InquiryMouldController {
 	@ResponseBody
 	public void reCheckInquiryMould(@RequestParam("data") String data) throws UnsupportedEncodingException {
 		purchaseInquiryMouldService
-				.reCheck(ArrayUtils.convertStringToNumberArray(URLDecoder.decode(data, "UTF-8"), Long.class));
+				.reCheck(ArrayUtils.convertStringToNumberArray(URLDecoderUtils.decode(data, "UTF-8"), Long.class));
 	}
 
 	/**
@@ -113,7 +113,7 @@ public class InquiryMouldController {
 	@RequestMapping(value = "/reply/back", method = RequestMethod.POST)
 	@ResponseBody
 	public void onReplySuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseInquiryMouldService.onReplyUploadSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseInquiryMouldService.onReplyUploadSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 	/**
@@ -125,7 +125,7 @@ public class InquiryMouldController {
 	@RequestMapping(value = "/reply/decide", method = RequestMethod.POST)
 	@ResponseBody
 	public void onReplyDecide(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<InquiryMouldDecide> decides = FlexJsonUtils.fromJsonArray(jsonStr, InquiryMouldDecide.class);
 		purchaseInquiryMouldService.onReplyDecide(inquiryMouldService.convertInquiryMouldDecide(decides));
 		logger.log("模具询价单", "修改模具询价单报价信息状态", decides.size());
@@ -140,7 +140,7 @@ public class InquiryMouldController {
 	@RequestMapping(value = "/invalidate", method = RequestMethod.POST)
 	@ResponseBody
 	public void onInvalid(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<InquiryMould> inquiryMoulds = FlexJsonUtils.fromJsonArray(jsonStr, InquiryMould.class);
 		purchaseInquiryMouldService.onInvalid(inquiryMoulds);
 		logger.log("模具询价单", "作废模具询价单", inquiryMoulds.size());
@@ -154,7 +154,7 @@ public class InquiryMouldController {
 	@RequestMapping(value = "/attach", method = RequestMethod.POST)
 	@ResponseBody
 	public void uploadAttach(String data, FileUpload uploadItem) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		Map<String, Map<String, Object>> fileList = FlexJsonUtils.fromJson(jsonStr);
 		List<Attach> attachs = attachService.uploadZipAndSave(uploadItem, "inquirymould", "客户模具询价单附件", fileList);
 		purchaseInquiryMouldService.saveAttach(attachs);

src/main/java/com/uas/platform/b2b/erp/controller/LabelInfoController.java

@@ -1,7 +1,7 @@
 package com.uas.platform.b2b.erp.controller;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,7 +61,7 @@ public class LabelInfoController {
 	@RequestMapping(value = "/label", method = RequestMethod.POST)
 	@ResponseBody
 	public void saveLabel(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<Label> labels = FlexJsonUtils.fromJsonArray(jsonStr, Label.class);
 		b2bBarLabelService.saveOrUpdate(barLabelService.convertBarLabel(labels));
 		logger.log("发货单", "保存发货单条码 label表", labels.size());
@@ -75,7 +75,7 @@ public class LabelInfoController {
 	@RequestMapping(value = "/labelparameter", method = RequestMethod.POST)
 	@ResponseBody
 	public void saveLabelParameter(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<LabelParameter> lParameters = FlexJsonUtils.fromJsonArray(jsonStr, LabelParameter.class);
 		b2bBarLParameterService.saveOrUpdate(barLParameterService.convertBarLParameter(lParameters));
 		logger.log("发货单", "保存发货单条码  LabelParameter模型", lParameters.size());
@@ -89,7 +89,7 @@ public class LabelInfoController {
 	@RequestMapping(value = "/lpSeting", method = RequestMethod.POST)
 	@ResponseBody
 	public void savelPSeting(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<LabelPrintSetting> lPSetings = FlexJsonUtils.fromJsonArray(jsonStr, LabelPrintSetting.class);
 		b2bBarLPSetingService.saveOrUpdate(barLPSetingService.convertBarLSeting(lPSetings));
 		logger.log("发货单", "保存发货单条码  lpSeting表", lPSetings.size());

src/main/java/com/uas/platform/b2b/erp/controller/MakeChangeController.java

@@ -1,7 +1,7 @@
 package com.uas.platform.b2b.erp.controller;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,7 +48,7 @@ public class MakeChangeController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public void savePurchases(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<MakeChange> changes = FlexJsonUtils.fromJsonArray(jsonStr, MakeChange.class);
 		makeOrderChangeService.save(makeChangeService.convertMakeChange(changes));
 		logger.log("委外加工变更单", "上传委外加工变更单", changes.size());
@@ -77,7 +77,7 @@ public class MakeChangeController {
 	@RequestMapping(value = "/reply", method = RequestMethod.POST)
 	@ResponseBody
 	public void onReplySuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		makeOrderChangeService.onReplyUploadSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		makeOrderChangeService.onReplyUploadSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 

src/main/java/com/uas/platform/b2b/erp/controller/MakeController.java

@@ -1,9 +1,10 @@
 package com.uas.platform.b2b.erp.controller;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -49,7 +50,7 @@ public class MakeController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public void saveMakes(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<Make> makes = FlexJsonUtils.fromJsonArray(jsonStr, Make.class);
 		makeOrderService.saveOrders(makeService.convertMakes(makes));
 		logger.log("委外加工单", "上传委外加工单", makes.size());
@@ -78,7 +79,7 @@ public class MakeController {
 	@RequestMapping(value = "/reply", method = RequestMethod.POST)
 	@ResponseBody
 	public void reply(@RequestParam("data") String data) throws UnsupportedEncodingException {
-//		String jsonStr = URLDecoder.decode(data, "UTF-8");
+//		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 //		List<PurchaseReply> replies = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseReply.class);
 //		purchaseOrderService.reply(purchaseService.convertPurchaseReply(replies));
 //		logger.log("采购单", "上传采购单主动回复", replies.size());
@@ -93,7 +94,7 @@ public class MakeController {
 	@RequestMapping(value = "/reply/back", method = RequestMethod.POST)
 	@ResponseBody
 	public void onReplySuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		makeOrderService.onReplySendSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		makeOrderService.onReplySendSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 	/**
@@ -105,7 +106,7 @@ public class MakeController {
 	@RequestMapping(value = "/end", method = RequestMethod.POST)
 	@ResponseBody
 	public void end(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<MakeEnd> ends = FlexJsonUtils.fromJsonArray(jsonStr, MakeEnd.class);
 		makeOrderService.saveOrders(makeService.convertMakeEnd(ends));
 		logger.log("委外加工单", "上传结案、反结案委外加工单", ends.size());

src/main/java/com/uas/platform/b2b/erp/controller/MakeProdInOutController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
 /**
@@ -45,7 +45,7 @@ public class MakeProdInOutController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public List<MakeProdInOut> saveProdInOuts(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<MakeProdInOut> prodInOuts = FlexJsonUtils.fromJsonArray(jsonStr, MakeProdInOut.class);
 		makeAcceptService.save(makeProdInOutService.convertProdInOuts(prodInOuts));
 		logger.log("委外验收单", "上传委外验收单", prodInOuts.size());
@@ -62,7 +62,7 @@ public class MakeProdInOutController {
 	@RequestMapping(value="/nonPosting", method = RequestMethod.POST)
 	@ResponseBody
 	public void nonPostingProdInOuts(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<MakeProdInOut> prodInOuts = FlexJsonUtils.fromJsonArray(jsonStr, MakeProdInOut.class);
 		makeAcceptService.nonPosting(makeProdInOutService.convertNonPostingProdInOuts(prodInOuts));
 		logger.log("反过账的委外验收单", "上传反过账的委外验收单", prodInOuts.size());

src/main/java/com/uas/platform/b2b/erp/controller/MakeProdReturnController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
 /**
@@ -45,7 +45,7 @@ public class MakeProdReturnController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public List<MakeProdInOut> saveMakeProdReturn(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<MakeProdInOut> prodInOuts = FlexJsonUtils.fromJsonArray(jsonStr, MakeProdInOut.class);
 		makeReturnService.save(makeProdInOutService.convertReturns(prodInOuts));
 		logger.log("委外验退单", "上传委外验退单", prodInOuts.size());
@@ -62,7 +62,7 @@ public class MakeProdReturnController {
 	@RequestMapping(value = "/nonPosting", method = RequestMethod.POST)
 	@ResponseBody
 	public void nonPostingProdInOuts(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<MakeProdInOut> prodInOuts = FlexJsonUtils.fromJsonArray(jsonStr, MakeProdInOut.class);
 		makeReturnService.nonPosting(makeProdInOutService.convertNonPostingReturns(prodInOuts));
 		logger.log("反过账的委外验退单", "上传反过账的委外验退单", prodInOuts.size());

src/main/java/com/uas/platform/b2b/erp/controller/NotExistOrderController.java

@@ -10,7 +10,7 @@ import com.uas.platform.core.model.Status;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
 /**
@@ -46,8 +46,8 @@ public class NotExistOrderController {
     @RequestMapping(value = "/back", method = RequestMethod.POST)
     @ResponseBody
     public void updateNotExistSaleItemStatus(@RequestParam("data") String data) throws Exception {
-        orderService.updateDownloadStatus(URLDecoder.decode(data, "UTF-8").split(","));
-        logger.log("采购订单", "ERP获取平台未上传单据返回更新下载状态", URLDecoder.decode(data, "UTF-8").split(",").length);
+        orderService.updateDownloadStatus(URLDecoderUtils.decode(data, "UTF-8").split(","));
+        logger.log("采购订单", "ERP获取平台未上传单据返回更新下载状态", URLDecoderUtils.decode(data, "UTF-8").split(",").length);
     }
 
     /**

src/main/java/com/uas/platform/b2b/erp/controller/OrderSendStatusController.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
 /**
@@ -35,7 +35,7 @@ public class OrderSendStatusController {
     @RequestMapping(method = RequestMethod.POST)
     public List<OrderSendStatusColumn> getByOrderInfo(@RequestParam("data") String data, @RequestParam("callerName") String callerName,
                                                       @RequestParam("role") String role) throws UnsupportedEncodingException {
-        String jsonStr = URLDecoder.decode(data, "UTF-8");
+        String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
         List<OrderSendStatusColumn> columns =  FlexJsonUtils.fromJsonArray(jsonStr, OrderSendStatusColumn.class);
         return orderService.getOrderInfo(columns, callerName, role);
     }

src/main/java/com/uas/platform/b2b/erp/controller/OutSourceProdInOutDownController.java

@@ -1,7 +1,7 @@
 package com.uas.platform.b2b.erp.controller;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -59,7 +59,7 @@ public class OutSourceProdInOutDownController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public void onSourceDownChangeSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		makeAcceptService.onUploadSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		makeAcceptService.onUploadSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 	/**
@@ -90,7 +90,7 @@ public class OutSourceProdInOutDownController {
 	@RequestMapping(value = "/nonPosting", method = RequestMethod.POST)
 	@ResponseBody
 	public void onNonPostingDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		makeAcceptService.onNonPostingUploadSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		makeAcceptService.onNonPostingUploadSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 }

src/main/java/com/uas/platform/b2b/erp/controller/OutSourceProdReturnDownController.java

@@ -1,10 +1,11 @@
 package com.uas.platform.b2b.erp.controller;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.CollectionUtils;
@@ -60,7 +61,7 @@ public class OutSourceProdReturnDownController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public void onSaleDownChangeSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		makeReturnService.onUploadSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		makeReturnService.onUploadSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 	/**
@@ -91,7 +92,7 @@ public class OutSourceProdReturnDownController {
 	@RequestMapping(value = "/nonPosting", method = RequestMethod.POST)
 	@ResponseBody
 	public void onNonPostingDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		makeReturnService.onNonPostingUploadSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		makeReturnService.onNonPostingUploadSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 }

src/main/java/com/uas/platform/b2b/erp/controller/OutsourceChangeController.java

@@ -1,7 +1,7 @@
 package com.uas.platform.b2b.erp.controller;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,7 +56,7 @@ public class OutsourceChangeController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public void onSaleDownChangeSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		makeOrderChangeService.onUploadChangeSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		makeOrderChangeService.onUploadChangeSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 }

src/main/java/com/uas/platform/b2b/erp/controller/OutsourceController.java

@@ -1,7 +1,7 @@
 package com.uas.platform.b2b.erp.controller;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,7 +60,7 @@ public class OutsourceController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public void onSaleDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		makeOrderService.onMakeDownSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		makeOrderService.onMakeDownSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 	/**
@@ -73,7 +73,7 @@ public class OutsourceController {
 	@RequestMapping(value = "/reply", method = RequestMethod.POST)
 	@ResponseBody
 	public void saveReplies(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<SaleReply> replies = FlexJsonUtils.fromJsonArray(jsonStr, SaleReply.class);
 		makeOrderService.reply(outsourceService.convertSaleReply(replies));
 		logger.log("客户委外加工单", "上传客户委外加工单回复信息", replies.size());
@@ -101,7 +101,7 @@ public class OutsourceController {
 	@RequestMapping(value = "/reply/back", method = RequestMethod.POST)
 	@ResponseBody
 	public void onReplyDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		makeOrderService.onReplyBackSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		makeOrderService.onReplyBackSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 	/**
@@ -126,7 +126,7 @@ public class OutsourceController {
 	@RequestMapping(value = "/end/back", method = RequestMethod.POST)
 	@ResponseBody
 	public void onEndDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		makeOrderService.onEndDownSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		makeOrderService.onEndDownSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 

src/main/java/com/uas/platform/b2b/erp/controller/ProdController.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -69,7 +69,7 @@ public class ProdController {
     @RequestMapping(value = "/notExistProds/back", method = RequestMethod.POST)
     @ResponseBody
     public void updateNotExistProdsStatus(@RequestParam("data") String data) throws Exception {
-        notExistProductService.updateDownloadStatus(URLDecoder.decode(data, "UTF-8").split(","));
-        logger.log("物料资料", "ERP获取平台未上传的物料信息返回更新下载状态", URLDecoder.decode(data, "UTF-8").split(",").length);
+        notExistProductService.updateDownloadStatus(URLDecoderUtils.decode(data, "UTF-8").split(","));
+        logger.log("物料资料", "ERP获取平台未上传的物料信息返回更新下载状态", URLDecoderUtils.decode(data, "UTF-8").split(",").length);
     }
 }

src/main/java/com/uas/platform/b2b/erp/controller/ProdIoPayController.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.erp.controller;
 
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import com.uas.platform.b2b.erp.model.ProdIoPay;
 import com.uas.platform.b2b.erp.service.ProdIoPayService;
 import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
@@ -12,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.*;
-import java.net.*;
 import java.util.List;
 
 /**
@@ -37,7 +37,7 @@ public class ProdIoPayController {
      */
     @RequestMapping(method = RequestMethod.POST)
     public void updateProdIoPay(@RequestParam("data") String data) throws UnsupportedEncodingException {
-        String jsonStr = URLDecoder.decode(data, "UTF-8");
+        String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
         List<ProdIoPay> payloadList = FlexJsonUtils.fromJsonArray(jsonStr, ProdIoPay.class);
         payService.saveAndUpdate(payloadList);
         LOGGER.log("出入库单付款记录更新", "批量更新付款记录", payloadList.size());

src/main/java/com/uas/platform/b2b/erp/controller/ProductSampleController.java

@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 import java.util.Map;
 
@@ -59,7 +59,7 @@ public class ProductSampleController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public List<ProductSample> saveProductSamples(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<ProductSample> productSamples = FlexJsonUtils.fromJsonArray(jsonStr, ProductSample.class);
 		purchaseProofingService.save(purchaseSampleService.convertProofing(productSamples));
 		logger.log("打样申请", "买家上传打样申请", productSamples.size());
@@ -74,7 +74,7 @@ public class ProductSampleController {
 	@RequestMapping(value = "/attach", method = RequestMethod.POST)
 	@ResponseBody
 	public void uploadAttach(String data, FileUpload uploadItem) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		Map<String, Map<String, Object>> fileList = FlexJsonUtils.fromJson(jsonStr);
 		List<Attach> attachs = attachService.uploadZipAndSave(uploadItem, "purchaseProofing", "客户打样申请单附件", fileList);
 		purchaseProofingService.saveAttach(attachs);
@@ -89,7 +89,7 @@ public class ProductSampleController {
 	@RequestMapping(value = "/approval/attach", method = RequestMethod.POST)
 	@ResponseBody
 	public void uploadApprovalAttach(String data, FileUpload uploadItem) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		Map<String, Map<String, Object>> fileList = FlexJsonUtils.fromJson(jsonStr);
 		List<Attach> attachs = attachService.uploadZipAndSave(uploadItem, "purchaseApproval", "客户送样认定单附件", fileList);
 		purchaseProofingService.saveApprovalAttach(attachs);
@@ -104,7 +104,7 @@ public class ProductSampleController {
 	@RequestMapping(value = "/approval/prdattach", method = RequestMethod.POST)
 	@ResponseBody
 	public void uploadApprovalPrdAttach(String data, FileUpload uploadItem) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		Map<String, Map<String, Object>> fileList = FlexJsonUtils.fromJson(jsonStr);
 		List<Attach> attachs = attachService.uploadZipAndSave(uploadItem, "purchaseApproval", "客户送样认定单附件", fileList);
 		purchaseProofingService.saveApprovalPrdattach(attachs);
@@ -119,7 +119,7 @@ public class ProductSampleController {
 	@RequestMapping(value = "/approval/padattach", method = RequestMethod.POST)
 	@ResponseBody
 	public void uploadApprovalPadAttach(String data, FileUpload uploadItem) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		Map<String, Map<String, Object>> fileList = FlexJsonUtils.fromJson(jsonStr);
 		List<Attach> attachs = attachService.uploadZipAndSave(uploadItem, "purchaseApproval", "客户送样认定单附件", fileList);
 		purchaseProofingService.saveApprovalPadattach(attachs);
@@ -134,7 +134,7 @@ public class ProductSampleController {
 	@RequestMapping(value = "/approval/ppdattach", method = RequestMethod.POST)
 	@ResponseBody
 	public void uploadApprovalPpdAttach(String data, FileUpload uploadItem) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		Map<String, Map<String, Object>> fileList = FlexJsonUtils.fromJson(jsonStr);
 		List<Attach> attachs = attachService.uploadZipAndSave(uploadItem, "purchaseApproval", "客户送样认定单附件", fileList);
 		purchaseProofingService.saveApprovalPpdattach(attachs);
@@ -162,7 +162,7 @@ public class ProductSampleController {
 	@RequestMapping(value = "/sampleSend/back", method = RequestMethod.POST)
 	@ResponseBody
 	public void onSampleSendDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseProofingService.sendSampleSendSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseProofingService.sendSampleSendSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 	
 	/**
@@ -175,7 +175,7 @@ public class ProductSampleController {
 	@RequestMapping(value = "/approval", method = RequestMethod.POST)
 	@ResponseBody
 	public List<ProductSampleApproval> saveProductSampleApprovals(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<ProductSampleApproval> sampleApprovals = FlexJsonUtils.fromJsonArray(jsonStr, ProductSampleApproval.class);
 		purchaseProofingService.saveSampleApproval(purchaseSampleService.convertApproval(sampleApprovals));
 		logger.log("认定单", "买家上传认定单", sampleApprovals.size());
@@ -191,7 +191,7 @@ public class ProductSampleController {
 	@RequestMapping(value = "/invalidate", method = RequestMethod.POST)
 	@ResponseBody
 	public void invalidateProductSample(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseProofingService.invalidateProductSample(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseProofingService.invalidateProductSample(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 }

src/main/java/com/uas/platform/b2b/erp/controller/PurchaseAPBillController.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.erp.controller;
 
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import com.uas.platform.b2b.erp.model.PurchaseAPBill;
 import com.uas.platform.b2b.erp.service.PurchaseAPBillService;
 import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
@@ -16,7 +17,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.io.*;
-import java.net.*;
 import java.util.List;
 
 /**
@@ -51,7 +51,7 @@ public class PurchaseAPBillController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public List<PurchaseAPBill> saveApBills(@RequestParam(value = "data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<PurchaseAPBill> purchaseAPBills = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseAPBill.class);
 		purchaseApBillService.save(purchaseAPBillService.convertApBills(purchaseAPBills));
 		logger.log("采购变更单", "上传采购变更单", purchaseAPBills.size());
@@ -68,7 +68,7 @@ public class PurchaseAPBillController {
 	@RequestMapping(value="/nonPosting", method = RequestMethod.POST)
 	@ResponseBody
 	public void nonPostingApBills(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<PurchaseAPBill> apBills = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseAPBill.class);
 		purchaseApBillService.nonPosting(purchaseAPBillService.convertNonPostingApBills(apBills));
 		logger.log("反过账的应付发票", "上传反过账的应付发票", apBills.size());
@@ -85,7 +85,7 @@ public class PurchaseAPBillController {
 	@RequestMapping(value = "/APBillAdjustment", method = RequestMethod.POST)
 	@ResponseBody
 	public void APBillAdjustment(@RequestParam("data") String data) throws Exception {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<PurchaseAPBill> apBills = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseAPBill.class);
 		List<ApbillAdjustment> adjusts = purchaseAPBillService.convertApbillAdjustment(apBills);
 		apbillAdjustmentService.save(adjusts);
@@ -101,7 +101,7 @@ public class PurchaseAPBillController {
 	@RequestMapping(value = "/nonPostAdjustment", method = RequestMethod.POST)
 	@ResponseBody
 	public void nonPostAdjustment(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<PurchaseAPBill> apBills = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseAPBill.class);
 		apbillAdjustmentService.nonPosting(apbillAdjustmentService.convertNonPostAdjustment(apBills));
 	}

src/main/java/com/uas/platform/b2b/erp/controller/PurchaseChangeController.java

@@ -1,7 +1,7 @@
 package com.uas.platform.b2b.erp.controller;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,7 +48,7 @@ public class PurchaseChangeController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public void savePurchases(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<PurchaseChange> changes = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseChange.class);
 		purchaseOrderChangeService.save(purchaseChangeService.convertPurchaseChange(changes));
 		logger.log("采购变更单", "上传采购变更单", changes.size());
@@ -77,7 +77,7 @@ public class PurchaseChangeController {
 	@RequestMapping(value = "/reply", method = RequestMethod.POST)
 	@ResponseBody
 	public void onReplySuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseOrderChangeService.onReplyUploadSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseOrderChangeService.onReplyUploadSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 }

src/main/java/com/uas/platform/b2b/erp/controller/PurchaseController.java

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
 /**
@@ -48,7 +48,7 @@ public class PurchaseController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public List<Purchase> savePurchases(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<Purchase> purchases = FlexJsonUtils.fromJsonArray(jsonStr, Purchase.class);
 		purchaseOrderService.save(purchaseService.convertPurchase(purchases));
 		logger.log("采购单", "上传采购单", purchases.size());
@@ -87,7 +87,7 @@ public class PurchaseController {
 	@RequestMapping(value = "/issued/back",method = RequestMethod.POST)
 	@ResponseBody
 	public void onIssuedSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<PurchaseDetail> details = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseDetail.class);
 		purchaseOrderService.onIssuedSucess(details);
 	}
@@ -102,7 +102,7 @@ public class PurchaseController {
 	@RequestMapping(value = "/reply", method = RequestMethod.POST)
 	@ResponseBody
 	public void reply(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<PurchaseReply> replies = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseReply.class);
 		purchaseOrderService.reply(purchaseService.convertPurchaseReply(replies));
 		logger.log("采购单", "上传采购单主动回复", replies.size());
@@ -117,7 +117,7 @@ public class PurchaseController {
 	@RequestMapping(value = "/reply/back", method = RequestMethod.POST)
 	@ResponseBody
 	public void onReplySuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseOrderService.onReplyUploadSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseOrderService.onReplyUploadSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 	/**
@@ -129,7 +129,7 @@ public class PurchaseController {
 	@RequestMapping(value = "/end", method = RequestMethod.POST)
 	@ResponseBody
 	public void end(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<PurchaseDetailEnd> ends = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseDetailEnd.class);
 		purchaseOrderService.saveItems(purchaseService.convertPurchaseEnd(ends));
 		logger.log("采购单", "上传结案、反结案采购单", ends.size());
@@ -157,7 +157,7 @@ public class PurchaseController {
     @RequestMapping(value = "/print/back", method = RequestMethod.POST)
     @ResponseBody
     public void onPrintSendSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-        purchaseOrderService.onPrintSendSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+        purchaseOrderService.onPrintSendSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
     }
 
     /**
@@ -169,7 +169,7 @@ public class PurchaseController {
     @RequestMapping(value = "/item", method = RequestMethod.POST)
     @ResponseBody
     public void saveSaleItem(@RequestParam("data") String data) throws UnsupportedEncodingException {
-        String jsonStr = URLDecoder.decode(data, "UTF-8");
+        String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
         List<PurchaseDetail> details = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseDetail.class);
         itemService.save(itemService.covert(details));
         logger.log("采购单", "上传采购单明细", details.size());

src/main/java/com/uas/platform/b2b/erp/controller/PurchaseForecastController.java

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
 /**
@@ -48,7 +48,7 @@ public class PurchaseForecastController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public void savePurchases(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<PurchaseForecast> purchaseForecasts = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseForecast.class);
 		purchaseForecastOrderService.save(purchaseForecastService.convertPurchaseForecast(purchaseForecasts));
 		logger.log("采购预测", "上传采购预测", purchaseForecasts.size());
@@ -70,7 +70,7 @@ public class PurchaseForecastController {
 			map.put("message", "未传入参数！");
 			return map;
 		}
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		JSONObject jsonObject = JSON.parseObject(jsonStr);
 		if (StringUtils.isEmpty(jsonObject.getString("enUU")) || StringUtils.isEmpty(jsonObject.getString("PurchaseForecast"))) {
 			map.put("success", false);

src/main/java/com/uas/platform/b2b/erp/controller/PurchaseNotifyController.java

@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -60,7 +60,7 @@ public class PurchaseNotifyController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public List<PurchaseNotify> saveNotifies(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<PurchaseNotify> notifies = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseNotify.class);
 		List<PurchaseNotice> noticeList = purchaseNotifyService.convertPurchaseNotify(notifies);
 		noticeList = purchaseNoticeService.save(noticeList);
@@ -84,7 +84,7 @@ public class PurchaseNotifyController {
 			map.put("message", "未传入参数！");
 			return map;
 		}
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		JSONObject jsonObject = JSON.parseObject(jsonStr);
 		if (StringUtils.isEmpty(jsonObject.getString("enUU")) || StringUtils.isEmpty(jsonObject.getString("PurchaseNotify"))) {
 			map.put("success", false);
@@ -132,7 +132,7 @@ public class PurchaseNotifyController {
 	@RequestMapping(value = "/accept/back", method = RequestMethod.POST)
 	@ResponseBody
 	public void onSendSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseNoticeService.onSendUploadSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseNoticeService.onSendUploadSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 	/**
@@ -149,7 +149,7 @@ public class PurchaseNotifyController {
 			map.put("message", "未传入参数！");
 			return map;
 		}
-		String enUU = URLDecoder.decode(data, "UTF-8");
+		String enUU = URLDecoderUtils.decode(data, "UTF-8");
 		List<AcceptNotify> notifies = purchaseNotifyService.convertSaleSend(purchaseNoticeService.findNotUploadSendEDI(Long.valueOf(enUU)));
 		logger.log("供应商发货单", "下载来自供应商的发货单", notifies.size());
 		map.put("success", true);
@@ -172,7 +172,7 @@ public class PurchaseNotifyController {
 			map.put("message", "未传入参数！");
 			return map;
 		}
-		purchaseNoticeService.onSendUploadSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseNoticeService.onSendUploadSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 		map.put("success", true);
 		return map;
 	}
@@ -187,7 +187,7 @@ public class PurchaseNotifyController {
 	@RequestMapping(value = "/accept", method = RequestMethod.POST)
 	@ResponseBody
 	public List<AcceptNotify> send(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<AcceptNotify> accepts = FlexJsonUtils.fromJsonArray(jsonStr, AcceptNotify.class);
 		purchaseNoticeService.send(purchaseNotifyService.convertAcceptNotify(accepts));
 		logger.log("主动收料通知单", "上传主动收料通知单", accepts.size());
@@ -203,7 +203,7 @@ public class PurchaseNotifyController {
 	@RequestMapping(value = "/end", method = RequestMethod.POST)
 	@ResponseBody
 	public List<String> end(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<PurchaseNotify> ends = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseNotify.class);
 		String string = purchaseNoticeService.end(ends);
 		logger.log("送货提醒", "上传结案送货提醒", ends.size());
@@ -221,7 +221,7 @@ public class PurchaseNotifyController {
     @RequestMapping(value = "/endCheck", method = RequestMethod.POST)
     @ResponseBody
     public void endCheck(@RequestParam("data") String data) throws UnsupportedEncodingException {
-        String jsonStr = URLDecoder.decode(data, "UTF-8");
+        String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
         List<PurchaseNotify> notifyList = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseNotify.class);
         noticeRecordService.check(notifyList);
         logger.log("送货提醒", "送货提醒校验", notifyList.size());
@@ -236,7 +236,7 @@ public class PurchaseNotifyController {
 	@RequestMapping(value = "/accept/confirm", method = RequestMethod.POST)
 	@ResponseBody
 	public void onConfirm(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<AcceptNotifyConfirm> confirms = FlexJsonUtils.fromJsonArray(jsonStr, AcceptNotifyConfirm.class);
 		purchaseNoticeService.onSaleSendChange(purchaseNotifyService.convertAcceptNotifyDetail(confirms));
 		logger.log("送货提醒", "上传收料通知的确认数量", confirms.size());
@@ -251,7 +251,7 @@ public class PurchaseNotifyController {
 	@RequestMapping(value = "/accept/verify", method = RequestMethod.POST)
 	@ResponseBody
 	public void onVerify(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<AcceptNotifyVerify> verifies = FlexJsonUtils.fromJsonArray(jsonStr, AcceptNotifyVerify.class);
 		purchaseNoticeService.onVerify(purchaseNotifyService.convertAcceptNotifyVerify(verifies));
 		logger.log("送货提醒", "上传转收料单的数量", verifies.size());
@@ -266,7 +266,7 @@ public class PurchaseNotifyController {
 	@RequestMapping(value = "/accept/unverify", method = RequestMethod.POST)
 	@ResponseBody
 	public void onUnVerify(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<AcceptNotifyVerify> verifies = FlexJsonUtils.fromJsonArray(jsonStr, AcceptNotifyVerify.class);
 		purchaseNoticeService.unVerify(purchaseNotifyService.convertAcceptUnauditVerify(verifies));
 		logger.log("送货提醒", "上传反审核收料单的数量", verifies.size());

src/main/java/com/uas/platform/b2b/erp/controller/PurchaseProdBadInController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
 /**
@@ -46,7 +46,7 @@ public class PurchaseProdBadInController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public List<PurchaseProdInOut> savePurchases(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<PurchaseProdInOut> prodInOuts = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseProdInOut.class);
 		purchaseBadInService.save(purchaseProdInOutService.convertBadIns(prodInOuts));
 		logger.log("不良品入库单", "上传不良品入库单", prodInOuts.size());
@@ -63,7 +63,7 @@ public class PurchaseProdBadInController {
 	@RequestMapping(value="/nonPosting", method = RequestMethod.POST)
 	@ResponseBody
 	public void nonPostingProdInOuts(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<PurchaseProdInOut> prodInOuts = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseProdInOut.class);
 		purchaseBadInService.nonPosting(purchaseProdInOutService.convertNonPostingBadIns(prodInOuts));
 		logger.log("反过账的不良品入库单", "上传反过账的不良品入库单", prodInOuts.size());

src/main/java/com/uas/platform/b2b/erp/controller/PurchaseProdBadOutController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
 /**
@@ -46,7 +46,7 @@ public class PurchaseProdBadOutController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public List<PurchaseProdInOut> savePurchases(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<PurchaseProdInOut> prodInOuts = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseProdInOut.class);
 		purchaseBadOutService.save(purchaseProdInOutService.convertBadOuts(prodInOuts));
 		logger.log("不良品出库单", "上传不良品出库单", prodInOuts.size());
@@ -63,7 +63,7 @@ public class PurchaseProdBadOutController {
 	@RequestMapping(value="/nonPosting", method = RequestMethod.POST)
 	@ResponseBody
 	public void nonPostingProdInOuts(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<PurchaseProdInOut> prodInOuts = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseProdInOut.class);
 		purchaseBadOutService.nonPosting(purchaseProdInOutService.convertNonPostingBadOuts(prodInOuts));
 		logger.log("反过账的不良品出库单", "上传反过账的不良品出库单", prodInOuts.size());

src/main/java/com/uas/platform/b2b/erp/controller/PurchaseProdInOutController.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
 /**
@@ -59,7 +59,7 @@ public class PurchaseProdInOutController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public List<PurchaseProdInOut> saveProdInOuts(@RequestParam("data") String data) throws Exception {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<PurchaseProdInOut> prodInOuts = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseProdInOut.class);
 		purchaseAcceptService.save(purchaseProdInOutService.convertProdInOuts(prodInOuts));
 		logger.log("采购验收单", "上传采购验收单", prodInOuts.size());
@@ -76,7 +76,7 @@ public class PurchaseProdInOutController {
 	@RequestMapping(value="/nonPosting", method = RequestMethod.POST)
 	@ResponseBody
 	public void nonPostingProdInOuts(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<PurchaseProdInOut> prodInOuts = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseProdInOut.class);
 		purchaseAcceptService.nonPosting(purchaseProdInOutService.convertNonPostingProdInOuts(prodInOuts));
 		logger.log("反过账的采购验收单", "上传反过账的采购验收单", prodInOuts.size());
@@ -91,7 +91,7 @@ public class PurchaseProdInOutController {
 	@RequestMapping(value = "/refreshPrice", method = RequestMethod.POST)
 	@ResponseBody
 	public void refreshPrice(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<ProdInOutRefreshPrice> prodInOuts = FlexJsonUtils.fromJsonArray(jsonStr, ProdInOutRefreshPrice.class);
 		// 更新采购验收单明细的价格
 		purchaseAcceptService.batchSave(purchaseProdInOutService.convertPirceForProdIn(prodInOuts));
@@ -110,7 +110,7 @@ public class PurchaseProdInOutController {
 	@RequestMapping(value = "/refreshPrice/purc/return", method = RequestMethod.POST)
 	@ResponseBody
 	public void refreshPriceForPurcReturn(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<ProdInOutRefreshPrice> prodInOuts = FlexJsonUtils.fromJsonArray(jsonStr, ProdInOutRefreshPrice.class);
 		// 更新采购验退单的价格
 		returnService.batchSave(returnService.convertPirceForProdIn(prodInOuts));
@@ -128,7 +128,7 @@ public class PurchaseProdInOutController {
 	@RequestMapping(value = "/refreshPrice/make/accept", method = RequestMethod.POST)
 	@ResponseBody
 	public void refreshPriceForMakeAccept(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<ProdInOutRefreshPrice> prodInOuts = FlexJsonUtils.fromJsonArray(jsonStr, ProdInOutRefreshPrice.class);
 		// 更新委外验收单的价格
 		makeAcceptService.batchSave(makeAcceptService.convertPirceForProdIn(prodInOuts));
@@ -146,7 +146,7 @@ public class PurchaseProdInOutController {
 	@RequestMapping(value = "/refreshPrice/make/return", method = RequestMethod.POST)
 	@ResponseBody
 	public void refreshPriceForMakeReturn(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<ProdInOutRefreshPrice> prodInOuts = FlexJsonUtils.fromJsonArray(jsonStr, ProdInOutRefreshPrice.class);
 		// 更新委外验退单的价格
 		makeReturnService.batchSave(makeReturnService.convertPirceForProdIn(prodInOuts));

src/main/java/com/uas/platform/b2b/erp/controller/PurchaseProdReturnController.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.erp.controller;
 
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import com.uas.platform.b2b.erp.model.PurchaseProdInOut;
 import com.uas.platform.b2b.erp.service.PurchaseProdInOutService;
 import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
@@ -14,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
 /**
@@ -46,7 +47,7 @@ public class PurchaseProdReturnController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public List<PurchaseProdInOut> savePurchases(@RequestParam("data") String data) throws Exception {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<PurchaseProdInOut> prodInOuts = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseProdInOut.class);
 		purchaseReturnService.save(purchaseProdInOutService.convertReturns(prodInOuts));
 		logger.log("采购验退单", "上传采购验退单", prodInOuts.size());
@@ -63,7 +64,7 @@ public class PurchaseProdReturnController {
 	@RequestMapping(value="/nonPosting", method = RequestMethod.POST)
 	@ResponseBody
 	public void nonPostingProdInOuts(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<PurchaseProdInOut> prodInOuts = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseProdInOut.class);
 		purchaseReturnService.nonPosting(purchaseProdInOutService.convertNonPostingReturns(prodInOuts));
 		logger.log("反过账的采购验退单", "上传反过账的采购验退单", prodInOuts.size());

src/main/java/com/uas/platform/b2b/erp/controller/PurchaseQuaMRBController.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.erp.controller;
 
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import com.uas.platform.b2b.erp.model.PurchaseQuaMRB;
 import com.uas.platform.b2b.erp.service.PurchaseQuaMRBService;
 import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
@@ -14,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
 /**
@@ -46,7 +47,7 @@ public class PurchaseQuaMRBController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public List<PurchaseQuaMRB> savePurchases(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<PurchaseQuaMRB> quaMRBs = FlexJsonUtils.fromJsonArray(jsonStr, PurchaseQuaMRB.class);
 		purchaseMRBService.save(purchaseQuaMRBService.convertMRBs(quaMRBs));
 		logger.log("MRB单", "上传MRB单", quaMRBs.size());

src/main/java/com/uas/platform/b2b/erp/controller/QuotationController.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.erp.controller;
 
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import com.uas.platform.b2b.erp.model.Quotation;
 import com.uas.platform.b2b.erp.model.QuotationDecide;
 import com.uas.platform.b2b.erp.service.QuotationService;
@@ -17,7 +18,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -52,7 +53,7 @@ public class QuotationController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public List<Map<String, Object>> saveQuotations(@RequestParam("data") String data) throws Exception {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<Quotation> quotations = FlexJsonUtils.fromJsonArray(jsonStr, Quotation.class);
 		Map<String, List<SaleQuotationItem>> convertQuotation = quotationService.convertQuotation(quotations);
 		List<SaleQuotationItem> save = convertQuotation.get("save");
@@ -97,7 +98,7 @@ public class QuotationController {
 	@RequestMapping(value = "/decide/back", method = RequestMethod.POST)
 	@ResponseBody
 	public void onReplyDecideDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		saleQuotationService.onQuotationDecideDownSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		saleQuotationService.onQuotationDecideDownSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 	
 	/**
@@ -122,7 +123,7 @@ public class QuotationController {
 	@RequestMapping(value = "/back/back", method = RequestMethod.POST)
 	@ResponseBody
 	public void onBackSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		saleQuotationService.onQuotationBackSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		saleQuotationService.onQuotationBackSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 	/**
@@ -147,7 +148,7 @@ public class QuotationController {
 	@RequestMapping(value = "/reply/invalid/back", method = RequestMethod.POST)
 	@ResponseBody
 	public void onReplyInvalidDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		saleQuotationService.onReplyInvalidDownSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		saleQuotationService.onReplyInvalidDownSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 }

src/main/java/com/uas/platform/b2b/erp/controller/QuotationDownController.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
 /**
@@ -59,7 +59,7 @@ public class QuotationDownController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public void onQuotationDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseInquiryService.onQuotationDownSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseInquiryService.onQuotationDownSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 	/**
@@ -72,7 +72,7 @@ public class QuotationDownController {
 	@RequestMapping(value = "/reply", method = RequestMethod.POST)
 	@ResponseBody
 	public void saveQuotationReplies(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<QuotationDown> downs = FlexJsonUtils.fromJsonArray(jsonStr, QuotationDown.class);
 		purchaseInquiryService.reply(downs);
 		logger.log("客户询价单", "上传客户询价单的报价信息", downs.size());
@@ -100,7 +100,7 @@ public class QuotationDownController {
 	@RequestMapping(value = "/reply/back", method = RequestMethod.POST)
 	@ResponseBody
 	public void onReplyDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseInquiryService.onReplyDownSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseInquiryService.onReplyDownSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 	/**
@@ -125,7 +125,7 @@ public class QuotationDownController {
 	@RequestMapping(value = "/reply/decide/back", method = RequestMethod.POST)
 	@ResponseBody
 	public void onReplyDecideDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseInquiryService.onReplyDecideDownSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseInquiryService.onReplyDecideDownSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 	/**
@@ -150,7 +150,7 @@ public class QuotationDownController {
 	@RequestMapping(value = "/reply/invalid/back", method = RequestMethod.POST)
 	@ResponseBody
 	public void onReplyInvalidDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseInquiryService.onReplyInvalidDownSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseInquiryService.onReplyInvalidDownSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 }

src/main/java/com/uas/platform/b2b/erp/controller/SaleAPBillController.java

@@ -1,10 +1,11 @@
 package com.uas.platform.b2b.erp.controller;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.CollectionUtils;
@@ -60,7 +61,7 @@ public class SaleAPBillController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public void onSaleAPBillDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseApBillService.onUploadSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseApBillService.onUploadSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 	
 	/**
@@ -91,7 +92,7 @@ public class SaleAPBillController {
 	@RequestMapping(value="/nonPosting", method = RequestMethod.POST)
 	@ResponseBody
 	public void onNonPostingDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseApBillService.onNonPostingUploadSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseApBillService.onNonPostingUploadSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 }

src/main/java/com/uas/platform/b2b/erp/controller/SaleDownChangeController.java

@@ -1,7 +1,7 @@
 package com.uas.platform.b2b.erp.controller;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,7 +59,7 @@ public class SaleDownChangeController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public void onSaleDownChangeSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseOrderChangeService.onSaleDownChangeSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseOrderChangeService.onSaleDownChangeSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 	/**
@@ -72,7 +72,7 @@ public class SaleDownChangeController {
 	@RequestMapping(value = "/reply", method = RequestMethod.POST)
 	@ResponseBody
 	public void saveChangeReplies(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<SaleDownChangeReply> replies = FlexJsonUtils.fromJsonArray(jsonStr, SaleDownChangeReply.class);
 		purchaseOrderChangeService.reply(replies);
 		logger.log("客户采购变更单", "上传客户采购变更单的回复信息", replies.size());
@@ -84,7 +84,7 @@ public class SaleDownChangeController {
 	@RequestMapping(value = "/reply/b2b", method = RequestMethod.POST)
 	@ResponseBody
 	public void  saveChangeRepliesB2b(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<SaleDownChangeReply> replies = FlexJsonUtils.fromJsonArray(jsonStr, SaleDownChangeReply.class);
 		purchaseOrderChangeService.saveb2b(replies);
 		logger.log("客户采购变更单", "下载b2b客户采购变更单的回复信息", replies.size());
@@ -112,7 +112,7 @@ public class SaleDownChangeController {
 	@RequestMapping(value = "/reply/back", method = RequestMethod.POST)
 	@ResponseBody
 	public void onReplyDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseOrderChangeService.onSaleDownChangeReplySuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseOrderChangeService.onSaleDownChangeReplySuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 	/**

src/main/java/com/uas/platform/b2b/erp/controller/SaleDownController.java

@@ -1,7 +1,7 @@
 package com.uas.platform.b2b.erp.controller;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,7 +60,7 @@ public class SaleDownController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public void onSaleDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseOrderService.onSaleDownSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseOrderService.onSaleDownSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 	/**
@@ -73,7 +73,7 @@ public class SaleDownController {
 	@RequestMapping(value = "/reply", method = RequestMethod.POST)
 	@ResponseBody
 	public void saveReplies(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<SaleReply> replies = FlexJsonUtils.fromJsonArray(jsonStr, SaleReply.class);
 		purchaseOrderService.reply(saleDownService.convertSaleReply(replies));
 		logger.log("客户采购单", "上传客户采购单回复信息", replies.size());
@@ -101,7 +101,7 @@ public class SaleDownController {
 	@RequestMapping(value = "/reply/back", method = RequestMethod.POST)
 	@ResponseBody
 	public void onReplyDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseOrderService.onReplyDownSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseOrderService.onReplyDownSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 	/**
@@ -126,7 +126,7 @@ public class SaleDownController {
 	@RequestMapping(value = "/end/back", method = RequestMethod.POST)
 	@ResponseBody
 	public void onEndDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseOrderService.onEndDownSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseOrderService.onEndDownSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 }

src/main/java/com/uas/platform/b2b/erp/controller/SaleForecastDownController.java

@@ -1,9 +1,10 @@
 package com.uas.platform.b2b.erp.controller;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -59,6 +60,6 @@ public class SaleForecastDownController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public void onEndDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseForecastOrderService.onEndDownSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseForecastOrderService.onEndDownSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 }

src/main/java/com/uas/platform/b2b/erp/controller/SaleNotifyDownController.java

@@ -1,7 +1,7 @@
 package com.uas.platform.b2b.erp.controller;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,7 +61,7 @@ public class SaleNotifyDownController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public void onSaleNotifyDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseNoticeService.onNoticeDownSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseNoticeService.onNoticeDownSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 	/**
@@ -74,7 +74,7 @@ public class SaleNotifyDownController {
 	@RequestMapping(value = "/send", method = RequestMethod.POST)
 	@ResponseBody
 	public void saveReplies(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<SaleOut> outs = FlexJsonUtils.fromJsonArray(jsonStr, SaleOut.class);
 		purchaseNoticeService.send(saleNotifyDownService.convertSaleOut(outs));
 		logger.log("发货单", "上传发货单", outs.size());
@@ -102,7 +102,7 @@ public class SaleNotifyDownController {
 	@RequestMapping(value = "/send/back", method = RequestMethod.POST)
 	@ResponseBody
 	public void onReplyDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseNoticeService.onSendDownSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseNoticeService.onSendDownSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 	/**
@@ -127,7 +127,7 @@ public class SaleNotifyDownController {
 	@RequestMapping(value = "/end/back", method = RequestMethod.POST)
 	@ResponseBody
 	public void onEndDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseNoticeService.onEndDownSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseNoticeService.onEndDownSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 }

src/main/java/com/uas/platform/b2b/erp/controller/SaleProdBadInDownController.java

@@ -1,7 +1,7 @@
 package com.uas.platform.b2b.erp.controller;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -60,7 +60,7 @@ public class SaleProdBadInDownController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public void onSaleDownChangeSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseBadInService.onUploadSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseBadInService.onUploadSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 	/**
@@ -91,7 +91,7 @@ public class SaleProdBadInDownController {
 	@RequestMapping(value="/nonPosting", method = RequestMethod.POST)
 	@ResponseBody
 	public void onNonPostingDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseBadInService.onNonPostingUploadSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseBadInService.onNonPostingUploadSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 }

src/main/java/com/uas/platform/b2b/erp/controller/SaleProdBadOutDownController.java

@@ -1,7 +1,7 @@
 package com.uas.platform.b2b.erp.controller;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -60,7 +60,7 @@ public class SaleProdBadOutDownController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public void onSaleDownChangeSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseBadOutServices.onUploadSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseBadOutServices.onUploadSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 	/**
@@ -91,7 +91,7 @@ public class SaleProdBadOutDownController {
 	@RequestMapping(value="/nonPosting", method = RequestMethod.POST)
 	@ResponseBody
 	public void onNonPostingDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseBadOutServices.onNonPostingUploadSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseBadOutServices.onNonPostingUploadSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 

src/main/java/com/uas/platform/b2b/erp/controller/SaleProdInOutDownController.java

@@ -1,7 +1,7 @@
 package com.uas.platform.b2b.erp.controller;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -60,7 +60,7 @@ public class SaleProdInOutDownController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public void onSaleDownChangeSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseAcceptService.onUploadSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseAcceptService.onUploadSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 	/**
@@ -91,7 +91,7 @@ public class SaleProdInOutDownController {
 	@RequestMapping(value="/nonPosting", method = RequestMethod.POST)
 	@ResponseBody
 	public void onNonPostingDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseAcceptService.onNonPostingUploadSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseAcceptService.onNonPostingUploadSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 }

src/main/java/com/uas/platform/b2b/erp/controller/SaleProdReturnDownController.java

@@ -1,7 +1,7 @@
 package com.uas.platform.b2b.erp.controller;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -60,7 +60,7 @@ public class SaleProdReturnDownController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public void onSaleDownChangeSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseReturnService.onUploadSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseReturnService.onUploadSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 	/**
@@ -91,7 +91,7 @@ public class SaleProdReturnDownController {
 	@RequestMapping(value="/nonPosting", method = RequestMethod.POST)
 	@ResponseBody
 	public void onNonPostingDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseReturnService.onNonPostingUploadSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseReturnService.onNonPostingUploadSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 }

src/main/java/com/uas/platform/b2b/erp/controller/SaleQuaMRBController.java

@@ -1,7 +1,7 @@
 package com.uas.platform.b2b.erp.controller;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,7 +57,7 @@ public class SaleQuaMRBController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public void onSaleQuaMRBDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseMRBService.onUploadSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseMRBService.onUploadSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 }

src/main/java/com/uas/platform/b2b/erp/controller/SaleSampleDownController.java

@@ -1,10 +1,10 @@
 package com.uas.platform.b2b.erp.controller;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import java.util.List;
 import java.util.Map;
 
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -68,7 +68,7 @@ public class SaleSampleDownController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public void onSampleDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseProofingService.uploadProofingSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseProofingService.uploadProofingSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 	
 	/**
@@ -81,7 +81,7 @@ public class SaleSampleDownController {
 	@RequestMapping(value = "/sampleSend", method = RequestMethod.POST)
 	@ResponseBody
 	public void saveSampleSend(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<SaleSampleSend> sampleSends = FlexJsonUtils.fromJsonArray(jsonStr, SaleSampleSend.class);
 		purchaseProofingService.send(saleSampleDownService.convertProofingSends(sampleSends));
 		logger.log("送样单", "上传送样单", sampleSends.size());
@@ -109,7 +109,7 @@ public class SaleSampleDownController {
 	@RequestMapping(value = "/sampleSend/back", method = RequestMethod.POST)
 	@ResponseBody
 	public void onSampleSendDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseProofingService.backSampleSendSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseProofingService.backSampleSendSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 	
 	/**
@@ -120,7 +120,7 @@ public class SaleSampleDownController {
 	@RequestMapping(value = "/sampleSend/attach", method = RequestMethod.POST)
 	@ResponseBody
 	public void uploadApprovalPpdAttach(String data, FileUpload uploadItem) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		Map<String, Map<String, Object>> fileList = FlexJsonUtils.fromJson(jsonStr);
 		List<Attach> attachs = attachService.uploadZipAndSave(uploadItem, "purchaseProofing", "送样单附件", fileList);
 		purchaseProofingService.saveSendAttach(attachs);
@@ -150,7 +150,7 @@ public class SaleSampleDownController {
 	@RequestMapping(value = "/sampleApproval", method = RequestMethod.POST)
 	@ResponseBody
 	public void onSampleApprovalDownSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		purchaseProofingService.uploadApprovalsSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+		purchaseProofingService.uploadApprovalsSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
 	}
 
 }

src/main/java/com/uas/platform/b2b/erp/controller/TenderController.java

@@ -2,6 +2,7 @@ package com.uas.platform.b2b.erp.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import com.uas.platform.b2b.erp.model.SaleTenderErp;
 import com.uas.platform.b2b.erp.service.TenderService;
 import com.uas.platform.b2b.model.*;
@@ -30,7 +31,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -65,13 +65,13 @@ public class TenderController {
     @ResponseBody
     @Transactional
     public ModelMap publishTender(String tender, String enInfos, String attaches) throws UnsupportedEncodingException {
-        tender = URLDecoder.decode(tender, "UTF-8");
+        tender = URLDecoderUtils.decode(tender, "UTF-8");
         PurchaseTender purchaseTender = FlexJsonUtils.fromJson(tender, PurchaseTender.class);
         if (null != enInfos) {
-            enInfos = URLDecoder.decode(enInfos, "UTF-8");
+            enInfos = URLDecoderUtils.decode(enInfos, "UTF-8");
             List<TenderContactInfo> contactInfos = FlexJsonUtils.fromJsonArray(enInfos, TenderContactInfo.class);
             if (null != attaches) {
-                attaches = URLDecoder.decode(attaches, "UTF-8");
+                attaches = URLDecoderUtils.decode(attaches, "UTF-8");
                 List<Attach> tenderAttaches = FlexJsonUtils.fromJsonArray(attaches, Attach.class);
                 return tenderService.publishOrSave(purchaseTender, contactInfos, tenderAttaches);
             } else {
@@ -80,7 +80,7 @@ public class TenderController {
 
         } else {
             if (null != attaches) {
-                attaches = URLDecoder.decode(attaches, "UTF-8");
+                attaches = URLDecoderUtils.decode(attaches, "UTF-8");
                 List<Attach> tenderAttaches = FlexJsonUtils.fromJsonArray(attaches, Attach.class);
                 return tenderService.publishOrSave(purchaseTender, null, tenderAttaches);
             } else {
@@ -99,13 +99,13 @@ public class TenderController {
     @ResponseBody
     @Transactional
     public ModelMap saveTender(String tender, String enInfos, String attaches) throws UnsupportedEncodingException {
-        tender = URLDecoder.decode(tender, "UTF-8");
+        tender = URLDecoderUtils.decode(tender, "UTF-8");
         PurchaseTender purchaseTender = FlexJsonUtils.fromJson(tender, PurchaseTender.class);
         if (null != enInfos) {
-            enInfos = URLDecoder.decode(enInfos, "UTF-8");
+            enInfos = URLDecoderUtils.decode(enInfos, "UTF-8");
             List<TenderContactInfo> contactInfos = FlexJsonUtils.fromJsonArray(enInfos, TenderContactInfo.class);
             if (null != attaches) {
-                attaches = URLDecoder.decode(attaches, "UTF-8");
+                attaches = URLDecoderUtils.decode(attaches, "UTF-8");
                 List<Attach> saleTenderAttaches = FlexJsonUtils.fromJsonArray(attaches, Attach.class);
                 return tenderService.publishOrSave(purchaseTender, contactInfos, saleTenderAttaches);
             } else {
@@ -114,7 +114,7 @@ public class TenderController {
 
         } else {
             if (null != attaches) {
-                attaches = URLDecoder.decode(attaches, "UTF-8");
+                attaches = URLDecoderUtils.decode(attaches, "UTF-8");
                 List<Attach> saleTenderAttaches = FlexJsonUtils.fromJsonArray(attaches, Attach.class);
                 return tenderService.publishOrSave(purchaseTender, null, saleTenderAttaches);
             } else {
@@ -134,11 +134,11 @@ public class TenderController {
     public ModelMap replyTender(String saleTender, String attaches) throws UnsupportedEncodingException {
         SaleTender saleTender1 = new SaleTender();
         if (null != saleTender && !"".equals(saleTender)) {
-            saleTender = URLDecoder.decode(saleTender, "UTF-8");
+            saleTender = URLDecoderUtils.decode(saleTender, "UTF-8");
             saleTender1 = FlexJsonUtils.fromJson(saleTender, SaleTender.class);
         }
         if (null != attaches && !"".equals(attaches)) {
-            attaches = URLDecoder.decode(attaches, "UTF-8");
+            attaches = URLDecoderUtils.decode(attaches, "UTF-8");
             List<Attach> saleTenderAttaches = FlexJsonUtils.fromJsonArray(attaches, Attach.class);
             return tenderService.reply(saleTender1, saleTenderAttaches);
         }
@@ -180,7 +180,7 @@ public class TenderController {
      */
     @RequestMapping(value = "/addcontact", method = RequestMethod.POST)
     public ModelMap savecontact(String contact) throws UnsupportedEncodingException {
-        contact = URLDecoder.decode(contact, "UTF-8");
+        contact = URLDecoderUtils.decode(contact, "UTF-8");
         VendorContact vendor = JSON.parseObject(contact, VendorContact.class);
         vendorService.saveContact(vendor);
         ModelMap map = new ModelMap();
@@ -223,7 +223,7 @@ public class TenderController {
     @RequestMapping(value = "/decide", method = RequestMethod.POST)
     @ResponseBody
     public ModelMap decideTender(String saleTenderItems) throws UnsupportedEncodingException {
-        saleTenderItems = URLDecoder.decode(saleTenderItems, "UTF-8");
+        saleTenderItems = URLDecoderUtils.decode(saleTenderItems, "UTF-8");
         List<SaleTenderItem> tenderItems = FlexJsonUtils.fromJsonArray(saleTenderItems, SaleTenderItem.class);
         return tenderService.decide(tenderItems);
     }
@@ -633,21 +633,21 @@ public class TenderController {
     @ResponseBody
     @Transactional
     public ModelMap publishSavedTender(String tender, String enInfos, String attaches) throws UnsupportedEncodingException {
-        tender = URLDecoder.decode(tender, "UTF-8");
+        tender = URLDecoderUtils.decode(tender, "UTF-8");
         PurchaseTender purchaseTender = FlexJsonUtils.fromJson(tender, PurchaseTender.class);
         if (purchaseTender.getIfOpen() == Constant.YES) { // 开放时进另外的方法
             if (null != attaches) {
-                attaches = URLDecoder.decode(attaches, "UTF-8");
+                attaches = URLDecoderUtils.decode(attaches, "UTF-8");
                 List<Attach> attachList = FlexJsonUtils.fromJsonArray(attaches, Attach.class);
                 return tenderService.publishSavedOpen(purchaseTender, attachList);
             }
             return tenderService.publishSavedOpen(purchaseTender);
         } else {
             if (null != enInfos) {
-                enInfos = URLDecoder.decode(enInfos, "UTF-8");
+                enInfos = URLDecoderUtils.decode(enInfos, "UTF-8");
                 List<TenderContactInfo> contactInfos = FlexJsonUtils.fromJsonArray(enInfos, TenderContactInfo.class);
                 if (null != attaches) {
-                    attaches = URLDecoder.decode(attaches, "UTF-8");
+                    attaches = URLDecoderUtils.decode(attaches, "UTF-8");
                     List<Attach> attachList = FlexJsonUtils.fromJsonArray(attaches, Attach.class);
                     return tenderService.publishSaved(purchaseTender, contactInfos, attachList);
                 } else {
@@ -655,7 +655,7 @@ public class TenderController {
                 }
             } else {
                 if (null != attaches) {
-                    attaches = URLDecoder.decode(attaches, "UTF-8");
+                    attaches = URLDecoderUtils.decode(attaches, "UTF-8");
                     List<Attach> attachList = FlexJsonUtils.fromJsonArray(attaches, Attach.class);
                     return tenderService.publishSaved(purchaseTender, null, attachList);
                 } else {
@@ -675,21 +675,21 @@ public class TenderController {
     @ResponseBody
     @Transactional
     public ModelMap updateSavedTender(String tender, String enInfos, String attaches) throws UnsupportedEncodingException {
-        tender = URLDecoder.decode(tender, "UTF-8");
+        tender = URLDecoderUtils.decode(tender, "UTF-8");
         PurchaseTender purchaseTender = FlexJsonUtils.fromJson(tender, PurchaseTender.class);
         if (purchaseTender.getIfOpen() == Constant.YES) { // 开放时进另外的方法
             if (null != attaches) {
-                attaches = URLDecoder.decode(attaches, "UTF-8");
+                attaches = URLDecoderUtils.decode(attaches, "UTF-8");
                 List<Attach> attachList = FlexJsonUtils.fromJsonArray(attaches, Attach.class);
                 return tenderService.updateSavedOpen(purchaseTender, attachList);
             }
             return tenderService.updateSavedOpen(purchaseTender);
         } else {
             if (null != enInfos) {
-                enInfos = URLDecoder.decode(enInfos, "UTF-8");
+                enInfos = URLDecoderUtils.decode(enInfos, "UTF-8");
                 List<TenderContactInfo> contactInfos = FlexJsonUtils.fromJsonArray(enInfos, TenderContactInfo.class);
                 if (null != attaches) {
-                    attaches = URLDecoder.decode(attaches, "UTF-8");
+                    attaches = URLDecoderUtils.decode(attaches, "UTF-8");
                     List<Attach> attachList = FlexJsonUtils.fromJsonArray(attaches, Attach.class);
                     return tenderService.updateSaved(purchaseTender, contactInfos, attachList);
                 } else {
@@ -697,7 +697,7 @@ public class TenderController {
                 }
             } else {
                 if (null != attaches) {
-                    attaches = URLDecoder.decode(attaches, "UTF-8");
+                    attaches = URLDecoderUtils.decode(attaches, "UTF-8");
                     List<Attach> attachList = FlexJsonUtils.fromJsonArray(attaches, Attach.class);
                     return tenderService.updateSaved(purchaseTender, null, attachList);
                 } else {
@@ -807,7 +807,7 @@ public class TenderController {
      */
     @RequestMapping(value = "/decide/all", method = RequestMethod.POST)
     public ModelMap decideTenderAll (String data) throws UnsupportedEncodingException {
-        data = URLDecoder.decode(data, "UTF-8");
+        data = URLDecoderUtils.decode(data, "UTF-8");
         List<DecideTender> decideTenders = FlexJsonUtils.fromJsonArray(data, DecideTender.class);
         return tenderService.decideTenderAll(decideTenders);
     }
@@ -842,7 +842,7 @@ public class TenderController {
      */
     @RequestMapping(value = "/question/answer/save", method = RequestMethod.POST)
     public ModelMap saveQuestionAnswer(String data) throws UnsupportedEncodingException {
-        data = URLDecoder.decode(data, "UTF-8");
+        data = URLDecoderUtils.decode(data, "UTF-8");
         PurchaseTenderAnswer answer = FlexJsonUtils.fromJson(data, PurchaseTenderAnswer.class);
         return tenderService.saveQuestionAnswer(answer);
     }

src/main/java/com/uas/platform/b2b/erp/controller/UserController.java

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 
 /**
  * Created by wangmh on 2017/8/9.

src/main/java/com/uas/platform/b2b/erp/controller/UserSpaceDetailController.java

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.erp.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import com.uas.platform.b2b.erp.model.B2BCustomer;
 import com.uas.platform.b2b.erp.model.B2BVendor;
 import com.uas.platform.b2b.erp.model.PageInfo;
@@ -27,7 +28,7 @@ import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -68,7 +69,7 @@ public class UserSpaceDetailController {
 	@RequestMapping(method = RequestMethod.GET)
 	public Page<UserSpaceView> UserSpaceInfo(@RequestParam("data") String data) throws UnsupportedEncodingException {
 		Page<UserSpaceView> details = new Page<UserSpaceView>();
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		PageInfo pageInfo = FlexJsonUtils.fromJson(jsonStr, PageInfo.class);
 		com.uas.platform.core.model.PageParams params = new com.uas.platform.core.model.PageParams();
 		params.setPage(pageInfo.getPageNumber());
@@ -93,9 +94,9 @@ public class UserSpaceDetailController {
 	@RequestMapping(value="/invitations", method = RequestMethod.GET)
 	public Page<InvitationRecord> invitations(@RequestParam("data") String data, @RequestParam("onlySelf") String onlySelf) throws UnsupportedEncodingException {
 		Page<InvitationRecord> records = new Page<InvitationRecord>();
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		PageInfo pageInfo = FlexJsonUtils.fromJson(jsonStr, PageInfo.class);
-		onlySelf = URLDecoder.decode(onlySelf, "UTF-8");
+		onlySelf = URLDecoderUtils.decode(onlySelf, "UTF-8");
 		// 是否只看自己，是为1，查看所有为0
 		Integer ifSelf = FlexJsonUtils.fromJson(onlySelf, Integer.class);
 		com.uas.platform.core.model.PageParams params = new com.uas.platform.core.model.PageParams();
@@ -138,7 +139,7 @@ public class UserSpaceDetailController {
 	@RequestMapping(value = "/vendor", method = RequestMethod.GET)
 	@ResponseBody
 	public Page<B2BVendor> getVendors(@RequestParam("pageInfo") String pageInfo) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(pageInfo, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(pageInfo, "UTF-8");
 		PageInfo info = JSON.parseObject(jsonStr, PageInfo.class);
 		String keyword = info.getKeyword();
 		PageParams pageParams = new PageParams();
@@ -162,7 +163,7 @@ public class UserSpaceDetailController {
 	@RequestMapping(value = "/servicer", method = RequestMethod.GET)
 	@ResponseBody
 	public Page<B2BVendor> getServicer(@RequestParam("pageInfo") String pageInfo) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(pageInfo, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(pageInfo, "UTF-8");
 		PageInfo info = JSON.parseObject(jsonStr, PageInfo.class);
 		String keyword = info.getKeyword();
 		PageParams pageParams = new PageParams();
@@ -187,7 +188,7 @@ public class UserSpaceDetailController {
 	@RequestMapping(value = "/customer", method = RequestMethod.GET)
 	@ResponseBody
 	public Page<B2BCustomer> getCustomers(@RequestParam("pageInfo") String pageInfo) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(pageInfo, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(pageInfo, "UTF-8");
 		PageInfo info = JSON.parseObject(jsonStr, PageInfo.class);
 		String keyword = info.getKeyword();
 		com.uas.search.b2b.model.PageParams pageParams = new com.uas.search.b2b.model.PageParams();
@@ -225,7 +226,7 @@ public class UserSpaceDetailController {
 	@RequestMapping(value = "/request", method = RequestMethod.GET)
 	@ResponseBody
 	public Page<BasePartnersInfo> getDoneRequest(@RequestParam("data") String data) throws Exception {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		PageInfo info = JSON.parseObject(jsonStr, PageInfo.class);
 		return addPartnerService.findByBusCodeAndKeyWord(info.getKeyword(), Status.ENABLED.value(), info.getPageSize(),
                 info.getPageNumber());
@@ -241,7 +242,7 @@ public class UserSpaceDetailController {
 	@RequestMapping(value = "/addSupplier", method = RequestMethod.POST)
 	@ResponseBody
 	public ModelMap addSupplier(@RequestParam("businessCode") String businessCode) throws UnsupportedEncodingException {
-		businessCode = URLDecoder.decode(businessCode, "UTF-8");
+		businessCode = URLDecoderUtils.decode(businessCode, "UTF-8");
 		return addPartnerService.addSupplier(businessCode);
 	}
 
@@ -254,7 +255,7 @@ public class UserSpaceDetailController {
 	@RequestMapping(value = "/addServicer", method = RequestMethod.POST)
 	@ResponseBody
 	public ModelMap addServicer(@RequestParam("businessCode") String businessCode) throws UnsupportedEncodingException {
-		businessCode = URLDecoder.decode(businessCode, "UTF-8");
+		businessCode = URLDecoderUtils.decode(businessCode, "UTF-8");
 		return addPartnerService.addServicer(businessCode);
 	}
 
@@ -267,7 +268,7 @@ public class UserSpaceDetailController {
 	@RequestMapping(value = "/addCust", method = RequestMethod.POST)
 	@ResponseBody
 	public ModelMap addCust(@RequestParam("businessCode") String businessCode) throws UnsupportedEncodingException {
-		businessCode = URLDecoder.decode(businessCode, "UTF-8");
+		businessCode = URLDecoderUtils.decode(businessCode, "UTF-8");
 		return addPartnerService.addCust(businessCode);
 	}
 
@@ -349,7 +350,7 @@ public class UserSpaceDetailController {
 	 */
 	@RequestMapping(value = "/invite", method = RequestMethod.POST)
 	private ModelMap invite(@RequestParam("data")String data) throws UnsupportedEncodingException {
-		String formStore = URLDecoder.decode(data, "UTF-8");
+		String formStore = URLDecoderUtils.decode(data, "UTF-8");
 		InvitationRecord record = FlexJsonUtils.fromJson(formStore, InvitationRecord.class);
 		return invitationRecordService.invite(record);
 	}

src/main/java/com/uas/platform/b2b/erp/controller/VendorPerformanceAssessErpController.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -45,7 +45,7 @@ public class VendorPerformanceAssessErpController {
     @RequestMapping(method = RequestMethod.POST)
     @ResponseBody
     public void saveVPAs(@RequestParam("data") String data) throws UnsupportedEncodingException {
-        String jsonStr = URLDecoder.decode(data, "UTF-8");
+        String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
         List<VendorPerformanceAssessErp> vpas = FlexJsonUtils.fromJsonArray(jsonStr, VendorPerformanceAssessErp.class);
         vpaService.save(vpaErpService.convertVPA(vpas));
         logger.log("供应商绩效考核信息", "上传供应商绩效考核信息", vpas.size());
@@ -84,7 +84,7 @@ public class VendorPerformanceAssessErpController {
     @RequestMapping(value = "/refreshDownloadstatus", method = RequestMethod.POST)
     @ResponseBody
     public void refreshDownloadstatus(@RequestParam("data") String data) throws UnsupportedEncodingException {
-        vpaService.onVPADownSuccess(URLDecoder.decode(data, "UTF-8").split(","));
+        vpaService.onVPADownSuccess(URLDecoderUtils.decode(data, "UTF-8").split(","));
     }
 
 

src/main/java/com/uas/platform/b2b/erp/controller/VendorRateController.java

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.Arrays;
 import java.util.List;
 
@@ -43,7 +43,7 @@ public class VendorRateController {
 	@RequestMapping(value = "/rate", method = RequestMethod.POST)
 	@ResponseBody
 	public void uploadVendorRate(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<VendorRate> rates = JSONArray.parseArray(jsonStr, VendorRate.class);
 		logger.log("供应商", "更改供应商税率", rates.size());
 		if(!CollectionUtils.isEmpty(rates)){
@@ -74,7 +74,7 @@ public class VendorRateController {
 	@RequestMapping(value = "/apcheck", method = RequestMethod.POST)
 	@ResponseBody
 	public void uploadB2BApcheck(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<VendorInfo> infos = JSONArray.parseArray(jsonStr, VendorInfo.class);
 		logger.log("供应商资料", "设置是否启用平台对账功能", infos.size());
 		if (!CollectionUtils.isEmpty(infos)) {
@@ -105,7 +105,7 @@ public class VendorRateController {
 	@RequestMapping(value = "/invite", method = RequestMethod.POST)
 	@ResponseBody
 	public void uploadVendorInfo(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
 		List<InquiryVendorInfo> infos = JSONArray.parseArray(jsonStr, InquiryVendorInfo.class);
 		vendorService.saveInvitation(infos);
 		logger.log("供应商资料", "邀请供应商开通平台", infos.size());
@@ -130,6 +130,6 @@ public class VendorRateController {
 	@RequestMapping(value = "/check", method = RequestMethod.POST)
 	@ResponseBody
 	public void checkSuccess(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		vendorService.updateStatus(URLDecoder.decode(data, "UTF-8"));
+		vendorService.updateStatus(URLDecoderUtils.decode(data, "UTF-8"));
 	}
 }

src/main/java/com/uas/platform/b2b/erp/listen/controller/ListenController.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.List;
 
 
@@ -31,7 +31,7 @@ public class ListenController {
      */
     @RequestMapping(method = RequestMethod.POST)
     public void save(@RequestParam("data") String data) throws UnsupportedEncodingException {
-        String jsonStr = URLDecoder.decode(data, "UTF-8");
+        String jsonStr = URLDecoderUtils.decode(data, "UTF-8");
         List<Listen> listens = FlexJsonUtils.fromJsonArray(jsonStr, Listen.class);
         listenService.save(listens);
     }

src/main/java/com/uas/platform/b2b/erp/service/impl/OrderSendStatusServiceImpl.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.erp.service.impl;
 
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import com.uas.platform.b2b.dao.CommonDao;
 import com.uas.platform.b2b.erp.model.OrderSendStatusColumn;
 import com.uas.platform.b2b.erp.model.Role;
@@ -12,7 +13,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -33,7 +34,7 @@ public class OrderSendStatusServiceImpl implements OrderSendStatusService {
         for (OrderSendStatusColumn column : columns) {
             List<OrderSendStatusColumn> statusColumnList = new ArrayList<OrderSendStatusColumn>();
             String sql = "select code,b2b_id,erp_id id from v$erp$orderid where code = '" + column.getCode()
-                    + "' and sourcetable = '" + URLDecoder.decode(tableName, "UTF-8") + "' ";
+                    + "' and sourcetable = '" + URLDecoderUtils.decode(tableName, "UTF-8") + "' ";
             if (role.equals(Role.BUYER.name())) {
                 sql = sql + "and custuu = " + SystemSession.getUser().getEnterprise().getUu();
             } else if (role.equals(Role.SELLER.name())) {

src/main/java/com/uas/platform/b2b/listener/GlobalExceptionHandler.java

@@ -2,6 +2,7 @@ package com.uas.platform.b2b.listener;
 
 import com.alibaba.fastjson.JSON;
 import com.uas.platform.b2b.core.util.ContextUtils;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import com.uas.platform.b2b.dao.ErrorLogDao;
 import com.uas.platform.b2b.dao.ErrorLogDetailDao;
 import com.uas.platform.b2b.model.ErrorLog;
@@ -95,7 +96,7 @@ public class GlobalExceptionHandler {
         String errMsg = e.getCause() == null ? "" : e.getCause().getMessage();
         ErrorLog log = logDao.save(new ErrorLog(JSON.toJSONString(msgs), e.toString(), url, errMsg));
         if (!StringUtils.isEmpty(log.getId())) {
-            detailDao.save(new ErrorLogDetail(log.getId(), AgentUtils.getIp(request), needRead, StringUtils.isEmpty(data) ? "" : URLDecoder.decode(data, Consts.UTF_8.toString()), access));
+            detailDao.save(new ErrorLogDetail(log.getId(), AgentUtils.getIp(request), needRead, StringUtils.isEmpty(data) ? "" : URLDecoderUtils.decode(data, Consts.UTF_8.toString()), access));
         }
         HttpHeaders headers = new HttpHeaders();
         headers.add("Content-Type", "application/text; charset=utf-8");

src/main/java/com/uas/platform/b2b/manage/controller/NoticeController.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.manage.controller;
 
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import com.uas.platform.b2b.manage.model.ManageNotice;
 import com.uas.platform.b2b.service.NoticeService;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
@@ -8,7 +9,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 
 /**
  * 系统公告请求
@@ -32,7 +33,7 @@ public class NoticeController {
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
 	public void save(@RequestParam("data") String data) throws UnsupportedEncodingException{
-		String noticeStr = URLDecoder.decode(data, "UTF-8");
+		String noticeStr = URLDecoderUtils.decode(data, "UTF-8");
 		ManageNotice notice = FlexJsonUtils.fromJson(noticeStr, ManageNotice.class);
 		noticeService.save(notice.convert());
 	}

src/main/java/com/uas/platform/b2b/mobile/controller/SaleController.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.mobile.controller;
 
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import com.uas.platform.b2b.dao.PurchaseOrderAllDao;
 import com.uas.platform.b2b.dao.PurchaseOrderDoneDao;
 import com.uas.platform.b2b.dao.PurchaseOrderTodoDao;
@@ -510,7 +511,7 @@ public class SaleController {
 	 */
 	@RequestMapping(value = "/reply")
 	public ResponseEntity<String> replyOrderItem(String json) throws UnsupportedEncodingException {
-		List<OrderReply> orderReplies = FlexJsonUtils.fromJsonArray(URLDecoder.decode(json, "utf-8"), OrderReply.class);
+		List<OrderReply> orderReplies = FlexJsonUtils.fromJsonArray(URLDecoderUtils.decode(json, "utf-8"), OrderReply.class);
 		for (OrderReply orderReply : orderReplies) {
 			Long pdId = orderReply.getPdId();
 			PurchaseOrderReply reply = orderReply.convert();

src/main/java/com/uas/platform/b2b/openapi/controller/UsoftFxController.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.openapi.controller;
 
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import com.uas.platform.b2b.openapi.model.FxPurOrder;
 import com.uas.platform.b2b.openapi.model.FxPurcAcceptItem;
 import com.uas.platform.b2b.openapi.service.UsoftFxService;
@@ -9,7 +10,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import java.util.*;
 
 /**
@@ -40,7 +41,7 @@ public class UsoftFxController {
                                    @RequestParam(value = "endDate", required = false) Long endDate) throws UnsupportedEncodingException {
         String acceptItems = null;
         if (!StringUtils.isEmpty(excludeAcceptItemIds)) {
-            acceptItems = URLDecoder.decode(excludeAcceptItemIds, "UTF-8");
+            acceptItems = URLDecoderUtils.decode(excludeAcceptItemIds, "UTF-8");
         }
         List<Long> excludeItemsIds = new ArrayList<>();
         if (!StringUtils.isEmpty(acceptItems)) {

src/main/java/com/uas/platform/b2b/publicapi/controller/InviteRecordController.java

@@ -2,6 +2,7 @@ package com.uas.platform.b2b.publicapi.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2b.core.util.URLDecoderUtils;
 import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.EnterpriseBaseInfo;
 import com.uas.platform.b2b.model.InvitationRecord;
@@ -147,7 +148,7 @@ public class InviteRecordController {
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     private ModelMap addInvitation(String jsonStr) throws UnsupportedEncodingException {
         System.out.println(jsonStr);
-        String str = URLDecoder.decode(jsonStr, "UTF-8");
+        String str = URLDecoderUtils.decode(jsonStr, "UTF-8");
         str = str.replaceAll(" ", "");
         str = str.replaceAll("\\\\n", "");
         InvitationRecord record = JSONObject.parseObject(str, InvitationRecord.class);
@@ -248,7 +249,7 @@ public class InviteRecordController {
         if (StringUtils.isEmpty(enUU) || StringUtils.isEmpty(userUU)) {
             throw new IllegalAccessError("企业UU或用户UU不能为空");
         }
-        String str = URLDecoder.decode(invitations, "UTF-8");
+        String str = URLDecoderUtils.decode(invitations, "UTF-8");
         List<InvitationRecord> records = JSON.parseArray(str, InvitationRecord.class);
         logger.log("邀请注册", "批量新增邀请，来源" + source, invitations.length() > 1000 ? invitations.substring(0, 1000).concat("...") : invitations, userUU, enUU);
         return inviteRecordService.inviteByBatch(enUU, userUU, records, source);

src/main/resources/dev/jdbc.properties

@@ -16,7 +16,7 @@ jdbc.removeAbandoned=true
 jdbc.removeAbandonedTimeout=1800
 
 #manage.ubtob.com
-manage.jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
+manage.jdbc.driverClassName=oracle.jdbc.OracleDriver
 manage.jdbc.url=jdbc:oracle:thin:@192.168.253.12:1521:orcl
 manage.jdbc.username=platformmanager$test
 manage.jdbc.password=select!#%*(

src/main/resources/ptest/jdbc.properties

@@ -17,7 +17,7 @@ jdbc.removeAbandoned=true
 jdbc.removeAbandonedTimeout=1800
 
 #manage.ubtob.com
-manage.jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
+manage.jdbc.driverClassName=oracle.jdbc.OracleDriver
 manage.jdbc.url=jdbc:oracle:thin:@//113.105.74.137:1521/orcl
 manage.jdbc.username=platformmanager
 manage.jdbc.password=select!#%*(

src/main/resources/txcloud/jdbc.properties

@@ -20,7 +20,7 @@ jdbc.removeAbandoned=true
 jdbc.removeAbandonedTimeout=1800
 
 #manage.ubtob.com
-manage.jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
+manage.jdbc.driverClassName=oracle.jdbc.OracleDriver
 manage.jdbc.url=jdbc:oracle:thin:@//113.105.74.137:1522/orcl
 manage.jdbc.username=platformmanager
 manage.jdbc.password=select!#%*(