Unifying the order of outbound settings

infra/conf/http.go

@@ -53,10 +53,10 @@ type HTTPRemoteConfig struct {
 type HTTPClientConfig struct {
 	Address  *Address          	 `json:"address"`
 	Port     uint16            	 `json:"port"`
-	Username string              `json:"user"`
-	Password string              `json:"pass"`
 	Level    uint32              `json:"level"`
 	Email    string              `json:"email"`
+	Username string              `json:"user"`
+	Password string              `json:"pass"`
 	Servers  []*HTTPRemoteConfig `json:"servers"`
 	Headers  map[string]string   `json:"headers"`
 }

infra/conf/shadowsocks.go

@@ -162,10 +162,10 @@ func buildShadowsocks2022(v *ShadowsocksServerConfig) (proto.Message, error) {
 type ShadowsocksServerTarget struct {
 	Address    *Address `json:"address"`
 	Port       uint16   `json:"port"`
+	Level      byte     `json:"level"`
+	Email      string   `json:"email"`
 	Cipher     string   `json:"method"`
 	Password   string   `json:"password"`
-	Email      string   `json:"email"`
-	Level      byte     `json:"level"`
 	IVCheck    bool     `json:"ivCheck"`
 	UoT        bool     `json:"uot"`
 	UoTVersion int      `json:"uotVersion"`
@@ -174,10 +174,10 @@ type ShadowsocksServerTarget struct {
 type ShadowsocksClientConfig struct {
 	Address    *Address `json:"address"`
 	Port       uint16   `json:"port"`
+	Level      byte     `json:"level"`
+	Email      string   `json:"email"`
 	Cipher     string   `json:"method"`
 	Password   string   `json:"password"`
-	Email      string   `json:"email"`
-	Level      byte     `json:"level"`
 	IVCheck    bool     `json:"ivCheck"`
 	UoT        bool     `json:"uot"`
 	UoTVersion int      `json:"uotVersion"`
@@ -190,10 +190,10 @@ func (v *ShadowsocksClientConfig) Build() (proto.Message, error) {
 			{
 				Address:    v.Address,
 				Port:       v.Port,
+				Level:      v.Level,
+				Email:      v.Email,
 				Cipher:     v.Cipher,
 				Password:   v.Password,
-				Email:      v.Email,
-				Level:      v.Level,
 				IVCheck:    v.IVCheck,
 				UoT:        v.UoT,
 				UoTVersion: v.UoTVersion,

infra/conf/socks.go

@@ -72,10 +72,10 @@ type SocksRemoteConfig struct {
 type SocksClientConfig struct {
 	Address  *Address             `json:"address"`
 	Port     uint16               `json:"port"`
+	Level    uint32               `json:"level"`
+	Email    string               `json:"email"`
 	Username string               `json:"user"`
 	Password string               `json:"pass"`
-	Email    string               `json:"email"`
-	Level    uint32               `json:"level"`
 	Servers  []*SocksRemoteConfig `json:"servers"`
 }
 

infra/conf/trojan.go

@@ -20,9 +20,9 @@ import (
 type TrojanServerTarget struct {
 	Address  *Address `json:"address"`
 	Port     uint16   `json:"port"`
-	Password string   `json:"password"`
-	Email    string   `json:"email"`
 	Level    byte     `json:"level"`
+	Email    string   `json:"email"`
+	Password string   `json:"password"`
 	Flow     string   `json:"flow"`
 }
 
@@ -30,9 +30,9 @@ type TrojanServerTarget struct {
 type TrojanClientConfig struct {
 	Address  *Address `json:"address"`
 	Port     uint16   `json:"port"`
-	Password string   `json:"password"`
-	Email    string   `json:"email"`
 	Level    byte     `json:"level"`
+	Email    string   `json:"email"`
+	Password string   `json:"password"`
 	Flow     string   `json:"flow"`
 	Servers []*TrojanServerTarget `json:"servers"`
 }
@@ -44,9 +44,9 @@ func (c *TrojanClientConfig) Build() (proto.Message, error) {
 			{
 				Address:  c.Address,
 				Port:     c.Port,
-				Password: c.Password,
-				Email:    c.Email,
 				Level:    c.Level,
+				Email:    c.Email,
+				Password: c.Password,
 				Flow:     c.Flow,
 			},
 		}

infra/conf/vmess.go

@@ -119,9 +119,9 @@ type VMessOutboundTarget struct {
 type VMessOutboundConfig struct {
 	Address     *Address               `json:"address"`
 	Port        uint16                 `json:"port"`
-	ID          string                 `json:"id"`
 	Level       uint32                 `json:"level"`
 	Email       string                 `json:"email"`
+	ID          string                 `json:"id"`
 	Security    string                 `json:"security"`
 	Experiments string                 `json:"experiments"`
 	Receivers   []*VMessOutboundTarget `json:"vnext"`