Merge branch 'hotfix-20190213-suntg' into dev

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

@@ -222,7 +222,8 @@ public class SaleApCheckController {
      * @return ModelMap 封装成功信息以及异常信息
 	 */
 	@RequestMapping(value = "/operation/save", method = RequestMethod.POST)
-	public ModelMap saveApCheck(@RequestBody String json) {
+	public ModelMap saveApCheck(@RequestBody String json) throws UnsupportedEncodingException {
+		json = URLDecoder.decode(json, "UTF-8");
 		PurchaseApCheck apCheck = FlexJsonUtils.fromJson(json, PurchaseApCheck.class);
 		return purchaseApCheckService.checkCount(apCheck);
 	}
@@ -287,7 +288,8 @@ public class SaleApCheckController {
 	@RequestMapping(value = "/info/search", method = RequestMethod.GET)
 	public SPage<PurchaseApCheck> getPurchaseApChecks(PageParams params, String searchFilter) throws UnsupportedEncodingException {
 		LOGGER.log("应收对账单", "作为买家，获取全部应收对账单");
-		SearchFilter filter = JSONObject.parseObject(URLDecoder.decode(searchFilter, "UTF-8"), SearchFilter.class);
+		searchFilter = URLDecoder.decode(searchFilter, "UTF-8");
+		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
 		if (StringUtils.isEmpty(filter.getKeyword())) {
             PageInfo pageInfo = new PageInfo(params);
             pageInfo.filter("enUu", SystemSession.getUser().getEnterprise().getUu());

src/main/resources/dev/sys.properties

@@ -20,7 +20,7 @@ inquiryServiceUrl=https://test-inquiry.uuzcc.cn
 messageServiceIp=http://message.ubtob.com/
 
 #search url
-searchUrl=http://188.131.128.107:24005
+searchUrl=https://test-b2b-search.uuzcc.cn
 
 #dfs file url
 dfsFileUrl=http://10.10.100.200:9999