jiangjiazhi / regional-platform

Download as
Browse Code »

Commit de3e99fee80d183d8b347998d019f8d581af9297

Authored by liquanyu
1 parent 140c279b16
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update code

Showing 6 changed files with 5 additions and 23 deletions

platform-msg-generate/src/main/java/com/lyms/platform/msg/constants/ConfigInterface.java View file @ de3e99f
... ... @@ -14,9 +14,8 @@
14 14 String AMS_URL = PropertiesUtils.getPropertyValue("ams_url");
15 15  
16 16  
17   - String CENTER_BASE_URL= PropertiesUtils.getPropertyValue("center_base_url");
  17 + String MSG_BASE_URL= PropertiesUtils.getPropertyValue("msg_base_url");
18 18  
19   - String CENTER_TOKEN = PropertiesUtils.getPropertyValue("center_token");
20 19  
21 20 }
platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/SaveMessageService.java View file @ de3e99f
... ... @@ -35,7 +35,7 @@
35 35 {
36 36 String json = JsonUtil.obj2JsonString(list);
37 37 resultLog.info(json);
38   - String result = HttpClientUtil.doPostSSL(ConfigInterface.CENTER_BASE_URL+"/biz-push-web/push",json);
  38 + String result = HttpClientUtil.doPostSSL(ConfigInterface.MSG_BASE_URL+"/biz-push-web/push",json);
39 39 if (StringUtils.isNotEmpty(result))
40 40 {
41 41 Map<String,String> map = JsonUtil.str2Obj(result, Map.class);
... ... @@ -62,7 +62,7 @@
62 62 param.put("limit","10");
63 63 param.put("patientId",patientId);
64 64 param.put("tempId",tempId);
65   - String result = HttpClientUtil.doGet(ConfigInterface.CENTER_BASE_URL + "/biz-push-web/push", param,"utf-8",null);
  65 + String result = HttpClientUtil.doGet(ConfigInterface.MSG_BASE_URL + "/biz-push-web/push", param,"utf-8",null);
66 66 JSONObject jsonObject = JsonUtil.getObj(result);
67 67 if (jsonObject != null && jsonObject.getJSONObject("pageInfo") != null)
68 68 {
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyAmsMsgGenerateWorker.java View file @ de3e99f
... ... @@ -3,11 +3,7 @@
3 3 import com.lyms.platform.beans.MessageListRequest;
4 4 import com.lyms.platform.beans.MessageRequest;
5 5 import com.lyms.platform.biz.service.BabyBookbuildingService;
6   -import com.lyms.platform.biz.service.HighRiskService;
7   -import com.lyms.platform.biz.service.YunBookbuildingService;
8 6 import com.lyms.platform.common.enums.*;
9   -import com.lyms.platform.common.utils.DateUtil;
10   -import com.lyms.platform.common.utils.JsonUtil;
11 7 import com.lyms.platform.common.utils.StringUtils;
12 8 import com.lyms.platform.msg.model.MessageContent;
13 9 import com.lyms.platform.msg.remote.AmsMessageService;
14 10  
... ... @@ -16,12 +12,8 @@
16 12 import com.lyms.platform.msg.utils.DateUtils;
17 13 import com.lyms.platform.msg.utils.HelperUtils;
18 14 import com.lyms.platform.pojo.BabyModel;
19   -import com.lyms.platform.pojo.HighRiskSmsModel;
20   -import com.lyms.platform.pojo.Patients;
21 15 import com.lyms.platform.pojo.SmsConfigModel;
22 16 import com.lyms.platform.query.BabyModelQuery;
23   -import com.lyms.platform.query.HighRiskSmsQuery;
24   -import com.lyms.platform.query.PatientsQuery;
25 17 import org.apache.commons.collections.CollectionUtils;
26 18 import org.slf4j.Logger;
27 19 import org.slf4j.LoggerFactory;
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/ChanAmsMsgGenerateWorker.java View file @ de3e99f
... ... @@ -2,11 +2,8 @@
2 2  
3 3 import com.lyms.platform.beans.MessageListRequest;
4 4 import com.lyms.platform.beans.MessageRequest;
5   -import com.lyms.platform.biz.service.HighRiskService;
6 5 import com.lyms.platform.biz.service.YunBookbuildingService;
7 6 import com.lyms.platform.common.enums.*;
8   -import com.lyms.platform.common.utils.DateUtil;
9   -import com.lyms.platform.common.utils.JsonUtil;
10 7 import com.lyms.platform.common.utils.StringUtils;
11 8 import com.lyms.platform.msg.model.MessageContent;
12 9 import com.lyms.platform.msg.remote.AmsMessageService;
13 10  
... ... @@ -14,10 +11,8 @@
14 11 import com.lyms.platform.msg.service.IBaseService;
15 12 import com.lyms.platform.msg.utils.DateUtils;
16 13 import com.lyms.platform.msg.utils.HelperUtils;
17   -import com.lyms.platform.pojo.HighRiskSmsModel;
18 14 import com.lyms.platform.pojo.Patients;
19 15 import com.lyms.platform.pojo.SmsConfigModel;
20   -import com.lyms.platform.query.HighRiskSmsQuery;
21 16 import com.lyms.platform.query.PatientsQuery;
22 17 import org.apache.commons.collections.CollectionUtils;
23 18 import org.slf4j.Logger;
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java View file @ de3e99f
... ... @@ -15,7 +15,6 @@
15 15 import org.apache.commons.collections.CollectionUtils;
16 16 import org.slf4j.Logger;
17 17 import org.slf4j.LoggerFactory;
18   -import org.springframework.beans.factory.annotation.Autowired;
19 18  
20 19 import java.util.*;
21 20 import java.util.concurrent.ExecutorService;
platform-msg-generate/src/main/resources/config.properties View file @ de3e99f
1 1 #消息中心url
2   -#center_base_url=http://sms.healthbaby.com.cn/v1/
3   -center_base_url=https://push.stage.platform.healthbaby.com.cn
4   -
5   -#区域平台访问短信中心的token
6   -center_token=e0c56363-00d6-42ee-bbe0-23c553583062
  2 +#msg_base_url=http://sms.healthbaby.com.cn/v1/
  3 +msg_base_url=https://push.stage.platform.healthbaby.com.cn
7 4  
8 5 #AMS地址 线上：http://data.api.healthbaby.com.cn/v1/messages 测试：http://data.api.stage.healthbaby.com.cn/v1/messages
9 6 #演示地址 https://stage-rp-data-api.healthbaby.com.cn/v1/messages