Skip to content

Commit 56e066a

Browse files
glennliaoglennliao
authored
Merge pull request glennliao#2 from glennliao/dev
增加gitpod一键运行
2 parents c80c551 + 9bef566 commit 56e066a

File tree

9 files changed

+58
-20
lines changed

9 files changed

+58
-20
lines changed

‎.gitpod.Dockerfile‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
FROM gitpod/workspace-mysql
2+
3+
USER gitpod
4+
5+
6+
ENV CUSTOM_GO_VERSION=1.18
7+
ENV GOPATH=$HOME/go-packages
8+
ENV GOROOT=$HOME/go
9+
ENV PATH=$GOROOT/bin:$GOPATH/bin:$PATH
10+
11+
RUN curl -fsSL https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz | tar xzs \
12+
&& printf '%s\n' 'export GOPATH=/workspace/go' \
13+
'export PATH=$GOPATH/bin:$PATH' > $HOME/.bashrc.d/300-go

‎.gitpod.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
image:
2+
file: .gitpod.Dockerfile
3+
4+
ports:
5+
# app server
6+
- port: 8080
7+
onOpen: open-preview
8+
# MySQL server
9+
- port: 3306
10+
onOpen: ignore
11+
12+
tasks:
13+
- init: |
14+
mv cmd/config.yaml.example cmd/config.yaml
15+
mysql -e "CREATE DATABASE my_apijson;"
16+
mysql -p my_apijson < cmd/test/test.sql
17+
mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'yourpassword';"
18+
19+
command: |
20+
go mod tidy
21+
go run cmd/main.go
22+
23+
vscode:
24+
extensions:
25+
- golang.Go
26+
- humao.rest-client

‎README.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33

44
> 暂仍处于前期开发探索中, 请仅使用在 个人探索项目
55
6+
7+
# 快速体验
8+
[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/glennliao/apijson-go)
9+
10+
创建后 执行cmd/test/test.http 或者 cmd/z_test.go 访问测试
11+
612
# 功能实现
713

814
- [x] 单表查询、单表数组查询

‎README.zh-CN.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33

44
> 暂仍处于前期开发探索中, 请仅使用在 个人探索项目
55
6+
# 快速体验
7+
[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/glennliao/apijson-go)
8+
9+
创建后 执行cmd/test/test.http 或者 cmd/z_test.go 访问测试
10+
611
# 功能实现
712

813
- [x] 单表查询、单表数组查询

cmd/test.http renamed to cmd/test/test.http

File renamed without changes.

cmd/test.sql renamed to cmd/test/test.sql

File renamed without changes.

‎go.mod‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ go 1.18
55
require (
66
github.com/gogf/gf/contrib/drivers/mysql/v2 v2.2.1
77
github.com/gogf/gf/v2 v2.2.1
8+
github.com/iancoleman/orderedmap v0.2.0
9+
github.com/samber/lo v1.33.0
810
)
911

1012
require (
@@ -20,23 +22,17 @@ require (
2022
github.com/go-sql-driver/mysql v1.6.0 // indirect
2123
github.com/gorilla/websocket v1.5.0 // indirect
2224
github.com/grokify/html-strip-tags-go v0.0.1 // indirect
23-
github.com/iancoleman/orderedmap v0.2.0 // indirect
24-
github.com/kr/text v0.2.0 // indirect
2525
github.com/magiconair/properties v1.8.6 // indirect
2626
github.com/mattn/go-colorable v0.1.9 // indirect
2727
github.com/mattn/go-isatty v0.0.14 // indirect
2828
github.com/mattn/go-runewidth v0.0.9 // indirect
29-
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
3029
github.com/olekukonko/tablewriter v0.0.5 // indirect
31-
github.com/samber/lo v1.33.0 // indirect
32-
github.com/stretchr/testify v1.8.0 // indirect
3330
go.opentelemetry.io/otel v1.7.0 // indirect
3431
go.opentelemetry.io/otel/sdk v1.7.0 // indirect
3532
go.opentelemetry.io/otel/trace v1.7.0 // indirect
3633
golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect
3734
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
3835
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
3936
golang.org/x/text v0.3.8-0.20211105212822-18b340fc7af2 // indirect
40-
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
4137
gopkg.in/yaml.v3 v3.0.1 // indirect
4238
)

‎go.sum‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P
88
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
99
github.com/clbanning/mxj/v2 v2.5.5 h1:oT81vUeEiQQ/DcHbzSytRngP6Ky9O+L+0Bw0zSJag9E=
1010
github.com/clbanning/mxj/v2 v2.5.5/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s=
11-
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
1211
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1312
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
1413
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -63,10 +62,7 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO
6362
github.com/iancoleman/orderedmap v0.2.0 h1:sq1N/TFpYH++aViPcaKjys3bDClUEU7s5B+z6jq8pNA=
6463
github.com/iancoleman/orderedmap v0.2.0/go.mod h1:N0Wam8K1arqPXNWjMo21EXnBPOPp36vB07FNRdD2geA=
6564
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
66-
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
67-
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
6865
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
69-
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
7066
github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
7167
github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
7268
github.com/mattn/go-colorable v0.1.9 h1:sqDoxXbdeALODt0DAeJCVp38ps9ZogZEAXjus69YV3U=
@@ -77,7 +73,6 @@ github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27k
7773
github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
7874
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
7975
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
80-
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
8176
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
8277
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
8378
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
@@ -100,12 +95,11 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
10095
github.com/samber/lo v1.33.0 h1:2aKucr+rQV6gHpY3bpeZu69uYoQOzVhGT3J22Op6Cjk=
10196
github.com/samber/lo v1.33.0/go.mod h1:HLeWcJRRyLKp3+/XBJvOrerCQn9mhdKMHyd7IRlgeQ8=
10297
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
103-
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
10498
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
10599
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
106100
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
107101
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
108-
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
102+
github.com/thoas/go-funk v0.9.1 h1:O549iLZqPpTUQ10ykd26sZhzD+rmR5pWhuElrhbC20M=
109103
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
110104
github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
111105
go.opentelemetry.io/otel v1.0.0/go.mod h1:AjRVh9A5/5DE7S+mZtTR6t8vpKKryam+0lREnfmS4cg=
@@ -181,7 +175,6 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
181175
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
182176
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
183177
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
184-
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
185178
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
186179
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
187180
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=

‎query/query.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"github.com/gogf/gf/v2/frame/g"
99
"github.com/gogf/gf/v2/util/gconv"
1010
"github.com/samber/lo"
11+
"strings"
1112
"time"
1213
)
1314

@@ -141,11 +142,7 @@ func (q *Query) fetch() {
141142
}
142143
}
143144

144-
fmt.Println("fetch queue")
145-
for _, path := range fetchQueue {
146-
fmt.Printf(" 【%s】 > ", path)
147-
}
148-
fmt.Println()
145+
g.Log().Debugf(q.ctx, "fetch queue： %s", strings.Join(fetchQueue, " > "))
149146

150147
for _, path := range fetchQueue {
151148
q.pathNodes[path].fetch()
@@ -167,7 +164,9 @@ func (q *Query) Result() (g.Map, error) {
167164
return nil, err
168165
}
169166

170-
printNode(q.rootNode, 0)
167+
if config.Debug {
168+
printNode(q.rootNode, 0)
169+
}
171170

172171
g.Log().Debugf(q.ctx, "【query】 ============ [parse]")
173172

0 commit comments

Comments
 (0)