Merge branch 'test6.9.8' of git.yoho.cn:platform/platform-cms into test6.9.8

@@ -302,7 +302,7 @@ public class GrassArticleServiceImpl implements IGrassArticleService {
         List<GrassArticleBlock> blockList = grassArticleBlockDao.selectByArticleId(articleId);
         List<GrassArticleBlock> blockList = grassArticleBlockDao.selectByArticleId(articleId);
         Map<String, Future<JSONObject>> map = Maps.newConcurrentMap();
         Map<String, Future<JSONObject>> map = Maps.newConcurrentMap();
         for (GrassArticleBlock block : blockList) {
         for (GrassArticleBlock block : blockList) {
-            if (block.getTemplateKey().equals("text")) {
+            if (!block.getTemplateKey().equals("image")) {
                 continue;
                 continue;
             }
             }
             JSONObject object = JSONObject.parseObject(block.getContentData());
             JSONObject object = JSONObject.parseObject(block.getContentData());
@@ -314,7 +314,7 @@ public class GrassArticleServiceImpl implements IGrassArticleService {
         }
         }
         List<GrassArticleBlock> needUpdateBlocks = Lists.newArrayList();
         List<GrassArticleBlock> needUpdateBlocks = Lists.newArrayList();
         for (GrassArticleBlock block : blockList) {
         for (GrassArticleBlock block : blockList) {
-            if (block.getTemplateKey().equals("text")) {
+            if (!block.getTemplateKey().equals("image")) {
                 continue;
                 continue;
             }
             }
             JSONObject object = JSONObject.parseObject(block.getContentData());
             JSONObject object = JSONObject.parseObject(block.getContentData());
@@ -735,6 +735,7 @@ public class GrassArticleServiceImpl implements IGrassArticleService {
             grassArticleLabel.setAuthStatus(1);//审核状态
             grassArticleLabel.setAuthStatus(1);//审核状态
             grassArticleLabel.setCreateTime(time);
             grassArticleLabel.setCreateTime(time);
             grassArticleLabelDao.updateByPrimaryKeySelective(grassArticleLabel);
             grassArticleLabelDao.updateByPrimaryKeySelective(grassArticleLabel);
+            clearArticleNewCache(articleId);
             logger.info("updateArticle updateByPrimaryKeySelective success! type={}", type);
             logger.info("updateArticle updateByPrimaryKeySelective success! type={}", type);
         }
         }
 
 
@@ -755,6 +756,7 @@ public class GrassArticleServiceImpl implements IGrassArticleService {
             grassArticleLabel.setAuthStatus(2);//审核状态
             grassArticleLabel.setAuthStatus(2);//审核状态
             grassArticleLabel.setCreateTime(0L);
             grassArticleLabel.setCreateTime(0L);
             grassArticleLabelDao.updateByPrimaryKeySelective(grassArticleLabel);
             grassArticleLabelDao.updateByPrimaryKeySelective(grassArticleLabel);
+            clearArticleNewCache(articleId);
             logger.info("updateArticle updateByPrimaryKeySelective success! type={}", type);
             logger.info("updateArticle updateByPrimaryKeySelective success! type={}", type);
 
 
         }
         }
@@ -777,6 +779,7 @@ public class GrassArticleServiceImpl implements IGrassArticleService {
             grassArticleLabel.setAuthStatus(1);//审核状态
             grassArticleLabel.setAuthStatus(1);//审核状态
             grassArticleLabel.setCreateTime(System.currentTimeMillis());
             grassArticleLabel.setCreateTime(System.currentTimeMillis());
             grassArticleLabelDao.updateByPrimaryKeySelective(grassArticleLabel);
             grassArticleLabelDao.updateByPrimaryKeySelective(grassArticleLabel);
+            clearArticleNewCache(articleId);
             logger.info("updateArticle updateByPrimaryKeySelective success! type={}", type);
             logger.info("updateArticle updateByPrimaryKeySelective success! type={}", type);
         }
         }
     }
     }
@@ -1071,6 +1074,8 @@ public class GrassArticleServiceImpl implements IGrassArticleService {
         } catch (Exception e) {
         } catch (Exception e) {
             logger.warn("publishArticle ,grassArticleTopicDao insertArticleTopic error, uid is {}, e is {}", req.getAuthorUid(), e);
             logger.warn("publishArticle ,grassArticleTopicDao insertArticleTopic error, uid is {}, e is {}", req.getAuthorUid(), e);
         }
         }
+
+        clearArticleNewCache(articleId);
     }
     }
 
 
     @Override
     @Override