Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-base/pom.xml

@@ -66,6 +66,7 @@
            <groupId>com.yihu.jw</groupId>
            <artifactId>im-service</artifactId>
            <version>2.0.0</version>
            <scope>compile</scope>
        </dependency>
        <dependency>

svr/svr-base/src/main/java/com/yihu/jw/base/service/ManageMessagePush/ManageSystemPushMessageService.java

@@ -230,6 +230,7 @@ public class ManageSystemPushMessageService {
            systemMessageDO.setCreateTime(new Date());
            systemMessageDO.setAudioUrl(audioUrl(data));
            messageDOS.add(systemMessageDO);
            patientMessageSocket(systemMessageDO);
        }
        systemMessageDao.save(messageDOS);
@@ -255,6 +256,7 @@ public class ManageSystemPushMessageService {
    }
    //腾讯语音
    private String audioUrl(String content){
        ResponseEntity<String> forEntity = restTemplate.getForEntity("http://svr-cloud-care/common/open/wordToVoice?text={1}", String.class, content);
        JSONObject jsonObject = JSONObject.parseObject(forEntity.getBody());
@@ -266,6 +268,7 @@ public class ManageSystemPushMessageService {
    }
    //SOCKET
    private void patientMessageSocket(SystemMessageDO messageDOWatch){
        JSONObject message = new JSONObject();
        message.put("title",messageDOWatch.getTitle());

svr/svr-base/src/main/resources/application.yml

@@ -189,6 +189,7 @@ testPattern:
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
im:
  im_list_get: http://172.26.0.105:3000/
  data_base_name: 1
---
spring:
  profiles: iottest
@@ -325,6 +326,7 @@ testPattern:
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
im:
  im_list_get: http://172.26.0.105:3000/
  data_base_name: im_internet_hospital
---
spring:
  profiles: jwOracleTest
@@ -375,6 +377,7 @@ testPattern:
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
im:
  im_list_get: http://172.26.0.105:3000/
  data_base_name: im_internet_hospital
---
spring:
  profiles: jwOracleProd
@@ -424,6 +427,7 @@ testPattern:
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
im:
  im_list_get: http://172.26.0.105:3000/
  data_base_name: im_internet_hospital
---
spring:
  profiles: iotprod
@@ -649,7 +653,7 @@ testPattern:
  remote_inner_url: 1
im:
  im_list_get: http://10.18.43.41:3000/
  data_base_name: im_internet_hospital
---
spring:
  profiles: wjwProd