Commit 9458b451 authored by root's avatar root

go fmt

parent 1fcb761c
......@@ -10,13 +10,13 @@ import (
"fmt"
"github.com/gin-gonic/gin"
"chain33-pai/pkg/cmd"
"chain33-pai/pkg/pai"
"flag"
clog "github.com/33cn/chain33/common/log"
log "github.com/33cn/chain33/common/log/log15"
"net/http"
"time"
"flag"
"chain33-pai/pkg/pai"
"chain33-pai/pkg/cmd"
)
func init() {
......@@ -32,8 +32,9 @@ func init() {
var tlog = log.New("main", "main.go")
var (
versionCmd = flag.Bool("v", false, "version")
testCmd = flag.Bool("t",false,"test")
testCmd = flag.Bool("t", false, "test")
)
// @title Golang Gin API
// @version 1.0
// @description An example of gin
......@@ -47,7 +48,7 @@ func main() {
return
}
if *testCmd {
fmt.Println("app sys:",cmd.GetLocalArchType(),pai.GetArchType())
fmt.Println("app sys:", cmd.GetLocalArchType(), pai.GetArchType())
return
}
gin.SetMode(setting.ServerSetting.RunMode)
......
......@@ -26,7 +26,7 @@ func Broadcast() {
panic("no serial no")
}
}
ip,err := GetRightIp()
ip, err := GetRightIp()
if err != nil {
panic(err)
}
......@@ -105,21 +105,21 @@ func GetRightIp() (ipv4 *net.IPNet, err error) {
}
}
}
return ip,err
return ip, err
}
func GetRightIps() (ipv4s []*net.IPNet,err error) {
ips := make([]*net.IPNet,0)
interfaces,err := net.Interfaces()
func GetRightIps() (ipv4s []*net.IPNet, err error) {
ips := make([]*net.IPNet, 0)
interfaces, err := net.Interfaces()
if err != nil {
return nil,err
return nil, err
}
for _,i := range interfaces {
ip ,err := util.GetLocalIpByName(i.Name)
for _, i := range interfaces {
ip, err := util.GetLocalIpByName(i.Name)
if err != nil {
return nil,err
return nil, err
}
ips = append(ips,ip)
ips = append(ips, ip)
}
return ips, nil
}
package cmd
import (
"os/exec"
"bytes"
"strings"
"fmt"
"github.com/33cn/chain33/common/log"
"os/exec"
"strings"
)
var cmdLog = log.New("pkg", "app")
......@@ -16,13 +16,13 @@ func GetLocalArchType() string {
cmd.Stdout = &buf
err := cmd.Run()
if err != nil {
cmdLog.Error("GetLocalArchType","err",err)
cmdLog.Error("GetLocalArchType", "err", err)
return ""
}
if buf.String() != "" {
lines := strings.Split(buf.String(),"\n")
lines := strings.Split(buf.String(), "\n")
if len(lines) == 2 {
return strings.Trim(lines[0]," ")
return strings.Trim(lines[0], " ")
}
}
return ""
......@@ -30,25 +30,25 @@ func GetLocalArchType() string {
func GetLocalUuid() string {
cmd := exec.Command("dmidecode")
var buf ,errbuf bytes.Buffer
var buf, errbuf bytes.Buffer
cmd.Stdout = &buf
cmd.Stderr = &errbuf
err := cmd.Start()
if err != nil {
fmt.Println("Start",err)
fmt.Println("Start", err)
}
err = cmd.Wait()
if err != nil {
fmt.Println("Wait",err)
fmt.Println("Wait", err)
}
fmt.Println("err",errbuf.String())
fmt.Println("uuid",buf.String())
fmt.Println("err", errbuf.String())
fmt.Println("uuid", buf.String())
if buf.String() != "" {
lines := strings.Split(buf.String(),"\n")
if len(lines) >0 {
for _,l := range lines {
if strings.Contains(l,"UUID") {
return strings.Trim(l,"\t")
lines := strings.Split(buf.String(), "\n")
if len(lines) > 0 {
for _, l := range lines {
if strings.Contains(l, "UUID") {
return strings.Trim(l, "\t")
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment