v2ray 9 anni fa
parent
commit
50957b9973

+ 5 - 5
app/router/rules/config_json.go

@@ -21,10 +21,10 @@ type JsonRule struct {
 func parseFieldRule(msg json.RawMessage) (*Rule, error) {
 	type RawFieldRule struct {
 		JsonRule
-		Domain  *serial.StringLiteralList `json:"domain"`
-		IP      *serial.StringLiteralList `json:"ip"`
-		Port    *v2net.PortRange          `json:"port"`
-		Network *v2net.NetworkList        `json:"network"`
+		Domain  *serial.StringTList `json:"domain"`
+		IP      *serial.StringTList `json:"ip"`
+		Port    *v2net.PortRange    `json:"port"`
+		Network *v2net.NetworkList  `json:"network"`
 	}
 	rawFieldRule := new(RawFieldRule)
 	err := json.Unmarshal(msg, rawFieldRule)
@@ -128,7 +128,7 @@ func init() {
 			Rules:          make([]*Rule, len(jsonConfig.RuleList)),
 			DomainStrategy: DomainAsIs,
 		}
-		domainStrategy := serial.StringLiteral(jsonConfig.DomainStrategy).ToLower()
+		domainStrategy := serial.StringT(jsonConfig.DomainStrategy).ToLower()
 		if domainStrategy.String() == "alwaysip" {
 			config.DomainStrategy = AlwaysUseIP
 		} else if domainStrategy.String() == "ipifnonmatch" {

+ 1 - 1
common/net/network_json.go

@@ -9,7 +9,7 @@ import (
 )
 
 func (this *NetworkList) UnmarshalJSON(data []byte) error {
-	var strlist serial.StringLiteralList
+	var strlist serial.StringTList
 	if err := json.Unmarshal(data, &strlist); err != nil {
 		return err
 	}

+ 1 - 1
proxy/freedom/config_json.go

@@ -18,7 +18,7 @@ func (this *Config) UnmarshalJSON(data []byte) error {
 		return err
 	}
 	this.DomainStrategy = DomainStrategyAsIs
-	domainStrategy := serial.StringLiteral(jsonConfig.DomainStrategy).ToLower()
+	domainStrategy := serial.StringT(jsonConfig.DomainStrategy).ToLower()
 	if domainStrategy.String() == "useip" {
 		this.DomainStrategy = DomainStrategyUseIP
 	}

+ 5 - 5
proxy/shadowsocks/config_json.go

@@ -14,11 +14,11 @@ import (
 
 func (this *Config) UnmarshalJSON(data []byte) error {
 	type JsonConfig struct {
-		Cipher   serial.StringLiteral `json:"method"`
-		Password serial.StringLiteral `json:"password"`
-		UDP      bool                 `json:"udp"`
-		Level    byte                 `json:"level"`
-		Email    string               `json:"email"`
+		Cipher   serial.StringT `json:"method"`
+		Password serial.StringT `json:"password"`
+		UDP      bool           `json:"udp"`
+		Level    byte           `json:"level"`
+		Email    string         `json:"email"`
 	}
 	jsonConfig := new(JsonConfig)
 	if err := json.Unmarshal(data, jsonConfig); err != nil {