This commit is contained in:
chenzhongjie 2024-04-10 17:03:15 +08:00
parent dd2f4b5973
commit 8c4c872939
2 changed files with 0 additions and 17 deletions

View File

@ -40,7 +40,6 @@ type ClientConfig struct {
BaseConfig `ini:",extends"` BaseConfig `ini:",extends"`
OidcClientConfig `ini:",extends"` OidcClientConfig `ini:",extends"`
TokenConfig `ini:",extends"` TokenConfig `ini:",extends"`
JWTConfig `ini:",extends"`
} }
func GetDefaultClientConf() ClientConfig { func GetDefaultClientConf() ClientConfig {
@ -48,7 +47,6 @@ func GetDefaultClientConf() ClientConfig {
BaseConfig: getDefaultBaseConf(), BaseConfig: getDefaultBaseConf(),
OidcClientConfig: getDefaultOidcClientConf(), OidcClientConfig: getDefaultOidcClientConf(),
TokenConfig: getDefaultTokenConf(), TokenConfig: getDefaultTokenConf(),
JWTConfig: getDefaultJWTConf(),
} }
} }
@ -56,7 +54,6 @@ type ServerConfig struct {
BaseConfig `ini:",extends"` BaseConfig `ini:",extends"`
OidcServerConfig `ini:",extends"` OidcServerConfig `ini:",extends"`
TokenConfig `ini:",extends"` TokenConfig `ini:",extends"`
JWTConfig `ini:",extends"`
} }
func GetDefaultServerConf() ServerConfig { func GetDefaultServerConf() ServerConfig {
@ -64,7 +61,6 @@ func GetDefaultServerConf() ServerConfig {
BaseConfig: getDefaultBaseConf(), BaseConfig: getDefaultBaseConf(),
OidcServerConfig: getDefaultOidcServerConf(), OidcServerConfig: getDefaultOidcServerConf(),
TokenConfig: getDefaultTokenConf(), TokenConfig: getDefaultTokenConf(),
JWTConfig: getDefaultJWTConf(),
} }
} }
@ -147,13 +143,3 @@ func getDefaultTokenConf() TokenConfig {
Token: "", Token: "",
} }
} }
type JWTConfig struct {
Secret string `ini:"secret" json:"secret"`
}
func getDefaultJWTConf() JWTConfig {
return JWTConfig{
Secret: "",
}
}

View File

@ -17,8 +17,6 @@ package msg
import ( import (
"io" "io"
"reflect" "reflect"
"github.com/fatedier/frp/pkg/util/log"
) )
func AsyncHandler(f func(Message)) func(Message) { func AsyncHandler(f func(Message)) func(Message) {
@ -67,7 +65,6 @@ func (d *Dispatcher) readLoop() {
for { for {
m, err := ReadMsg(d.rw) m, err := ReadMsg(d.rw)
if err != nil { if err != nil {
log.Errorf("read msg error, %v", err)
close(d.doneCh) close(d.doneCh)
return return
} }