物料工具类消息公共接口地址修改为在配置文件配置

src/main/java/com/uas/platform/b2b/ps/ProductUtils.java

@@ -1,7 +1,9 @@
 package com.uas.platform.b2b.ps;
 
 import com.alibaba.fastjson.JSON;
+import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.model.Product;
+import com.uas.platform.b2b.support.SysConf;
 import com.uas.platform.core.util.HttpUtil;
 import com.uas.platform.core.util.HttpUtil.Response;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
@@ -21,7 +23,7 @@ import java.util.List;
  */
 public class ProductUtils {
 
-    private static final String PRODUCT_PUBLIC_SERVICE_DEV_URL = "http://218.17.158.219:24000";
+    private static final String PRODUCT_PUBLIC_SERVICE_URL = ContextUtils.getBean(SysConf.class).getProductServiceUrl();
 
     /**
      * 批量更新物料
@@ -34,7 +36,7 @@ public class ProductUtils {
     public static List<Long> update(List<Product> products) throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("data", FlexJsonUtils.toJsonDeep(products));
-        Response res = HttpUtil.sendPostRequest(PRODUCT_PUBLIC_SERVICE_DEV_URL + "/product/update", params);
+        Response res = HttpUtil.sendPostRequest(PRODUCT_PUBLIC_SERVICE_URL + "/product/update", params);
         if (HttpStatus.OK.value() == res.getStatusCode()) {
             if (null != res.getResponseText()) {
                 // 保存成功物料的id
@@ -59,7 +61,7 @@ public class ProductUtils {
         List<Product> products = new ArrayList<>();
         products.add(product);
         params.put("data", FlexJsonUtils.toJsonDeep(products));
-        Response res = HttpUtil.sendPostRequest(PRODUCT_PUBLIC_SERVICE_DEV_URL + "/product/update", params);
+        Response res = HttpUtil.sendPostRequest(PRODUCT_PUBLIC_SERVICE_URL + "/product/update", params);
         if (HttpStatus.OK.value() == res.getStatusCode()) {
             if (null != res.getResponseText()) {
                 // 保存成功物料的id
@@ -86,7 +88,7 @@ public class ProductUtils {
     public static ModelMap deleteProductUser(Long id) throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("id", id);
-        Response res = HttpUtil.sendPostRequest(PRODUCT_PUBLIC_SERVICE_DEV_URL + "/productuser/edit/delete", params);
+        Response res = HttpUtil.sendPostRequest(PRODUCT_PUBLIC_SERVICE_URL + "/productuser/edit/delete", params);
         if (HttpStatus.OK.value() == res.getStatusCode()) {
             return new ModelMap("success", "删除个人物料成功");
         } else {
@@ -105,7 +107,7 @@ public class ProductUtils {
     public static ModelMap deleteMatchResultAndProductUser(Long id) throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("id", id);
-        Response res = HttpUtil.sendPostRequest(PRODUCT_PUBLIC_SERVICE_DEV_URL + "/product/matchResultAndProductUser/delete", params);
+        Response res = HttpUtil.sendPostRequest(PRODUCT_PUBLIC_SERVICE_URL + "/product/matchResultAndProductUser/delete", params);
         if (HttpStatus.OK.value() == res.getStatusCode()) {
             return new ModelMap("success", "删除匹配结果和个人物料");
         } else {
@@ -124,7 +126,7 @@ public class ProductUtils {
         params.put("enUU", enUU);
         params.put("switchType", switchType);
         params.put("switchStatus", switchStatus);
-        Response res = HttpUtil.sendPostRequest(PRODUCT_PUBLIC_SERVICE_DEV_URL + "/product/saleAndPurchase/edit/toggle", params);
+        Response res = HttpUtil.sendPostRequest(PRODUCT_PUBLIC_SERVICE_URL + "/product/saleAndPurchase/edit/toggle", params);
         if (HttpStatus.OK.value() != res.getStatusCode()) {
             throw new RuntimeException("一键操作失败");
         }
@@ -137,7 +139,7 @@ public class ProductUtils {
     public static void matchAll(Long enUU) throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("enUU", enUU);
-        Response res = HttpUtil.sendPostRequest(PRODUCT_PUBLIC_SERVICE_DEV_URL + "/product/match/nonProduct", params);
+        Response res = HttpUtil.sendPostRequest(PRODUCT_PUBLIC_SERVICE_URL + "/product/match/nonProduct", params);
         if (HttpStatus.OK.value() != res.getStatusCode()) {
             throw new RuntimeException("一键匹配失败");
         }
@@ -154,7 +156,7 @@ public class ProductUtils {
         params.put("id", id);
         params.put("switchType", switchType);
         params.put("switchStatus", switchStatus);
-        Response res = HttpUtil.sendPostRequest(PRODUCT_PUBLIC_SERVICE_DEV_URL + "/product/edit/toggle/one", params);
+        Response res = HttpUtil.sendPostRequest(PRODUCT_PUBLIC_SERVICE_URL + "/product/edit/toggle/one", params);
         if (HttpStatus.OK.value() != res.getStatusCode()) {
             throw new RuntimeException("操作失败");
         }
@@ -169,7 +171,7 @@ public class ProductUtils {
         HashMap<String, Object> params = new HashMap<>();
         params.put("enUU", enUU);
         params.put("idList", idList);
-        Response res = HttpUtil.sendPostRequest(PRODUCT_PUBLIC_SERVICE_DEV_URL + "/product/match/selected", params);
+        Response res = HttpUtil.sendPostRequest(PRODUCT_PUBLIC_SERVICE_URL + "/product/match/selected", params);
         if (HttpStatus.OK.value() != res.getStatusCode()) {
             throw new RuntimeException("匹配所选失败");
         }

src/main/java/com/uas/platform/b2b/support/SysConf.java

@@ -54,6 +54,14 @@ public class SysConf {
     @Value("#{sys.registerUrl}")
     private String registerUrl;
 
+	/**
+	 * 物料公共服务地址
+	 *
+	 * @return
+	 */
+	@Value("#{sys.productServiceUrl}")
+	private String productServiceUrl;
+
     public String getRegisterUrl() {
         return registerUrl;
     }
@@ -118,4 +126,11 @@ public class SysConf {
 		this.reportUploadUrl = reportUploadUrl;
 	}
 
+	public String getProductServiceUrl() {
+		return productServiceUrl;
+	}
+
+	public void setProductServiceUrl(String productServiceUrl) {
+		this.productServiceUrl = productServiceUrl;
+	}
 }

src/main/resources/dev/sys.properties

@@ -8,4 +8,7 @@ registerUrl=http://10.10.100.133/sso/register
 
 #report url
 reportPrintUrl=http://print.ubtob.com/report/print?userName=B2B%s&profile=${profile}&reportName=%s&whereCondition=%s
-reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2B%s
+reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2B%s
+
+#product service url
+productServiceUrl=http://218.17.158.219:24000

src/main/resources/prod/sys.properties

@@ -9,3 +9,6 @@ registerUrl=https://account.ubtob.com/sso/register
 #report url
 reportPrintUrl=http://print.ubtob.com/report/print?userName=B2B%s&profile=${profile}&reportName=%s&whereCondition=%s
 reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2B%s
+
+#product service url
+productServiceUrl=

src/main/resources/test/sys.properties

@@ -8,4 +8,7 @@ registerUrl=http://10.10.100.133/sso/register
 
 #report url
 reportPrintUrl=http://print.ubtob.com/report/print?userName=B2B%s&profile=${profile}&reportName=%s&whereCondition=%s
-reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2B%s
+reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2B%s
+
+#product service url
+productServiceUrl=http://218.17.158.219:24000