lanyulei/ferry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复 jwt 空值的问题。

Browse Source
This commit is contained in:
lanyulei
2024-11-18 23:28:42 +08:00
parent c14ca0d831
commit 626f169e81
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/jwtauth/jwtauth.go
View File

@@ -4,8 +4,8 @@ import (
"crypto/rsa" "crypto/rsa"
"errors" "errors"
config2 "ferry/tools/config" config2 "ferry/tools/config"
"io/ioutil"
"net/http" "net/http"
"os"
"strings" "strings"
"time" "time"
@@ -234,7 +234,7 @@ func (mw *GinJWTMiddleware) readKeys() error {
} }
func (mw *GinJWTMiddleware) privateKey() error { func (mw *GinJWTMiddleware) privateKey() error {
keyData, err := ioutil.ReadFile(mw.PrivKeyFile) keyData, err := os.ReadFile(mw.PrivKeyFile)
if err != nil { if err != nil {
return ErrNoPrivKeyFile return ErrNoPrivKeyFile
} }
@@ -247,7 +247,7 @@ func (mw *GinJWTMiddleware) privateKey() error {
} }
func (mw *GinJWTMiddleware) publicKey() error { func (mw *GinJWTMiddleware) publicKey() error {
keyData, err := ioutil.ReadFile(mw.PubKeyFile) keyData, err := os.ReadFile(mw.PubKeyFile)
if err != nil { if err != nil {
return ErrNoPubKeyFile return ErrNoPubKeyFile
} }

4
tools/config/application.go
View File

@@ -22,7 +22,7 @@ func InitApplication(cfg *viper.Viper) *Application {
Host: cfg.GetString("host"), Host: cfg.GetString("host"),
Port: portDefault(cfg), Port: portDefault(cfg),
Name: cfg.GetString("name"), Name: cfg.GetString("name"),
JwtSecret: cfg.GetString("jwtSecret"), JwtSecret: viper.GetString("settings.jwt.secret"),
Mode: cfg.GetString("mode"), Mode: cfg.GetString("mode"),
DemoMsg: cfg.GetString("demoMsg"), DemoMsg: cfg.GetString("demoMsg"),
Domain: cfg.GetString("domain"), Domain: cfg.GetString("domain"),
@@ -41,7 +41,7 @@ func portDefault(cfg *viper.Viper) string {
} }
func isHttpsDefault(cfg *viper.Viper) bool { func isHttpsDefault(cfg *viper.Viper) bool {
if cfg.GetString("ishttps") == "" || cfg.GetBool("ishttps") == false{ if cfg.GetString("ishttps") == "" || cfg.GetBool("ishttps") == false {
return false return false
} else { } else {
return true return true