Skip to content

Commit 261f176

Browse files
granty1granty1
committed
Format project
1 parent b87d822 commit 261f176

32 files changed

+107
-126
lines changed

‎cmd/graph.go

-1
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,3 @@ const tmplGraph = `digraph melody { {{ $port := .Port }}
6969
":{{ $port }}" -> "{{ .Endpoint }}" [ label="{{ .Method }}"]{{ end }}
7070
}
7171
`
72-

‎cmd/root.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ var (
3636
Example: "melody run -d -c melody.json",
3737
}
3838
graphCmd = &cobra.Command{
39-
Use: "graph",
40-
Short: "generate graph of melody server",
41-
Long: `Generate a simple example diagram according to service config
39+
Use: "graph",
40+
Short: "generate graph of melody server",
41+
Long: `Generate a simple example diagram according to service config
4242
But your computer needs graphviz, you can install this software by
4343
4444
brew install graphviz

‎core/version.go

-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,4 @@ var (
1414
// MelodyUserAgent setted to backend
1515
MelodyUserAgent = fmt.Sprintf("Melody Version %s", MelodyVersion)
1616
MelodyHeaderValue = fmt.Sprintf("Version %s", MelodyVersion)
17-
1817
)

‎encoding/register.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func (d *DecoderRegister) Get(s string) DecoderFactory {
2424
for _, v := range []string{s, JSON} {
2525
if v, ok := d.data.Get(v); ok {
2626
decoderFactory, ok := v.(func(bool) func(io.Reader, *map[string]interface{}) error)
27-
if ok{
27+
if ok {
2828
return decoderFactory
2929
}
3030
}

‎logging/log.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package logging
33
import (
44
"fmt"
55
"io"
6+
"io/ioutil"
67
"log"
78
"os"
89
"strings"
9-
"io/ioutil"
1010
)
1111

1212
// Logger show logging information with level

‎melody-cases/coupon/main.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,32 @@ func main() {
1212
profileEngine.GET("/coupon/:uuid", func(context *gin.Context) {
1313
uuid := context.Param("uuid")
1414
context.JSON(http.StatusOK, map[string]interface{}{
15-
"id": 1,
16-
"uuid": uuid,
15+
"id": 1,
16+
"uuid": uuid,
1717
"coupons": []map[string]interface{}{
1818
{
19-
"title": "5元优惠券",
19+
"title": "5元优惠券",
2020
"condition": "age > 20",
21-
"start": "xxxx-xx-xx",
22-
"end": "xxxx-xx-xx",
21+
"start": "xxxx-xx-xx",
22+
"end": "xxxx-xx-xx",
2323
},
2424
{
25-
"title": "7元优惠券",
25+
"title": "7元优惠券",
2626
"condition": "none",
27-
"start": "xxxx-xx-xx",
28-
"end": "xxxx-xx-xx",
27+
"start": "xxxx-xx-xx",
28+
"end": "xxxx-xx-xx",
2929
},
3030
{
31-
"title": "7元优惠券",
31+
"title": "7元优惠券",
3232
"condition": "none",
33-
"start": "xxxx-xx-xx",
34-
"end": "xxxx-xx-xx",
33+
"start": "xxxx-xx-xx",
34+
"end": "xxxx-xx-xx",
3535
},
3636
{
37-
"title": "5元优惠券",
37+
"title": "5元优惠券",
3838
"condition": "vip true",
39-
"start": "xxxx-xx-xx",
40-
"end": "xxxx-xx-xx",
39+
"start": "xxxx-xx-xx",
40+
"end": "xxxx-xx-xx",
4141
},
4242
},
4343
})

‎melody-cases/finance/main.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ func main() {
1212
profileEngine.GET("/finance/:uuid", func(context *gin.Context) {
1313
uuid := context.Param("uuid")
1414
context.JSON(http.StatusOK, map[string]interface{}{
15-
"id": 1,
16-
"uuid": uuid,
17-
"name": "Grant",
18-
"level": "Gold member",
15+
"id": 1,
16+
"uuid": uuid,
17+
"name": "Grant",
18+
"level": "Gold member",
1919
"active_balance": 5000.22,
2020
"frozen_balance": 1000.00,
2121
"borrow_balance": 50000.00,

‎melody-cases/profile/main.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ func main() {
1212
profileEngine.GET("/profile/:id", func(context *gin.Context) {
1313
id := context.Param("id")
1414
context.JSON(http.StatusOK, map[string]interface{}{
15-
"id": id,
16-
"uuid": "15316368801",
17-
"name": "Grant",
18-
"age": 22,
19-
"role_id": 1,
20-
"vip": false,
21-
"password": "xxxxxxx",
15+
"id": id,
16+
"uuid": "15316368801",
17+
"name": "Grant",
18+
"age": 22,
19+
"role_id": 1,
20+
"vip": false,
21+
"password": "xxxxxxx",
2222
"nick_name": "Grant",
23-
"avatar": "grant.jpg",
24-
"birth": "xxxx-xx-xx",
23+
"avatar": "grant.jpg",
24+
"birth": "xxxx-xx-xx",
2525
})
2626
})
2727
fmt.Println(profileEngine.Run(":9001"))

‎melody-cases/role/main.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,25 @@ func main() {
1212
profileEngine.GET("/role/:id", func(context *gin.Context) {
1313
roleId := context.Param("id")
1414
context.JSON(http.StatusOK, map[string]interface{}{
15-
"role_id": roleId,
16-
"role_name": "Administrator",
17-
"role_tag": "Admin",
15+
"role_id": roleId,
16+
"role_name": "Administrator",
17+
"role_tag": "Admin",
1818
"authorities": []map[string]interface{}{
1919
{
20-
"tag": "user add",
21-
"path": "/user/add",
20+
"tag": "user add",
21+
"path": "/user/add",
2222
"method": "post",
2323
"active": true,
2424
},
2525
{
26-
"tag": "user delete",
27-
"path": "/user/delete",
26+
"tag": "user delete",
27+
"path": "/user/delete",
2828
"method": "get",
2929
"active": true,
3030
},
3131
{
32-
"tag": "user modify",
33-
"path": "/user/modify",
32+
"tag": "user modify",
33+
"path": "/user/modify",
3434
"method": "post",
3535
"active": true,
3636
},

‎middleware/melody-botmonitor/gin/monitor.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import (
44
"errors"
55
"net/http"
66

7-
botmonitor "melody/middleware/melody-botmonitor"
8-
melody "melody/middleware/melody-botmonitor/melody"
7+
"github.com/gin-gonic/gin"
98
"melody/config"
109
"melody/logging"
10+
botmonitor "melody/middleware/melody-botmonitor"
11+
melody "melody/middleware/melody-botmonitor/melody"
1112
"melody/proxy"
1213
melodygin "melody/router/gin"
13-
"github.com/gin-gonic/gin"
1414
)
1515

1616
// Register 检查配置，按照需要在gin引擎上注册一个bot检测中间件

‎middleware/melody-botmonitor/gin/monitor_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ import (
77
"net/http/httptest"
88
"testing"
99

10-
melody "melody/middleware/melody-botmonitor/melody"
10+
"github.com/gin-gonic/gin"
1111
"melody/config"
1212
"melody/logging"
13+
melody "melody/middleware/melody-botmonitor/melody"
1314
"melody/proxy"
1415
melodygin "melody/router/gin"
15-
"github.com/gin-gonic/gin"
1616
)
1717

1818
func TestRegister(t *testing.T) {

‎middleware/melody-botmonitor/melody/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"encoding/json"
55
"errors"
66

7-
botmonitor "melody/middleware/melody-botmonitor"
87
"melody/config"
8+
botmonitor "melody/middleware/melody-botmonitor"
99
)
1010

1111
// Namespace 命名空间

‎middleware/melody-influxdb/ws/runtime_handler.go

+19-19
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ func (wsc WebSocketClient) GetNumMemoryFree() http.HandlerFunc {
9696
"times": times,
9797
"series": []map[string]interface{}{
9898
{
99-
"data": numGCFrees,
100-
"name": "free memory",
101-
"type": "line",
99+
"data": numGCFrees,
100+
"name": "free memory",
101+
"type": "line",
102102
"areaStyle": map[string]interface{}{},
103103
},
104104
},
@@ -124,7 +124,7 @@ func (wsc WebSocketClient) GetSysMemory() http.HandlerFunc {
124124
values := result.Series[0].Values
125125

126126
var times []string
127-
var sys, heap, stack, mspan, mcache []int64
127+
var sys, heap, stack, mspan, mcache []int64
128128

129129
handler.ResultDataHandler(&times, values, GetTimeFormat(), &heap, &mcache, &mspan, &sys, &stack)
130130

@@ -133,33 +133,33 @@ func (wsc WebSocketClient) GetSysMemory() http.HandlerFunc {
133133
"times": times,
134134
"series": []map[string]interface{}{
135135
{
136-
"data": sys,
137-
"name": "sys",
138-
"type": "line",
136+
"data": sys,
137+
"name": "sys",
138+
"type": "line",
139139
"areaStyle": map[string]interface{}{},
140140
},
141141
{
142-
"data": heap,
143-
"name": "heap",
144-
"type": "line",
142+
"data": heap,
143+
"name": "heap",
144+
"type": "line",
145145
"areaStyle": map[string]interface{}{},
146146
},
147147
{
148-
"data": stack,
149-
"name": "stack",
150-
"type": "line",
148+
"data": stack,
149+
"name": "stack",
150+
"type": "line",
151151
"areaStyle": map[string]interface{}{},
152152
},
153153
{
154-
"data": mcache,
155-
"name": "mcache",
156-
"type": "line",
154+
"data": mcache,
155+
"name": "mcache",
156+
"type": "line",
157157
"areaStyle": map[string]interface{}{},
158158
},
159159
{
160-
"data": mspan,
161-
"name": "mspan",
162-
"type": "line",
160+
"data": mspan,
161+
"name": "mspan",
162+
"type": "line",
163163
"areaStyle": map[string]interface{}{},
164164
},
165165
},

‎middleware/melody-influxdb/ws/timer.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import (
66
)
77

88
type TimeControl struct {
9-
MinTime string `json:"min_time"`
10-
MaxTime string `json:"max_time"`
11-
TimeInterval string `json:"time_interval"`
12-
GroupTime string `json:"group_time"`
9+
MinTime string `json:"min_time"`
10+
MaxTime string `json:"max_time"`
11+
TimeInterval string `json:"time_interval"`
12+
GroupTime string `json:"group_time"`
1313
RefreshTime time.Duration
1414
RefreshParam string `json:"refresh_time"`
1515
}
@@ -30,11 +30,11 @@ func SetTimeControl(timer TimeControl) {
3030
WsTimeControl = timer
3131
}
3232

33-
var r = regexp.MustCompile(`([0-9]*)([a-z])`)
33+
var r = regexp.MustCompile(`([0-9]*)([a-z])`)
3434

3535
const (
3636
hour = "15:04"
37-
day = "01-02 15:04"
37+
day = "01-02 15:04"
3838
)
3939

4040
func GetTimeFormat() string {

‎middleware/melody-metrics/proxy.go

-1
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,3 @@ func (rm *ProxyMetrics) Histogram(labels ...string) metrics.Histogram {
8989
func (rm *ProxyMetrics) Counter(labels ...string) metrics.Counter {
9090
return metrics.GetOrRegisterCounter(strings.Join(labels, "."), rm.register)
9191
}
92-

‎middleware/melody-metrics/router.go

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ func (rm *RouterMetrics) Disconnection() {
4141
rm.disconnected.Inc(1)
4242
}
4343

44-
4544
func (rm *RouterMetrics) RegisterResponseWriterMetrics(name string) {
4645
rm.Counter("response", name, "status")
4746
rm.Histogram("response", name, "size")

‎proxy/balancing.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ func newLoadBalancedMiddleware(lb sd.Balancer) Middleware {
3737
return next[0](ctx, &r)
3838
}
3939
}
40-
}
40+
}

‎proxy/formatter_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"melody/config"
55
"reflect"
66
"testing"
7-
87
)
98

109
func TestEntityFormatterFunc(t *testing.T) {

‎proxy/http.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func NewHTTPProxyDetailed(remote *config.Backend, re client.HTTPRequestExecutor,
6565
}
6666

6767
// **真正发送请求的地方**
68-
resp ,err := re(ctx, requestToBackend)
68+
resp, err := re(ctx, requestToBackend)
6969
if requestToBackend.Body != nil {
7070
requestToBackend.Body.Close()
7171
}

‎proxy/http_response.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ type HTTPResponseParserConfig struct {
1515
// NoOpHTTPResponseParser 不对http.Response做任何format，直接封装成proxy.Response
1616
func NoOpHTTPResponseParser(ctx context.Context, resp *http.Response) (*Response, error) {
1717
return &Response{
18-
Data: map[string]interface{}{},
18+
Data: map[string]interface{}{},
1919
IsComplete: true,
2020
Io: NewReadCloserWrapper(ctx, resp.Body),
21-
Metadata: Metadata{
21+
Metadata: Metadata{
2222
Headers: resp.Header,
2323
StatusCode: resp.StatusCode,
2424
},
2525
}, nil
2626
}
2727

2828
func DefaultHTTPResponseParserFactory(cfg HTTPResponseParserConfig) HTTPResponseParser {
29-
return func(ctx context.Context, resp *http.Response) (*Response,error) {
29+
return func(ctx context.Context, resp *http.Response) (*Response, error) {
3030
defer resp.Body.Close()
3131

3232
var data map[string]interface{}
@@ -41,4 +41,4 @@ func DefaultHTTPResponseParserFactory(cfg HTTPResponseParserConfig) HTTPResponse
4141
response = cfg.EntityFormatter.Format(response)
4242
return &response, nil
4343
}
44-
}
44+
}

0 commit comments

Comments
 (0)