normalize code

common/utils/utils.go

@@ -43,21 +43,36 @@ func GetRewardPerBlock() *big.Int {
 
 func GetFieldFromJson(jsonStr string, fieldName string) (interface{}){
 	var result map[string]interface{}
-	json.Unmarshal([]byte(jsonStr), &result)
+	err := json.Unmarshal([]byte(jsonStr), &result)
+	if err != nil {
+		logs.GetLogger().Error(err)
+		return nil
+	}
+
 	fieldVal := result[fieldName].(interface{})
 	return fieldVal
 }
 
 func GetFieldStrFromJson(jsonStr string, fieldName string) (string){
 	var result map[string]interface{}
-	json.Unmarshal([]byte(jsonStr), &result)
+	err := json.Unmarshal([]byte(jsonStr), &result)
+	if err != nil {
+		logs.GetLogger().Error(err)
+		return ""
+	}
+
 	fieldVal := result[fieldName].(interface{})
 	return fieldVal.(string)
 }
 
 func GetFieldMapFromJson(jsonStr string, fieldName string) (map[string]interface{}){
 	var result map[string]interface{}
-	json.Unmarshal([]byte(jsonStr), &result)
+	err := json.Unmarshal([]byte(jsonStr), &result)
+	if err != nil {
+		logs.GetLogger().Error(err)
+		return nil
+	}
+
 	fieldVal := result[fieldName].(interface{})
 
 	return fieldVal.(map[string]interface{})

main.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"fmt"
 	"github.com/gin-gonic/gin"
 	cors "github.com/itsjamie/gin-cors"
 	"github.com/joho/godotenv"
@@ -47,5 +46,6 @@ func LoadEnv() {
 	if err != nil {
 		logs.GetLogger().Error(err)
 	}
-	fmt.Println("name: ", os.Getenv("privateKey"))
+
+	logs.GetLogger().Info("name: ", os.Getenv("privateKey"))
 }

offlineDealAdmin/aria2Service.go

@@ -174,7 +174,6 @@ func (self *Aria2Service) CheckDownloadStatus(aria2Client *utils.Aria2Client, sw
 	downloadingDeals := swanClient.GetOfflineDeals(self.MinerFid, DEAL_STATUS_DOWNLOADING)
 
 	for _, deal := range downloadingDeals {
-		//fmt.Println(deal)
 		gid := deal.Note
 		if len(gid) <= 0 {
 			note := "Download gid not found in offline_deals.note"
@@ -217,7 +216,7 @@ func (self *Aria2Service) StartDownload4Deal(deal *models.OfflineDeal, aria2Clie
 	}
 
 	response := aria2Client.DownloadFile(deal.SourceFileUrl, option)
-	fmt.Println(response)
+	logs.GetLogger().Info(response)
 
 	gid := utils.GetFieldStrFromJson(response, "result")
 	self.CheckDownloadStatus4Deal(aria2Client, swanClient, deal, gid)

test/test.go

@@ -1,10 +1,10 @@
 package test
 
 import (
-	"fmt"
 	"strings"
 	"swan-miner/common/utils"
 	"swan-miner/config"
+	"swan-miner/logs"
 	"swan-miner/models"
 	"swan-miner/offlineDealAdmin"
 )
@@ -18,32 +18,31 @@ type Todo struct {
 
 func TestRestApiClient() {
 	response := utils.HttpGetJsonParam("https://jsonplaceholder.typicode.com/todos/1", "", "")
-	fmt.Println(response)
+	logs.GetLogger().Info(response)
+
 	todo := Todo{1, 2, "lorem ipsum dolor sit amet", true}
 	response = utils.HttpPostJsonParamNoToken("https://jsonplaceholder.typicode.com/todos", todo)
-	fmt.Println(response)
+	logs.GetLogger().Info(response)
 
 	response = utils.HttpPutJsonParam("https://jsonplaceholder.typicode.com/todos/1", "",todo)
-	fmt.Println(response)
+	logs.GetLogger().Info(response)
 
 	title := utils.GetFieldFromJson(response,"title")
-	fmt.Println("title",title)
+	logs.GetLogger().Info(title)
 
 	response = utils.HttpDeleteJsonParam("https://jsonplaceholder.typicode.com/todos/1", "",todo)
-	fmt.Println(response)
+	logs.GetLogger().Info(response)
 }
 
 func TestSwanClient() {
 	swanClient := utils.GetSwanClient()
-
-	//fmt.Println(swanClient)
-
 	mainConf := config.GetConfig().Main
 	deals := swanClient.GetOfflineDeals(mainConf.MinerFid,"Downloading", "10")
-	fmt.Println(deals)
+	logs.GetLogger().Info(deals)
+
 	response := swanClient.UpdateOfflineDealStatus(2455, "Downloaded","test note")
 	response = swanClient.UpdateOfflineDealStatus(2455,"Completed","test note","/test/test","0003222")
-	fmt.Println(response)
+	logs.GetLogger().Info(response)
 }
 
 func TestAriaClient() {
@@ -71,28 +70,27 @@ func TestDownloader() {
 
 func TestOsCmdClient()  {
 	result, err := utils.ExecOsCmd("ls -l")
-	fmt.Println(result, err)
+	logs.GetLogger().Info(result, err)
 
 	result, err = utils.ExecOsCmd("pwd")
-	fmt.Println(result, err)
+	logs.GetLogger().Info(result, err)
 
 	result, err = utils.ExecOsCmd("ls -l | grep common")
-	fmt.Println(result, err)
+	logs.GetLogger().Info(result, err)
+
 	words := strings.Fields(result)
 	for _, word := range words {
-		fmt.Println(word)
+		logs.GetLogger().Info(word)
 	}
 }
 
-
-
 func TestOsCmdClient1()  {
 	/*result, err := */utils.ExecOsCmd2Screen("ls -l")
-	//fmt.Println(result, err)
+	//logs.GetLogger().Info(result, err)
 
 	/*result, err = */utils.ExecOsCmd2Screen("pwd")
-	//fmt.Println(result, err)
+	//logs.GetLogger().Info(result, err)
 
 	/*result, err = */utils.ExecOsCmd2Screen("ls -l | grep x")
-	//fmt.Println(result, err)
+	//logs.GetLogger().Info(result, err)
 }