mirror of
https://github.com/usememos/memos.git
synced 2024-12-19 00:51:30 +03:00
chore: release v0.4.3
This commit is contained in:
parent
d1a4348048
commit
b8a7df21f2
@ -7,10 +7,10 @@ import (
|
|||||||
|
|
||||||
// Version is the service current released version.
|
// Version is the service current released version.
|
||||||
// Semantic versioning: https://semver.org/
|
// Semantic versioning: https://semver.org/
|
||||||
var Version = "0.4.2"
|
var Version = "0.4.3"
|
||||||
|
|
||||||
// DevVersion is the service current development version.
|
// DevVersion is the service current development version.
|
||||||
var DevVersion = "0.4.2"
|
var DevVersion = "0.4.3"
|
||||||
|
|
||||||
func GetCurrentVersion(mode string) string {
|
func GetCurrentVersion(mode string) string {
|
||||||
if mode == "dev" {
|
if mode == "dev" {
|
||||||
@ -27,6 +27,12 @@ func GetMinorVersion(version string) string {
|
|||||||
return versionList[0] + "." + versionList[1]
|
return versionList[0] + "." + versionList[1]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func GetSchemaVersion(version string) string {
|
||||||
|
minorVersion := GetMinorVersion(version)
|
||||||
|
|
||||||
|
return minorVersion + ".0"
|
||||||
|
}
|
||||||
|
|
||||||
// convSemanticVersionToInt converts version string to int.
|
// convSemanticVersionToInt converts version string to int.
|
||||||
func convSemanticVersionToInt(version string) int {
|
func convSemanticVersionToInt(version string) int {
|
||||||
versionList := strings.Split(version, ".")
|
versionList := strings.Split(version, ".")
|
||||||
|
@ -71,7 +71,7 @@ func aclMiddleware(s *Server, next echo.HandlerFunc) echo.HandlerFunc {
|
|||||||
OpenID: &openID,
|
OpenID: &openID,
|
||||||
}
|
}
|
||||||
user, err := s.Store.FindUser(ctx, userFind)
|
user, err := s.Store.FindUser(ctx, userFind)
|
||||||
if err != nil {
|
if err != nil && common.ErrorCode(err) != common.NotFound {
|
||||||
return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find user by open_id").SetInternal(err)
|
return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find user by open_id").SetInternal(err)
|
||||||
}
|
}
|
||||||
if user != nil {
|
if user != nil {
|
||||||
@ -90,7 +90,7 @@ func aclMiddleware(s *Server, next echo.HandlerFunc) echo.HandlerFunc {
|
|||||||
ID: &userID,
|
ID: &userID,
|
||||||
}
|
}
|
||||||
user, err := s.Store.FindUser(ctx, userFind)
|
user, err := s.Store.FindUser(ctx, userFind)
|
||||||
if err != nil {
|
if err != nil && common.ErrorCode(err) != common.NotFound {
|
||||||
return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to find user by ID: %d", userID)).SetInternal(err)
|
return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to find user by ID: %d", userID)).SetInternal(err)
|
||||||
}
|
}
|
||||||
if user != nil {
|
if user != nil {
|
||||||
|
@ -24,7 +24,7 @@ func (s *Server) registerAuthRoutes(g *echo.Group) {
|
|||||||
Email: &signin.Email,
|
Email: &signin.Email,
|
||||||
}
|
}
|
||||||
user, err := s.Store.FindUser(ctx, userFind)
|
user, err := s.Store.FindUser(ctx, userFind)
|
||||||
if err != nil {
|
if err != nil && common.ErrorCode(err) != common.NotFound {
|
||||||
return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to find user by email %s", signin.Email)).SetInternal(err)
|
return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to find user by email %s", signin.Email)).SetInternal(err)
|
||||||
}
|
}
|
||||||
if user == nil {
|
if user == nil {
|
||||||
@ -68,7 +68,7 @@ func (s *Server) registerAuthRoutes(g *echo.Group) {
|
|||||||
Role: &hostUserType,
|
Role: &hostUserType,
|
||||||
}
|
}
|
||||||
hostUser, err := s.Store.FindUser(ctx, &hostUserFind)
|
hostUser, err := s.Store.FindUser(ctx, &hostUserFind)
|
||||||
if err != nil {
|
if err != nil && common.ErrorCode(err) != common.NotFound {
|
||||||
return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find host user").SetInternal(err)
|
return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find host user").SetInternal(err)
|
||||||
}
|
}
|
||||||
if hostUser != nil {
|
if hostUser != nil {
|
||||||
|
@ -5,6 +5,7 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"github.com/usememos/memos/api"
|
"github.com/usememos/memos/api"
|
||||||
|
"github.com/usememos/memos/common"
|
||||||
|
|
||||||
"github.com/labstack/echo/v4"
|
"github.com/labstack/echo/v4"
|
||||||
)
|
)
|
||||||
@ -27,7 +28,7 @@ func (s *Server) registerSystemRoutes(g *echo.Group) {
|
|||||||
Role: &hostUserType,
|
Role: &hostUserType,
|
||||||
}
|
}
|
||||||
hostUser, err := s.Store.FindUser(ctx, &hostUserFind)
|
hostUser, err := s.Store.FindUser(ctx, &hostUserFind)
|
||||||
if err != nil {
|
if err != nil && common.ErrorCode(err) != common.NotFound {
|
||||||
return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find host user").SetInternal(err)
|
return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find host user").SetInternal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -84,7 +84,7 @@ func (db *DB) Open(ctx context.Context) (err error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if common.IsVersionGreaterThan(currentVersion, migrationHistory.Version) {
|
if common.IsVersionGreaterThan(common.GetSchemaVersion(currentVersion), migrationHistory.Version) {
|
||||||
minorVersionList := getMinorVersionList()
|
minorVersionList := getMinorVersionList()
|
||||||
|
|
||||||
// backup the raw database file before migration
|
// backup the raw database file before migration
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "memos",
|
"name": "memos",
|
||||||
"version": "0.4.2",
|
"version": "0.4.3",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
"build": "tsc && vite build",
|
"build": "tsc && vite build",
|
||||||
|
Loading…
Reference in New Issue
Block a user