mirror of
https://github.com/keven1024/015.git
synced 2026-05-26 07:08:02 +00:00
refactor(backend): standardize environment variable names for download and password handling, enhancing consistency and clarity
This commit is contained in:
@@ -25,7 +25,7 @@ func DownloadShare(c echo.Context) error {
|
||||
}
|
||||
claims := DownloadShareClaims{}
|
||||
t, err := jwt.ParseWithClaims(token, &claims, func(token *jwt.Token) (interface{}, error) {
|
||||
return []byte(utils.GetEnv("download.secret")), nil
|
||||
return []byte(utils.GetEnv("share.download_secret")), nil
|
||||
})
|
||||
if err != nil {
|
||||
return utils.HTTPErrorHandler(c, err)
|
||||
@@ -96,7 +96,7 @@ func VaildateShare(c echo.Context) error {
|
||||
})
|
||||
|
||||
// Sign and get the complete encoded token as a string using the secret
|
||||
downloadToken, err := token.SignedString([]byte(utils.GetEnv("download.secret")))
|
||||
downloadToken, err := token.SignedString([]byte(utils.GetEnv("share.download_secret")))
|
||||
if err != nil {
|
||||
return utils.HTTPErrorHandler(c, err)
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
)
|
||||
|
||||
func GeneratePasswordHash(password string) (string, error) {
|
||||
salt := GetEnv("password.salt")
|
||||
salt := GetEnv("share.password_salt")
|
||||
if salt == "" {
|
||||
return "", errors.New("请配置PASSWORD_SALT")
|
||||
}
|
||||
|
||||
@@ -9,8 +9,8 @@ import (
|
||||
|
||||
func TestGeneratePasswordHash(t *testing.T) {
|
||||
// 保存原始环境变量
|
||||
originalSalt := os.Getenv("password.salt")
|
||||
defer os.Setenv("password.salt", originalSalt)
|
||||
originalSalt := os.Getenv("share.password_salt")
|
||||
defer os.Setenv("share.password_salt", originalSalt)
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
@@ -20,11 +20,11 @@ func TestGeneratePasswordHash(t *testing.T) {
|
||||
errorMsg string
|
||||
}{
|
||||
{
|
||||
name: "password.salt未配置",
|
||||
name: "share.password_salt未配置",
|
||||
password: "testpassword",
|
||||
salt: "",
|
||||
expectError: true,
|
||||
errorMsg: "请配置password.salt",
|
||||
errorMsg: "请配置share.password_salt",
|
||||
},
|
||||
{
|
||||
name: "正常生成哈希",
|
||||
@@ -38,9 +38,9 @@ func TestGeneratePasswordHash(t *testing.T) {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
// 设置环境变量
|
||||
if tt.salt != "" {
|
||||
os.Setenv("password.salt", tt.salt)
|
||||
os.Setenv("share.password_salt", tt.salt)
|
||||
} else {
|
||||
os.Unsetenv("password.salt")
|
||||
os.Unsetenv("share.password_salt")
|
||||
}
|
||||
|
||||
hash, err := GeneratePasswordHash(tt.password)
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"backend/internal/controllers"
|
||||
"backend/internal/utils"
|
||||
"backend/middleware"
|
||||
"fmt"
|
||||
|
||||
"github.com/labstack/echo/v4"
|
||||
"go.uber.org/zap"
|
||||
@@ -12,7 +13,7 @@ import (
|
||||
func main() {
|
||||
// 日志
|
||||
var logger *zap.Logger
|
||||
if utils.GetEnvWithDefault("NODE_ENV", "production") == "production" {
|
||||
if utils.GetEnvWithDefault("node.env", "production") == "production" {
|
||||
logger, _ = zap.NewProduction()
|
||||
} else {
|
||||
logger, _ = zap.NewDevelopment()
|
||||
@@ -40,5 +41,5 @@ func main() {
|
||||
e.GET("/image/compress/:id", controllers.GetCompressImage)
|
||||
|
||||
e.GET("/stat", controllers.GetStat)
|
||||
e.Logger.Fatal(e.Start(":1323"))
|
||||
e.Logger.Fatal(e.Start(fmt.Sprintf(":%s", utils.GetEnvWithDefault("api.port", "5001"))))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user