Skip to content

Commit

Permalink
Merge pull request #123 from Colin-XKL/update
Browse files Browse the repository at this point in the history
fix reset password not working
  • Loading branch information
Colin-XKL authored Nov 10, 2024
2 parents 7daf604 + 72bfa33 commit dd4354a
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 22 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -182,4 +182,5 @@ yarn-error.log
web/admin/.idea
web/admin/dist
.aider*
.run
.run
main
4 changes: 2 additions & 2 deletions internal/craft/entry.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ import (
"FeedCraft/internal/dao"
"FeedCraft/internal/util"
"fmt"
"net/http"

"github.com/gin-gonic/gin"
"github.com/samber/lo"
"github.com/sirupsen/logrus"
"gorm.io/gorm"
"net/http"
)

func GetSysCraftTemplateDict() map[string]CraftTemplate {
Expand Down Expand Up @@ -122,7 +123,6 @@ func Entry(c *gin.Context) {
return
}
CommonCraftHandlerUsingCraftOptionList(c, craftOptionList)
return
}

const MaxCallDepth = 5
Expand Down
10 changes: 5 additions & 5 deletions internal/craft/fulltext_plus.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@ package craft

import (
"FeedCraft/internal/util"
"github.com/go-resty/resty/v2"
"github.com/go-shiori/go-readability"
"github.com/gorilla/feeds"
"github.com/sirupsen/logrus"
"log"
"net/url"
"strings"
"time"

"github.com/go-resty/resty/v2"
"github.com/go-shiori/go-readability"
"github.com/gorilla/feeds"
"github.com/sirupsen/logrus"
)

//func getRenderedHTML(websiteUrl string) (string, error) {
Expand Down Expand Up @@ -96,7 +97,6 @@ func getRenderedHTML2(websiteUrl string, timeout time.Duration) (string, error)
article, err := readability.FromReader(strings.NewReader(response.String()), parseUrl)

return article.Content, err
return response.String(), nil
}

func GetFulltextPlusCraftOptions() []CraftOption {
Expand Down
11 changes: 5 additions & 6 deletions internal/craft/keyword.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package craft

import (
"strings"

"github.com/gorilla/feeds"
"github.com/sirupsen/logrus"
"strings"
)

type KeywordFilterMode string
Expand Down Expand Up @@ -54,12 +55,10 @@ func optionKeyword(mode KeywordFilterMode, matchScope KeywordMatchScope, keyword
if matched {
filtered = append(filtered, feedItem)
}
break
case KeywordExcludeMode:
if !matched {
filtered = append(filtered, feedItem)
}
break
default:
logrus.Warnf("unknown mode %s", mode)
}
Expand All @@ -83,7 +82,7 @@ var keywordCraftParamTmpl = []ParamTemplate{
}

func keywordCraftLoadParams(m map[string]string) []CraftOption {
modeStr, _ := m["mode"]
modeStr := m["mode"]
mode := KeywordIncludeMode
if modeStr == string(KeywordIncludeMode) {
mode = KeywordIncludeMode
Expand All @@ -92,7 +91,7 @@ func keywordCraftLoadParams(m map[string]string) []CraftOption {
} else {
logrus.Warnf("unknown mode str %s", modeStr)
}
scopeStr, _ := m["scope"]
scopeStr := m["scope"]
scope := KeywordMatchAll
if scopeStr == string(KeywordMatchTitle) {
scope = KeywordMatchTitle
Expand All @@ -103,7 +102,7 @@ func keywordCraftLoadParams(m map[string]string) []CraftOption {
} else {
logrus.Warnf("unknown scope str %s", scopeStr)
}
keywordStr, _ := m["keywords"]
keywordStr := m["keywords"]
keywordList := strings.Split(keywordStr, ",")
return GetKeywordOption(mode, scope, keywordList)
}
18 changes: 10 additions & 8 deletions internal/dao/migrate.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package dao

import (
"FeedCraft/internal/util"

"github.com/sirupsen/logrus"
"gorm.io/gorm"
)
Expand All @@ -27,6 +28,12 @@ func MigrateDatabases() {
var defaultAdminUsername = "admin"
var defaultPassword = "adminadmin" // default defaultPassword string

var defaultAdminUser = User{
Username: defaultAdminUsername,
NickName: "Admin",
Email: "admin@example.com",
}

func createAdminUser(db *gorm.DB) {
md5Password := util.GetMD5Hash(defaultPassword)

Expand All @@ -39,12 +46,7 @@ func createAdminUser(db *gorm.DB) {
}

// 创建 admin 用户
adminUser := &User{
Username: defaultAdminUsername,
NickName: "Admin",
Email: "admin@example.com",
}
if err := CreateUser(db, adminUser, md5Password); err != nil {
if err := CreateUser(db, &defaultAdminUser, md5Password); err != nil {
logrus.Error("failed to create admin user:", err)
return
}
Expand All @@ -53,9 +55,9 @@ func createAdminUser(db *gorm.DB) {
}

// 重置 admin 密码
func ResetAdminPassword()error {
func ResetAdminPassword() error {
logrus.Info("resetting admin password...")
db := util.GetDatabase()
md5Password := util.GetMD5Hash(defaultPassword)
return db.Model(&User{}).Where("username = ?", defaultAdminUsername).Update("password", md5Password).Error
return UpdateUserPassword(db, &defaultAdminUser, md5Password)
}

0 comments on commit dd4354a

Please sign in to comment.