Merge branch 'dev' of yeshijie/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/iot/IotDeviceService.java

@@ -18,6 +18,7 @@ import org.apache.http.message.BasicNameValuePair;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.ResultSetExtractor;
@@ -39,8 +40,9 @@ public class IotDeviceService {
    private Logger logger = LoggerFactory.getLogger(IotDeviceService.class);
//    @Value("${}")
    private String baseUrl = "http://192.168.131.24:8088/svr-iot/";
    @Value("${iot.url}")
    private String baseUrl;
//    private String baseUrl = "http://192.168.131.24:8088/svr-iot/";
    private String grantType = "client_credentials";
    private String clientId = "Va5yQRHlA4Fq4eR3LT0vuXV4";
    private String clientSecret = "0rDSjzQ20XUj5itV7WRtznPQSzr5pVw2";

patient-co/patient-co-wlyy/src/main/resources/application-dev.yml

@@ -33,6 +33,10 @@ im:
  im_list_get: http://172.19.103.88:3000/
  data_base_name: ichat
#物联网配置
iot:
  url: http://192.168.131.24:8088/svr-iot/
wechat:
  appId: wxd03f859efdf0873d
  appSecret: 2935b54b53a957d9516c920a544f2537

patient-co/patient-co-wlyy/src/main/resources/application-devtest.yml

@@ -33,6 +33,10 @@ im:
  im_list_get: http://172.19.103.88:3000/
  data_base_name: im_new
#物联网配置
iot:
  url: http://192.168.131.24:8088/svr-iot/
wechat:
  appId: wx1f129f7b51701428
  appSecret: 988f005d8309ed1795939e0f042431fb

patient-co/patient-co-wlyy/src/main/resources/application-local.yml

@@ -29,6 +29,10 @@ im:
  im_list_get: http://10.95.22.138:3000/
  data_base_name: im
#物联网配置
iot:
  url: http://192.168.131.24:8088/svr-iot/
wechat:
  appId: wxad04e9c4c5255acf
  appSecret: ae77c48ccf1af5d07069f5153d1ac8d3

patient-co/patient-co-wlyy/src/main/resources/application-localtest.yml

@@ -29,6 +29,10 @@ im:
  im_list_get: http://172.19.103.88:3000/
  data_base_name: im_new
#物联网配置
iot:
  url: http://192.168.131.24:8088/svr-iot/
wechat:
  appId: wx1f129f7b51701428
  appSecret: 988f005d8309ed1795939e0f042431fb

patient-co/patient-co-wlyy/src/main/resources/application-prod.yml

@@ -32,6 +32,10 @@ im:
  im_list_get: http://27.155.101.77:3000/
  data_base_name: im
#物联网配置
iot:
  url: http://192.168.131.24:8088/svr-iot/
wechat:
  appId: wxad04e9c4c5255acf
  appSecret: ae77c48ccf1af5d07069f5153d1ac8d3

patient-co/patient-co-wlyy/src/main/resources/application-test.yml

@@ -28,6 +28,10 @@ im:
  im_list_get: http://172.19.103.88:3000/
  data_base_name: im_new
#物联网配置
iot:
  url: http://172.19.103.88:8088/svr-iot/
wechat:
  appId: wx1f129f7b51701428
  appSecret: 988f005d8309ed1795939e0f042431fb