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

gateway/ag-basic/src/main/resources/application.yml

@@ -233,10 +233,10 @@ spring:
spring:
  profiles: hzprod
  datasource:
    url: jdbc:mysql://172.26.0.13:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: root
    password: '*ukOOSl&c0!y'
    url: jdbc:mysql://10.18.43.40:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: wlyy
    password: '0XxS3W*!cRj'
  redis:
    host: 172.26.0.13 # Redis server host.
    host: 10.18.43.40 # Redis server host.
    port: 6379  # Redis server port.
    password: Kb6wKDQP1W4

gateway/ag-basic/src/main/resources/bootstrap.yml

@@ -128,4 +128,4 @@ spring:
  cloud:
    config:
      uri: ${wlyy-spring.config.uri:http://127.0.0.1:1221}
      label: ${wlyy-spring.config.label:jwdev}
      label: ${wlyy-spring.config.label:master}

server/svr-authentication/src/main/resources/application.yml

@@ -380,11 +380,11 @@ wechat:
spring:
  profiles: hzprod
  datasource:
    url: jdbc:mysql://172.26.0.13:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: root
    password: '*ukOOSl&c0!y'
    url: jdbc:mysql://10.18.43.40:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: wlyy
    password: '0XxS3W*!cRj'
  redis:
    host: 172.26.0.13 # Redis server host.
    host: 10.18.43.40 # Redis server host.
    port: 6379  # Redis server port.
    password: Kb6wKDQP1W4
  ##发现服务
@@ -395,7 +395,7 @@ iHealth:
zhongshanHospital:
  user-info-uri: 1
fastDFS:
  fastdfs_file_url: http://172.26.0.13:8888/
  fastdfs_file_url: http://10.18.43.40:8888/
wlyy:
  url: 1
#文件服务器上传配置 0本地，1.I健康,2.内网调用

server/svr-configuration/src/main/resources/bootstrap.yml

@@ -189,6 +189,8 @@ spring:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://192.168.1.220:10080/Amoy2/wlyy2.0.config.git}
          uri: ${wlyy.spring.config.git.uri:http://10.18.43.41:3001/jkzl/ehr.config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:jwdev}
          username: jkzl
          password: jkzl
        default-label: ${wlyy.spring.config.git.label:master}

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

@@ -599,19 +599,19 @@ im:
spring:
  profiles: hzprod
  datasource:
     url: jdbc:mysql://172.26.0.13:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: root
     password: '*ukOOSl&c0!y'
     url: jdbc:mysql://10.18.43.40:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: wlyy
     password: '0XxS3W*!cRj'
  elasticsearch:
    cluster-name: jkzl #集群名 默认elasticsearch
    cluster-nodes: 172.26.0.13:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
    cluster-nodes: 10.18.43.40:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
    client-transport-sniff: false
    jest:
      uris: http://172.26.0.13:9200
      uris: http://10.18.43.40:9200
      connection-timeout: 60000 # Connection timeout in milliseconds.
      multi-threaded: true # Enable connection requests from multiple execution threads.
  activemq:
    broker-url: tcp://172.26.0.12:61616
    broker-url: tcp://10.18.43.40:61616
    user: admin
    password: admin
  redis:
@@ -619,7 +619,7 @@ spring:
    port: 6379  # Redis server port.
    password: Kb6wKDQP1W4
fastDFS:
  fastdfs_file_url: http://172.26.0.13:80/
  fastdfs_file_url: http://10.18.43.40:80/
demo:
  flag: true
hospital:
@@ -641,4 +641,4 @@ testPattern:
  sign: 0
  remote_inner_url: 1
im:
  im_list_get: http://172.26.0.12:3000/
  im_list_get: http://10.18.43.40:3000/

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

@@ -108,5 +108,5 @@ spring:
  profiles: hzprod
  cloud:
    config:
      uri: ${wlyy-spring.config.uri:http://172.26.0.12:1221}
      label: ${wlyy-spring.config.label:jwdev}
      uri: ${wlyy-spring.config.uri:http://127.0.0.1:1221}
      label: ${wlyy-spring.config.label:master}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/course/CourseService.java

@@ -501,72 +501,6 @@ public class CourseService {
        return object;
    }
//    public JSONObject getCourseByOrg(String lon2,String lat2){ //, int pageSize,int currentPage
//        JSONObject object = new JSONObject();
//        String sql = "SELECT id,`name`,longitude,latitude FROM base.base_org where del = 1 and type = 4";
//        List<Map<String , Object>> positionList = jdbcTemplate.queryForList(sql);
//        List<Map<String,Object>> list = new ArrayList<>();
//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//        if (positionList.size() > 0){
//            for (int i=0;i<positionList.size();i++){
//                String sql1 = "SELECT id,code,`name`,mobile,photo,address,longitude,latitude ,funDistance("+positionList.get(i).get("latitude")+","+positionList.get(i).get("longitude")+","+lat2+","+lon2+") funDistance FROM base.base_org where id = '"+positionList.get(i).get("id")+"'";
//                List<Map<String , Object>> mapList = jdbcTemplate.queryForList(sql1);
////                base_recruit_students
//                Integer allNum = 0;
//                String recruitId = "";
//                String orgCode = String.valueOf(mapList.get(0).get("code"));
//                List<RecruitStudentsDO> recruitStudentsDOList = recruitStudentsDao.findByOrgCode(orgCode,new Date());
//                Integer num = 0;
//                // 判断该机构是否开放报名
//                if (recruitStudentsDOList.size()>0){
//                    RecruitStudentsDO recruitStudentsDO = recruitStudentsDOList.get(0);
//                    allNum = recruitStudentsDO.getNum();
//                    recruitId = recruitStudentsDO.getId();
//                    String sqlNum = "SELECT allm.id,allm.num - bbm.num num\n" +
//                            "FROM (SELECT id,num FROM base_recruit_students WHERE org_code = '"+mapList.get(0).get("code")+"' AND del = 1 ) allm,(\n" +
//                            "SELECT rs.id,COUNT(rsr.id) num FROM base_recruit_students rs,base_recruit_students_record rsr WHERE rsr.org_code =  '"+mapList.get(0).get("code")+"'\n" +
//                            " AND rs.id = rsr.recruit_students_id and rsr.recruit_students_id = '"+recruitId+"' AND rs.del = 1 AND rs.id = rsr.recruit_students_id AND rsr.status IN (2,3,6)) bbm";
//                    List<Map<String,Object>> maps = jdbcTemplate.queryForList(sqlNum);
//                    num = 0;
//                    if (maps.size() > 0){
//                        for (int j =0 ; j < maps.size() ; j++){
//                            num = num + Integer.parseInt(String.valueOf(maps.get(j).get("num")));
//                        }
//                    }else {
//                        num = 0;
//                    }
//                } else {
//                    num = -1; //未开放报名
//                }
//                String sqlCourse = "SELECT GROUP_CONCAT(DISTINCT `name` SEPARATOR '、') course FROM base_course WHERE org_code = '"+mapList.get(0).get("code")+"' AND del = 1";
//                String course = jdbcTemplate.queryForObject(sqlCourse,String.class);
//                JSONObject obj = new JSONObject();
//                obj.put("id",mapList.get(0).get("id"));
//                obj.put("orgCode",mapList.get(0).get("code"));
//                obj.put("name",mapList.get(0).get("name"));
//                obj.put("photo",mapList.get(0).get("photo"));
//                obj.put("address",mapList.get(0).get("address"));
//                obj.put("longitude",mapList.get(0).get("longitude"));
//                obj.put("latitude",mapList.get(0).get("latitude"));
//                obj.put("mobile",mapList.get(0).get("mobile"));
//                obj.put("funDistance",mapList.get(0).get("funDistance"));
//                obj.put("num",num);
//                obj.put("allNum",allNum);
//                obj.put("course",course);
//                list.add(obj);
//            }
//            if (list.size() > 0){
//                Collections.sort(list, new Comparator<Map<String, Object>>() {
//                    public int compare(Map<String, Object> o1, Map<String, Object> o2) {
//                        return (Double) o1.get("funDistance") > (Double) o2.get("funDistance") ? 1 : ((Double) o1.get("funDistance") == (Double) o2.get("funDistance") ? 0 : -1);
//                    }
//                });
//            }
//            object.put("object",list);
//        }
//        return object;
//    }
    public JSONObject getCourseByteacher(String lon2,String lat2){ //, int pageSize,int currentPage
        JSONObject object = new JSONObject();
        String sql = "SELECT id,`name`,longitude,latitude FROM base.base_org where del = 1 and type = 4";
@@ -612,17 +546,7 @@ public class CourseService {
                    }
                }
            object.put("object",aList);
//                if (list.size() > 0 ){
//                    if (list != null && list.size() > 0) {
//                        int currIdx = (currentPage > 1 ? (currentPage - 1) * pageSize : 0);
//                        for (int i = 0; i < pageSize && i < list.size() - currIdx; i++) {
//                            Map<String, Object> data = list.get(currIdx + i);
//                            currentPageList.add(data);
//                        }
//                    }
//                }
            }
//            object.put("object",currentPageList);
        }
        return object;
    }

svr/svr-cloud-care/src/main/resources/application.yml

@@ -396,9 +396,9 @@ spring:
  profiles: hzprod
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
    url: jdbc:mysql://172.26.0.13:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: root
    password: '*ukOOSl&c0!y'
    url: jdbc:mysql://10.18.43.40:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: wlyy
    password: '0XxS3W*!cRj'
#  elasticsearch:
#    cluster-name: jkzl #集群名 默认elasticsearch
#    cluster-nodes: 172.26.0.115:9300,172.26.0.115:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
@@ -408,17 +408,17 @@ spring:
#      connection-timeout: 60000 # Connection timeout in milliseconds.
#      multi-threaded: true # Enable connection requests from multiple execution threads.
  activemq:
    broker-url: tcp://172.26.0.13:61616
    broker-url: tcp://10.18.43.40:61616
    user: admin
    password: admin
  redis:
    host: 172.26.0.13 # Redis server host.
    host: 10.18.43.40 # Redis server host.
    port: 6379  # Redis server port.
    password: Kb6wKDQP1W4
fastDFS:
  fastdfs_file_url: http://172.26.0.13:8888/
  fastdfs_file_url: http://10.18.43.40:8888/
fast-dfs:
  tracker-server: 172.26.0.13:22122 #服务器地址
  tracker-server: 10.18.43.40:22122 #服务器地址
# 短信验证码发送的客户端标识,居民端
sms:
  clientId: EwC0iRSrcP
@@ -446,7 +446,7 @@ wechat:
  flag: true #演示环境  true走Mysql数据库  false走Oracle
im:
  im_list_get: http://172.26.0.12:3000/
  im_list_get: http://10.18.43.40:3000/
  data_base_name: im_internet_hospital
es:
  pwflag: 2 # 1需要密码，2不需要密码
@@ -456,8 +456,8 @@ es:
  type:
    Statistics: hlw_quota_prod
    FollowUpContent: wlyy_followup_content
  host:  http://172.26.0.13:9000
  tHost: 172.26.0.13:9300
  host:  http://10.18.43.40:9000
  tHost: 10.18.43.40:9300
  clusterName: jkzl
  securityUser: lion:jkzlehr
  user: lion

svr/svr-cloud-care/src/main/resources/bootstrap.yml

@@ -36,4 +36,4 @@ spring:
  cloud:
    config:
      uri: ${wlyy-spring.config.uri:http://127.0.0.1:1221}
      label: ${wlyy-spring.config.label:jwdev}
      label: ${wlyy-spring.config.label:master}

svr/svr-cloud-care/src/main/resources/wechat/weixin_menu.txt

@@ -3,7 +3,7 @@
   {
	  "name":"进入云照护",
	  "type":"view",
      "url":"https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx2c55f5b7b2f3cb56&redirect_uri=https%3A%2F%2Fhzijk.cityihealth.com%2Fmedical-care-patient%2Fhome%2Findex&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
      "url":"https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx2c55f5b7b2f3cb56&redirect_uri=http%3A%2F%2Fhzijk.cityihealth.com%2Fmedical-care-patient%2Fhome%2Findex&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
   }
]
}