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

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

@@ -4,7 +4,9 @@ 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.support.HttpUtils;
+import com.uas.platform.b2b.support.MessageConf;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.temporary.model.MessageModel;
 import org.springframework.http.HttpStatus;
@@ -20,7 +22,9 @@ import java.util.HashMap;
  */
 public class MessageUtils {
 
-    private static final String MESSAGE_PUBLIC_SERVICE_DEV_URL = "";
+
+    //TODO 其他也修改为从properties取
+    private static final String MESSAGE_PUBLIC_SERVICE_URL = ContextUtils.getBean(MessageConf.class).getMessagePublicServiceDevUrl();
 
     /**
      * 获取公共消息的方法
@@ -38,7 +42,7 @@ public class MessageUtils {
         params.put("consumerApp", "B2B");
         params.put("page", page);
         params.put("size", size);
-        HttpUtils.Response res = HttpUtils.get(MESSAGE_PUBLIC_SERVICE_DEV_URL + "/message", params);
+        HttpUtils.Response res = HttpUtils.get(MESSAGE_PUBLIC_SERVICE_URL + "/message", params);
         if (HttpStatus.OK.value() == res.getStatusCode()) {
             if (null != res.getResponseText()) {
                 return (Page) JSONObject.parseObject(res.getResponseText(), new TypeReference<Page<MessageModel>>() {
@@ -63,7 +67,7 @@ public class MessageUtils {
         HashMap<String, String> params = new HashMap<>();
         params.put("messageId", String.valueOf(id));
         params.put("consumerApp", "B2B");
-        HttpUtils.Response res = HttpUtils.post(MESSAGE_PUBLIC_SERVICE_DEV_URL + "/message/read", params);
+        HttpUtils.Response res = HttpUtils.post(MESSAGE_PUBLIC_SERVICE_URL + "/message/read", params);
         if (HttpStatus.OK.value() == res.getStatusCode()) {
             map.put("success", "成功设为已读");
             return map;

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

@@ -81,6 +81,13 @@ public class MessageConf {
 	@Value("#{message.messageUrl}")
 	private String messageUrl;
 
+	/**
+	 * 消息公共服务地址
+	 * @return
+	 */
+	@Value("#{message.messagePublicServiceDevUrl}")
+	private String messagePublicServiceDevUrl;
+
 	public String getTplInvitationForB2B() {
 		return tplInvitationForB2B;
 	}
@@ -168,4 +175,12 @@ public class MessageConf {
 	public void setMsgAutoInquiryForB2B(String msgAutoInquiryForB2B) {
 		this.msgAutoInquiryForB2B = msgAutoInquiryForB2B;
 	}
+
+	public String getMessagePublicServiceDevUrl() {
+		return messagePublicServiceDevUrl;
+	}
+
+	public void setMessagePublicServiceDevUrl(String messagePublicServiceDevUrl) {
+		this.messagePublicServiceDevUrl = messagePublicServiceDevUrl;
+	}
 }

src/main/resources/dev/message.properties

@@ -11,3 +11,5 @@ tplAutoInquiryForB2B=fe01ead8-1e26-43d9-8278-4f8a9b4b343c
 msgInquiryForB2B=629edeb3-a87e-4a40-a5e5-51d9ae734f1b
 msgAutoInquiryForB2B=8cf71d56-09bb-4d60-993e-ed87ce72ec3b
 messageUrl=http://message.ubtob.com/sms/send
+
+messagePublicServiceDevUrl=http://218.17.158.219:24000/message

src/main/resources/prod/message.properties

@@ -10,4 +10,6 @@ tplInquiryForB2B=d94e931b-b699-46d7-8bb2-94604a3352c0
 tplAutoInquiryForB2B=fe01ead8-1e26-43d9-8278-4f8a9b4b343c
 msgInquiryForB2B=629edeb3-a87e-4a40-a5e5-51d9ae734f1b
 msgAutoInquiryForB2B=8cf71d56-09bb-4d60-993e-ed87ce72ec3b
-messageUrl=http://message.ubtob.com/sms/send
+messageUrl=http://message.ubtob.com/sms/send
+
+messagePublicServiceDevUrl=http://218.17.158.219:24000/message

src/main/resources/test/message.properties

@@ -10,4 +10,6 @@ tplInquiryForB2B=d94e931b-b699-46d7-8bb2-94604a3352c0
 tplAutoInquiryForB2B=fe01ead8-1e26-43d9-8278-4f8a9b4b343c
 msgInquiryForB2B=629edeb3-a87e-4a40-a5e5-51d9ae734f1b
 msgAutoInquiryForB2B=8cf71d56-09bb-4d60-993e-ed87ce72ec3b
-messageUrl=http://message.ubtob.com/sms/send
+messageUrl=http://message.ubtob.com/sms/send
+
+messagePublicServiceDevUrl=http://218.17.158.219:24000/message