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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/data/DataHandlingController.java

@@ -99,7 +99,7 @@ public class DataHandlingController extends BaseController {
        }
    }
    @RequestMapping(value = "/getArticleListToNewDataBase",method = RequestMethod.POST)
    @RequestMapping(value = "/getArticleListToNewDataBase",method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation("文章列表转移")
    public String getArticleListToNewDataBase(){
@@ -111,7 +111,7 @@ public class DataHandlingController extends BaseController {
        }
    }
    @RequestMapping(value = "/getArticleCollectToNewDataBase",method = RequestMethod.POST)
    @RequestMapping(value = "/getArticleCollectToNewDataBase",method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation("文章收藏转移")
    public String getArticleCollectToNewDataBase(){
@@ -123,7 +123,7 @@ public class DataHandlingController extends BaseController {
        }
    }
    @RequestMapping(value = "/getArticleBehaviorToNewDataBase",method = RequestMethod.POST)
    @RequestMapping(value = "/getArticleBehaviorToNewDataBase",method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation("文章行为转移")
    public String getArticleBehaviorToNewDataBase(){
@@ -135,7 +135,7 @@ public class DataHandlingController extends BaseController {
        }
    }
    @RequestMapping(value = "/getArticleSendToEs",method = RequestMethod.POST)
    @RequestMapping(value = "/getArticleSendToEs",method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation("已发送文章列表转移Es")
    public String getArticleSendToEs(){

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

@@ -10,6 +10,10 @@ spring:
      url: jdbc:mysql://59.61.92.90:9069/device?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
      username: wlyy
      password: jkzlehr@123
    jkedu:
      url: jdbc:mysql://59.61.92.90:9069/jkedudb?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
      username: wlyy
      password: jkzlehr@123
  redis:
     host: 27.155.101.77 # Redis server host.
@@ -101,11 +105,11 @@ pushMes:
es:
  index:
    HealthEduArticlePatient: health_edu_article_patient_prod
    HealthEduArticlePatient: health_edu_article_patient
    Statistics: wlyy_quota_prod
    FollowUp: wlyy_followup
  type:
    HealthEduArticlePatient: health_edu_article_patient_prod
    HealthEduArticlePatient: health_edu_article_patient
    Statistics: wlyy_quota_prod
    FollowUpContent: wlyy_followup_content
  host:  http://59.61.92.90:9065,http://59.61.92.90:9067