mirror of
https://github.com/eiblog/eiblog.git
synced 2026-02-08 23:52:26 +08:00
chore: remove blogger config
This commit is contained in:
75
pkg/cache/cache.go
vendored
75
pkg/cache/cache.go
vendored
@@ -41,17 +41,7 @@ func init() {
|
||||
TagArticles: make(map[string]model.SortedArticles),
|
||||
ArticlesMap: make(map[string]*model.Article),
|
||||
}
|
||||
err = Ei.loadAccount()
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
// blogger
|
||||
err = Ei.loadBlogger()
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
// articles
|
||||
err = Ei.loadArticles()
|
||||
err = Ei.loadOrInit()
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
@@ -151,47 +141,60 @@ func (c *Cache) PageArticles(page int, pageSize int) (prev,
|
||||
return
|
||||
}
|
||||
|
||||
// loadBlogger 博客信息
|
||||
func (c *Cache) loadBlogger() error {
|
||||
// loadOrInit 读取数据或初始化
|
||||
func (c *Cache) loadOrInit() error {
|
||||
blogapp := config.Conf.BlogApp
|
||||
// blogger
|
||||
blogger := &model.Blogger{
|
||||
BlogName: blogapp.Blogger.BlogName,
|
||||
SubTitle: blogapp.Blogger.SubTitle,
|
||||
BeiAn: blogapp.Blogger.BeiAn,
|
||||
BTitle: blogapp.Blogger.BTitle,
|
||||
Copyright: blogapp.Blogger.Copyright,
|
||||
BlogName: strings.Title(blogapp.Account.Username),
|
||||
SubTitle: "Rome was not built in one day.",
|
||||
BeiAn: "蜀ICP备xxxxxxxx号-1",
|
||||
BTitle: fmt.Sprintf("%s's Blog", strings.Title(blogapp.Account.Username)),
|
||||
Copyright: `本站使用「<a href="//creativecommons.org/licenses/by/4.0/">署名 4.0 国际</a>」创作共享协议,转载请注明作者及原网址。`,
|
||||
}
|
||||
blogger, err := c.LoadInsertBlogger(context.Background(), blogger)
|
||||
created, err := c.LoadInsertBlogger(context.Background(), blogger)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
c.Blogger = blogger
|
||||
return nil
|
||||
}
|
||||
|
||||
// loadAccount 账户账户信息
|
||||
func (c *Cache) loadAccount() error {
|
||||
blogapp := config.Conf.BlogApp
|
||||
if created { // init articles: about blogroll
|
||||
about := &model.Article{
|
||||
ID: 1, // 固定ID
|
||||
Author: blogapp.Account.Username,
|
||||
Title: "关于",
|
||||
Slug: "about",
|
||||
}
|
||||
err = c.InsertArticle(context.Background(), about)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
// 推送到 disqus
|
||||
go internal.ThreadCreate(about, blogger.BTitle)
|
||||
blogroll := &model.Article{
|
||||
ID: 2, // 固定ID
|
||||
Author: blogapp.Account.Username,
|
||||
Title: "友情链接",
|
||||
Slug: "blogroll",
|
||||
}
|
||||
err = c.InsertArticle(context.Background(), blogroll)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
// account
|
||||
pwd := tools.EncryptPasswd(blogapp.Account.Password,
|
||||
blogapp.Account.Password)
|
||||
|
||||
account := &model.Account{
|
||||
Username: blogapp.Account.Username,
|
||||
Password: pwd,
|
||||
Email: blogapp.Account.Email,
|
||||
PhoneN: blogapp.Account.PhoneNumber,
|
||||
Address: blogapp.Account.Address,
|
||||
}
|
||||
account, err := c.LoadInsertAccount(context.Background(), account)
|
||||
_, err = c.LoadInsertAccount(context.Background(), account)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
c.Account = account
|
||||
return nil
|
||||
}
|
||||
|
||||
// loadArticles 文章信息
|
||||
func (c *Cache) loadArticles() error {
|
||||
// all articles
|
||||
articles, err := c.LoadAllArticle(context.Background())
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -204,13 +207,13 @@ func (c *Cache) loadArticles() error {
|
||||
|
||||
c.ArticlesMap[v.Slug] = v
|
||||
// 分析文章
|
||||
if v.ID < config.Conf.BlogApp.General.StartID {
|
||||
if v.ID < blogapp.General.StartID {
|
||||
continue
|
||||
}
|
||||
if i > 0 {
|
||||
v.Prev = Ei.Articles[i-1]
|
||||
}
|
||||
if Ei.Articles[i+1].ID >= config.Conf.BlogApp.General.StartID {
|
||||
if Ei.Articles[i+1].ID >= blogapp.General.StartID {
|
||||
v.Next = Ei.Articles[i+1]
|
||||
}
|
||||
c.rebuildArticle(v, false)
|
||||
|
||||
45
pkg/cache/store/mongodb.go
vendored
45
pkg/cache/store/mongodb.go
vendored
@@ -50,27 +50,50 @@ func (db *mongodb) Init(source string) (Store, error) {
|
||||
return nil, err
|
||||
}
|
||||
db.Client = client
|
||||
// create index
|
||||
indexModel := mongo.IndexModel{
|
||||
Keys: bson.D{{"username", 1}},
|
||||
Options: options.Index().SetUnique(true).SetSparse(true),
|
||||
}
|
||||
db.Database(mongoDBName).Collection(collectionAccount).
|
||||
Indexes().
|
||||
CreateOne(context.Background(), indexModel)
|
||||
indexModel = mongo.IndexModel{
|
||||
Keys: bson.D{{"slug", 1}},
|
||||
Options: options.Index().SetUnique(true).SetSparse(true),
|
||||
}
|
||||
db.Database(mongoDBName).Collection(collectionArticle).
|
||||
Indexes().
|
||||
CreateOne(context.Background(), indexModel)
|
||||
indexModel = mongo.IndexModel{
|
||||
Keys: bson.D{{"slug", 1}},
|
||||
Options: options.Index().SetUnique(true).SetSparse(true),
|
||||
}
|
||||
db.Database(mongoDBName).Collection(collectionSeries).
|
||||
Indexes().
|
||||
CreateOne(context.Background(), indexModel)
|
||||
return db, nil
|
||||
}
|
||||
|
||||
// LoadInsertBlogger 读取或创建博客
|
||||
func (db *mongodb) LoadInsertBlogger(ctx context.Context,
|
||||
blogger *model.Blogger) (*model.Blogger, error) {
|
||||
blogger *model.Blogger) (created bool, err error) {
|
||||
|
||||
collection := db.Database(mongoDBName).Collection(collectionBlogger)
|
||||
|
||||
filter := bson.M{}
|
||||
result := collection.FindOne(ctx, filter)
|
||||
err := result.Err()
|
||||
err = result.Err()
|
||||
if err != nil {
|
||||
if err != mongo.ErrNoDocuments {
|
||||
return nil, err
|
||||
return
|
||||
}
|
||||
_, err = collection.InsertOne(ctx, blogger)
|
||||
created = true
|
||||
} else {
|
||||
err = result.Decode(blogger)
|
||||
}
|
||||
return blogger, err
|
||||
return
|
||||
}
|
||||
|
||||
// UpdateBlogger 更新博客
|
||||
@@ -91,22 +114,23 @@ func (db *mongodb) UpdateBlogger(ctx context.Context,
|
||||
|
||||
// LoadInsertAccount 读取或创建账户
|
||||
func (db *mongodb) LoadInsertAccount(ctx context.Context,
|
||||
acct *model.Account) (*model.Account, error) {
|
||||
acct *model.Account) (created bool, err error) {
|
||||
|
||||
collection := db.Database(mongoDBName).Collection(collectionAccount)
|
||||
|
||||
filter := bson.M{"username": config.Conf.BlogApp.Account.Username}
|
||||
result := collection.FindOne(ctx, filter)
|
||||
err := result.Err()
|
||||
err = result.Err()
|
||||
if err != nil {
|
||||
if err != mongo.ErrNoDocuments {
|
||||
return nil, err
|
||||
return
|
||||
}
|
||||
_, err = collection.InsertOne(ctx, acct)
|
||||
created = true
|
||||
} else {
|
||||
err = result.Decode(acct)
|
||||
}
|
||||
return acct, err
|
||||
return
|
||||
}
|
||||
|
||||
// UpdateAccount 更新账户
|
||||
@@ -185,14 +209,13 @@ func (db *mongodb) LoadAllSeries(ctx context.Context) (model.SortedSeries, error
|
||||
|
||||
// InsertArticle 创建文章
|
||||
func (db *mongodb) InsertArticle(ctx context.Context, article *model.Article) error {
|
||||
// 分配ID, 占位至起始id
|
||||
for {
|
||||
// 可手动分配ID或者分配ID, 占位至起始id
|
||||
for article.ID == 0 {
|
||||
id := db.nextValue(ctx, counterNameArticle)
|
||||
if id < config.Conf.BlogApp.General.StartID {
|
||||
continue
|
||||
} else {
|
||||
article.ID = id
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
1
pkg/cache/store/mongodb_test.go
vendored
1
pkg/cache/store/mongodb_test.go
vendored
@@ -135,6 +135,7 @@ func TestLoadAllSeries(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestInsertArticle(t *testing.T) {
|
||||
article.ID = 12
|
||||
err := store.InsertArticle(context.Background(), article)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
|
||||
5
pkg/cache/store/store.go
vendored
5
pkg/cache/store/store.go
vendored
@@ -18,12 +18,12 @@ var (
|
||||
// Store 存储后端
|
||||
type Store interface {
|
||||
// LoadInsertBlogger 读取或创建博客
|
||||
LoadInsertBlogger(ctx context.Context, blogger *model.Blogger) (*model.Blogger, error)
|
||||
LoadInsertBlogger(ctx context.Context, blogger *model.Blogger) (bool, error)
|
||||
// UpdateBlogger 更新博客
|
||||
UpdateBlogger(ctx context.Context, fields map[string]interface{}) error
|
||||
|
||||
// LoadInsertAccount 读取或创建账户
|
||||
LoadInsertAccount(ctx context.Context, acct *model.Account) (*model.Account, error)
|
||||
LoadInsertAccount(ctx context.Context, acct *model.Account) (bool, error)
|
||||
// UpdateAccount 更新账户
|
||||
UpdateAccount(ctx context.Context, name string, fields map[string]interface{}) error
|
||||
|
||||
@@ -58,6 +58,7 @@ type Store interface {
|
||||
|
||||
// Driver 存储驱动
|
||||
type Driver interface {
|
||||
// Init 数据库初始化, 建表, 加索引操作等
|
||||
Init(source string) (Store, error)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user