Commit 9c2d5388 authored by Liang Ding's avatar Liang Ding

Fix #12678

parent b5c47395
...@@ -317,6 +317,12 @@ public class ArticleMgmtService { ...@@ -317,6 +317,12 @@ public class ArticleMgmtService {
} }
} }
final String articleImg1URL = getArticleImg1URL(article);
article.put(ARTICLE_IMG1_URL, articleImg1URL);
final String articleAbstractText = Article.getAbstractText(article);
article.put(ARTICLE_ABSTRACT_TEXT, articleAbstractText);
final boolean publishNewArticle = !oldArticle.getBoolean(ARTICLE_IS_PUBLISHED) && article.getBoolean(ARTICLE_IS_PUBLISHED); final boolean publishNewArticle = !oldArticle.getBoolean(ARTICLE_IS_PUBLISHED) && article.getBoolean(ARTICLE_IS_PUBLISHED);
// Update // Update
...@@ -451,6 +457,9 @@ public class ArticleMgmtService { ...@@ -451,6 +457,9 @@ public class ArticleMgmtService {
final String articleImg1URL = getArticleImg1URL(article); final String articleImg1URL = getArticleImg1URL(article);
article.put(ARTICLE_IMG1_URL, articleImg1URL); article.put(ARTICLE_IMG1_URL, articleImg1URL);
final String articleAbstractText = Article.getAbstractText(article);
article.put(ARTICLE_ABSTRACT_TEXT, articleAbstractText);
final boolean postToCommunity = article.optBoolean(Common.POST_TO_COMMUNITY, true); final boolean postToCommunity = article.optBoolean(Common.POST_TO_COMMUNITY, true);
article.remove(Common.POST_TO_COMMUNITY); // Do not persist this property article.remove(Common.POST_TO_COMMUNITY); // Do not persist this property
......
...@@ -260,6 +260,7 @@ public class InitService { ...@@ -260,6 +260,7 @@ public class InitService {
final String content = "![](" + Images.imageSize(Images.randImage(), Article.ARTICLE_THUMB_IMG_WIDTH, Article.ARTICLE_THUMB_IMG_HEIGHT) + ") \n\n" + final String content = "![](" + Images.imageSize(Images.randImage(), Article.ARTICLE_THUMB_IMG_WIDTH, Article.ARTICLE_THUMB_IMG_HEIGHT) + ") \n\n" +
langPropsService.get("helloWorld.content"); langPropsService.get("helloWorld.content");
article.put(Article.ARTICLE_ABSTRACT_TEXT, Article.getAbstractText(content));
article.put(Article.ARTICLE_ABSTRACT, content); article.put(Article.ARTICLE_ABSTRACT, content);
article.put(Article.ARTICLE_CONTENT, content); article.put(Article.ARTICLE_CONTENT, content);
article.put(Article.ARTICLE_TAGS_REF, "Solo"); article.put(Article.ARTICLE_TAGS_REF, "Solo");
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
*/ */
package org.b3log.solo.upgrade; package org.b3log.solo.upgrade;
import org.apache.commons.lang.StringUtils;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.ioc.BeanManager; import org.b3log.latke.ioc.BeanManager;
...@@ -68,6 +69,7 @@ public final class V300_310 { ...@@ -68,6 +69,7 @@ public final class V300_310 {
// 文章表新增首图字段 // 文章表新增首图字段
final String tablePrefix = Latkes.getLocalProperty("jdbc.tablePrefix") + "_"; final String tablePrefix = Latkes.getLocalProperty("jdbc.tablePrefix") + "_";
statement.executeUpdate("ALTER TABLE `" + tablePrefix + "article` ADD COLUMN `articleAbstractText` TEXT NOT NULL");
statement.executeUpdate("ALTER TABLE `" + tablePrefix + "article` ADD COLUMN `articleImg1URL` VARCHAR(255) DEFAULT '' NOT NULL"); statement.executeUpdate("ALTER TABLE `" + tablePrefix + "article` ADD COLUMN `articleImg1URL` VARCHAR(255) DEFAULT '' NOT NULL");
statement.close(); statement.close();
connection.commit(); connection.commit();
...@@ -83,6 +85,18 @@ public final class V300_310 { ...@@ -83,6 +85,18 @@ public final class V300_310 {
for (final JSONObject article : articles) { for (final JSONObject article : articles) {
final String imgURL = Images.imageSize(Images.randImage(), Article.ARTICLE_THUMB_IMG_WIDTH, Article.ARTICLE_THUMB_IMG_HEIGHT); final String imgURL = Images.imageSize(Images.randImage(), Article.ARTICLE_THUMB_IMG_WIDTH, Article.ARTICLE_THUMB_IMG_HEIGHT);
article.put(Article.ARTICLE_IMG1_URL, imgURL); article.put(Article.ARTICLE_IMG1_URL, imgURL);
final String summary = article.optString(Article.ARTICLE_ABSTRACT);
String summaryText;
if (StringUtils.isBlank(summary)) {
final String content = article.optString(Article.ARTICLE_CONTENT);
summaryText = Article.getAbstractText(content);
article.put(Article.ARTICLE_ABSTRACT, summaryText);
} else {
summaryText = Article.getAbstractText(summary);
}
article.put(Article.ARTICLE_ABSTRACT_TEXT, summaryText);
articleRepository.update(article.optString(Keys.OBJECT_ID), article); articleRepository.update(article.optString(Keys.OBJECT_ID), article);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment