mirrors2/hk4e
1
0
Fork 0
mirror of https://github.com/FlourishingWorld/hk4e.git synced 2026-02-04 14:22:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化代码

Browse Source
This commit is contained in:
flswld
2023-02-18 22:09:59 +08:00
parent 21fb9d400f
commit e580baeb46
37 changed files with 198 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/alg/aoi_test.go
View File

@@ -11,6 +11,9 @@ func TestAoiManagerGetSurrGridListByGid(t *testing.T) {
filePath := "./application.toml"
config.InitConfig(filePath)
logger.InitLogger("")
defer func() {
logger.CloseLogger()
}()
aoiManager := NewAoiManager()
aoiManager.SetAoiRange(
-150, 150,

30
pkg/httpclient/http_client.go
View File

@@ -26,13 +26,14 @@ func init() {
}
}
func GetJson[T any](url string, authToken string) (*T, error) {
func GetJson[T any](url string, authToken ...string) (*T, error) {
logger.Debug("http get req url: %v", url)
req, err := http.NewRequest("GET", url, nil)
if err != nil {
return nil, err
}
if authToken != "" {
req.Header.Set("Authorization", "Bearer"+" "+authToken)
if len(authToken) != 0 {
req.Header.Set("Authorization", "Bearer"+" "+authToken[0])
}
rsp, err := httpClient.Do(req)
if err != nil {
@@ -52,13 +53,14 @@ func GetJson[T any](url string, authToken string) (*T, error) {
return responseData, nil
}
func GetRaw(url string, authToken string) (string, error) {
func GetRaw(url string, authToken ...string) (string, error) {
logger.Debug("http get req url: %v", url)
req, err := http.NewRequest("GET", url, nil)
if err != nil {
return "", err
}
if authToken != "" {
req.Header.Set("Authorization", "Bearer"+" "+authToken)
if len(authToken) != 0 {
req.Header.Set("Authorization", "Bearer"+" "+authToken[0])
}
rsp, err := httpClient.Do(req)
if err != nil {
@@ -69,21 +71,23 @@ func GetRaw(url string, authToken string) (string, error) {
if err != nil {
return "", err
}
logger.Debug("http get rsp data: %v", string(data))
return string(data), nil
}
func PostJson[T any](url string, body any, authToken string) (*T, error) {
func PostJson[T any](url string, body any, authToken ...string) (*T, error) {
reqData, err := json.Marshal(body)
if err != nil {
return nil, err
}
logger.Debug("http post req url: %v", url)
req, err := http.NewRequest("POST", url, bytes.NewBuffer(reqData))
if err != nil {
return nil, err
}
req.Header.Set("Content-Type", "application/json")
if authToken != "" {
req.Header.Set("Authorization", "Bearer"+" "+authToken)
if len(authToken) != 0 {
req.Header.Set("Authorization", "Bearer"+" "+authToken[0])
}
rsp, err := httpClient.Do(req)
if err != nil {
@@ -103,14 +107,15 @@ func PostJson[T any](url string, body any, authToken string) (*T, error) {
return responseData, nil
}
func PostRaw(url string, body string, authToken string) (string, error) {
func PostRaw(url string, body string, authToken ...string) (string, error) {
logger.Debug("http post req url: %v", url)
req, err := http.NewRequest("POST", url, strings.NewReader(body))
if err != nil {
return "", err
}
req.Header.Set("Content-Type", "application/json")
if authToken != "" {
req.Header.Set("Authorization", "Bearer"+" "+authToken)
if len(authToken) != 0 {
req.Header.Set("Authorization", "Bearer"+" "+authToken[0])
}
rsp, err := httpClient.Do(req)
if err != nil {
@@ -121,5 +126,6 @@ func PostRaw(url string, body string, authToken string) (string, error) {
if err != nil {
return "", err
}
logger.Debug("http post rsp data: %v", string(rspData))
return string(rspData), nil
}

18
pkg/logger/logger.go
View File

@@ -66,15 +66,25 @@ func InitLogger(appName string) {
log.SetFlags(0)
LOG = new(Logger)
LOG.AppName = appName
LOG.Level = LOG.getLevelInt(config.CONF.Logger.Level)
LOG.Mode = LOG.getModeInt(config.CONF.Logger.Mode)
LOG.Track = config.CONF.Logger.Track
LOG.MaxSize = config.CONF.Logger.MaxSize
LOG.Level = LOG.getLevelInt(config.GetConfig().Logger.Level)
LOG.Mode = LOG.getModeInt(config.GetConfig().Logger.Mode)
LOG.Track = config.GetConfig().Logger.Track
LOG.MaxSize = config.GetConfig().Logger.MaxSize
LOG.LogInfoChan = make(chan *LogInfo, 1000)
LOG.File = nil
go LOG.doLog()
}
func CloseLogger() {
// 等待所有日志打印完毕
for {
if len(LOG.LogInfoChan) == 0 {
break
}
time.Sleep(time.Millisecond * 100)
}
}
func (l *Logger) doLog() {
for {
logInfo := <-l.LogInfoChan