增加访问公共询价服务地址为配置读取方式

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

@@ -5,12 +5,15 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.alibaba.fastjson.parser.Feature;
 import com.uas.account.support.Page;
+import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.support.SysConf;
 import com.uas.platform.b2b.temporary.model.InquiryDetailInfo;
 import com.uas.platform.b2b.temporary.model.InquiryMessage;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.util.HttpUtil;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import org.apache.http.HttpStatus;
 import org.springframework.ui.ModelMap;
 
 import java.util.List;
@@ -25,7 +28,7 @@ public class InquiryUtils {
     /**
      * 访问地址
      */
-    private static String url = "http://192.168.253.12:24000";
+    private static final String url = ContextUtils.getBean(SysConf.class).getProductServiceUrl();
 
     /**
      * 传递数据到公共询价接口方法
@@ -157,7 +160,7 @@ public class InquiryUtils {
         formData.put("id", id);
         formData.put("status", status);
         HttpUtil.Response res = HttpUtil.sendPostRequest(url + "/inquiry/buyer/decide", formData);
-        if (res.getStatusCode() != 200) {
+        if (res.getStatusCode() != HttpStatus.SC_OK) {
             throw new Exception("审核失败");
         }
     }
@@ -175,7 +178,7 @@ public class InquiryUtils {
         formData.put("id", id);
         formData.put("en_uu", enuu);
         HttpUtil.Response res = HttpUtil.sendGetRequest(url + "/inquiry/sale/quote", formData);
-        if (res.getStatusCode() == 200) {
+        if (res.getStatusCode() == HttpStatus.SC_OK) {
             if (null != res.getResponseText()) {
                 return JSONObject.parseObject(res.getResponseText(), PublicInquiryItem.class);
             }
@@ -198,7 +201,7 @@ public class InquiryUtils {
         formData.put("itemId", id);
         formData.put("en_uu", enuu);
         HttpUtil.Response res = HttpUtil.sendGetRequest(url + "/inquiry/sale/inquiry/detail", formData);
-        if (res.getStatusCode() == 200) {
+        if (res.getStatusCode() == HttpStatus.SC_OK) {
             if (null != res.getResponseText()) {
                 return JSONObject.parseObject(res.getResponseText(), PublicInquiryItem.class);
             }
@@ -242,7 +245,7 @@ public class InquiryUtils {
         formData.put("id", id);
         formData.put("enuu", enuu);
         HttpUtil.Response res = HttpUtil.sendGetRequest(url + "/inquiry/buyer/detail", formData);
-        if (res.getStatusCode() == 200) {
+        if (res.getStatusCode() == HttpStatus.SC_OK) {
             if (null != res.getResponseText()) {
                 return JSONObject.parseObject(res.getResponseText(), InquiryDetailInfo.class);
             }
@@ -265,7 +268,7 @@ public class InquiryUtils {
         formData.put("enuu", enuu);
         formData.put("size", size);
         HttpUtil.Response res = HttpUtil.sendGetRequest(url + "/inquiry/public/messageList", formData);
-        if (res.getStatusCode() == 200) {
+        if (res.getStatusCode() == HttpStatus.SC_OK) {
             if (null != res.getResponseText()) {
                 return JSONObject.parseArray(res.getResponseText(), InquiryMessage.class);
             }
@@ -284,7 +287,7 @@ public class InquiryUtils {
      */
     public static Attach getAttach(Long id) throws Exception {
         HttpUtil.Response res = HttpUtil.sendGetRequest(url + "/inquiry/public/attachUrl?id=" + id, null);
-        if (res.getStatusCode() == 200) {
+        if (res.getStatusCode() == HttpStatus.SC_OK) {
             if (null != res.getResponseText()) {
                 return JSONObject.parseObject(res.getResponseText(), Attach.class);
             }

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

@@ -62,6 +62,14 @@ public class SysConf {
 	@Value("#{sys.productServiceUrl}")
 	private String productServiceUrl;
 
+	/**
+	 * 公共询价服务地址
+	 *
+	 * @return
+	 */
+	@Value("#{sys.inquiryServiceUrl}")
+	private String inquiryServiceUrl;
+
     public String getRegisterUrl() {
         return registerUrl;
     }
@@ -133,4 +141,12 @@ public class SysConf {
 	public void setProductServiceUrl(String productServiceUrl) {
 		this.productServiceUrl = productServiceUrl;
 	}
+
+	public String getInquiryServiceUrl() {
+		return inquiryServiceUrl;
+	}
+
+	public void setInquiryServiceUrl(String inquiryServiceUrl) {
+		this.inquiryServiceUrl = inquiryServiceUrl;
+	}
 }

src/main/resources/dev/sys.properties

@@ -11,4 +11,7 @@ reportPrintUrl=http://print.ubtob.com/report/print?userName=B2B%s&profile=${prof
 reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2B%s
 
 #product service url
-productServiceUrl=http://218.17.158.219:24000
+productServiceUrl=http://218.17.158.219:24000
+
+#inquiry service url
+inquiryServiceUrl=http://218.17.158.219:24000

src/main/resources/prod/sys.properties

@@ -11,4 +11,7 @@ reportPrintUrl=http://print.ubtob.com/report/print?userName=B2B%s&profile=${prof
 reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2B%s
 
 #product service url
-productServiceUrl=
+productServiceUrl=
+
+#inquiry service url
+inquiryServiceUrl=

src/main/resources/test/sys.properties

@@ -11,4 +11,7 @@ reportPrintUrl=http://print.ubtob.com/report/print?userName=B2B%s&profile=${prof
 reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2B%s
 
 #product service url
-productServiceUrl=http://218.17.158.219:24000
+productServiceUrl=http://218.17.158.219:24000
+
+#inquiry service url
+inquiryServiceUrl=http://218.17.158.219:24000