文章处理优化

polaris1119 · polaris1119 · commit ea59abcb9cdd · 2019-12-06T15:45:36.000+08:00
diff --git a/config/db.sql b/config/db.sql
@@ -153,6 +153,7 @@ CREATE TABLE IF NOT EXISTS `user_info` (
   `city` varchar(10) NOT NULL DEFAULT '' COMMENT '居住地',
   `company` varchar(63) NOT NULL DEFAULT '' COMMENT '公司',
   `github` varchar(31) NOT NULL DEFAULT '' COMMENT 'Github昵称',
+  `gitea` varchar(31) NOT NULL DEFAULT '' COMMENT 'Gitea昵称',
   `weibo` varchar(31) NOT NULL DEFAULT '' COMMENT '微博昵称',
   `website` varchar(63) NOT NULL DEFAULT '' COMMENT '个人主页，博客',
   `monlog` varchar(140) NOT NULL DEFAULT '' COMMENT '个人状态，签名，独白',
diff --git a/logic/article.go b/logic/article.go
@@ -94,26 +94,18 @@ func (self ArticleLogic) ParseArticle(ctx context.Context, articleUrl string, au
 		return nil, err
 	}
 
-	author, authorTxt := "", ""
+	author := ""
 	if rule.InUrl {
 		index, err := strconv.Atoi(rule.Author)
 		if err != nil {
 			logger.Errorln("author rule is illegal:", rule.Author, "error:", err)
 			return nil, err
 		}
 		author = urlPaths[index]
-		authorTxt = author
 	} else {
-		if strings.HasPrefix(rule.Author, ".") || strings.HasPrefix(rule.Author, "#") {
-			authorSelection := doc.Find(rule.Author)
-			author, err = authorSelection.Html()
-			if err != nil {
-				logger.Errorln("goquery parse author error:", err)
-				return nil, err
-			}
-
-			author = strings.TrimSpace(author)
-			authorTxt = strings.TrimSpace(authorSelection.Text())
+		authorSelection := doc.Find(rule.Author)
+		if authorSelection.Is(rule.Author) {
+			author = strings.TrimSpace(authorSelection.Text())
 		} else if strings.HasPrefix(rule.Author, "/") {
 			// 正则表达式
 			re, err := regexp.Compile(rule.Author[1:])
@@ -129,11 +121,9 @@ func (self ArticleLogic) ParseArticle(ctx context.Context, articleUrl string, au
 			}
 
 			author = authorResult[1]
-			authorTxt = author
 		} else {
 			// 某些个人博客，页面中没有作者的信息，因此，规则中 author 即为 作者
 			author = rule.Author
-			authorTxt = rule.Author
 		}
 	}
 
@@ -222,7 +212,7 @@ func (self ArticleLogic) ParseArticle(ctx context.Context, articleUrl string, au
 		Domain:    domain,
 		Name:      rule.Name,
 		Author:    author,
-		AuthorTxt: authorTxt,
+		AuthorTxt: author,
 		Title:     title,
 		Content:   content,
 		Txt:       txt,
@@ -870,7 +860,7 @@ func (self ArticleLogic) setImgSrc(ctx context.Context, v string, imgDeny bool,
 		if strings.HasPrefix(v, "//") {
 			v = "https:" + v
 		} else if !strings.HasPrefix(v, "http") {
-			v = "http://" + domain + "/" + v
+			v = "http://" + domain + v
 		}
 		path, err := DefaultUploader.TransferUrl(ctx, v)
 		if err == nil {
diff --git a/template/common/my_info.html b/template/common/my_info.html
@@ -95,8 +95,8 @@ <h3 class="title"><i class="glyphicon glyphicon-user"></i> 用户登录</h3>
 					</div>
 					<input class="btn btn-block btn-success btn-sm" data-disable-with="正在登录" name="commit" type="submit" value="登录" />
 					<div class="sidebar-login-tip">
-						<div>没有账号？<a href="">注册</a></div>
-						<div><a href="">忘记密码？</a></div>
+						<div>没有账号？<a href="/account/register">注册</a></div>
+						<div><a href="/account/forgetpwd">忘记密码？</a></div>
 					</div>
 					<div class="sep10"></div>
 					<div class="cut-line">
