From a7d6ae7350b9e00c8ccea14d5b2ac93831d4b7f4 Mon Sep 17 00:00:00 2001
From: Aehxy <ahmrcxy@gmail.com>
Date: Wed, 16 Aug 2023 19:34:16 +0800
Subject: [PATCH] var-naming

---
 pkg/config/parse.go  |  1 +
 pkg/config/server.go | 20 ++++++++++----------
 server/control.go    |  4 ++--
 server/service.go    |  8 ++++----
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/pkg/config/parse.go b/pkg/config/parse.go
index 86b15b2..445f723 100644
--- a/pkg/config/parse.go
+++ b/pkg/config/parse.go
@@ -28,6 +28,7 @@ func ParseClientConfig(fileContent string) (
 	err error,
 ) {
 	var content []byte
+
 	content = []byte(fileContent)
 
 	configBuffer := bytes.NewBuffer(nil)
diff --git a/pkg/config/server.go b/pkg/config/server.go
index 545227e..0cfbd0b 100644
--- a/pkg/config/server.go
+++ b/pkg/config/server.go
@@ -193,11 +193,11 @@ type ServerCommonConf struct {
 	// Dashboard port must be set first.
 	PprofEnable bool `ini:"pprof_enable" json:"pprof_enable"`
 	// Enable API Service
-	EnableApi bool `json:"api_enable"`
+	EnableAPI bool `json:"api_enable"`
 	// GET API BaseUrl
-	ApiBaseUrl string `json:"api_baseurl"`
+	APIBaseURL string `json:"api_baseurl"`
 	// Get API Token
-	ApiToken string `json:"api_token"`
+	APIToken string `json:"api_token"`
 	// NatHoleAnalysisDataReserveHours specifies the hours to reserve nat hole analysis data.
 	NatHoleAnalysisDataReserveHours int64 `ini:"nat_hole_analysis_data_reserve_hours" json:"nat_hole_analysis_data_reserve_hours"`
 }
@@ -229,9 +229,9 @@ func GetDefaultServerConf() ServerCommonConf {
 		UserConnTimeout:                 10,
 		HTTPPlugins:                     make(map[string]plugin.HTTPPluginOptions),
 		UDPPacketSize:                   1500,
-		EnableApi:                       false,
-		ApiBaseUrl:                      "",
-		ApiToken:                        "",
+		EnableAPI:                       false,
+		APIBaseURL:                      "",
+		APIToken:                        "",
 		NatHoleAnalysisDataReserveHours: 7 * 24,
 	}
 }
@@ -278,19 +278,19 @@ func UnmarshalServerConfFromIni(source interface{}) (ServerCommonConf, error) {
 
 	tmpStr = s.Key("api_enable").String()
 	if tmpStr == "false" {
-		common.EnableApi = false
+		common.EnableAPI = false
 	} else {
-		common.EnableApi = true
+		common.EnableAPI = true
 	}
 
 	tmpStr = s.Key("api_baseurl").String()
 	if tmpStr == s.Key("api_baseurl").String() {
-		common.ApiBaseUrl = tmpStr
+		common.APIBaseURL = tmpStr
 	}
 
 	tmpStr = s.Key("api_token").String()
 	if tmpStr == s.Key("api_token").String() {
-		common.ApiToken = tmpStr
+		common.APIToken = tmpStr
 	}
 
 	// plugin.xxx
diff --git a/server/control.go b/server/control.go
index 6c6a4a6..f2fc1b7 100644
--- a/server/control.go
+++ b/server/control.go
@@ -557,7 +557,7 @@ func (ctl *Control) HandleNatHoleReport(m *msg.NatHoleReport) {
 func (ctl *Control) RegisterProxy(pxyMsg *msg.NewProxy, LoginMsg *msg.Login) (remoteAddr string, err error) {
 	var pxyConf config.ProxyConf
 
-	s, err := api.NewService(ctl.serverCfg.ApiBaseUrl)
+	s, err := api.NewService(ctl.serverCfg.APIBaseURL)
 
 	var workConn proxy.GetWorkConnFn = ctl.GetWorkConn
 
@@ -568,7 +568,7 @@ func (ctl *Control) RegisterProxy(pxyMsg *msg.NewProxy, LoginMsg *msg.Login) (re
 	if ctl.serverCfg.EnableApi {
 
 		nowTime := time.Now().Unix()
-		ok, err := s.CheckProxy(ctl.loginMsg.User, pxyMsg, nowTime, ctl.serverCfg.ApiToken, LoginMsg)
+		ok, err := s.CheckProxy(ctl.loginMsg.User, pxyMsg, nowTime, ctl.serverCfg.APIToken, LoginMsg)
 
 		if err != nil {
 			return remoteAddr, err
diff --git a/server/service.go b/server/service.go
index 04cef75..7cd7a55 100644
--- a/server/service.go
+++ b/server/service.go
@@ -587,11 +587,11 @@ func (svr *Service) RegisterControl(ctlConn net.Conn, loginMsg *msg.Login) (err
 		outLimit uint64
 	)
 
-	if svr.cfg.EnableApi {
+	if svr.cfg.EnableAPI {
 
 		nowTime := time.Now().Unix()
 
-		s, err := api.NewService(svr.cfg.ApiBaseUrl)
+		s, err := api.NewService(svr.cfg.APIBaseURL)
 		if err != nil {
 			return err
 		}
@@ -604,7 +604,7 @@ func (svr *Service) RegisterControl(ctlConn net.Conn, loginMsg *msg.Login) (err
 		}
 
 		// Connect to API server and verify the user.
-		valid, err := s.CheckToken(loginMsg.User, loginMsg.PrivilegeKey, nowTime, svr.cfg.ApiToken)
+		valid, err := s.CheckToken(loginMsg.User, loginMsg.PrivilegeKey, nowTime, svr.cfg.APIToken)
 
 		if err != nil {
 			return err
@@ -614,7 +614,7 @@ func (svr *Service) RegisterControl(ctlConn net.Conn, loginMsg *msg.Login) (err
 			return fmt.Errorf("authorization failed")
 		}
 
-		inLimit, outLimit, err = s.GetProxyLimit(loginMsg.User, nowTime, svr.cfg.ApiToken)
+		inLimit, outLimit, err = s.GetProxyLimit(loginMsg.User, nowTime, svr.cfg.APIToken)
 		if err != nil {
 			return err
 		}