增加从环境变量获取配置&修复修改密码失败的bug&增加退出登录&修复新增用户无法登录的bug

pkg/api/account.go

@@ -13,6 +13,11 @@ type LoginAccount struct {
 	Password string `json:"password"`
 }
 
+type ChangePassword struct {
+	NewPassword string `json:"newPassword"`
+	OldPassword string `json:"oldPassword"`
+}
+
 func LoginEndpoint(c echo.Context) error {
 	var loginAccount LoginAccount
 	if err := c.Bind(&loginAccount); err != nil {
@@ -21,10 +26,10 @@ func LoginEndpoint(c echo.Context) error {
 
 	user, err := model.FindUserByUsername(loginAccount.Username)
 	if err != nil {
-		return err
+		return Fail(c, -1, "您输入的账号或密码不正确")
 	}
 	if err := utils.Encoder.Match([]byte(user.Password), []byte(loginAccount.Password)); err != nil {
-		return err
+		return Fail(c, -1, "您输入的账号或密码不正确")
 	}
 
 	token := utils.UUID()
@@ -43,7 +48,28 @@ func LogoutEndpoint(c echo.Context) error {
 }
 
 func ChangePasswordEndpoint(c echo.Context) error {
-	return nil
+	account, _ := GetCurrentAccount(c)
+
+	var changePassword ChangePassword
+	if err := c.Bind(&changePassword); err != nil {
+		return err
+	}
+
+	if err := utils.Encoder.Match([]byte(account.Password), []byte(changePassword.OldPassword)); err != nil {
+		return Fail(c, -1, "您输入的原密码不正确")
+	}
+
+	passwd, err := utils.Encoder.Encode([]byte(changePassword.NewPassword))
+	if err != nil {
+		return err
+	}
+	u := &model.User{
+		Password: string(passwd),
+	}
+
+	model.UpdateUserById(u, account.ID)
+
+	return LogoutEndpoint(c)
 }
 
 func InfoEndpoint(c echo.Context) error {

pkg/api/middleware.go

@@ -7,6 +7,16 @@ import (
 	"time"
 )
 
+func ErrorHandler(next echo.HandlerFunc) echo.HandlerFunc {
+	return func(c echo.Context) error {
+
+		if err := next(c); err != nil {
+			return Fail(c, 0, err.Error())
+		}
+		return nil
+	}
+}
+
 func Auth(next echo.HandlerFunc) echo.HandlerFunc {
 
 	urls := []string{"download", "recording", "login", "static", "favicon", "logo"}

pkg/api/routes.go

@@ -36,6 +36,7 @@ func SetupRoutes() *echo.Echo {
 		AllowOrigins: []string{"*"},
 		AllowMethods: []string{http.MethodGet, http.MethodHead, http.MethodPut, http.MethodPatch, http.MethodPost, http.MethodDelete},
 	}))
+	e.Use(ErrorHandler)
 	e.Use(Auth)
 
 	e.POST("/login", LoginEndpoint)

pkg/api/user.go

@@ -16,7 +16,7 @@ func UserCreateEndpoint(c echo.Context) error {
 
 	var pass []byte
 	var err error
-	if pass, err = utils.Encoder.Encode([]byte("admin")); err != nil {
+	if pass, err = utils.Encoder.Encode([]byte(item.Password)); err != nil {
 		return err
 	}
 	item.Password = string(pass)