删除字数统计

Author: rawchen

blog-api/src/main/java/com/rawchen/controller/admin/BlogAdminController.java

@@ -188,8 +188,7 @@ public Result updateBlog(@RequestBody com.rawchen.model.dto.Blog blog) {
 	 */
 	private Result getResult(com.rawchen.model.dto.Blog blog, String type) {
 		//验证普通字段
-		if (StringUtils.isEmpty(blog.getTitle(),blog.getFirstPicture(), blog.getContent(), blog.getDescription())
-				|| blog.getWords() == null || blog.getWords() < 0) {
+		if (StringUtils.isEmpty(blog.getTitle(),blog.getFirstPicture(), blog.getContent(), blog.getDescription())) {
 			return Result.error("参数有误");
 		}
 
@@ -238,9 +237,7 @@ private Result getResult(com.rawchen.model.dto.Blog blog, String type) {
 		}
 
 		Date date = new Date();
-		if (blog.getReadTime() == null || blog.getReadTime() < 0) {
-			blog.setReadTime((int) Math.round(blog.getWords() / 200.0));//粗略计算阅读时长
-		}
+
 		if (blog.getViews() == null || blog.getViews() < 0) {
 			blog.setViews(0);
 		}

blog-api/src/main/java/com/rawchen/entity/Blog.java

@@ -31,8 +31,6 @@ public class Blog {
 	private Date createTime;//创建时间
 	private Date updateTime;//更新时间
 	private Integer views;//浏览次数
-	private Integer words;//文章字数
-	private Integer readTime;//阅读时长(分钟)
 	private String password;//密码保护
 
 	private User user;//文章作者(因为是个人博客，也可以不加作者字段，暂且加上)

blog-api/src/main/java/com/rawchen/model/dto/Blog.java

@@ -34,8 +34,6 @@ public class Blog {
 	private Date createTime;//创建时间
 	private Date updateTime;//更新时间
 	private Integer views;//浏览次数
-	private Integer words;//文章字数
-	private Integer readTime;//阅读时长(分钟)
 	private String password;//密码保护
 
 	private User user;//文章作者(因为是个人博客，也可以不加作者字段，暂且加上)

blog-api/src/main/java/com/rawchen/model/vo/BlogDetail.java

@@ -29,8 +29,6 @@ public class BlogDetail {
 	private Date createTime;//创建时间
 	private Date updateTime;//更新时间
 	private Integer views;//浏览次数
-	private Integer words;//文章字数
-	private Integer readTime;//阅读时长(分钟)
 	private String password;//密码保护
 
 	private Category category;//文章分类

blog-api/src/main/java/com/rawchen/model/vo/BlogInfo.java

@@ -25,8 +25,6 @@ public class BlogInfo {
 	private String description;//描述
 	private Date createTime;//创建时间
 	private Integer views;//浏览次数
-	private Integer words;//文章字数
-	private Integer readTime;//阅读时长(分钟)
 	private Boolean top;//是否置顶
 	private String password;//文章密码
 	private Boolean privacy;//是否私密文章

blog-api/src/main/resources/mapper/BlogMapper.xml

@@ -16,8 +16,6 @@
 		<result property="createTime" column="create_time"/>
 		<result property="updateTime" column="update_time"/>
 		<result property="views" column="views"/>
-		<result property="words" column="words"/>
-		<result property="readTime" column="read_time"/>
 		<result property="password" column="password"/>
 		<association property="user" javaType="com.rawchen.entity.User">
 			<id property="id" column="user_id"/>
@@ -104,8 +102,6 @@
 		<result property="description" column="description"/>
 		<result property="createTime" column="create_time"/>
 		<result property="views" column="views"/>
-		<result property="words" column="words"/>
-		<result property="readTime" column="read_time"/>
 		<result property="top" column="is_top"/>
 		<result property="password" column="password"/>
 		<association property="category" javaType="com.rawchen.entity.Category">
@@ -121,8 +117,6 @@
 			   b.is_top,
 			   b.create_time,
 			   b.views,
-			   b.words,
-			   b.read_time,
 			   b.password,
 			   c.category_name
 		from blog as b
@@ -138,8 +132,6 @@
 			   b.is_top,
 			   b.create_time,
 			   b.views,
-			   b.words,
-			   b.read_time,
 			   b.password,
 			   c.category_name
 		from category as c
@@ -156,8 +148,6 @@
 			   b.is_top,
 			   b.create_time,
 			   b.views,
-			   b.words,
-			   b.read_time,
 			   b.password,
 			   c.category_name
 		from (((tag as t left join blog_tag as bt on t.id = bt.tag_id) left join blog as b on bt.blog_id = b.id)
@@ -239,10 +229,10 @@
 	<insert id="saveBlog" parameterType="com.rawchen.model.dto.Blog" useGeneratedKeys="true" keyProperty="id">
 		insert into blog (title, first_picture, content, description, is_published, is_recommend, is_appreciation,
 						  is_comment_enabled,
-						  is_top, create_time, update_time, views, words, read_time, category_id, user_id, password)
+						  is_top, create_time, update_time, views, category_id, user_id, password)
 		values (#{title}, #{firstPicture}, #{content}, #{description}, #{published}, #{recommend}, #{appreciation},
 				#{commentEnabled},
-				#{top}, #{createTime}, #{updateTime}, #{views}, #{words}, #{readTime}, #{category.id}, #{user.id},
+				#{top}, #{createTime}, #{updateTime}, #{views}, #{category.id}, #{user.id},
 				#{password})
 	</insert>
 
@@ -294,8 +284,6 @@
 			   b.create_time,
 			   b.update_time,
 			   b.views,
-			   b.words,
-			   b.read_time,
 			   b.password,
 			   c.id       as category_id,
 			   c.category_name,
@@ -324,8 +312,6 @@
 		<result property="createTime" column="create_time"/>
 		<result property="updateTime" column="update_time"/>
 		<result property="views" column="views"/>
-		<result property="words" column="words"/>
-		<result property="readTime" column="read_time"/>
 		<result property="password" column="password"/>
 		<association property="category" javaType="com.rawchen.entity.Category">
 			<result property="name" column="category_name"/>
@@ -347,8 +333,6 @@
 			   b.create_time,
 			   b.update_time,
 			   b.views,
-			   b.words,
-			   b.read_time,
 			   b.password,
 			   c.category_name,
 			   t.tag_name as tag_name,
@@ -381,8 +365,6 @@
 			create_time=#{createTime},
 			update_time=#{updateTime},
 			views=#{views},
-			words=#{words},
-			read_time=#{readTime},
 			category_id=#{category.id},
 			password=#{password}
 		where id = #{id}

blog-cms/src/views/blog/blog/WriteBlog.vue

@@ -6,24 +6,24 @@
 		<el-form :model="form" :rules="formRules" ref="formRef" label-position="top">
 			<el-row :gutter="20">
 				<el-col :span="12">
-					<el-form-item label="文章标题" prop="title">
+					<el-form-item label="标题" prop="title">
 						<el-input v-model="form.title" placeholder="请输入标题"></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
-					<el-form-item label="文章首图" prop="firstPicture">
+					<el-form-item label="封面图" prop="firstPicture">
 						<el-input v-model="form.firstPicture" placeholder="文章首图，用于随机文章展示"></el-input>
 					</el-form-item>
 				</el-col>
 			</el-row>
 
-			<el-alert title="注意：如果从 Typora 中复制 Markdown，粘贴时要选择粘贴为纯文本，否则代码块可能无法被 prismjs 高亮" type="warning" center show-icon></el-alert>
+			<!-- <el-alert title="注意：如果从 Typora 中复制 Markdown，粘贴时要选择粘贴为纯文本，否则代码块可能无法被 prismjs 高亮" type="warning" center show-icon></el-alert> -->
 
-			<el-form-item label="文章描述" prop="description">
+			<el-form-item label="描述" prop="description">
 				<div id="vditor-description"></div>
 			</el-form-item>
 
-			<el-form-item label="文章正文" prop="content">
+			<el-form-item label="正文" prop="content">
 				<div id="vditor-content"></div>
 			</el-form-item>
 
@@ -44,21 +44,8 @@
 				</el-col>
 			</el-row>
 
-			<el-row :gutter="20">
-				<el-col :span="12">
-					<el-form-item label="字数" prop="words">
-						<el-input v-model="form.words" placeholder="请输入文章字数（自动计算阅读时长）" type="number"></el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="12">
-					<el-form-item label="阅读时长(分钟)" prop="readTime">
-						<el-input v-model="form.readTime" placeholder="请输入阅读时长（可选）默认 Math.round(字数 / 200)" type="number"></el-input>
-					</el-form-item>
-				</el-col>
-			</el-row>
-
 			<el-form-item label="浏览次数" prop="views">
-				<el-input v-model="form.views" placeholder="请输入文章字数（可选）默认为 0" type="number" style="width: 50%;"></el-input>
+				<el-input v-model="form.views" placeholder="文章访问量（默认为 0）" type="number" style="width: 50%;"></el-input>
 			</el-form-item>
 
 			<el-form-item style="text-align: right;">
@@ -144,16 +131,10 @@
 					title: [{required: true, message: '请输入标题', trigger: 'change'}],
 					firstPicture: [{required: true, message: '请输入首图链接', trigger: 'change'}],
 					cate: [{required: true, message: '请选择分类', trigger: 'change'}],
-					tagList: [{required: true, message: '请选择标签', trigger: 'change'}],
-					words: [{required: true, message: '请输入文章字数', trigger: 'change'}],
+					// tagList: [{required: true, message: '请选择标签', trigger: 'change'}],
 				},
 			}
 		},
-		watch: {
-			'form.words'(newValue) {
-				this.form.readTime = newValue ? Math.round(newValue / 200) : null
-			},
-		},
 		created() {
 			this.getData()
 		},

blog-view/src/assets/css/base.css

@@ -245,7 +245,7 @@ footer {
 }
 
 .m-datetime {
-    color: #00a7e0 !important;
+    color: #5f5f5f !important;
 }
 
 .m-datetime * {
@@ -257,7 +257,7 @@ footer {
 }
 
 .m-views {
-    color: #ff3f1f !important;
+    color: #5f5f5f !important;
 }
 
 .m-views * {
@@ -268,19 +268,19 @@ footer {
     margin-right: 3px !important;
 }
 
-.m-common-black {
-    color: #000 !important;
+.m-common-gray {
+    color: #5f5f5f !important;
 }
 
-.m-common-black * {
+.m-common-gray * {
     vertical-align: middle !important;
 }
 
-.m-common-black * * {
+.m-common-gray * * {
     vertical-align: middle !important;
 }
 
-.m-common-black i {
+.m-common-gray i {
     margin-right: 3px !important;
 }
 

blog-view/src/components/blog/BlogItem.vue

@@ -19,13 +19,10 @@
 								<i class="small calendar icon"></i><span>{{ item.createTime | dateFormat('YYYY-MM-DD')}}</span>
 							</div>
 							<div class="item m-views">
-								<i class="small eye icon"></i><span>{{ item.views }}</span>
+								<i class="el-icon-s-data"></i><span>{{ item.views }}</span>
 							</div>
-							<div class="item m-common-black">
-								<i class="small pencil alternate icon"></i><span>字数≈{{ item.words }}字</span>
-							</div>
-							<div class="item m-common-black">
-								<i class="small clock icon"></i><span>阅读时长≈{{ item.readTime }}分</span>
+							<div class="item m-common-gray">
+								<i class="el-icon-s-comment"></i><span>123</span>
 							</div>
 						</div>
 					</div>

blog-view/src/views/blog/Blog.vue

@@ -17,20 +17,17 @@
 								<i class="small calendar icon"></i><span>{{ blog.createTime | dateFormat('YYYY-MM-DD') }}</span>
 							</div>
 							<div class="item m-views">
-								<i class="small eye icon"></i><span>{{ blog.views }}</span>
+								<i class="el-icon-s-data"></i><span>{{ blog.views }}</span>
 							</div>
-							<div class="item m-common-black">
-								<i class="small pencil alternate icon"></i><span>字数≈{{ blog.words }}字</span>
+							<div class="item m-common-gray">
+								<i class="el-icon-s-comment"></i><span>123</span>
 							</div>
-							<div class="item m-common-black">
-								<i class="small clock icon"></i><span>阅读时长≈{{ blog.readTime }}分</span>
-							</div>
-							<a class="item m-common-black" @click.prevent="bigFontSize=!bigFontSize">
+							<a class="item m-common-gray" @click.prevent="bigFontSize=!bigFontSize">
 								<div data-inverted="" data-tooltip="点击切换字体大小" data-position="top center">
 									<i class="font icon"></i>
 								</div>
 							</a>
-							<a class="item m-common-black" @click.prevent="changeFocusMode">
+							<a class="item m-common-gray" @click.prevent="changeFocusMode">
 								<div data-inverted="" data-tooltip="专注模式" data-position="top center">
 									<i class="book icon"></i>
 								</div>