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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/jimeiJkEdu/JMJkEduArticleService.java

@@ -435,7 +435,9 @@ public class JMJkEduArticleService extends BaseService {
            healthEduArticleES.setArticleId(article.get("articleId") + "");
            healthEduArticleES.setArticleTitle(article.get("articleTitle") + "");
            healthEduArticleES.setArticleCover(article.get("articleCover") + "");
            healthEduArticleES.setArticleContent(article.get("articleContent") + "");
            String articleContent = article.containsKey("articleContent")?article.getString("articleContent").replaceAll("</?[^>]+>", ""):"";
            healthEduArticleES.setArticleContent(articleContent.length()>0?(articleContent.length()>100?articleContent.substring(0,100):articleContent):"");
//            healthEduArticleES.setArticleContent(article.get("articleContent") + "");
            healthEduArticleES.setArticleCategoryId(article.get("articleCategoryId") + "");
            healthEduArticleES.setFirstLevelCategoryId(article.get("firstLevelCategoryId") + "");
            healthEduArticleES.setFirstLevelCategoryName(article.get("firstLevelCategoryName") + "");

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/common/FileUploadController.java

@@ -101,6 +101,7 @@ public class FileUploadController extends BaseController {
     * @return
     * @throws IOException
     * @throws IllegalStateException
     * 备注：图片先保存到本地服务器，后续保存图片到fastDFS
     */
    @RequestMapping(value = "image", method = RequestMethod.POST  /*,headers = "Accept=image/png"*/ )
    @ResponseBody
@@ -620,6 +621,7 @@ public class FileUploadController extends BaseController {
                json.put("status", 200);
                json.put("msg", "上传成功");
                json.put("urls", urls);
                logger.info("图片上传：" + json.toString());
                return json.toString();
            } catch (Exception e) {

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

@@ -133,7 +133,7 @@ activemq:
  password: admin
  url: tcp://172.19.103.87:61616
  queue:
    healtHarticleQueue: healthArticleChannel_devtest  #健康文章推送
    healtHarticleQueue: healthArticleChannel_test  #健康文章推送
##如果是外网项目就是flase 内网是true
neiwang: