From de3e99fee80d183d8b347998d019f8d581af9297 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sat, 5 Aug 2017 10:10:18 +0800 Subject: [PATCH] update code --- .../java/com/lyms/platform/msg/constants/ConfigInterface.java | 3 +-- .../java/com/lyms/platform/msg/remote/SaveMessageService.java | 4 ++-- .../com/lyms/platform/msg/worker/BabyAmsMsgGenerateWorker.java | 8 -------- .../com/lyms/platform/msg/worker/ChanAmsMsgGenerateWorker.java | 5 ----- .../com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java | 1 - platform-msg-generate/src/main/resources/config.properties | 7 ++----- 6 files changed, 5 insertions(+), 23 deletions(-) diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/constants/ConfigInterface.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/constants/ConfigInterface.java index bd8cf64..c7ba3b9 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/constants/ConfigInterface.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/constants/ConfigInterface.java @@ -14,8 +14,7 @@ public interface ConfigInterface { String AMS_URL = PropertiesUtils.getPropertyValue("ams_url"); - String CENTER_BASE_URL= PropertiesUtils.getPropertyValue("center_base_url"); + String MSG_BASE_URL= PropertiesUtils.getPropertyValue("msg_base_url"); - String CENTER_TOKEN = PropertiesUtils.getPropertyValue("center_token"); } diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/SaveMessageService.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/SaveMessageService.java index cf700d1..8edf9fa 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/SaveMessageService.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/SaveMessageService.java @@ -35,7 +35,7 @@ public class SaveMessageService { { String json = JsonUtil.obj2JsonString(list); resultLog.info(json); - String result = HttpClientUtil.doPostSSL(ConfigInterface.CENTER_BASE_URL+"/biz-push-web/push",json); + String result = HttpClientUtil.doPostSSL(ConfigInterface.MSG_BASE_URL+"/biz-push-web/push",json); if (StringUtils.isNotEmpty(result)) { Map map = JsonUtil.str2Obj(result, Map.class); @@ -62,7 +62,7 @@ public class SaveMessageService { param.put("limit","10"); param.put("patientId",patientId); param.put("tempId",tempId); - String result = HttpClientUtil.doGet(ConfigInterface.CENTER_BASE_URL + "/biz-push-web/push", param,"utf-8",null); + String result = HttpClientUtil.doGet(ConfigInterface.MSG_BASE_URL + "/biz-push-web/push", param,"utf-8",null); JSONObject jsonObject = JsonUtil.getObj(result); if (jsonObject != null && jsonObject.getJSONObject("pageInfo") != null) { diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyAmsMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyAmsMsgGenerateWorker.java index f534853..03f5199 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyAmsMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyAmsMsgGenerateWorker.java @@ -3,11 +3,7 @@ package com.lyms.platform.msg.worker; import com.lyms.platform.beans.MessageListRequest; import com.lyms.platform.beans.MessageRequest; import com.lyms.platform.biz.service.BabyBookbuildingService; -import com.lyms.platform.biz.service.HighRiskService; -import com.lyms.platform.biz.service.YunBookbuildingService; import com.lyms.platform.common.enums.*; -import com.lyms.platform.common.utils.DateUtil; -import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.msg.model.MessageContent; import com.lyms.platform.msg.remote.AmsMessageService; @@ -16,12 +12,8 @@ import com.lyms.platform.msg.service.IBaseService; import com.lyms.platform.msg.utils.DateUtils; import com.lyms.platform.msg.utils.HelperUtils; import com.lyms.platform.pojo.BabyModel; -import com.lyms.platform.pojo.HighRiskSmsModel; -import com.lyms.platform.pojo.Patients; import com.lyms.platform.pojo.SmsConfigModel; import com.lyms.platform.query.BabyModelQuery; -import com.lyms.platform.query.HighRiskSmsQuery; -import com.lyms.platform.query.PatientsQuery; import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/ChanAmsMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/ChanAmsMsgGenerateWorker.java index 7b55f44..aa43f7d 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/ChanAmsMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/ChanAmsMsgGenerateWorker.java @@ -2,11 +2,8 @@ package com.lyms.platform.msg.worker; import com.lyms.platform.beans.MessageListRequest; import com.lyms.platform.beans.MessageRequest; -import com.lyms.platform.biz.service.HighRiskService; import com.lyms.platform.biz.service.YunBookbuildingService; import com.lyms.platform.common.enums.*; -import com.lyms.platform.common.utils.DateUtil; -import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.msg.model.MessageContent; import com.lyms.platform.msg.remote.AmsMessageService; @@ -14,10 +11,8 @@ import com.lyms.platform.msg.remote.SaveMessageService; import com.lyms.platform.msg.service.IBaseService; import com.lyms.platform.msg.utils.DateUtils; import com.lyms.platform.msg.utils.HelperUtils; -import com.lyms.platform.pojo.HighRiskSmsModel; import com.lyms.platform.pojo.Patients; import com.lyms.platform.pojo.SmsConfigModel; -import com.lyms.platform.query.HighRiskSmsQuery; import com.lyms.platform.query.PatientsQuery; import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java index b738c7b..39a762c 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java @@ -15,7 +15,6 @@ import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import java.util.*; import java.util.concurrent.ExecutorService; diff --git a/platform-msg-generate/src/main/resources/config.properties b/platform-msg-generate/src/main/resources/config.properties index 22fd6b6..d98f82d 100644 --- a/platform-msg-generate/src/main/resources/config.properties +++ b/platform-msg-generate/src/main/resources/config.properties @@ -1,9 +1,6 @@ #消息中心url -#center_base_url=http://sms.healthbaby.com.cn/v1/ -center_base_url=https://push.stage.platform.healthbaby.com.cn - -#区域平台访问短信中心的token -center_token=e0c56363-00d6-42ee-bbe0-23c553583062 +#msg_base_url=http://sms.healthbaby.com.cn/v1/ +msg_base_url=https://push.stage.platform.healthbaby.com.cn #AMS地址 线上：http://data.api.healthbaby.com.cn/v1/messages 测试：http://data.api.stage.healthbaby.com.cn/v1/messages #演示地址 https://stage-rp-data-api.healthbaby.com.cn/v1/messages -- 1.8.3.1