mirror of https://github.com/beego/bee.git
Compare commits
138 Commits
Author | SHA1 | Date |
---|---|---|
Ming Deng | a106dd6ba2 | |
Ming Deng | c8ccbb7e70 | |
Deng Ming | 07a06e75cc | |
Ming Deng | 2d3dae7fa0 | |
Deng Ming | e879c37436 | |
Ming Deng | 0db82ee3bb | |
RS | 0420c775cf | |
Ming Deng | 969ce1d1eb | |
Ming Deng | 95cab0c26f | |
RS | 01569d265c | |
Ming Deng | 0cf9bdde10 | |
RS | 5aa9764e55 | |
Ming Deng | ebb8c0ad31 | |
Sangseng Lee | 8c91192dae | |
Sangseng Lee | d78f259fdf | |
Ming Deng | 22ea0fa345 | |
Ming Deng | ef570ffb7b | |
Deng Ming | 651d604cca | |
Ming Deng | f9d0af2146 | |
Deng Ming | afe1678459 | |
Ming Deng | a75a0c8723 | |
zhangqz | 97df75a28c | |
Ming Deng | d04f11c57a | |
Ming Deng | d7fcaf0921 | |
Deng Ming | 7ee363657f | |
Ming Deng | 1b4f90114a | |
xinyi | 47e6e7c145 | |
xinyi | 50ffa7ed8c | |
Ming Deng | 8a299fa755 | |
Deng Ming | e3d0b640df | |
Ming Deng | 8f8166b3da | |
Daniel Ashcroft | 1a47e0e945 | |
Ming Deng | 9a9dbc0d78 | |
Geektree0101 | 3b15b101e2 | |
Ming Deng | 0d739375d1 | |
DataSttructure | c36f132fd8 | |
DataSttructure | e22201eae3 | |
Ming Deng | bdeabd3b70 | |
jianzhiyao | 112769d885 | |
jianzhiyao | 97e66f3d18 | |
Ming Deng | ee7b335232 | |
Ming Deng | 5bbc43e153 | |
Yu Huang | d0cfcd96ba | |
Ming Deng | d63e07087c | |
Ming Deng | 6b1c370fd0 | |
Ming Deng | 7b3d1b5f64 | |
Ming Deng | 457c2f7dc8 | |
Ming Deng | 551d7cb8d3 | |
zhangqz | 665150ec64 | |
Ming Deng | f73ad3252b | |
Ming Deng | 844823a367 | |
Ming Deng | cbb523325d | |
Ming Deng | 22a4b07b4a | |
Ming Deng | 0a690decfb | |
Ming Deng | 21f42e22a4 | |
John | 9428a53176 | |
John | 824fa639f0 | |
John | 637637efb2 | |
John | 7f80477761 | |
John | d995fc5328 | |
John | 02a66c7bd7 | |
John | 9541046a29 | |
John | d0bc4f76fc | |
John | 100f0af03a | |
Ming Deng | 3a727232d7 | |
王厚伟 | 29e2203ba1 | |
王厚伟 | a44ef93f99 | |
Ming Deng | 88101ce7a5 | |
zyt312074545 | 6f2d624a32 | |
Ming Deng | 734d77f60d | |
Jarvib Ding | e9edae7563 | |
Dings | 7db43f16d5 | |
Ming Deng | 6c17de3436 | |
Ming Deng | ea846e1ec6 | |
Ming Deng | ee56934371 | |
王厚伟 | f150956981 | |
王厚伟 | adbc0af183 | |
Ming Deng | 639eccfef9 | |
Ming Deng | 486ac49f38 | |
Ming Deng | 9f04de468a | |
Ming Deng | 31930ecd29 | |
Ming Deng | 037f319c11 | |
Ming Deng | 4eb58f534b | |
Ming Deng | 3b2304a480 | |
Ming Deng | 06e09b0f87 | |
Ming Deng | 8eb7a2dfaf | |
Ming Deng | ebb2fee3fc | |
Ming Deng | d1611db053 | |
Ming Deng | c93bda1d3c | |
Ming Deng | 642d933c4a | |
Ming Deng | c693549cc6 | |
Ming Deng | cdb41fad3f | |
Ming Deng | c619ccf1b3 | |
Ming Deng | 9d68c302bd | |
Ming Deng | 958e4564d1 | |
chenli | e3e1a9849f | |
chenli | 32230de2ea | |
王厚伟 | b8213eba24 | |
王厚伟 | 62abed87e9 | |
王厚伟 | 9c423bbc97 | |
Ming Deng | 1653a01eaa | |
Ming Deng | bc846b254e | |
Ming Deng | 62c20031a1 | |
Ming Deng | a5fb1b4690 | |
Ming Deng | 0080f54a08 | |
Ming Deng | 36e532fa4b | |
Ming Deng | f2a93c8c75 | |
Ming Deng | 22b64e8157 | |
Ming Deng | fa7aee4d01 | |
Ming Deng | 1ed5c71087 | |
Ming Deng | 29e5fadf6a | |
Ming Deng | 9f1d5fc5eb | |
Ming Deng | e0fd237002 | |
Ming Deng | f5665162f7 | |
Ming Deng | cef7185b35 | |
wangle | 1605bacc9e | |
wangle | 3ea61a8926 | |
wangle | 674b52a732 | |
wangle | 7a7357a983 | |
wangle | 81ed06ea01 | |
wangle | 8f0badc630 | |
askuy | 8b942b1f22 | |
wucheng | d496d26a1c | |
wucheng | c0d29b0d2a | |
wucheng | b45ded3355 | |
wucheng | 2c673b7d1e | |
wucheng | 53b0b68d00 | |
wucheng | 2862ff48db | |
wucheng | b56b3794e4 | |
askuy | 5005bd4408 | |
askuy | 8e91f22aeb | |
askuy | fc12eabbb6 | |
askuy | 3121f64b8f | |
John | 8357e26a9f | |
John | 5d223c6513 | |
John | 81ed8514be | |
John | c687a67d52 | |
John | f694778078 |
|
@ -0,0 +1,25 @@
|
|||
name: Go
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ develop ]
|
||||
pull_request:
|
||||
branches: [ develop ]
|
||||
|
||||
jobs:
|
||||
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
|
||||
- name: Set up Go
|
||||
uses: actions/setup-go@v3
|
||||
with:
|
||||
go-version: 1.18
|
||||
|
||||
- name: Build
|
||||
run: go build -v ./...
|
||||
|
||||
- name: Test
|
||||
run: go test -v ./...
|
|
@ -11,4 +11,4 @@
|
|||
}
|
||||
},
|
||||
"ConfigVersion": "0.9"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
language: go
|
||||
go:
|
||||
- 1.12.17
|
||||
- 1.14.6
|
||||
install:
|
||||
- export PATH=$PATH:$HOME/gopath/bin
|
||||
- go get -u github.com/opennota/check/cmd/structcheck
|
||||
|
@ -12,6 +12,7 @@ script:
|
|||
- cd $(dirname `dirname $(pwd)`)/beego/bee
|
||||
- export GO111MODULE="on"
|
||||
- go mod download
|
||||
- go test -coverprofile=coverage.txt -covermode=atomic ./...
|
||||
- find . ! \( -path './vendor' -prune \) -type f -name '*.go' -print0 | xargs -0 gofmt -l -s
|
||||
- go list ./... | grep -v /vendor/ | grep -v /pkg/mod/
|
||||
- go vet $(go list ./... | grep -v /vendor/ | grep -v /pkg/mod/ )
|
||||
|
|
2
LICENSE
2
LICENSE
|
@ -188,4 +188,4 @@ third-party archives.
|
|||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
limitations under the License.
|
||||
|
|
4
Makefile
4
Makefile
|
@ -24,6 +24,6 @@ clean:
|
|||
publish:
|
||||
mkdir -p bin/$(VERSION)
|
||||
cd bin/$(VERSION)
|
||||
xgo -v -x --targets="windows/*,darwin/*,linux/386,linux/amd64,linux/arm-5,linux/arm64" -out bee_$(VERSION) github.com/beego/bee
|
||||
xgo -v -x --targets="windows/*,darwin/*,linux/386,linux/amd64,linux/arm-5,linux/arm64" -out bee_$(VERSION) github.com/beego/bee/v2
|
||||
cd ..
|
||||
ghr -u beego -r bee $(VERSION) $(VERSION)
|
||||
ghr -u beego -r bee $(VERSION) $(VERSION)
|
||||
|
|
271
README.md
271
README.md
|
@ -9,26 +9,34 @@ Bee is a command-line tool facilitating development of Beego-based application.
|
|||
|
||||
## Requirements
|
||||
|
||||
- Go version >= 1.12.
|
||||
- Go version >= 1.13
|
||||
|
||||
## Installation
|
||||
|
||||
To install `bee` use the `go get` command:
|
||||
To install or update `bee` use the `go install` command:
|
||||
|
||||
```bash
|
||||
go get github.com/beego/bee
|
||||
go install github.com/beego/bee/v2@latest
|
||||
```
|
||||
|
||||
Then you can add `bee` binary to PATH environment variable in your `~/.bashrc` or `~/.bash_profile` file:
|
||||
## Then you can add `bee` binary to PATH environment variable in your `~/.bashrc` or `~/.bash_profile` file:
|
||||
|
||||
```bash
|
||||
export PATH=$PATH:<your_main_gopath>/bin
|
||||
```
|
||||
|
||||
## Installing and updating bee prior Go version 1.17
|
||||
|
||||
To install `bee` use the `go get` command:
|
||||
|
||||
```bash
|
||||
go get github.com/beego/bee/v2
|
||||
```
|
||||
|
||||
> If you already have `bee` installed, updating `bee` is simple:
|
||||
|
||||
```bash
|
||||
go get -u github.com/beego/bee
|
||||
go get -u github.com/beego/bee/v2
|
||||
```
|
||||
|
||||
## Basic commands
|
||||
|
@ -41,15 +49,17 @@ Bee provides a variety of commands which can be helpful at various stages of dev
|
|||
api Creates a Beego API application
|
||||
bale Transforms non-Go files to Go source files
|
||||
fix Fixes your application by making it compatible with newer versions of Beego
|
||||
pro Source code generator
|
||||
dlv Start a debugging session using Delve
|
||||
dockerize Generates a Dockerfile for your Beego application
|
||||
dockerize Generates a Dockerfile and docker-compose.yaml for your Beego application
|
||||
generate Source code generator
|
||||
hprose Creates an RPC application based on Hprose and Beego frameworks
|
||||
new Creates a Beego application
|
||||
pack Compresses a Beego application into a single file
|
||||
rs Run customized scripts
|
||||
run Run the application by starting a local development server
|
||||
|
||||
server serving static content over HTTP on port
|
||||
update Update Bee
|
||||
```
|
||||
|
||||
### bee version
|
||||
|
@ -63,17 +73,17 @@ ______
|
|||
| |_/ / ___ ___
|
||||
| ___ \ / _ \ / _ \
|
||||
| |_/ /| __/| __/
|
||||
\____/ \___| \___| v1.6.2
|
||||
\____/ \___| \___| v2.0.4
|
||||
|
||||
├── Beego : 1.7.2
|
||||
├── GoVersion : go1.7.4
|
||||
├── GOOS : linux
|
||||
├── Beego : 2.0.4
|
||||
├── GoVersion : go1.14.1
|
||||
├── GOOS : darwin
|
||||
├── GOARCH : amd64
|
||||
├── NumCPU : 2
|
||||
├── NumCPU : 4
|
||||
├── GOPATH : /home/beeuser/.go
|
||||
├── GOROOT : /usr/lib/go
|
||||
├── GOROOT : /usr/local/Cellar/go/1.14.1/libexec
|
||||
├── Compiler : gc
|
||||
└── Date : Monday, 26 Dec 2016
|
||||
└── Published : 2020-09-13
|
||||
```
|
||||
|
||||
You can also change the output format using `-o` flag:
|
||||
|
@ -81,15 +91,16 @@ You can also change the output format using `-o` flag:
|
|||
```bash
|
||||
$ bee version -o json
|
||||
{
|
||||
"GoVersion": "go1.7.4",
|
||||
"GOOS": "linux",
|
||||
"GoVersion": "go1.14.1",
|
||||
"GOOS": "darwin",
|
||||
"GOARCH": "amd64",
|
||||
"NumCPU": 2,
|
||||
"NumCPU": 4,
|
||||
"GOPATH": "/home/beeuser/.go",
|
||||
"GOROOT": "/usr/lib/go",
|
||||
"GOROOT": "/usr/local/Cellar/go/1.14.1/libexec",
|
||||
"Compiler": "gc",
|
||||
"BeeVersion": "1.6.2",
|
||||
"BeegoVersion": "1.7.2"
|
||||
"BeeVersion": "2.0.4",
|
||||
"BeegoVersion": "2.0.4",
|
||||
"Published": "2020-09-13"
|
||||
}
|
||||
```
|
||||
|
||||
|
@ -101,31 +112,27 @@ To create a new Beego web application:
|
|||
|
||||
```bash
|
||||
$ bee new my-web-app
|
||||
______
|
||||
| ___ \
|
||||
| |_/ / ___ ___
|
||||
| ___ \ / _ \ / _ \
|
||||
| |_/ /| __/| __/
|
||||
\____/ \___| \___| v1.6.2
|
||||
2016/12/26 22:28:11 INFO ▶ 0001 Creating application...
|
||||
create /home/beeuser/.go/src/github.com/user/my-web-app/
|
||||
create /home/beeuser/.go/src/github.com/user/my-web-app/conf/
|
||||
create /home/beeuser/.go/src/github.com/user/my-web-app/controllers/
|
||||
create /home/beeuser/.go/src/github.com/user/my-web-app/models/
|
||||
create /home/beeuser/.go/src/github.com/user/my-web-app/routers/
|
||||
create /home/beeuser/.go/src/github.com/user/my-web-app/tests/
|
||||
create /home/beeuser/.go/src/github.com/user/my-web-app/static/
|
||||
create /home/beeuser/.go/src/github.com/user/my-web-app/static/js/
|
||||
create /home/beeuser/.go/src/github.com/user/my-web-app/static/css/
|
||||
create /home/beeuser/.go/src/github.com/user/my-web-app/static/img/
|
||||
create /home/beeuser/.go/src/github.com/user/my-web-app/views/
|
||||
create /home/beeuser/.go/src/github.com/user/my-web-app/conf/app.conf
|
||||
create /home/beeuser/.go/src/github.com/user/my-web-app/controllers/default.go
|
||||
create /home/beeuser/.go/src/github.com/user/my-web-app/views/index.tpl
|
||||
create /home/beeuser/.go/src/github.com/user/my-web-app/routers/router.go
|
||||
create /home/beeuser/.go/src/github.com/user/my-web-app/tests/default_test.go
|
||||
create /home/beeuser/.go/src/github.com/user/my-web-app/main.go
|
||||
2016/12/26 22:28:11 SUCCESS ▶ 0002 New application successfully created!
|
||||
2020/09/14 22:28:51 INFO ▶ 0001 generate new project support go modules.
|
||||
2020/09/14 22:28:51 INFO ▶ 0002 Creating application...
|
||||
create /Users/beeuser/learn/my-web-app/go.mod
|
||||
create /Users/beeuser/learn/my-web-app/
|
||||
create /Users/beeuser/learn/my-web-app/conf/
|
||||
create /Users/beeuser/learn/my-web-app/controllers/
|
||||
create /Users/beeuser/learn/my-web-app/models/
|
||||
create /Users/beeuser/learn/my-web-app/routers/
|
||||
create /Users/beeuser/learn/my-web-app/tests/
|
||||
create /Users/beeuser/learn/my-web-app/static/
|
||||
create /Users/beeuser/learn/my-web-app/static/js/
|
||||
create /Users/beeuser/learn/my-web-app/static/css/
|
||||
create /Users/beeuser/learn/my-web-app/static/img/
|
||||
create /Users/beeuser/learn/my-web-app/views/
|
||||
create /Users/beeuser/learn/my-web-app/conf/app.conf
|
||||
create /Users/beeuser/learn/my-web-app/controllers/default.go
|
||||
create /Users/beeuser/learn/my-web-app/views/index.tpl
|
||||
create /Users/beeuser/learn/my-web-app/routers/router.go
|
||||
create /Users/beeuser/learn/my-web-app/tests/default_test.go
|
||||
create /Users/beeuser/learn/my-web-app/main.go
|
||||
2020/09/14 22:28:51 SUCCESS ▶ 0003 New application successfully created!
|
||||
```
|
||||
|
||||
For more information on the usage, run `bee help new`.
|
||||
|
@ -138,12 +145,6 @@ To run the application we just created, you can navigate to the application fold
|
|||
$ cd my-web-app && bee run
|
||||
```
|
||||
|
||||
Or from anywhere in your machine:
|
||||
|
||||
```
|
||||
$ bee run github.com/user/my-web-app
|
||||
```
|
||||
|
||||
For more information on the usage, run `bee help run`.
|
||||
|
||||
### bee pack
|
||||
|
@ -157,7 +158,7 @@ ______
|
|||
| |_/ / ___ ___
|
||||
| ___ \ / _ \ / _ \
|
||||
| |_/ /| __/| __/
|
||||
\____/ \___| \___| v1.6.2
|
||||
\____/ \___| \___| v2.0.0
|
||||
2016/12/26 22:29:29 INFO ▶ 0001 Packaging application on '/home/beeuser/.go/src/github.com/user/my-web-app'...
|
||||
2016/12/26 22:29:29 INFO ▶ 0002 Building application...
|
||||
2016/12/26 22:29:29 INFO ▶ 0003 Using: GOOS=linux GOARCH=amd64
|
||||
|
@ -213,23 +214,25 @@ ______
|
|||
| |_/ / ___ ___
|
||||
| ___ \ / _ \ / _ \
|
||||
| |_/ /| __/| __/
|
||||
\____/ \___| \___| v1.6.2
|
||||
2016/12/26 22:30:12 INFO ▶ 0001 Creating API...
|
||||
create /home/beeuser/.go/src/github.com/user/my-api
|
||||
create /home/beeuser/.go/src/github.com/user/my-api/conf
|
||||
create /home/beeuser/.go/src/github.com/user/my-api/controllers
|
||||
create /home/beeuser/.go/src/github.com/user/my-api/tests
|
||||
create /home/beeuser/.go/src/github.com/user/my-api/conf/app.conf
|
||||
create /home/beeuser/.go/src/github.com/user/my-api/models
|
||||
create /home/beeuser/.go/src/github.com/user/my-api/routers/
|
||||
create /home/beeuser/.go/src/github.com/user/my-api/controllers/object.go
|
||||
create /home/beeuser/.go/src/github.com/user/my-api/controllers/user.go
|
||||
create /home/beeuser/.go/src/github.com/user/my-api/tests/default_test.go
|
||||
create /home/beeuser/.go/src/github.com/user/my-api/routers/router.go
|
||||
create /home/beeuser/.go/src/github.com/user/my-api/models/object.go
|
||||
create /home/beeuser/.go/src/github.com/user/my-api/models/user.go
|
||||
create /home/beeuser/.go/src/github.com/user/my-api/main.go
|
||||
2016/12/26 22:30:12 SUCCESS ▶ 0002 New API successfully created!
|
||||
\____/ \___| \___| v2.0.0
|
||||
2020/09/14 22:35:11 INFO ▶ 0001 generate api project support go modules.
|
||||
2020/09/14 22:35:11 INFO ▶ 0002 Creating API...
|
||||
create /Users/beeuser/code/learn/my-api/go.mod
|
||||
create /Users/beeuser/code/learn/my-api
|
||||
create /Users/beeuser/code/learn/my-api/conf
|
||||
create /Users/beeuser/code/learn/my-api/controllers
|
||||
create /Users/beeuser/code/learn/my-api/tests
|
||||
create /Users/beeuser/code/learn/my-api/conf/app.conf
|
||||
create /Users/beeuser/code/learn/my-api/models
|
||||
create /Users/beeuser/code/learn/my-api/routers/
|
||||
create /Users/beeuser/code/learn/my-api/controllers/object.go
|
||||
create /Users/beeuser/code/learn/my-api/controllers/user.go
|
||||
create /Users/beeuser/code/learn/my-api/tests/default_test.go
|
||||
create /Users/beeuser/code/learn/my-api/routers/router.go
|
||||
create /Users/beeuser/code/learn/my-api/models/object.go
|
||||
create /Users/beeuser/code/learn/my-api/models/user.go
|
||||
create /Users/beeuser/code/learn/my-api/main.go
|
||||
2020/09/14 22:35:11 SUCCESS ▶ 0003 New API successfully created!
|
||||
```
|
||||
|
||||
For more information on the usage, run `bee help api`.
|
||||
|
@ -245,26 +248,18 @@ ______
|
|||
| |_/ / ___ ___
|
||||
| ___ \ / _ \ / _ \
|
||||
| |_/ /| __/| __/
|
||||
\____/ \___| \___| v1.6.2
|
||||
2016/12/26 22:30:58 INFO ▶ 0001 Creating application...
|
||||
create /home/beeuser/.go/src/github.com/user/my-rpc-app/
|
||||
create /home/beeuser/.go/src/github.com/user/my-rpc-app/conf/
|
||||
create /home/beeuser/.go/src/github.com/user/my-rpc-app/controllers/
|
||||
create /home/beeuser/.go/src/github.com/user/my-rpc-app/models/
|
||||
create /home/beeuser/.go/src/github.com/user/my-rpc-app/routers/
|
||||
create /home/beeuser/.go/src/github.com/user/my-rpc-app/tests/
|
||||
create /home/beeuser/.go/src/github.com/user/my-rpc-app/static/
|
||||
create /home/beeuser/.go/src/github.com/user/my-rpc-app/static/js/
|
||||
create /home/beeuser/.go/src/github.com/user/my-rpc-app/static/css/
|
||||
create /home/beeuser/.go/src/github.com/user/my-rpc-app/static/img/
|
||||
create /home/beeuser/.go/src/github.com/user/my-rpc-app/views/
|
||||
create /home/beeuser/.go/src/github.com/user/my-rpc-app/conf/app.conf
|
||||
create /home/beeuser/.go/src/github.com/user/my-rpc-app/controllers/default.go
|
||||
create /home/beeuser/.go/src/github.com/user/my-rpc-app/views/index.tpl
|
||||
create /home/beeuser/.go/src/github.com/user/my-rpc-app/routers/router.go
|
||||
create /home/beeuser/.go/src/github.com/user/my-rpc-app/tests/default_test.go
|
||||
create /home/beeuser/.go/src/github.com/user/my-rpc-app/main.go
|
||||
2016/12/26 22:30:58 SUCCESS ▶ 0002 New application successfully created!
|
||||
\____/ \___| \___| v2.0.0
|
||||
2020/09/14 22:36:39 INFO ▶ 0001 generate api project support go modules.
|
||||
2020/09/14 22:36:39 INFO ▶ 0002 Creating Hprose application...
|
||||
create /Users/beeuser/code/learn/my-rpc-app/go.mod
|
||||
create /Users/beeuser/code/learn/my-rpc-app
|
||||
create /Users/beeuser/code/learn/my-rpc-app/conf
|
||||
create /Users/beeuser/code/learn/my-rpc-app/conf/app.conf
|
||||
create /Users/beeuser/code/learn/my-rpc-app/models
|
||||
create /Users/beeuser/code/learn/my-rpc-app/models/object.go
|
||||
create /Users/beeuser/code/learn/my-rpc-app/models/user.go
|
||||
create /Users/beeuser/code/learn/my-rpc-app/main.go
|
||||
2020/09/14 22:36:39 SUCCESS ▶ 0003 New Hprose application successfully created!
|
||||
```
|
||||
|
||||
For more information on the usage, run `bee help hprose`.
|
||||
|
@ -280,9 +275,8 @@ ______
|
|||
| |_/ / ___ ___
|
||||
| ___ \ / _ \ / _ \
|
||||
| |_/ /| __/| __/
|
||||
\____/ \___| \___| v1.6.2
|
||||
2016/12/26 22:32:41 INFO ▶ 0001 Loading configuration from 'bee.json'...
|
||||
2016/12/26 22:32:41 SUCCESS ▶ 0002 Baled resources successfully!
|
||||
\____/ \___| \___| v2.0.0
|
||||
2020/09/14 22:37:56 SUCCESS ▶ 0001 Baled resources successfully!
|
||||
```
|
||||
|
||||
For more information on the usage, run `bee help bale`.
|
||||
|
@ -306,31 +300,32 @@ ______
|
|||
| |_/ / ___ ___
|
||||
| ___ \ / _ \ / _ \
|
||||
| |_/ /| __/| __/
|
||||
\____/ \___| \___| v1.6.2
|
||||
2016/12/26 22:33:58 INFO ▶ 0001 Using 'Hello' as controller name
|
||||
2016/12/26 22:33:58 INFO ▶ 0002 Using 'controllers' as package name
|
||||
create /home/beeuser/.go/src/github.com/user/my-web-app/controllers/hello.go
|
||||
2016/12/26 22:33:58 SUCCESS ▶ 0003 Controller successfully generated!
|
||||
\____/ \___| \___| v2.0.0
|
||||
2020/09/14 22:38:44 INFO ▶ 0001 Using 'Hello' as controller name
|
||||
2020/09/14 22:38:44 INFO ▶ 0002 Using 'controllers' as package name
|
||||
create /Users/beeuser/code/learn/my-api/controllers/hello.go
|
||||
2020/09/14 22:38:44 SUCCESS ▶ 0003 Controller successfully generated!
|
||||
```
|
||||
|
||||
For more information on the usage, run `bee help generate`.
|
||||
|
||||
### bee dockerize
|
||||
|
||||
Bee also helps you dockerize your Beego application by generating a Dockerfile.
|
||||
Bee also helps you dockerize your Beego application by generating a Dockerfile and a docker-compose.yaml file.
|
||||
|
||||
For example, to generate a Dockerfile with `Go version 1.6.4` and exposing port `9000`:
|
||||
For example, to generate a Dockerfile with `golang:1.20.1` baseimage and exposing port `9000`:
|
||||
|
||||
```bash
|
||||
$ bee dockerize -image="library/golang:1.6.4" -expose=9000
|
||||
$ bee dockerize -baseimage=golang:1.20.1 -expose=9000
|
||||
______
|
||||
| ___ \
|
||||
| |_/ / ___ ___
|
||||
| ___ \ / _ \ / _ \
|
||||
| |_/ /| __/| __/
|
||||
\____/ \___| \___| v1.6.2
|
||||
2016/12/26 22:34:54 INFO ▶ 0001 Generating Dockerfile...
|
||||
2016/12/26 22:34:54 SUCCESS ▶ 0002 Dockerfile generated.
|
||||
\____/ \___| \___| v2.0.4
|
||||
2023/05/02 21:03:05 INFO ▶ 0001 Generating Dockerfile and docker-compose.yaml...
|
||||
2023/05/02 21:03:05 SUCCESS ▶ 0002 Dockerfile generated.
|
||||
2023/05/02 21:03:05 SUCCESS ▶ 0003 docker-compose.yaml generated.
|
||||
```
|
||||
|
||||
For more information on the usage, run `bee help dockerize`.
|
||||
|
@ -345,8 +340,8 @@ ______
|
|||
| |_/ / ___ ___
|
||||
| ___ \ / _ \ / _ \
|
||||
| |_/ /| __/| __/
|
||||
\____/ \___| \___| v1.8.0
|
||||
2017/03/22 11:17:05 INFO ▶ 0001 Starting Delve Debugger...
|
||||
\____/ \___| \___| v2.0.0
|
||||
2020/09/14 22:40:12 INFO ▶ 0001 Starting Delve Debugger...
|
||||
Type 'help' for list of commands.
|
||||
(dlv) break main.main
|
||||
Breakpoint 1 set at 0x40100f for main.main() ./main.go:8
|
||||
|
@ -355,7 +350,7 @@ Breakpoint 1 set at 0x40100f for main.main() ./main.go:8
|
|||
> main.main() ./main.go:8 (hits goroutine(1):1 total:1) (PC: 0x40100f)
|
||||
3: import (
|
||||
4: _ "github.com/user/myapp/routers"
|
||||
5: "github.com/astaxie/beego"
|
||||
5: beego "github.com/beego/beego/v2/server/web"
|
||||
6: )
|
||||
7:
|
||||
=> 8: func main() {
|
||||
|
@ -366,6 +361,68 @@ Breakpoint 1 set at 0x40100f for main.main() ./main.go:8
|
|||
|
||||
For more information on the usage, run `bee help dlv`.
|
||||
|
||||
### bee pro
|
||||
|
||||
#### bee pro toml
|
||||
|
||||
To create a beegopro.toml file
|
||||
|
||||
```bash
|
||||
$ bee pro toml
|
||||
2020/09/14 22:51:18 SUCCESS ▶ 0001 Successfully created file beegopro.toml
|
||||
2020/09/14 22:51:18 SUCCESS ▶ 0002 Toml successfully generated!
|
||||
```
|
||||
|
||||
#### bee pro gen
|
||||
|
||||
Source code generator by beegopro.toml
|
||||
|
||||
```bash
|
||||
$ bee pro gen
|
||||
2020/09/14 23:01:13 INFO ▶ 0001 Create /Users/beeuser/.beego/beego-pro Success!
|
||||
2020/09/14 23:01:13 INFO ▶ 0002 git pull /Users/beeuser/.beego/beego-pro
|
||||
2020/09/14 23:01:15 INFO ▶ 0003 Using 'example' as name
|
||||
2020/09/14 23:01:15 INFO ▶ 0004 Using 'example' as package name from controllers
|
||||
2020/09/14 23:01:15 INFO ▶ 0005 create file '/Users/beeuser/code/learn/my-web-app/controllers/bee_default_controller.go' from controllers
|
||||
2020/09/14 23:01:15 INFO ▶ 0006 Using 'example' as name
|
||||
2020/09/14 23:01:15 INFO ▶ 0007 Using 'example' as package name from controllers
|
||||
2020/09/14 23:01:15 INFO ▶ 0008 create file '/Users/beeuser/code/learn/my-web-app/controllers/example.go' from controllers
|
||||
2020/09/14 23:01:15 INFO ▶ 0009 Using 'example' as name
|
||||
2020/09/14 23:01:15 INFO ▶ 0010 Using 'example' as package name from models
|
||||
2020/09/14 23:01:15 INFO ▶ 0011 create file '/Users/beeuser/code/learn/my-web-app/models/bee_default_model.go' from models
|
||||
2020/09/14 23:01:15 INFO ▶ 0012 Using 'example' as name
|
||||
2020/09/14 23:01:15 INFO ▶ 0013 Using 'example' as package name from models
|
||||
2020/09/14 23:01:15 INFO ▶ 0014 create file '/Users/beeuser/code/learn/my-web-app/models/example.go' from models
|
||||
2020/09/14 23:01:15 INFO ▶ 0015 Using 'example' as name
|
||||
2020/09/14 23:01:15 INFO ▶ 0016 Using 'example' as package name from routers
|
||||
2020/09/14 23:01:15 INFO ▶ 0017 create file '/Users/beeuser/code/learn/my-web-app/routers/example.go' from routers
|
||||
2020/09/14 23:01:15 INFO ▶ 0018 Using 'example' as name
|
||||
2020/09/14 23:01:15 INFO ▶ 0019 Using 'example' as package name from example
|
||||
2020/09/14 23:01:15 INFO ▶ 0020 create file '/Users/beeuser/code/learn/my-web-app/ant/src/pages/example/list.tsx' from example
|
||||
2020/09/14 23:01:15 INFO ▶ 0021 Using 'example' as name
|
||||
2020/09/14 23:01:15 INFO ▶ 0022 Using 'example' as package name from example
|
||||
2020/09/14 23:01:15 INFO ▶ 0023 create file '/Users/beeuser/code/learn/my-web-app/ant/src/pages/example/formconfig.tsx' from example
|
||||
2020/09/14 23:01:15 INFO ▶ 0024 Using 'example' as name
|
||||
2020/09/14 23:01:15 INFO ▶ 0025 Using 'example' as package name from example
|
||||
2020/09/14 23:01:15 INFO ▶ 0026 create file '/Users/beeuser/code/learn/my-web-app/ant/src/pages/example/create.tsx' from example
|
||||
2020/09/14 23:01:15 INFO ▶ 0027 Using 'example' as name
|
||||
2020/09/14 23:01:15 INFO ▶ 0028 Using 'example' as package name from example
|
||||
2020/09/14 23:01:15 INFO ▶ 0029 create file '/Users/beeuser/code/learn/my-web-app/ant/src/pages/example/update.tsx' from example
|
||||
2020/09/14 23:01:15 INFO ▶ 0030 Using 'example' as name
|
||||
2020/09/14 23:01:15 INFO ▶ 0031 Using 'example' as package name from example
|
||||
2020/09/14 23:01:15 INFO ▶ 0032 create file '/Users/beeuser/code/learn/my-web-app/ant/src/pages/example/info.tsx' from example
|
||||
2020/09/14 23:01:15 INFO ▶ 0033 Using 'example' as name
|
||||
2020/09/14 23:01:15 INFO ▶ 0034 Using 'example' as package name from sql
|
||||
2020/09/14 23:01:15 INFO ▶ 0035 create file '/Users/beeuser/code/learn/my-web-app/sql/example_up.sql' from sql
|
||||
2020/09/14 23:01:15 INFO ▶ 0036 2020/09/14 23:01:15 INFO ▶ 0001 db exec info ./sql/example_up.sql
|
||||
2020/09/14 23:01:15 SUCCESS ▶ 0002 Migration successfully generated!
|
||||
2020/09/14 23:01:15 INFO ▶ 0037 Using 'example' as name
|
||||
2020/09/14 23:01:15 INFO ▶ 0038 Using 'example' as package name from sql
|
||||
2020/09/14 23:01:15 INFO ▶ 0039 create file '/Users/beeuser/code/learn/my-web-app/sql/example_down.sql' from sql
|
||||
2020/09/14 23:01:15 SUCCESS ▶ 0040 Gen successfully generated!
|
||||
```
|
||||
|
||||
####
|
||||
## Shortcuts
|
||||
|
||||
Because you'll likely type these generator commands over and over, it makes sense to create aliases:
|
||||
|
@ -520,7 +577,7 @@ Rebasing will update your branch with the most recent code and make your changes
|
|||
## Licence
|
||||
|
||||
```text
|
||||
Copyright 2016 bee authors
|
||||
Copyright 2020 bee authors
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
|
|
40
cmd/bee.go
40
cmd/bee.go
|
@ -16,24 +16,25 @@
|
|||
package cmd
|
||||
|
||||
import (
|
||||
"github.com/beego/bee/cmd/commands"
|
||||
_ "github.com/beego/bee/cmd/commands/api"
|
||||
_ "github.com/beego/bee/cmd/commands/bale"
|
||||
_ "github.com/beego/bee/cmd/commands/beefix"
|
||||
_ "github.com/beego/bee/cmd/commands/beegopro"
|
||||
_ "github.com/beego/bee/cmd/commands/dlv"
|
||||
_ "github.com/beego/bee/cmd/commands/dockerize"
|
||||
_ "github.com/beego/bee/cmd/commands/generate"
|
||||
_ "github.com/beego/bee/cmd/commands/hprose"
|
||||
_ "github.com/beego/bee/cmd/commands/migrate"
|
||||
_ "github.com/beego/bee/cmd/commands/new"
|
||||
_ "github.com/beego/bee/cmd/commands/pack"
|
||||
_ "github.com/beego/bee/cmd/commands/rs"
|
||||
_ "github.com/beego/bee/cmd/commands/run"
|
||||
_ "github.com/beego/bee/cmd/commands/server"
|
||||
_ "github.com/beego/bee/cmd/commands/update"
|
||||
_ "github.com/beego/bee/cmd/commands/version"
|
||||
"github.com/beego/bee/utils"
|
||||
"github.com/beego/bee/v2/cmd/commands"
|
||||
_ "github.com/beego/bee/v2/cmd/commands/api"
|
||||
_ "github.com/beego/bee/v2/cmd/commands/bale"
|
||||
_ "github.com/beego/bee/v2/cmd/commands/beefix"
|
||||
_ "github.com/beego/bee/v2/cmd/commands/beegopro"
|
||||
_ "github.com/beego/bee/v2/cmd/commands/dev"
|
||||
_ "github.com/beego/bee/v2/cmd/commands/dlv"
|
||||
_ "github.com/beego/bee/v2/cmd/commands/dockerize"
|
||||
_ "github.com/beego/bee/v2/cmd/commands/generate"
|
||||
_ "github.com/beego/bee/v2/cmd/commands/hprose"
|
||||
_ "github.com/beego/bee/v2/cmd/commands/migrate"
|
||||
_ "github.com/beego/bee/v2/cmd/commands/new"
|
||||
_ "github.com/beego/bee/v2/cmd/commands/pack"
|
||||
_ "github.com/beego/bee/v2/cmd/commands/rs"
|
||||
_ "github.com/beego/bee/v2/cmd/commands/run"
|
||||
_ "github.com/beego/bee/v2/cmd/commands/server"
|
||||
_ "github.com/beego/bee/v2/cmd/commands/update"
|
||||
_ "github.com/beego/bee/v2/cmd/commands/version"
|
||||
"github.com/beego/bee/v2/utils"
|
||||
)
|
||||
|
||||
func IfGenerateDocs(name string, args []string) bool {
|
||||
|
@ -50,6 +51,8 @@ func IfGenerateDocs(name string, args []string) bool {
|
|||
|
||||
var usageTemplate = `Bee is a Fast and Flexible tool for managing your Beego Web Application.
|
||||
|
||||
You are using bee for beego v2.x. If you are working on beego v1.x, please downgrade version to bee v1.12.0
|
||||
|
||||
{{"USAGE" | headline}}
|
||||
{{"bee command [arguments]" | bold}}
|
||||
|
||||
|
@ -87,6 +90,7 @@ func Usage() {
|
|||
func Help(args []string) {
|
||||
if len(args) == 0 {
|
||||
Usage()
|
||||
return
|
||||
}
|
||||
if len(args) != 1 {
|
||||
utils.PrintErrorAndExit("Too many arguments", ErrorTemplate)
|
||||
|
|
|
@ -16,16 +16,17 @@ package apiapp
|
|||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/beego/bee/logger/colors"
|
||||
"os"
|
||||
path "path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/beego/bee/cmd/commands"
|
||||
"github.com/beego/bee/cmd/commands/version"
|
||||
"github.com/beego/bee/generate"
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
"github.com/beego/bee/utils"
|
||||
"github.com/beego/bee/v2/logger/colors"
|
||||
|
||||
"github.com/beego/bee/v2/cmd/commands"
|
||||
"github.com/beego/bee/v2/cmd/commands/version"
|
||||
"github.com/beego/bee/v2/generate"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
"github.com/beego/bee/v2/utils"
|
||||
)
|
||||
|
||||
var CmdApiapp = &commands.Command{
|
||||
|
@ -37,7 +38,7 @@ var CmdApiapp = &commands.Command{
|
|||
now default supoort generate a go modules project.
|
||||
|
||||
{{"Example:"|bold}}
|
||||
$ bee api [appname] [-tables=""] [-driver=mysql] [-conn="root:@tcp(127.0.0.1:3306)/test"] [-gopath=false] [-beego=v1.12.1]
|
||||
$ bee api [appname] [-tables=""] [-driver=mysql] [-conn="root:@tcp(127.0.0.1:3306)/test"] [-gopath=false] [-beego=v1.12.3]
|
||||
|
||||
If 'conn' argument is empty, the command will generate an example API application. Otherwise the command
|
||||
will connect to your database and generate models based on the existing tables.
|
||||
|
@ -75,7 +76,7 @@ var apiMaingo = `package main
|
|||
import (
|
||||
_ "{{.Appname}}/routers"
|
||||
|
||||
"github.com/astaxie/beego"
|
||||
beego "github.com/beego/beego/v2/server/web"
|
||||
)
|
||||
|
||||
func main() {
|
||||
|
@ -92,13 +93,18 @@ var apiMainconngo = `package main
|
|||
import (
|
||||
_ "{{.Appname}}/routers"
|
||||
|
||||
"github.com/astaxie/beego"
|
||||
"github.com/astaxie/beego/orm"
|
||||
beego "github.com/beego/beego/v2/server/web"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
"github.com/beego/beego/v2/client/orm"
|
||||
{{.DriverPkg}}
|
||||
)
|
||||
|
||||
func main() {
|
||||
orm.RegisterDataBase("default", "{{.DriverName}}", beego.AppConfig.String("sqlconn"))
|
||||
sqlConn,err := beego.AppConfig.String("sqlconn")
|
||||
if err != nil {
|
||||
beeLogger.Log.Fatal("%s", err)
|
||||
}
|
||||
orm.RegisterDataBase("default", "{{.DriverName}}", sqlConn)
|
||||
if beego.BConfig.RunMode == "dev" {
|
||||
beego.BConfig.WebConfig.DirectoryIndex = true
|
||||
beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"
|
||||
|
@ -112,7 +118,7 @@ module %s
|
|||
|
||||
go %s
|
||||
|
||||
require github.com/astaxie/beego %s
|
||||
require github.com/beego/beego/v2 %s
|
||||
require github.com/smartystreets/goconvey v1.6.4
|
||||
`
|
||||
|
||||
|
@ -128,7 +134,7 @@ package routers
|
|||
import (
|
||||
"{{.Appname}}/controllers"
|
||||
|
||||
"github.com/astaxie/beego"
|
||||
beego "github.com/beego/beego/v2/server/web"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
@ -297,7 +303,7 @@ import (
|
|||
"{{.Appname}}/models"
|
||||
"encoding/json"
|
||||
|
||||
"github.com/astaxie/beego"
|
||||
beego "github.com/beego/beego/v2/server/web"
|
||||
)
|
||||
|
||||
// Operations about object
|
||||
|
@ -390,7 +396,7 @@ import (
|
|||
"{{.Appname}}/models"
|
||||
"encoding/json"
|
||||
|
||||
"github.com/astaxie/beego"
|
||||
beego "github.com/beego/beego/v2/server/web"
|
||||
)
|
||||
|
||||
// Operations about Users
|
||||
|
@ -515,7 +521,8 @@ import (
|
|||
"path/filepath"
|
||||
_ "{{.Appname}}/routers"
|
||||
|
||||
"github.com/astaxie/beego"
|
||||
beego "github.com/beego/beego/v2/server/web"
|
||||
"github.com/beego/beego/v2/core/logs"
|
||||
. "github.com/smartystreets/goconvey/convey"
|
||||
)
|
||||
|
||||
|
@ -531,7 +538,7 @@ func TestGet(t *testing.T) {
|
|||
w := httptest.NewRecorder()
|
||||
beego.BeeApp.Handlers.ServeHTTP(w, r)
|
||||
|
||||
beego.Trace("testing", "TestGet", "Code[%d]\n%s", w.Code, w.Body.String())
|
||||
logs.Info("testing", "TestGet", "Code[%d]\n%s", w.Code, w.Body.String())
|
||||
|
||||
Convey("Subject: Test Station Endpoint\n", t, func() {
|
||||
Convey("Status Code Should Be 200", func() {
|
||||
|
@ -573,18 +580,18 @@ func createAPI(cmd *commands.Command, args []string) int {
|
|||
var packPath string
|
||||
var err error
|
||||
if gopath == `true` {
|
||||
beeLogger.Log.Info("generate api project support GOPATH")
|
||||
beeLogger.Log.Info("Generate api project support GOPATH")
|
||||
version.ShowShortVersionBanner()
|
||||
appPath, packPath, err = utils.CheckEnv(args[0])
|
||||
if err != nil {
|
||||
beeLogger.Log.Fatalf("%s", err)
|
||||
}
|
||||
} else {
|
||||
beeLogger.Log.Info("generate api project support go modules.")
|
||||
beeLogger.Log.Info("Generate api project support go modules.")
|
||||
appPath = path.Join(utils.GetBeeWorkPath(), args[0])
|
||||
packPath = args[0]
|
||||
if beegoVersion.String() == `` {
|
||||
beegoVersion.Set(`v1.12.1`)
|
||||
beegoVersion.Set(utils.BEEGO_VERSION)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -24,11 +24,11 @@ import (
|
|||
"runtime"
|
||||
"strings"
|
||||
|
||||
"github.com/beego/bee/cmd/commands"
|
||||
"github.com/beego/bee/cmd/commands/version"
|
||||
"github.com/beego/bee/config"
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
"github.com/beego/bee/utils"
|
||||
"github.com/beego/bee/v2/cmd/commands"
|
||||
"github.com/beego/bee/v2/cmd/commands/version"
|
||||
"github.com/beego/bee/v2/config"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
"github.com/beego/bee/v2/utils"
|
||||
)
|
||||
|
||||
var CmdBale = &commands.Command{
|
||||
|
|
|
@ -1,232 +1,48 @@
|
|||
package beefix
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"go/parser"
|
||||
"go/token"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"regexp"
|
||||
"strings"
|
||||
|
||||
"github.com/beego/bee/cmd/commands"
|
||||
"github.com/beego/bee/cmd/commands/version"
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
"github.com/beego/bee/logger/colors"
|
||||
"github.com/beego/bee/v2/cmd/commands"
|
||||
"github.com/beego/bee/v2/cmd/commands/version"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
"github.com/beego/bee/v2/utils"
|
||||
)
|
||||
|
||||
var CmdFix = &commands.Command{
|
||||
UsageLine: "fix",
|
||||
Short: "Fixes your application by making it compatible with newer versions of Beego",
|
||||
Long: `As of {{"Beego 1.6"|bold}}, there are some backward compatibility issues.
|
||||
|
||||
Long: `
|
||||
The command 'fix' will try to solve those issues by upgrading your code base
|
||||
to be compatible with Beego version 1.6+.
|
||||
to be compatible with Beego old version
|
||||
-s source version
|
||||
-t target version
|
||||
|
||||
example: bee fix -s 1 -t 2 means that upgrade Beego version from v1.x to v2.x
|
||||
`,
|
||||
}
|
||||
|
||||
var (
|
||||
source, target utils.DocValue
|
||||
)
|
||||
|
||||
func init() {
|
||||
CmdFix.Run = runFix
|
||||
CmdFix.PreRun = func(cmd *commands.Command, args []string) { version.ShowShortVersionBanner() }
|
||||
CmdFix.Flag.Var(&source, "s", "source version")
|
||||
CmdFix.Flag.Var(&target, "t", "target version")
|
||||
commands.AvailableCommands = append(commands.AvailableCommands, CmdFix)
|
||||
}
|
||||
|
||||
func runFix(cmd *commands.Command, args []string) int {
|
||||
output := cmd.Out()
|
||||
|
||||
beeLogger.Log.Info("Upgrading the application...")
|
||||
|
||||
dir, err := os.Getwd()
|
||||
if err != nil {
|
||||
beeLogger.Log.Fatalf("Error while getting the current working directory: %s", err)
|
||||
t := target.String()
|
||||
if t == "" || t == "1.6" {
|
||||
return fixTo16(cmd, args)
|
||||
} else if strings.HasPrefix(t, "2") {
|
||||
// upgrade to v2
|
||||
return fix1To2()
|
||||
}
|
||||
|
||||
filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
|
||||
if info.IsDir() {
|
||||
if strings.HasPrefix(info.Name(), ".") {
|
||||
return filepath.SkipDir
|
||||
}
|
||||
return nil
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if strings.HasSuffix(info.Name(), ".exe") {
|
||||
return nil
|
||||
}
|
||||
err = fixFile(path)
|
||||
fmt.Fprintf(output, colors.GreenBold("\tfix\t")+"%s\n", path)
|
||||
if err != nil {
|
||||
beeLogger.Log.Errorf("Could not fix file: %s", err)
|
||||
}
|
||||
return err
|
||||
})
|
||||
beeLogger.Log.Success("Upgrade Done!")
|
||||
beeLogger.Log.Info("The target is compatible version, do nothing")
|
||||
return 0
|
||||
}
|
||||
|
||||
var rules = []string{
|
||||
"beego.AppName", "beego.BConfig.AppName",
|
||||
"beego.RunMode", "beego.BConfig.RunMode",
|
||||
"beego.RecoverPanic", "beego.BConfig.RecoverPanic",
|
||||
"beego.RouterCaseSensitive", "beego.BConfig.RouterCaseSensitive",
|
||||
"beego.BeegoServerName", "beego.BConfig.ServerName",
|
||||
"beego.EnableGzip", "beego.BConfig.EnableGzip",
|
||||
"beego.ErrorsShow", "beego.BConfig.EnableErrorsShow",
|
||||
"beego.CopyRequestBody", "beego.BConfig.CopyRequestBody",
|
||||
"beego.MaxMemory", "beego.BConfig.MaxMemory",
|
||||
"beego.Graceful", "beego.BConfig.Listen.Graceful",
|
||||
"beego.HttpAddr", "beego.BConfig.Listen.HTTPAddr",
|
||||
"beego.HttpPort", "beego.BConfig.Listen.HTTPPort",
|
||||
"beego.ListenTCP4", "beego.BConfig.Listen.ListenTCP4",
|
||||
"beego.EnableHttpListen", "beego.BConfig.Listen.EnableHTTP",
|
||||
"beego.EnableHttpTLS", "beego.BConfig.Listen.EnableHTTPS",
|
||||
"beego.HttpsAddr", "beego.BConfig.Listen.HTTPSAddr",
|
||||
"beego.HttpsPort", "beego.BConfig.Listen.HTTPSPort",
|
||||
"beego.HttpCertFile", "beego.BConfig.Listen.HTTPSCertFile",
|
||||
"beego.HttpKeyFile", "beego.BConfig.Listen.HTTPSKeyFile",
|
||||
"beego.EnableAdmin", "beego.BConfig.Listen.EnableAdmin",
|
||||
"beego.AdminHttpAddr", "beego.BConfig.Listen.AdminAddr",
|
||||
"beego.AdminHttpPort", "beego.BConfig.Listen.AdminPort",
|
||||
"beego.UseFcgi", "beego.BConfig.Listen.EnableFcgi",
|
||||
"beego.HttpServerTimeOut", "beego.BConfig.Listen.ServerTimeOut",
|
||||
"beego.AutoRender", "beego.BConfig.WebConfig.AutoRender",
|
||||
"beego.ViewsPath", "beego.BConfig.WebConfig.ViewsPath",
|
||||
"beego.StaticDir", "beego.BConfig.WebConfig.StaticDir",
|
||||
"beego.StaticExtensionsToGzip", "beego.BConfig.WebConfig.StaticExtensionsToGzip",
|
||||
"beego.DirectoryIndex", "beego.BConfig.WebConfig.DirectoryIndex",
|
||||
"beego.FlashName", "beego.BConfig.WebConfig.FlashName",
|
||||
"beego.FlashSeperator", "beego.BConfig.WebConfig.FlashSeparator",
|
||||
"beego.EnableDocs", "beego.BConfig.WebConfig.EnableDocs",
|
||||
"beego.XSRFKEY", "beego.BConfig.WebConfig.XSRFKey",
|
||||
"beego.EnableXSRF", "beego.BConfig.WebConfig.EnableXSRF",
|
||||
"beego.XSRFExpire", "beego.BConfig.WebConfig.XSRFExpire",
|
||||
"beego.TemplateLeft", "beego.BConfig.WebConfig.TemplateLeft",
|
||||
"beego.TemplateRight", "beego.BConfig.WebConfig.TemplateRight",
|
||||
"beego.SessionOn", "beego.BConfig.WebConfig.Session.SessionOn",
|
||||
"beego.SessionProvider", "beego.BConfig.WebConfig.Session.SessionProvider",
|
||||
"beego.SessionName", "beego.BConfig.WebConfig.Session.SessionName",
|
||||
"beego.SessionGCMaxLifetime", "beego.BConfig.WebConfig.Session.SessionGCMaxLifetime",
|
||||
"beego.SessionSavePath", "beego.BConfig.WebConfig.Session.SessionProviderConfig",
|
||||
"beego.SessionCookieLifeTime", "beego.BConfig.WebConfig.Session.SessionCookieLifeTime",
|
||||
"beego.SessionAutoSetCookie", "beego.BConfig.WebConfig.Session.SessionAutoSetCookie",
|
||||
"beego.SessionDomain", "beego.BConfig.WebConfig.Session.SessionDomain",
|
||||
"Ctx.Input.CopyBody(", "Ctx.Input.CopyBody(beego.BConfig.MaxMemory",
|
||||
".UrlFor(", ".URLFor(",
|
||||
".ServeJson(", ".ServeJSON(",
|
||||
".ServeXml(", ".ServeXML(",
|
||||
".ServeJsonp(", ".ServeJSONP(",
|
||||
".XsrfToken(", ".XSRFToken(",
|
||||
".CheckXsrfCookie(", ".CheckXSRFCookie(",
|
||||
".XsrfFormHtml(", ".XSRFFormHTML(",
|
||||
"beego.UrlFor(", "beego.URLFor(",
|
||||
"beego.GlobalDocApi", "beego.GlobalDocAPI",
|
||||
"beego.Errorhandler", "beego.ErrorHandler",
|
||||
"Output.Jsonp(", "Output.JSONP(",
|
||||
"Output.Json(", "Output.JSON(",
|
||||
"Output.Xml(", "Output.XML(",
|
||||
"Input.Uri()", "Input.URI()",
|
||||
"Input.Url()", "Input.URL()",
|
||||
"Input.AcceptsHtml()", "Input.AcceptsHTML()",
|
||||
"Input.AcceptsXml()", "Input.AcceptsXML()",
|
||||
"Input.AcceptsJson()", "Input.AcceptsJSON()",
|
||||
"Ctx.XsrfToken()", "Ctx.XSRFToken()",
|
||||
"Ctx.CheckXsrfCookie()", "Ctx.CheckXSRFCookie()",
|
||||
"session.SessionStore", "session.Store",
|
||||
".TplNames", ".TplName",
|
||||
"swagger.ApiRef", "swagger.APIRef",
|
||||
"swagger.ApiDeclaration", "swagger.APIDeclaration",
|
||||
"swagger.Api", "swagger.API",
|
||||
"swagger.ApiRef", "swagger.APIRef",
|
||||
"swagger.Infomation", "swagger.Information",
|
||||
"toolbox.UrlMap", "toolbox.URLMap",
|
||||
"logs.LoggerInterface", "logs.Logger",
|
||||
"Input.Request", "Input.Context.Request",
|
||||
"Input.Params)", "Input.Params())",
|
||||
"httplib.BeegoHttpSettings", "httplib.BeegoHTTPSettings",
|
||||
"httplib.BeegoHttpRequest", "httplib.BeegoHTTPRequest",
|
||||
".TlsClientConfig", ".TLSClientConfig",
|
||||
".JsonBody", ".JSONBody",
|
||||
".ToJson", ".ToJSON",
|
||||
".ToXml", ".ToXML",
|
||||
"beego.Html2str", "beego.HTML2str",
|
||||
"beego.AssetsCss", "beego.AssetsCSS",
|
||||
"orm.DR_Sqlite", "orm.DRSqlite",
|
||||
"orm.DR_Postgres", "orm.DRPostgres",
|
||||
"orm.DR_MySQL", "orm.DRMySQL",
|
||||
"orm.DR_Oracle", "orm.DROracle",
|
||||
"orm.Col_Add", "orm.ColAdd",
|
||||
"orm.Col_Minus", "orm.ColMinus",
|
||||
"orm.Col_Multiply", "orm.ColMultiply",
|
||||
"orm.Col_Except", "orm.ColExcept",
|
||||
"GenerateOperatorSql", "GenerateOperatorSQL",
|
||||
"OperatorSql", "OperatorSQL",
|
||||
"orm.Debug_Queries", "orm.DebugQueries",
|
||||
"orm.COMMA_SPACE", "orm.CommaSpace",
|
||||
".SendOut()", ".DoRequest()",
|
||||
"validation.ValidationError", "validation.Error",
|
||||
}
|
||||
|
||||
func fixFile(file string) error {
|
||||
rp := strings.NewReplacer(rules...)
|
||||
content, err := ioutil.ReadFile(file)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
fixed := rp.Replace(string(content))
|
||||
|
||||
// Forword the RequestBody from the replace
|
||||
// "Input.Request", "Input.Context.Request",
|
||||
fixed = strings.Replace(fixed, "Input.Context.RequestBody", "Input.RequestBody", -1)
|
||||
|
||||
// Regexp replace
|
||||
pareg := regexp.MustCompile(`(Input.Params\[")(.*)("])`)
|
||||
fixed = pareg.ReplaceAllString(fixed, "Input.Param(\"$2\")")
|
||||
pareg = regexp.MustCompile(`(Input.Data\[\")(.*)(\"\])(\s)(=)(\s)(.*)`)
|
||||
fixed = pareg.ReplaceAllString(fixed, "Input.SetData(\"$2\", $7)")
|
||||
pareg = regexp.MustCompile(`(Input.Data\[\")(.*)(\"\])`)
|
||||
fixed = pareg.ReplaceAllString(fixed, "Input.Data(\"$2\")")
|
||||
// Fix the cache object Put method
|
||||
pareg = regexp.MustCompile(`(\.Put\(\")(.*)(\",)(\s)(.*)(,\s*)([^\*.]*)(\))`)
|
||||
if pareg.MatchString(fixed) && strings.HasSuffix(file, ".go") {
|
||||
fixed = pareg.ReplaceAllString(fixed, ".Put(\"$2\", $5, $7*time.Second)")
|
||||
fset := token.NewFileSet() // positions are relative to fset
|
||||
f, err := parser.ParseFile(fset, file, nil, parser.ImportsOnly)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
// Print the imports from the file's AST.
|
||||
hasTimepkg := false
|
||||
for _, s := range f.Imports {
|
||||
if s.Path.Value == `"time"` {
|
||||
hasTimepkg = true
|
||||
break
|
||||
}
|
||||
}
|
||||
if !hasTimepkg {
|
||||
fixed = strings.Replace(fixed, "import (", "import (\n\t\"time\"", 1)
|
||||
}
|
||||
}
|
||||
// Replace the v.Apis in docs.go
|
||||
if strings.Contains(file, "docs.go") {
|
||||
fixed = strings.Replace(fixed, "v.Apis", "v.APIs", -1)
|
||||
}
|
||||
// Replace the config file
|
||||
if strings.HasSuffix(file, ".conf") {
|
||||
fixed = strings.Replace(fixed, "HttpCertFile", "HTTPSCertFile", -1)
|
||||
fixed = strings.Replace(fixed, "HttpKeyFile", "HTTPSKeyFile", -1)
|
||||
fixed = strings.Replace(fixed, "EnableHttpListen", "HTTPEnable", -1)
|
||||
fixed = strings.Replace(fixed, "EnableHttpTLS", "EnableHTTPS", -1)
|
||||
fixed = strings.Replace(fixed, "EnableHttpTLS", "EnableHTTPS", -1)
|
||||
fixed = strings.Replace(fixed, "BeegoServerName", "ServerName", -1)
|
||||
fixed = strings.Replace(fixed, "AdminHttpAddr", "AdminAddr", -1)
|
||||
fixed = strings.Replace(fixed, "AdminHttpPort", "AdminPort", -1)
|
||||
fixed = strings.Replace(fixed, "HttpServerTimeOut", "ServerTimeOut", -1)
|
||||
}
|
||||
err = os.Truncate(file, 0)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return ioutil.WriteFile(file, []byte(fixed), 0666)
|
||||
}
|
||||
|
|
|
@ -0,0 +1,61 @@
|
|||
// Copyright 2020
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package beefix
|
||||
|
||||
import (
|
||||
"os"
|
||||
"os/exec"
|
||||
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
)
|
||||
|
||||
func fix1To2() int {
|
||||
beeLogger.Log.Info("Upgrading the application...")
|
||||
|
||||
cmdStr := `go get -u github.com/beego/beego/v2@master`
|
||||
err := runShell(cmdStr)
|
||||
if err != nil {
|
||||
beeLogger.Log.Error(err.Error())
|
||||
beeLogger.Log.Error(`fetch v2.0.1 failed. Please try to run: export GO111MODULE=on
|
||||
and if your network is not stable, please try to use proxy, for example: export GOPROXY=https://goproxy.cn;'
|
||||
`)
|
||||
return 1
|
||||
}
|
||||
|
||||
cmdStr = `find ./ -name '*.go' -type f -exec sed -i '' -e 's/github.com\/astaxie\/beego/github.com\/beego\/beego\/v2\/adapter/g' {} \;`
|
||||
err = runShell(cmdStr)
|
||||
if err != nil {
|
||||
beeLogger.Log.Error(err.Error())
|
||||
return 1
|
||||
}
|
||||
cmdStr = `find ./ -name '*.go' -type f -exec sed -i '' -e 's/"github.com\/beego\/beego\/v2\/adapter"/beego "github.com\/beego\/beego\/v2\/adapter"/g' {} \;`
|
||||
err = runShell(cmdStr)
|
||||
if err != nil {
|
||||
beeLogger.Log.Error(err.Error())
|
||||
return 1
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func runShell(cmdStr string) error {
|
||||
c := exec.Command("sh", "-c", cmdStr)
|
||||
c.Stdout = os.Stdout
|
||||
err := c.Run()
|
||||
if err != nil {
|
||||
beeLogger.Log.Errorf("execute command [%s] failed: %s", cmdStr, err.Error())
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
|
@ -0,0 +1,230 @@
|
|||
// Copyright 2020
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package beefix
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"go/parser"
|
||||
"go/token"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"regexp"
|
||||
"strings"
|
||||
|
||||
"github.com/beego/bee/v2/cmd/commands"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
"github.com/beego/bee/v2/logger/colors"
|
||||
)
|
||||
|
||||
// fixTo16 upgrade beego to 1.6
|
||||
func fixTo16(cmd *commands.Command, args []string) int {
|
||||
output := cmd.Out()
|
||||
|
||||
beeLogger.Log.Info("Upgrading the application...")
|
||||
|
||||
dir, err := os.Getwd()
|
||||
if err != nil {
|
||||
beeLogger.Log.Fatalf("Error while getting the current working directory: %s", err)
|
||||
}
|
||||
|
||||
filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
|
||||
if info.IsDir() {
|
||||
if strings.HasPrefix(info.Name(), ".") {
|
||||
return filepath.SkipDir
|
||||
}
|
||||
return nil
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if strings.HasSuffix(info.Name(), ".exe") {
|
||||
return nil
|
||||
}
|
||||
err = fixFile(path)
|
||||
fmt.Fprintf(output, colors.GreenBold("\tfix\t")+"%s\n", path)
|
||||
if err != nil {
|
||||
beeLogger.Log.Errorf("Could not fix file: %s", err)
|
||||
}
|
||||
return err
|
||||
})
|
||||
beeLogger.Log.Success("Upgrade Done!")
|
||||
return 0
|
||||
}
|
||||
|
||||
var rules = []string{
|
||||
"beego.AppName", "beego.BConfig.AppName",
|
||||
"beego.RunMode", "beego.BConfig.RunMode",
|
||||
"beego.RecoverPanic", "beego.BConfig.RecoverPanic",
|
||||
"beego.RouterCaseSensitive", "beego.BConfig.RouterCaseSensitive",
|
||||
"beego.BeegoServerName", "beego.BConfig.ServerName",
|
||||
"beego.EnableGzip", "beego.BConfig.EnableGzip",
|
||||
"beego.ErrorsShow", "beego.BConfig.EnableErrorsShow",
|
||||
"beego.CopyRequestBody", "beego.BConfig.CopyRequestBody",
|
||||
"beego.MaxMemory", "beego.BConfig.MaxMemory",
|
||||
"beego.Graceful", "beego.BConfig.Listen.Graceful",
|
||||
"beego.HttpAddr", "beego.BConfig.Listen.HTTPAddr",
|
||||
"beego.HttpPort", "beego.BConfig.Listen.HTTPPort",
|
||||
"beego.ListenTCP4", "beego.BConfig.Listen.ListenTCP4",
|
||||
"beego.EnableHttpListen", "beego.BConfig.Listen.EnableHTTP",
|
||||
"beego.EnableHttpTLS", "beego.BConfig.Listen.EnableHTTPS",
|
||||
"beego.HttpsAddr", "beego.BConfig.Listen.HTTPSAddr",
|
||||
"beego.HttpsPort", "beego.BConfig.Listen.HTTPSPort",
|
||||
"beego.HttpCertFile", "beego.BConfig.Listen.HTTPSCertFile",
|
||||
"beego.HttpKeyFile", "beego.BConfig.Listen.HTTPSKeyFile",
|
||||
"beego.EnableAdmin", "beego.BConfig.Listen.EnableAdmin",
|
||||
"beego.AdminHttpAddr", "beego.BConfig.Listen.AdminAddr",
|
||||
"beego.AdminHttpPort", "beego.BConfig.Listen.AdminPort",
|
||||
"beego.UseFcgi", "beego.BConfig.Listen.EnableFcgi",
|
||||
"beego.HttpServerTimeOut", "beego.BConfig.Listen.ServerTimeOut",
|
||||
"beego.AutoRender", "beego.BConfig.WebConfig.AutoRender",
|
||||
"beego.ViewsPath", "beego.BConfig.WebConfig.ViewsPath",
|
||||
"beego.StaticDir", "beego.BConfig.WebConfig.StaticDir",
|
||||
"beego.StaticExtensionsToGzip", "beego.BConfig.WebConfig.StaticExtensionsToGzip",
|
||||
"beego.DirectoryIndex", "beego.BConfig.WebConfig.DirectoryIndex",
|
||||
"beego.FlashName", "beego.BConfig.WebConfig.FlashName",
|
||||
"beego.FlashSeperator", "beego.BConfig.WebConfig.FlashSeparator",
|
||||
"beego.EnableDocs", "beego.BConfig.WebConfig.EnableDocs",
|
||||
"beego.XSRFKEY", "beego.BConfig.WebConfig.XSRFKey",
|
||||
"beego.EnableXSRF", "beego.BConfig.WebConfig.EnableXSRF",
|
||||
"beego.XSRFExpire", "beego.BConfig.WebConfig.XSRFExpire",
|
||||
"beego.TemplateLeft", "beego.BConfig.WebConfig.TemplateLeft",
|
||||
"beego.TemplateRight", "beego.BConfig.WebConfig.TemplateRight",
|
||||
"beego.SessionOn", "beego.BConfig.WebConfig.Session.SessionOn",
|
||||
"beego.SessionProvider", "beego.BConfig.WebConfig.Session.SessionProvider",
|
||||
"beego.SessionName", "beego.BConfig.WebConfig.Session.SessionName",
|
||||
"beego.SessionGCMaxLifetime", "beego.BConfig.WebConfig.Session.SessionGCMaxLifetime",
|
||||
"beego.SessionSavePath", "beego.BConfig.WebConfig.Session.SessionProviderConfig",
|
||||
"beego.SessionCookieLifeTime", "beego.BConfig.WebConfig.Session.SessionCookieLifeTime",
|
||||
"beego.SessionAutoSetCookie", "beego.BConfig.WebConfig.Session.SessionAutoSetCookie",
|
||||
"beego.SessionDomain", "beego.BConfig.WebConfig.Session.SessionDomain",
|
||||
"Ctx.Input.CopyBody(", "Ctx.Input.CopyBody(beego.BConfig.MaxMemory",
|
||||
".UrlFor(", ".URLFor(",
|
||||
".ServeJson(", ".ServeJSON(",
|
||||
".ServeXml(", ".ServeXML(",
|
||||
".ServeJsonp(", ".ServeJSONP(",
|
||||
".XsrfToken(", ".XSRFToken(",
|
||||
".CheckXsrfCookie(", ".CheckXSRFCookie(",
|
||||
".XsrfFormHtml(", ".XSRFFormHTML(",
|
||||
"beego.UrlFor(", "beego.URLFor(",
|
||||
"beego.GlobalDocApi", "beego.GlobalDocAPI",
|
||||
"beego.Errorhandler", "beego.ErrorHandler",
|
||||
"Output.Jsonp(", "Output.JSONP(",
|
||||
"Output.Json(", "Output.JSON(",
|
||||
"Output.Xml(", "Output.XML(",
|
||||
"Input.Uri()", "Input.URI()",
|
||||
"Input.Url()", "Input.URL()",
|
||||
"Input.AcceptsHtml()", "Input.AcceptsHTML()",
|
||||
"Input.AcceptsXml()", "Input.AcceptsXML()",
|
||||
"Input.AcceptsJson()", "Input.AcceptsJSON()",
|
||||
"Ctx.XsrfToken()", "Ctx.XSRFToken()",
|
||||
"Ctx.CheckXsrfCookie()", "Ctx.CheckXSRFCookie()",
|
||||
"session.SessionStore", "session.Store",
|
||||
".TplNames", ".TplName",
|
||||
"swagger.ApiRef", "swagger.APIRef",
|
||||
"swagger.ApiDeclaration", "swagger.APIDeclaration",
|
||||
"swagger.Api", "swagger.API",
|
||||
"swagger.ApiRef", "swagger.APIRef",
|
||||
"swagger.Infomation", "swagger.Information",
|
||||
"toolbox.UrlMap", "toolbox.URLMap",
|
||||
"logs.LoggerInterface", "logs.Logger",
|
||||
"Input.Request", "Input.Context.Request",
|
||||
"Input.Params)", "Input.Params())",
|
||||
"httplib.BeegoHttpSettings", "httplib.BeegoHTTPSettings",
|
||||
"httplib.BeegoHttpRequest", "httplib.BeegoHTTPRequest",
|
||||
".TlsClientConfig", ".TLSClientConfig",
|
||||
".JsonBody", ".JSONBody",
|
||||
".ToJson", ".ToJSON",
|
||||
".ToXml", ".ToXML",
|
||||
"beego.Html2str", "beego.HTML2str",
|
||||
"beego.AssetsCss", "beego.AssetsCSS",
|
||||
"orm.DR_Sqlite", "orm.DRSqlite",
|
||||
"orm.DR_Postgres", "orm.DRPostgres",
|
||||
"orm.DR_MySQL", "orm.DRMySQL",
|
||||
"orm.DR_Oracle", "orm.DROracle",
|
||||
"orm.Col_Add", "orm.ColAdd",
|
||||
"orm.Col_Minus", "orm.ColMinus",
|
||||
"orm.Col_Multiply", "orm.ColMultiply",
|
||||
"orm.Col_Except", "orm.ColExcept",
|
||||
"GenerateOperatorSql", "GenerateOperatorSQL",
|
||||
"OperatorSql", "OperatorSQL",
|
||||
"orm.Debug_Queries", "orm.DebugQueries",
|
||||
"orm.COMMA_SPACE", "orm.CommaSpace",
|
||||
".SendOut()", ".DoRequest()",
|
||||
"validation.ValidationError", "validation.Error",
|
||||
}
|
||||
|
||||
func fixFile(file string) error {
|
||||
rp := strings.NewReplacer(rules...)
|
||||
content, err := ioutil.ReadFile(file)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
fixed := rp.Replace(string(content))
|
||||
|
||||
// Forword the RequestBody from the replace
|
||||
// "Input.Request", "Input.Context.Request",
|
||||
fixed = strings.Replace(fixed, "Input.Context.RequestBody", "Input.RequestBody", -1)
|
||||
|
||||
// Regexp replace
|
||||
pareg := regexp.MustCompile(`(Input.Params\[")(.*)("])`)
|
||||
fixed = pareg.ReplaceAllString(fixed, "Input.Param(\"$2\")")
|
||||
pareg = regexp.MustCompile(`(Input.Data\[\")(.*)(\"\])(\s)(=)(\s)(.*)`)
|
||||
fixed = pareg.ReplaceAllString(fixed, "Input.SetData(\"$2\", $7)")
|
||||
pareg = regexp.MustCompile(`(Input.Data\[\")(.*)(\"\])`)
|
||||
fixed = pareg.ReplaceAllString(fixed, "Input.Data(\"$2\")")
|
||||
// Fix the cache object Put method
|
||||
pareg = regexp.MustCompile(`(\.Put\(\")(.*)(\",)(\s)(.*)(,\s*)([^\*.]*)(\))`)
|
||||
if pareg.MatchString(fixed) && strings.HasSuffix(file, ".go") {
|
||||
fixed = pareg.ReplaceAllString(fixed, ".Put(\"$2\", $5, $7*time.Second)")
|
||||
fset := token.NewFileSet() // positions are relative to fset
|
||||
f, err := parser.ParseFile(fset, file, nil, parser.ImportsOnly)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
// Print the imports from the file's AST.
|
||||
hasTimepkg := false
|
||||
for _, s := range f.Imports {
|
||||
if s.Path.Value == `"time"` {
|
||||
hasTimepkg = true
|
||||
break
|
||||
}
|
||||
}
|
||||
if !hasTimepkg {
|
||||
fixed = strings.Replace(fixed, "import (", "import (\n\t\"time\"", 1)
|
||||
}
|
||||
}
|
||||
// Replace the v.Apis in docs.go
|
||||
if strings.Contains(file, "docs.go") {
|
||||
fixed = strings.Replace(fixed, "v.Apis", "v.APIs", -1)
|
||||
}
|
||||
// Replace the config file
|
||||
if strings.HasSuffix(file, ".conf") {
|
||||
fixed = strings.Replace(fixed, "HttpCertFile", "HTTPSCertFile", -1)
|
||||
fixed = strings.Replace(fixed, "HttpKeyFile", "HTTPSKeyFile", -1)
|
||||
fixed = strings.Replace(fixed, "EnableHttpListen", "HTTPEnable", -1)
|
||||
fixed = strings.Replace(fixed, "EnableHttpTLS", "EnableHTTPS", -1)
|
||||
fixed = strings.Replace(fixed, "EnableHttpTLS", "EnableHTTPS", -1)
|
||||
fixed = strings.Replace(fixed, "BeegoServerName", "ServerName", -1)
|
||||
fixed = strings.Replace(fixed, "AdminHttpAddr", "AdminAddr", -1)
|
||||
fixed = strings.Replace(fixed, "AdminHttpPort", "AdminPort", -1)
|
||||
fixed = strings.Replace(fixed, "HttpServerTimeOut", "ServerTimeOut", -1)
|
||||
}
|
||||
err = os.Truncate(file, 0)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return ioutil.WriteFile(file, []byte(fixed), 0666)
|
||||
}
|
|
@ -14,10 +14,11 @@
|
|||
package beegopro
|
||||
|
||||
import (
|
||||
"github.com/beego/bee/cmd/commands"
|
||||
"github.com/beego/bee/internal/app/module/beegopro"
|
||||
"github.com/beego/bee/logger"
|
||||
"strings"
|
||||
|
||||
"github.com/beego/bee/v2/cmd/commands"
|
||||
"github.com/beego/bee/v2/internal/app/module/beegopro"
|
||||
"github.com/beego/bee/v2/logger"
|
||||
)
|
||||
|
||||
var CmdBeegoPro = &commands.Command{
|
||||
|
@ -31,6 +32,7 @@ func init() {
|
|||
CmdBeegoPro.Flag.Var(&beegopro.SQL, "sql", "sql file path")
|
||||
CmdBeegoPro.Flag.Var(&beegopro.SQLMode, "sqlmode", "sql mode")
|
||||
CmdBeegoPro.Flag.Var(&beegopro.SQLModePath, "sqlpath", "sql mode path")
|
||||
CmdBeegoPro.Flag.Var(&beegopro.GitRemotePath, "url", "git remote path")
|
||||
commands.AvailableCommands = append(commands.AvailableCommands, CmdBeegoPro)
|
||||
}
|
||||
|
||||
|
@ -47,6 +49,8 @@ func BeegoPro(cmd *commands.Command, args []string) int {
|
|||
switch gcmd {
|
||||
case "gen":
|
||||
beegopro.DefaultBeegoPro.Run()
|
||||
case "toml":
|
||||
beegopro.DefaultBeegoPro.InitToml()
|
||||
case "config":
|
||||
beegopro.DefaultBeegoPro.GenConfig()
|
||||
case "migration":
|
||||
|
|
|
@ -6,8 +6,8 @@ import (
|
|||
"os"
|
||||
"strings"
|
||||
|
||||
"github.com/beego/bee/logger/colors"
|
||||
"github.com/beego/bee/utils"
|
||||
"github.com/beego/bee/v2/logger/colors"
|
||||
"github.com/beego/bee/v2/utils"
|
||||
)
|
||||
|
||||
// Command is the unit of execution
|
||||
|
|
|
@ -0,0 +1,56 @@
|
|||
// Copyright 2020
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package dev
|
||||
|
||||
import (
|
||||
"github.com/beego/bee/v2/cmd/commands"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
)
|
||||
|
||||
var CmdDev = &commands.Command{
|
||||
CustomFlags: true,
|
||||
UsageLine: "dev [command]",
|
||||
Short: "Commands which used to help to develop beego and bee",
|
||||
Long: `
|
||||
Commands that help developer develop, build and test beego.
|
||||
- githook Prepare githooks
|
||||
`,
|
||||
Run: Run,
|
||||
}
|
||||
|
||||
func init() {
|
||||
commands.AvailableCommands = append(commands.AvailableCommands, CmdDev)
|
||||
}
|
||||
|
||||
func Run(cmd *commands.Command, args []string) int {
|
||||
if len(args) < 1 {
|
||||
beeLogger.Log.Fatal("Command is missing")
|
||||
}
|
||||
|
||||
if len(args) >= 2 {
|
||||
cmd.Flag.Parse(args[1:])
|
||||
}
|
||||
|
||||
gcmd := args[0]
|
||||
|
||||
switch gcmd {
|
||||
|
||||
case "githook":
|
||||
initGitHook()
|
||||
default:
|
||||
beeLogger.Log.Fatal("Unknown command")
|
||||
}
|
||||
return 0
|
||||
}
|
|
@ -0,0 +1,47 @@
|
|||
// Copyright 2020
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package dev
|
||||
|
||||
import (
|
||||
"os"
|
||||
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
)
|
||||
|
||||
var preCommit = `
|
||||
goimports -w -format-only ./ \
|
||||
ineffassign . \
|
||||
staticcheck -show-ignored -checks "-ST1017,-U1000,-ST1005,-S1034,-S1012,-SA4006,-SA6005,-SA1019,-SA1024" ./ \
|
||||
`
|
||||
|
||||
// for now, we simply override pre-commit file
|
||||
func initGitHook() {
|
||||
// pcf => pre-commit file
|
||||
pcfPath := "./.git/hooks/pre-commit"
|
||||
pcf, err := os.OpenFile(pcfPath, os.O_RDWR|os.O_CREATE, 0777)
|
||||
if err != nil {
|
||||
beeLogger.Log.Errorf("try to create or open file failed: %s, cause: %s", pcfPath, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
defer pcf.Close()
|
||||
_, err = pcf.Write(([]byte)(preCommit))
|
||||
|
||||
if err != nil {
|
||||
beeLogger.Log.Errorf("could not init githooks: %s", err.Error())
|
||||
} else {
|
||||
beeLogger.Log.Successf("The githooks has been added, the content is:\n %s ", preCommit)
|
||||
}
|
||||
}
|
|
@ -24,16 +24,16 @@ import (
|
|||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/beego/bee/cmd/commands"
|
||||
"github.com/beego/bee/cmd/commands/version"
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
"github.com/beego/bee/utils"
|
||||
"github.com/gadelkareem/delve/service"
|
||||
"github.com/gadelkareem/delve/service/debugger"
|
||||
"github.com/gadelkareem/delve/service/rpc2"
|
||||
"github.com/gadelkareem/delve/service/rpccommon"
|
||||
"github.com/gadelkareem/delve/pkg/terminal"
|
||||
"github.com/beego/bee/v2/cmd/commands"
|
||||
"github.com/beego/bee/v2/cmd/commands/version"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
"github.com/beego/bee/v2/utils"
|
||||
"github.com/fsnotify/fsnotify"
|
||||
"github.com/go-delve/delve/pkg/terminal"
|
||||
"github.com/go-delve/delve/service"
|
||||
"github.com/go-delve/delve/service/debugger"
|
||||
"github.com/go-delve/delve/service/rpc2"
|
||||
"github.com/go-delve/delve/service/rpccommon"
|
||||
)
|
||||
|
||||
var cmdDlv = &commands.Command{
|
||||
|
@ -44,7 +44,7 @@ var cmdDlv = &commands.Command{
|
|||
|
||||
To debug your application using Delve, use: {{"$ bee dlv" | bold}}
|
||||
|
||||
For more information on Delve: https://github.com/gadelkareem/delve
|
||||
For more information on Delve: https://github.com/go-delve/delve
|
||||
`,
|
||||
PreRun: func(cmd *commands.Command, args []string) { version.ShowShortVersionBanner() },
|
||||
Run: runDlv,
|
||||
|
|
|
@ -22,31 +22,36 @@ import (
|
|||
"strings"
|
||||
"text/template"
|
||||
|
||||
"github.com/beego/bee/cmd/commands"
|
||||
"github.com/beego/bee/cmd/commands/version"
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
"github.com/beego/bee/utils"
|
||||
"github.com/beego/bee/v2/cmd/commands"
|
||||
"github.com/beego/bee/v2/cmd/commands/version"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
"github.com/beego/bee/v2/utils"
|
||||
)
|
||||
|
||||
const dockerBuildTemplate = `FROM {{.BaseImage}}
|
||||
const dockerBuildTemplate = `# Build Golang binary
|
||||
FROM {{.BaseImage}} AS build-golang
|
||||
|
||||
# Godep for vendoring
|
||||
RUN go get github.com/tools/godep
|
||||
WORKDIR {{.Appdir}}
|
||||
|
||||
# Recompile the standard library without CGO
|
||||
RUN CGO_ENABLED=0 go install -a std
|
||||
|
||||
ENV APP_DIR $GOPATH{{.Appdir}}
|
||||
RUN mkdir -p $APP_DIR
|
||||
|
||||
# Set the entrypoint
|
||||
ENTRYPOINT (cd $APP_DIR && ./{{.Entrypoint}})
|
||||
ADD . $APP_DIR
|
||||
|
||||
# Compile the binary and statically link
|
||||
RUN cd $APP_DIR && CGO_ENABLED=0 godep go build -ldflags '-d -w -s'
|
||||
COPY . .
|
||||
RUN go get -v && go build -v -o /usr/local/bin/{{.Entrypoint}}
|
||||
|
||||
EXPOSE {{.Expose}}
|
||||
CMD ["{{.Entrypoint}}"]
|
||||
`
|
||||
|
||||
const composeBuildTemplate = `version: '3'
|
||||
networks:
|
||||
{{.Appname}}_network_compose:
|
||||
driver: bridge
|
||||
services:
|
||||
{{.Appname}}:
|
||||
container_name: {{.Appname}}
|
||||
build: .
|
||||
restart: unless-stopped
|
||||
networks:
|
||||
{{.Appname}}_network_compose:
|
||||
ports:{{.Expose}}
|
||||
`
|
||||
|
||||
// Dockerfile holds the information about the Docker container.
|
||||
|
@ -57,13 +62,19 @@ type Dockerfile struct {
|
|||
Expose string
|
||||
}
|
||||
|
||||
// docker-compose.yaml
|
||||
type Composefile struct {
|
||||
Appname string
|
||||
Expose string
|
||||
}
|
||||
|
||||
var CmdDockerize = &commands.Command{
|
||||
CustomFlags: true,
|
||||
UsageLine: "dockerize",
|
||||
Short: "Generates a Dockerfile for your Beego application",
|
||||
Long: `Dockerize generates a Dockerfile for your Beego Web Application.
|
||||
The Dockerfile will compile, get the dependencies with {{"godep"|bold}}, and set the entrypoint.
|
||||
|
||||
Short: "Generates a Dockerfile and docker-compose.yaml for your Beego application",
|
||||
Long: `Dockerize generates a Dockerfile and docker-compose.yaml for your Beego Web Application.
|
||||
The Dockerfile will compile and run the application.
|
||||
The docker-compose.yaml can be used to build and deploy the generated Dockerfile.
|
||||
{{"Example:"|bold}}
|
||||
$ bee dockerize -expose="3000,80,25"
|
||||
`,
|
||||
|
@ -78,8 +89,8 @@ var (
|
|||
|
||||
func init() {
|
||||
fs := flag.NewFlagSet("dockerize", flag.ContinueOnError)
|
||||
fs.StringVar(&baseImage, "image", "library/golang", "Set the base image of the Docker container.")
|
||||
fs.StringVar(&expose, "expose", "8080", "Port(s) to expose in the Docker container.")
|
||||
fs.StringVar(&baseImage, "baseimage", "golang:1.20.2", "Set the base image of the Docker container.")
|
||||
fs.StringVar(&expose, "expose", "8080", "Port(s) to expose for the Docker container.")
|
||||
CmdDockerize.Flag = *fs
|
||||
commands.AvailableCommands = append(commands.AvailableCommands, CmdDockerize)
|
||||
}
|
||||
|
@ -89,7 +100,7 @@ func dockerizeApp(cmd *commands.Command, args []string) int {
|
|||
beeLogger.Log.Fatalf("Error parsing flags: %v", err.Error())
|
||||
}
|
||||
|
||||
beeLogger.Log.Info("Generating Dockerfile...")
|
||||
beeLogger.Log.Info("Generating Dockerfile and docker-compose.yaml...")
|
||||
|
||||
gopath := os.Getenv("GOPATH")
|
||||
dir, err := filepath.Abs(".")
|
||||
|
@ -102,19 +113,31 @@ func dockerizeApp(cmd *commands.Command, args []string) int {
|
|||
// In case of multiple ports to expose inside the container,
|
||||
// replace all the commas with whitespaces.
|
||||
// See the verb EXPOSE in the Docker documentation.
|
||||
if strings.Contains(expose, ",") {
|
||||
expose = strings.Replace(expose, ",", " ", -1)
|
||||
}
|
||||
|
||||
exposedockerfile := strings.Replace(expose, ",", " ", -1)
|
||||
|
||||
// Multiple ports expose for docker-compose.yaml
|
||||
ports := strings.Fields(strings.Replace(expose, ",", " ", -1))
|
||||
exposecompose := ""
|
||||
for _, port := range ports {
|
||||
composeport := ("\n - " + "\"" + port + ":" + port + "\"")
|
||||
exposecompose += composeport
|
||||
}
|
||||
|
||||
|
||||
_, entrypoint := path.Split(appdir)
|
||||
dockerfile := Dockerfile{
|
||||
BaseImage: baseImage,
|
||||
Appdir: appdir,
|
||||
Entrypoint: entrypoint,
|
||||
Expose: expose,
|
||||
Expose: exposedockerfile,
|
||||
}
|
||||
composefile := Composefile{
|
||||
Appname: entrypoint,
|
||||
Expose: exposecompose,
|
||||
}
|
||||
|
||||
generateDockerfile(dockerfile)
|
||||
generatecomposefile(composefile)
|
||||
return 0
|
||||
}
|
||||
|
||||
|
@ -131,3 +154,17 @@ func generateDockerfile(df Dockerfile) {
|
|||
|
||||
beeLogger.Log.Success("Dockerfile generated.")
|
||||
}
|
||||
|
||||
func generatecomposefile(df Composefile) {
|
||||
t := template.Must(template.New("composeBuildTemplate").Parse(composeBuildTemplate)).Funcs(utils.BeeFuncMap())
|
||||
|
||||
f, err := os.Create("docker-compose.yaml")
|
||||
if err != nil {
|
||||
beeLogger.Log.Fatalf("Error writing docker-compose.yaml: %v", err.Error())
|
||||
}
|
||||
defer utils.CloseFile(f)
|
||||
|
||||
t.Execute(f, df)
|
||||
|
||||
beeLogger.Log.Success("docker-compose.yaml generated.")
|
||||
}
|
||||
|
|
|
@ -17,13 +17,13 @@ import (
|
|||
"os"
|
||||
"strings"
|
||||
|
||||
"github.com/beego/bee/cmd/commands"
|
||||
"github.com/beego/bee/cmd/commands/version"
|
||||
"github.com/beego/bee/config"
|
||||
"github.com/beego/bee/generate"
|
||||
"github.com/beego/bee/generate/swaggergen"
|
||||
"github.com/beego/bee/logger"
|
||||
"github.com/beego/bee/utils"
|
||||
"github.com/beego/bee/v2/cmd/commands"
|
||||
"github.com/beego/bee/v2/cmd/commands/version"
|
||||
"github.com/beego/bee/v2/config"
|
||||
"github.com/beego/bee/v2/generate"
|
||||
"github.com/beego/bee/v2/generate/swaggergen"
|
||||
"github.com/beego/bee/v2/logger"
|
||||
"github.com/beego/bee/v2/utils"
|
||||
)
|
||||
|
||||
var CmdGenerate = &commands.Command{
|
||||
|
@ -53,6 +53,10 @@ var CmdGenerate = &commands.Command{
|
|||
|
||||
$ bee generate docs
|
||||
|
||||
▶ {{"To generate swagger doc file:"|bold}}
|
||||
|
||||
$ bee generate routers [-ctrlDir=/path/to/controller/directory] [-routersFile=/path/to/routers/file.go] [-routersPkg=myPackage]
|
||||
|
||||
▶ {{"To generate a test case:"|bold}}
|
||||
|
||||
$ bee generate test [routerfile]
|
||||
|
@ -72,6 +76,15 @@ func init() {
|
|||
CmdGenerate.Flag.Var(&generate.Level, "level", "Either 1, 2 or 3. i.e. 1=models; 2=models and controllers; 3=models, controllers and routers.")
|
||||
CmdGenerate.Flag.Var(&generate.Fields, "fields", "List of table Fields.")
|
||||
CmdGenerate.Flag.Var(&generate.DDL, "ddl", "Generate DDL Migration")
|
||||
|
||||
// bee generate routers
|
||||
CmdGenerate.Flag.Var(&generate.ControllerDirectory, "ctrlDir",
|
||||
"Controller directory. Bee scans this directory and its sub directory to generate routers")
|
||||
CmdGenerate.Flag.Var(&generate.RoutersFile, "routersFile",
|
||||
"Routers file. If not found, Bee create a new one. Bee will truncates this file and output routers info into this file")
|
||||
CmdGenerate.Flag.Var(&generate.RouterPkg, "routersPkg",
|
||||
`router's package. Default is routers, it means that "package routers" in the generated file`)
|
||||
|
||||
commands.AvailableCommands = append(commands.AvailableCommands, CmdGenerate)
|
||||
}
|
||||
|
||||
|
@ -97,6 +110,8 @@ func GenerateCode(cmd *commands.Command, args []string) int {
|
|||
model(cmd, args, currpath)
|
||||
case "view":
|
||||
view(args, currpath)
|
||||
case "routers":
|
||||
genRouters(cmd, args)
|
||||
default:
|
||||
beeLogger.Log.Fatal("Command is missing")
|
||||
}
|
||||
|
@ -104,6 +119,16 @@ func GenerateCode(cmd *commands.Command, args []string) int {
|
|||
return 0
|
||||
}
|
||||
|
||||
func genRouters(cmd *commands.Command, args []string) {
|
||||
err := cmd.Flag.Parse(args[1:])
|
||||
beeLogger.Log.Infof("input parameter: %v", args)
|
||||
if err != nil {
|
||||
beeLogger.Log.Errorf("could not parse input parameter: %+v", err)
|
||||
return
|
||||
}
|
||||
generate.GenRouters()
|
||||
}
|
||||
|
||||
func scaffold(cmd *commands.Command, args []string, currpath string) {
|
||||
if len(args) < 2 {
|
||||
beeLogger.Log.Fatal("Wrong number of arguments. Run: bee help generate")
|
||||
|
|
|
@ -2,17 +2,18 @@ package hprose
|
|||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/beego/bee/logger/colors"
|
||||
"os"
|
||||
"path"
|
||||
"strings"
|
||||
|
||||
"github.com/beego/bee/cmd/commands"
|
||||
"github.com/beego/bee/cmd/commands/api"
|
||||
"github.com/beego/bee/cmd/commands/version"
|
||||
"github.com/beego/bee/generate"
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
"github.com/beego/bee/utils"
|
||||
"github.com/beego/bee/v2/logger/colors"
|
||||
|
||||
"github.com/beego/bee/v2/cmd/commands"
|
||||
"github.com/beego/bee/v2/cmd/commands/api"
|
||||
"github.com/beego/bee/v2/cmd/commands/version"
|
||||
"github.com/beego/bee/v2/generate"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
"github.com/beego/bee/v2/utils"
|
||||
)
|
||||
|
||||
var CmdHproseapp = &commands.Command{
|
||||
|
@ -24,7 +25,7 @@ var CmdHproseapp = &commands.Command{
|
|||
|
||||
{{"To scaffold out your application, use:"|bold}}
|
||||
|
||||
$ bee hprose [appname] [-tables=""] [-driver=mysql] [-conn="root:@tcp(127.0.0.1:3306)/test"] [-gopath=false] [-beego=v1.12.1]
|
||||
$ bee hprose [appname] [-tables=""] [-driver=mysql] [-conn="root:@tcp(127.0.0.1:3306)/test"] [-gopath=false] [-beego=v1.12.3]
|
||||
|
||||
If 'conn' is empty, the command will generate a sample application. Otherwise the command
|
||||
will connect to your database and generate models based on the existing tables.
|
||||
|
@ -48,7 +49,7 @@ module %s
|
|||
|
||||
go %s
|
||||
|
||||
require github.com/astaxie/beego %s
|
||||
require github.com/beego/beego/v2 %s
|
||||
require github.com/smartystreets/goconvey v1.6.4
|
||||
`
|
||||
|
||||
|
@ -81,18 +82,18 @@ func createhprose(cmd *commands.Command, args []string) int {
|
|||
var packpath string
|
||||
var err error
|
||||
if gopath == `true` {
|
||||
beeLogger.Log.Info("generate api project support GOPATH")
|
||||
beeLogger.Log.Info("Generate api project support GOPATH")
|
||||
version.ShowShortVersionBanner()
|
||||
apppath, packpath, err = utils.CheckEnv(args[0])
|
||||
if err != nil {
|
||||
beeLogger.Log.Fatalf("%s", err)
|
||||
}
|
||||
} else {
|
||||
beeLogger.Log.Info("generate api project support go modules.")
|
||||
beeLogger.Log.Info("Generate api project support go modules.")
|
||||
apppath = path.Join(utils.GetBeeWorkPath(), args[0])
|
||||
packpath = args[0]
|
||||
if beegoVersion.String() == `` {
|
||||
beegoVersion.Set(`v1.12.1`)
|
||||
beegoVersion.Set(utils.BEEGO_VERSION)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -23,12 +23,12 @@ import (
|
|||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/beego/bee/cmd/commands"
|
||||
"github.com/beego/bee/cmd/commands/version"
|
||||
"github.com/beego/bee/config"
|
||||
"github.com/beego/bee/utils"
|
||||
"github.com/beego/bee/v2/cmd/commands"
|
||||
"github.com/beego/bee/v2/cmd/commands/version"
|
||||
"github.com/beego/bee/v2/config"
|
||||
"github.com/beego/bee/v2/utils"
|
||||
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
)
|
||||
|
||||
var CmdMigrate = &commands.Command{
|
||||
|
@ -366,8 +366,8 @@ const (
|
|||
import(
|
||||
"os"
|
||||
|
||||
"github.com/astaxie/beego/orm"
|
||||
"github.com/astaxie/beego/migration"
|
||||
"github.com/beego/beego/v2/client/orm"
|
||||
"github.com/beego/beego/v2/client/orm/migration"
|
||||
|
||||
_ "{{DriverRepo}}"
|
||||
)
|
||||
|
|
|
@ -20,23 +20,23 @@ import (
|
|||
path "path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/beego/bee/cmd/commands"
|
||||
"github.com/beego/bee/cmd/commands/version"
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
"github.com/beego/bee/logger/colors"
|
||||
"github.com/beego/bee/utils"
|
||||
"github.com/beego/bee/v2/cmd/commands"
|
||||
"github.com/beego/bee/v2/cmd/commands/version"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
"github.com/beego/bee/v2/logger/colors"
|
||||
"github.com/beego/bee/v2/utils"
|
||||
)
|
||||
|
||||
var gopath utils.DocValue
|
||||
var beegoVersion utils.DocValue
|
||||
|
||||
var CmdNew = &commands.Command{
|
||||
UsageLine: "new [appname] [-gopath=false] [-beego=v1.12.1]",
|
||||
UsageLine: "new [appname] [-gopath=false] [-beego=v2.1.0]",
|
||||
Short: "Creates a Beego application",
|
||||
Long: `
|
||||
Creates a Beego application for the given app name in the current directory.
|
||||
now default supoort generate a go modules project
|
||||
The command 'new' creates a folder named [appname] [-gopath=false] [-beego=v1.12.1] and generates the following structure:
|
||||
now defaults to generating as a go modules project
|
||||
The command 'new' creates a folder named [appname] [-gopath=false] [-beego=v1.12.3] and generates the following structure:
|
||||
|
||||
├── main.go
|
||||
├── go.mod
|
||||
|
@ -70,7 +70,7 @@ var maingo = `package main
|
|||
|
||||
import (
|
||||
_ "{{.Appname}}/routers"
|
||||
"github.com/astaxie/beego"
|
||||
beego "github.com/beego/beego/v2/server/web"
|
||||
)
|
||||
|
||||
func main() {
|
||||
|
@ -82,7 +82,7 @@ var router = `package routers
|
|||
|
||||
import (
|
||||
"{{.Appname}}/controllers"
|
||||
"github.com/astaxie/beego"
|
||||
beego "github.com/beego/beego/v2/server/web"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
@ -93,7 +93,7 @@ var goMod = `module %s
|
|||
|
||||
go %s
|
||||
|
||||
require github.com/astaxie/beego %s
|
||||
require github.com/beego/beego/v2 %s
|
||||
require github.com/smartystreets/goconvey v1.6.4
|
||||
`
|
||||
var test = `package test
|
||||
|
@ -104,9 +104,12 @@ import (
|
|||
"testing"
|
||||
"runtime"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/beego/beego/v2/core/logs"
|
||||
|
||||
_ "{{.Appname}}/routers"
|
||||
|
||||
"github.com/astaxie/beego"
|
||||
beego "github.com/beego/beego/v2/server/web"
|
||||
. "github.com/smartystreets/goconvey/convey"
|
||||
)
|
||||
|
||||
|
@ -123,7 +126,7 @@ func TestBeego(t *testing.T) {
|
|||
w := httptest.NewRecorder()
|
||||
beego.BeeApp.Handlers.ServeHTTP(w, r)
|
||||
|
||||
beego.Trace("testing", "TestBeego", "Code[%d]\n%s", w.Code, w.Body.String())
|
||||
logs.Trace("testing", "TestBeego", "Code[%d]\n%s", w.Code, w.Body.String())
|
||||
|
||||
Convey("Subject: Test Station Endpoint\n", t, func() {
|
||||
Convey("Status Code Should Be 200", func() {
|
||||
|
@ -140,7 +143,7 @@ func TestBeego(t *testing.T) {
|
|||
var controllers = `package controllers
|
||||
|
||||
import (
|
||||
"github.com/astaxie/beego"
|
||||
beego "github.com/beego/beego/v2/server/web"
|
||||
)
|
||||
|
||||
type MainController struct {
|
||||
|
@ -148,7 +151,7 @@ type MainController struct {
|
|||
}
|
||||
|
||||
func (c *MainController) Get() {
|
||||
c.Data["Website"] = "beego.me"
|
||||
c.Data["Website"] = "beego.vip"
|
||||
c.Data["Email"] = "astaxie@gmail.com"
|
||||
c.TplName = "index.tpl"
|
||||
}
|
||||
|
@ -276,18 +279,18 @@ func CreateApp(cmd *commands.Command, args []string) int {
|
|||
var packPath string
|
||||
var err error
|
||||
if gopath == `true` {
|
||||
beeLogger.Log.Info("generate new project support GOPATH")
|
||||
beeLogger.Log.Info("Generate new project support GOPATH")
|
||||
version.ShowShortVersionBanner()
|
||||
appPath, packPath, err = utils.CheckEnv(args[0])
|
||||
if err != nil {
|
||||
beeLogger.Log.Fatalf("%s", err)
|
||||
}
|
||||
} else {
|
||||
beeLogger.Log.Info("generate new project support go modules.")
|
||||
beeLogger.Log.Info("Generate new project support go modules.")
|
||||
appPath = path.Join(utils.GetBeeWorkPath(), args[0])
|
||||
packPath = args[0]
|
||||
if beegoVersion.String() == `` {
|
||||
beegoVersion.Set(`v1.12.1`)
|
||||
beegoVersion.Set(utils.BEEGO_VERSION)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -18,10 +18,10 @@ import (
|
|||
"syscall"
|
||||
"time"
|
||||
|
||||
"github.com/beego/bee/cmd/commands"
|
||||
"github.com/beego/bee/cmd/commands/version"
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
"github.com/beego/bee/utils"
|
||||
"github.com/beego/bee/v2/cmd/commands"
|
||||
"github.com/beego/bee/v2/cmd/commands/version"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
"github.com/beego/bee/v2/utils"
|
||||
)
|
||||
|
||||
var CmdPack = &commands.Command{
|
||||
|
|
|
@ -24,12 +24,12 @@ import (
|
|||
|
||||
"strings"
|
||||
|
||||
"github.com/beego/bee/cmd/commands"
|
||||
"github.com/beego/bee/cmd/commands/version"
|
||||
"github.com/beego/bee/config"
|
||||
"github.com/beego/bee/logger"
|
||||
"github.com/beego/bee/logger/colors"
|
||||
"github.com/beego/bee/utils"
|
||||
"github.com/beego/bee/v2/cmd/commands"
|
||||
"github.com/beego/bee/v2/cmd/commands/version"
|
||||
"github.com/beego/bee/v2/config"
|
||||
"github.com/beego/bee/v2/logger"
|
||||
"github.com/beego/bee/v2/logger/colors"
|
||||
"github.com/beego/bee/v2/utils"
|
||||
)
|
||||
|
||||
var cmdRs = &commands.Command{
|
||||
|
|
|
@ -7,12 +7,12 @@ import (
|
|||
"os"
|
||||
"strings"
|
||||
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
)
|
||||
|
||||
var (
|
||||
swaggerVersion = "3"
|
||||
swaggerlink = "https://github.com/beego/swagger/archive/v" + swaggerVersion + ".zip"
|
||||
swaggerVersion = "4.6.1"
|
||||
swaggerlink = "https://codeload.github.com/beego/swagger/zip/refs/tags/v" + swaggerVersion
|
||||
)
|
||||
|
||||
func downloadFromURL(url, fileName string) {
|
||||
|
|
|
@ -18,7 +18,7 @@ import (
|
|||
"net/http"
|
||||
"time"
|
||||
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
"github.com/gorilla/websocket"
|
||||
)
|
||||
|
||||
|
|
|
@ -20,11 +20,11 @@ import (
|
|||
"runtime"
|
||||
"strings"
|
||||
|
||||
"github.com/beego/bee/cmd/commands"
|
||||
"github.com/beego/bee/cmd/commands/version"
|
||||
"github.com/beego/bee/config"
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
"github.com/beego/bee/utils"
|
||||
"github.com/beego/bee/v2/cmd/commands"
|
||||
"github.com/beego/bee/v2/cmd/commands/version"
|
||||
"github.com/beego/bee/v2/config"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
"github.com/beego/bee/v2/utils"
|
||||
)
|
||||
|
||||
var CmdRun = &commands.Command{
|
||||
|
|
|
@ -24,10 +24,10 @@ import (
|
|||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/beego/bee/config"
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
"github.com/beego/bee/logger/colors"
|
||||
"github.com/beego/bee/utils"
|
||||
"github.com/beego/bee/v2/config"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
"github.com/beego/bee/v2/logger/colors"
|
||||
"github.com/beego/bee/v2/utils"
|
||||
"github.com/fsnotify/fsnotify"
|
||||
)
|
||||
|
||||
|
|
|
@ -17,13 +17,13 @@ package apiapp
|
|||
import (
|
||||
"net/http"
|
||||
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
|
||||
"os"
|
||||
|
||||
"github.com/beego/bee/cmd/commands"
|
||||
"github.com/beego/bee/cmd/commands/version"
|
||||
"github.com/beego/bee/utils"
|
||||
"github.com/beego/bee/v2/cmd/commands"
|
||||
"github.com/beego/bee/v2/cmd/commands/version"
|
||||
"github.com/beego/bee/v2/utils"
|
||||
)
|
||||
|
||||
var CmdServer = &commands.Command{
|
||||
|
|
|
@ -5,16 +5,17 @@ import (
|
|||
"os"
|
||||
"os/exec"
|
||||
|
||||
"github.com/beego/bee/cmd/commands"
|
||||
"github.com/beego/bee/config"
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
"github.com/beego/bee/v2/cmd/commands"
|
||||
"github.com/beego/bee/v2/config"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
"github.com/beego/bee/v2/utils"
|
||||
)
|
||||
|
||||
var CmdUpdate = &commands.Command{
|
||||
UsageLine: "update",
|
||||
Short: "Update Bee",
|
||||
Long: `
|
||||
Automatic run command "go get -u github.com/beego/bee" for selfupdate
|
||||
Automatic run command "go get -u github.com/beego/bee/v2" for selfupdate
|
||||
`,
|
||||
Run: updateBee,
|
||||
}
|
||||
|
@ -32,7 +33,9 @@ func updateBee(cmd *commands.Command, args []string) int {
|
|||
cmdUp.Stdout = os.Stdout
|
||||
cmdUp.Stderr = os.Stderr
|
||||
if err := cmdUp.Run(); err != nil {
|
||||
beeLogger.Log.Warnf("Run cmd err:%s",err)
|
||||
beeLogger.Log.Warnf("Run cmd err:%s", err)
|
||||
}
|
||||
// update the Time when updateBee every time
|
||||
utils.UpdateLastPublishedTime()
|
||||
return 0
|
||||
}
|
||||
|
|
|
@ -9,20 +9,21 @@ import (
|
|||
|
||||
"time"
|
||||
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
"github.com/beego/bee/v2/utils"
|
||||
)
|
||||
|
||||
// RuntimeInfo holds information about the current runtime.
|
||||
type RuntimeInfo struct {
|
||||
GoVersion string
|
||||
GOOS string
|
||||
GOARCH string
|
||||
NumCPU int
|
||||
GOPATH string
|
||||
GOROOT string
|
||||
Compiler string
|
||||
BeeVersion string
|
||||
BeegoVersion string
|
||||
GoVersion string
|
||||
GOOS string
|
||||
GOARCH string
|
||||
NumCPU int
|
||||
GOPATH string
|
||||
GOROOT string
|
||||
Compiler string
|
||||
BeeVersion string
|
||||
Published string
|
||||
}
|
||||
|
||||
// InitBanner loads the banner and prints it to output
|
||||
|
@ -51,7 +52,7 @@ func show(out io.Writer, content string) {
|
|||
}
|
||||
|
||||
err = t.Execute(out, RuntimeInfo{
|
||||
GetGoVersion(),
|
||||
runtime.Version(),
|
||||
runtime.GOOS,
|
||||
runtime.GOARCH,
|
||||
runtime.NumCPU(),
|
||||
|
@ -59,7 +60,7 @@ func show(out io.Writer, content string) {
|
|||
runtime.GOROOT(),
|
||||
runtime.Compiler,
|
||||
version,
|
||||
GetBeegoVersion(),
|
||||
utils.GetLastPublishedTime(),
|
||||
})
|
||||
if err != nil {
|
||||
beeLogger.Log.Error(err.Error())
|
||||
|
|
|
@ -1,26 +1,18 @@
|
|||
package version
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"flag"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
"os/exec"
|
||||
path "path/filepath"
|
||||
"regexp"
|
||||
"runtime"
|
||||
"strings"
|
||||
|
||||
"gopkg.in/yaml.v2"
|
||||
"os"
|
||||
"runtime"
|
||||
|
||||
"github.com/beego/bee/cmd/commands"
|
||||
"github.com/beego/bee/config"
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
"github.com/beego/bee/logger/colors"
|
||||
"github.com/beego/bee/utils"
|
||||
"github.com/beego/bee/v2/cmd/commands"
|
||||
"github.com/beego/bee/v2/config"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
"github.com/beego/bee/v2/logger/colors"
|
||||
)
|
||||
|
||||
const verboseVersionBanner string = `%s%s______
|
||||
|
@ -30,7 +22,6 @@ const verboseVersionBanner string = `%s%s______
|
|||
| |_/ /| __/| __/
|
||||
\____/ \___| \___| v{{ .BeeVersion }}%s
|
||||
%s%s
|
||||
├── Beego : {{ .BeegoVersion }}
|
||||
├── GoVersion : {{ .GoVersion }}
|
||||
├── GOOS : {{ .GOOS }}
|
||||
├── GOARCH : {{ .GOARCH }}
|
||||
|
@ -75,15 +66,14 @@ func versionCmd(cmd *commands.Command, args []string) int {
|
|||
|
||||
if outputFormat != "" {
|
||||
runtimeInfo := RuntimeInfo{
|
||||
GetGoVersion(),
|
||||
runtime.GOOS,
|
||||
runtime.GOARCH,
|
||||
runtime.NumCPU(),
|
||||
os.Getenv("GOPATH"),
|
||||
runtime.GOROOT(),
|
||||
runtime.Compiler,
|
||||
version,
|
||||
GetBeegoVersion(),
|
||||
GoVersion: runtime.Version(),
|
||||
GOOS: runtime.GOOS,
|
||||
GOARCH: runtime.GOARCH,
|
||||
NumCPU: runtime.NumCPU(),
|
||||
GOPATH: os.Getenv("GOPATH"),
|
||||
GOROOT: runtime.GOROOT(),
|
||||
Compiler: runtime.Compiler,
|
||||
BeeVersion: version,
|
||||
}
|
||||
switch outputFormat {
|
||||
case "json":
|
||||
|
@ -118,60 +108,3 @@ func ShowShortVersionBanner() {
|
|||
output := colors.NewColorWriter(os.Stdout)
|
||||
InitBanner(output, bytes.NewBufferString(colors.MagentaBold(shortVersionBanner)))
|
||||
}
|
||||
|
||||
func GetBeegoVersion() string {
|
||||
re, err := regexp.Compile(`VERSION = "([0-9.]+)"`)
|
||||
if err != nil {
|
||||
return ""
|
||||
}
|
||||
wgopath := utils.GetGOPATHs()
|
||||
if len(wgopath) == 0 {
|
||||
beeLogger.Log.Error("GOPATH environment is empty,may be you use `go module`")
|
||||
return ""
|
||||
}
|
||||
for _, wg := range wgopath {
|
||||
wg, _ = path.EvalSymlinks(path.Join(wg, "src", "github.com", "astaxie", "beego"))
|
||||
filename := path.Join(wg, "beego.go")
|
||||
_, err := os.Stat(filename)
|
||||
if err != nil {
|
||||
if os.IsNotExist(err) {
|
||||
continue
|
||||
}
|
||||
beeLogger.Log.Error("Error while getting stats of 'beego.go'")
|
||||
}
|
||||
fd, err := os.Open(filename)
|
||||
if err != nil {
|
||||
beeLogger.Log.Error("Error while reading 'beego.go'")
|
||||
continue
|
||||
}
|
||||
reader := bufio.NewReader(fd)
|
||||
for {
|
||||
byteLine, _, er := reader.ReadLine()
|
||||
if er != nil && er != io.EOF {
|
||||
return ""
|
||||
}
|
||||
if er == io.EOF {
|
||||
break
|
||||
}
|
||||
line := string(byteLine)
|
||||
s := re.FindStringSubmatch(line)
|
||||
if len(s) >= 2 {
|
||||
return s[1]
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
return "Beego is not installed. Please do consider installing it first: https://github.com/astaxie/beego"
|
||||
}
|
||||
|
||||
func GetGoVersion() string {
|
||||
var (
|
||||
cmdOut []byte
|
||||
err error
|
||||
)
|
||||
|
||||
if cmdOut, err = exec.Command("go", "version").Output(); err != nil {
|
||||
beeLogger.Log.Fatalf("There was an error running 'go version' command: %s", err)
|
||||
}
|
||||
return strings.Split(string(cmdOut), " ")[2]
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
// not use this file except in compliance with the License. You may obtain
|
||||
// a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
|
@ -21,17 +21,16 @@ import (
|
|||
|
||||
"gopkg.in/yaml.v2"
|
||||
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
)
|
||||
|
||||
const confVer = 0
|
||||
|
||||
const (
|
||||
Version = "1.12.0"
|
||||
GitRemotePath = "github.com/beego/bee"
|
||||
Version = "2.1.0"
|
||||
GitRemotePath = "github.com/beego/bee/v2"
|
||||
)
|
||||
|
||||
|
||||
var Conf = struct {
|
||||
Version int
|
||||
WatchExts []string `json:"watch_ext" yaml:"watch_ext"`
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
package generate
|
||||
|
||||
import "github.com/beego/bee/utils"
|
||||
import "github.com/beego/bee/v2/utils"
|
||||
|
||||
var SQLDriver utils.DocValue
|
||||
var SQLConn utils.DocValue
|
||||
|
@ -22,3 +22,9 @@ var Level utils.DocValue
|
|||
var Tables utils.DocValue
|
||||
var Fields utils.DocValue
|
||||
var DDL utils.DocValue
|
||||
|
||||
|
||||
// bee generate routers
|
||||
var ControllerDirectory utils.DocValue
|
||||
var RoutersFile utils.DocValue
|
||||
var RouterPkg utils.DocValue
|
||||
|
|
|
@ -25,9 +25,9 @@ import (
|
|||
"regexp"
|
||||
"strings"
|
||||
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
"github.com/beego/bee/logger/colors"
|
||||
"github.com/beego/bee/utils"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
"github.com/beego/bee/v2/logger/colors"
|
||||
"github.com/beego/bee/v2/utils"
|
||||
_ "github.com/go-sql-driver/mysql"
|
||||
_ "github.com/lib/pq"
|
||||
)
|
||||
|
@ -925,9 +925,9 @@ func extractColSize(colType string) string {
|
|||
}
|
||||
|
||||
func extractIntSignness(colType string) string {
|
||||
regex := regexp.MustCompile(`(int|smallint|mediumint|bigint)\([0-9]+\)(.*)`)
|
||||
regex := regexp.MustCompile(`(int|smallint|mediumint|bigint).*`)
|
||||
signRegex := regex.FindStringSubmatch(colType)
|
||||
return strings.Trim(signRegex[2], " ")
|
||||
return strings.Trim(signRegex[1], " ")
|
||||
}
|
||||
|
||||
func extractDecimal(colType string) (digits string, decimals string) {
|
||||
|
@ -1023,7 +1023,7 @@ import (
|
|||
"reflect"
|
||||
"strings"
|
||||
{{timePkg}}
|
||||
"github.com/astaxie/beego/orm"
|
||||
"github.com/beego/beego/v2/client/orm"
|
||||
)
|
||||
|
||||
{{modelStruct}}
|
||||
|
@ -1172,7 +1172,7 @@ import (
|
|||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/astaxie/beego"
|
||||
beego "github.com/beego/beego/v2/server/web"
|
||||
)
|
||||
|
||||
// {{ctrlName}}Controller operations for {{ctrlName}}
|
||||
|
@ -1347,7 +1347,7 @@ package routers
|
|||
import (
|
||||
"{{pkgPath}}/controllers"
|
||||
|
||||
"github.com/astaxie/beego"
|
||||
beego "github.com/beego/beego/v2/server/web"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
|
|
@ -20,9 +20,9 @@ import (
|
|||
"path"
|
||||
"strings"
|
||||
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
"github.com/beego/bee/logger/colors"
|
||||
"github.com/beego/bee/utils"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
"github.com/beego/bee/v2/logger/colors"
|
||||
"github.com/beego/bee/v2/utils"
|
||||
)
|
||||
|
||||
func GenerateController(cname, currpath string) {
|
||||
|
@ -78,7 +78,7 @@ func GenerateController(cname, currpath string) {
|
|||
var controllerTpl = `package {{packageName}}
|
||||
|
||||
import (
|
||||
"github.com/astaxie/beego"
|
||||
beego "github.com/beego/beego/v2/server/web"
|
||||
)
|
||||
|
||||
// {{controllerName}}Controller operations for {{controllerName}}
|
||||
|
@ -166,7 +166,7 @@ import (
|
|||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/astaxie/beego"
|
||||
beego "github.com/beego/beego/v2/server/web"
|
||||
)
|
||||
|
||||
// {{controllerName}}Controller operations for {{controllerName}}
|
||||
|
|
|
@ -24,9 +24,9 @@ import (
|
|||
"path"
|
||||
"strings"
|
||||
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
"github.com/beego/bee/logger/colors"
|
||||
"github.com/beego/bee/utils"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
"github.com/beego/bee/v2/logger/colors"
|
||||
"github.com/beego/bee/v2/utils"
|
||||
_ "github.com/go-sql-driver/mysql"
|
||||
_ "github.com/lib/pq"
|
||||
)
|
||||
|
@ -47,7 +47,7 @@ import (
|
|||
"{{.Appname}}/models"
|
||||
"github.com/hprose/hprose-golang/rpc"
|
||||
|
||||
"github.com/astaxie/beego"
|
||||
beego "github.com/beego/beego/v2/server/web"
|
||||
)
|
||||
|
||||
func logInvokeHandler(
|
||||
|
@ -90,8 +90,8 @@ import (
|
|||
"{{.Appname}}/models"
|
||||
"github.com/hprose/hprose-golang/rpc"
|
||||
|
||||
"github.com/astaxie/beego"
|
||||
"github.com/astaxie/beego/orm"
|
||||
beego "github.com/beego/beego/v2/server/web"
|
||||
"github.com/beego/beego/v2/client/orm"
|
||||
{{.DriverPkg}}
|
||||
)
|
||||
|
||||
|
@ -419,7 +419,7 @@ import (
|
|||
"reflect"
|
||||
"strings"
|
||||
{{timePkg}}
|
||||
"github.com/astaxie/beego/orm"
|
||||
"github.com/beego/beego/v2/client/orm"
|
||||
)
|
||||
|
||||
{{modelStruct}}
|
||||
|
|
|
@ -21,9 +21,9 @@ import (
|
|||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/beego/bee/logger"
|
||||
"github.com/beego/bee/logger/colors"
|
||||
"github.com/beego/bee/utils"
|
||||
"github.com/beego/bee/v2/logger"
|
||||
"github.com/beego/bee/v2/logger/colors"
|
||||
"github.com/beego/bee/v2/utils"
|
||||
)
|
||||
|
||||
const (
|
||||
|
@ -238,7 +238,7 @@ func GenerateMigration(mname, upsql, downsql, curpath string) {
|
|||
const (
|
||||
MigrationHeader = `package main
|
||||
import (
|
||||
"github.com/astaxie/beego/migration"
|
||||
"github.com/beego/beego/v2/client/orm/migration"
|
||||
)
|
||||
|
||||
// DO NOT MODIFY
|
||||
|
|
|
@ -21,9 +21,9 @@ import (
|
|||
"path"
|
||||
"strings"
|
||||
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
"github.com/beego/bee/logger/colors"
|
||||
"github.com/beego/bee/utils"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
"github.com/beego/bee/v2/logger/colors"
|
||||
"github.com/beego/bee/v2/utils"
|
||||
)
|
||||
|
||||
func GenerateModel(mname, fields, currpath string) {
|
||||
|
@ -145,7 +145,7 @@ import (
|
|||
"reflect"
|
||||
"strings"
|
||||
{{timePkg}}
|
||||
"github.com/astaxie/beego/orm"
|
||||
"github.com/beego/beego/v2/client/orm"
|
||||
)
|
||||
|
||||
{{modelStruct}}
|
||||
|
|
|
@ -3,9 +3,9 @@ package generate
|
|||
import (
|
||||
"strings"
|
||||
|
||||
"github.com/beego/bee/cmd/commands/migrate"
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
"github.com/beego/bee/utils"
|
||||
"github.com/beego/bee/v2/cmd/commands/migrate"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
"github.com/beego/bee/v2/utils"
|
||||
)
|
||||
|
||||
func GenerateScaffold(sname, fields, currpath, driver, conn string) {
|
||||
|
|
|
@ -19,9 +19,9 @@ import (
|
|||
"os"
|
||||
"path"
|
||||
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
"github.com/beego/bee/logger/colors"
|
||||
"github.com/beego/bee/utils"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
"github.com/beego/bee/v2/logger/colors"
|
||||
"github.com/beego/bee/v2/utils"
|
||||
)
|
||||
|
||||
// recipe
|
||||
|
|
|
@ -0,0 +1,549 @@
|
|||
// Copyright 2014 beego Author. All Rights Reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package generate
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"go/ast"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"regexp"
|
||||
"sort"
|
||||
"strconv"
|
||||
"strings"
|
||||
"unicode"
|
||||
|
||||
"github.com/beego/beego/v2/server/web"
|
||||
"golang.org/x/tools/go/packages"
|
||||
|
||||
"github.com/beego/beego/v2/core/logs"
|
||||
|
||||
"github.com/beego/beego/v2/server/web/context/param"
|
||||
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
)
|
||||
|
||||
var globalRouterTemplate = `package {{.routersDir}}
|
||||
|
||||
import (
|
||||
beego "github.com/beego/beego/v2/server/web"
|
||||
"github.com/beego/beego/v2/server/web/context/param"{{.globalimport}}
|
||||
)
|
||||
|
||||
func init() {
|
||||
{{.globalinfo}}
|
||||
}
|
||||
`
|
||||
|
||||
var (
|
||||
genInfoList map[string][]web.ControllerComments
|
||||
|
||||
routerHooks = map[string]int{
|
||||
"beego.BeforeStatic": web.BeforeStatic,
|
||||
"beego.BeforeRouter": web.BeforeRouter,
|
||||
"beego.BeforeExec": web.BeforeExec,
|
||||
"beego.AfterExec": web.AfterExec,
|
||||
"beego.FinishRouter": web.FinishRouter,
|
||||
}
|
||||
|
||||
routerHooksMapping = map[int]string{
|
||||
web.BeforeStatic: "beego.BeforeStatic",
|
||||
web.BeforeRouter: "beego.BeforeRouter",
|
||||
web.BeforeExec: "beego.BeforeExec",
|
||||
web.AfterExec: "beego.AfterExec",
|
||||
web.FinishRouter: "beego.FinishRouter",
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
|
||||
func GenRouters() {
|
||||
ctrlPath := ControllerDirectory.String()
|
||||
if len(ctrlPath) == 0 {
|
||||
ctrlPath = "controllers"
|
||||
}
|
||||
routersPath := RoutersFile.String()
|
||||
if len(routersPath) == 0 {
|
||||
routersPath = "routers/commentsRouter.go"
|
||||
}
|
||||
genRouters(ctrlPath, routersPath)
|
||||
}
|
||||
|
||||
func genRouters(ctrlPath string, routersPath string) {
|
||||
beeLogger.Log.Infof("read controller info from directory[%s], and output routers to [%s]", ctrlPath, routersPath)
|
||||
err := parserPkg(ctrlPath, routersPath)
|
||||
if err != nil {
|
||||
beeLogger.Log.Errorf("Could not generate routers. Please check your input: %+v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func parserPkg(ctrlPath string, routersPath string) error {
|
||||
genInfoList = make(map[string][]web.ControllerComments)
|
||||
pkgs, err := packages.Load(&packages.Config{
|
||||
Mode: packages.NeedName | packages.NeedFiles | packages.NeedCompiledGoFiles | packages.NeedSyntax,
|
||||
Dir: ctrlPath,
|
||||
}, "./...")
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
for _, pkg := range pkgs {
|
||||
for _, fl := range pkg.Syntax {
|
||||
for _, d := range fl.Decls {
|
||||
switch specDecl := d.(type) {
|
||||
case *ast.FuncDecl:
|
||||
if specDecl.Recv != nil {
|
||||
exp, ok := specDecl.Recv.List[0].Type.(*ast.StarExpr) // Check that the type is correct first beforing throwing to parser
|
||||
if ok {
|
||||
err = parserComments(specDecl, fmt.Sprint(exp.X), pkg.PkgPath)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return genRouterCode(routersPath)
|
||||
}
|
||||
|
||||
type parsedComment struct {
|
||||
routerPath string
|
||||
methods []string
|
||||
params map[string]parsedParam
|
||||
filters []parsedFilter
|
||||
imports []parsedImport
|
||||
}
|
||||
|
||||
type parsedImport struct {
|
||||
importPath string
|
||||
importAlias string
|
||||
}
|
||||
|
||||
type parsedFilter struct {
|
||||
pattern string
|
||||
pos int
|
||||
filter string
|
||||
params []bool
|
||||
}
|
||||
|
||||
type parsedParam struct {
|
||||
name string
|
||||
datatype string
|
||||
location string
|
||||
defValue string
|
||||
required bool
|
||||
}
|
||||
|
||||
func parserComments(f *ast.FuncDecl, controllerName, pkgpath string) error {
|
||||
if f.Doc != nil {
|
||||
parsedComments, err := parseComment(f.Doc.List)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
for _, parsedComment := range parsedComments {
|
||||
if parsedComment.routerPath != "" {
|
||||
key := pkgpath + ":" + controllerName
|
||||
cc := web.ControllerComments{}
|
||||
cc.Method = f.Name.String()
|
||||
cc.Router = parsedComment.routerPath
|
||||
cc.AllowHTTPMethods = parsedComment.methods
|
||||
cc.MethodParams = buildMethodParams(f.Type.Params.List, parsedComment)
|
||||
cc.FilterComments = buildFilters(parsedComment.filters)
|
||||
cc.ImportComments = buildImports(parsedComment.imports)
|
||||
genInfoList[key] = append(genInfoList[key], cc)
|
||||
}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func buildImports(pis []parsedImport) []*web.ControllerImportComments {
|
||||
var importComments []*web.ControllerImportComments
|
||||
|
||||
for _, pi := range pis {
|
||||
importComments = append(importComments, &web.ControllerImportComments{
|
||||
ImportPath: pi.importPath,
|
||||
ImportAlias: pi.importAlias,
|
||||
})
|
||||
}
|
||||
|
||||
return importComments
|
||||
}
|
||||
|
||||
func buildFilters(pfs []parsedFilter) []*web.ControllerFilterComments {
|
||||
var filterComments []*web.ControllerFilterComments
|
||||
|
||||
for _, pf := range pfs {
|
||||
var (
|
||||
returnOnOutput bool
|
||||
resetParams bool
|
||||
)
|
||||
|
||||
if len(pf.params) >= 1 {
|
||||
returnOnOutput = pf.params[0]
|
||||
}
|
||||
|
||||
if len(pf.params) >= 2 {
|
||||
resetParams = pf.params[1]
|
||||
}
|
||||
|
||||
filterComments = append(filterComments, &web.ControllerFilterComments{
|
||||
Filter: pf.filter,
|
||||
Pattern: pf.pattern,
|
||||
Pos: pf.pos,
|
||||
ReturnOnOutput: returnOnOutput,
|
||||
ResetParams: resetParams,
|
||||
})
|
||||
}
|
||||
|
||||
return filterComments
|
||||
}
|
||||
|
||||
func buildMethodParams(funcParams []*ast.Field, pc *parsedComment) []*param.MethodParam {
|
||||
result := make([]*param.MethodParam, 0, len(funcParams))
|
||||
for _, fparam := range funcParams {
|
||||
for _, pName := range fparam.Names {
|
||||
methodParam := buildMethodParam(fparam, pName.Name, pc)
|
||||
result = append(result, methodParam)
|
||||
}
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
func buildMethodParam(fparam *ast.Field, name string, pc *parsedComment) *param.MethodParam {
|
||||
options := []param.MethodParamOption{}
|
||||
if cparam, ok := pc.params[name]; ok {
|
||||
// Build param from comment info
|
||||
name = cparam.name
|
||||
if cparam.required {
|
||||
options = append(options, param.IsRequired)
|
||||
}
|
||||
switch cparam.location {
|
||||
case "body":
|
||||
options = append(options, param.InBody)
|
||||
case "header":
|
||||
options = append(options, param.InHeader)
|
||||
case "path":
|
||||
options = append(options, param.InPath)
|
||||
}
|
||||
if cparam.defValue != "" {
|
||||
options = append(options, param.Default(cparam.defValue))
|
||||
}
|
||||
} else {
|
||||
if paramInPath(name, pc.routerPath) {
|
||||
options = append(options, param.InPath)
|
||||
}
|
||||
}
|
||||
return param.New(name, options...)
|
||||
}
|
||||
|
||||
func paramInPath(name, route string) bool {
|
||||
return strings.HasSuffix(route, ":"+name) ||
|
||||
strings.Contains(route, ":"+name+"/")
|
||||
}
|
||||
|
||||
var routeRegex = regexp.MustCompile(`@router\s+(\S+)(?:\s+\[(\S+)\])?`)
|
||||
|
||||
func parseComment(lines []*ast.Comment) (pcs []*parsedComment, err error) {
|
||||
pcs = []*parsedComment{}
|
||||
params := map[string]parsedParam{}
|
||||
filters := []parsedFilter{}
|
||||
imports := []parsedImport{}
|
||||
|
||||
const doubleSlash = "/"
|
||||
for _, c := range lines {
|
||||
t := strings.TrimSpace(strings.TrimLeft(c.Text, doubleSlash))
|
||||
const paramPrefix = "@Param"
|
||||
if strings.HasPrefix(t, paramPrefix) {
|
||||
pv := getparams(strings.TrimSpace(strings.TrimPrefix(t, paramPrefix)))
|
||||
if len(pv) < 4 {
|
||||
logs.Error("Invalid @Param format. Needs at least 4 parameters")
|
||||
}
|
||||
p := parsedParam{}
|
||||
names := strings.SplitN(pv[0], "=>", 2)
|
||||
p.name = names[0]
|
||||
funcParamName := p.name
|
||||
if len(names) > 1 {
|
||||
funcParamName = names[1]
|
||||
}
|
||||
p.location = pv[1]
|
||||
p.datatype = pv[2]
|
||||
switch len(pv) {
|
||||
case 5:
|
||||
p.required, _ = strconv.ParseBool(pv[3])
|
||||
case 6:
|
||||
p.defValue = pv[3]
|
||||
p.required, _ = strconv.ParseBool(pv[4])
|
||||
}
|
||||
params[funcParamName] = p
|
||||
}
|
||||
}
|
||||
|
||||
for _, c := range lines {
|
||||
t := strings.TrimSpace(strings.TrimLeft(c.Text, doubleSlash))
|
||||
if strings.HasPrefix(t, "@Import") {
|
||||
iv := getparams(strings.TrimSpace(strings.TrimLeft(t, "@Import")))
|
||||
if len(iv) == 0 || len(iv) > 2 {
|
||||
logs.Error("Invalid @Import format. Only accepts 1 or 2 parameters")
|
||||
continue
|
||||
}
|
||||
|
||||
p := parsedImport{}
|
||||
p.importPath = iv[0]
|
||||
|
||||
if len(iv) == 2 {
|
||||
p.importAlias = iv[1]
|
||||
}
|
||||
|
||||
imports = append(imports, p)
|
||||
}
|
||||
}
|
||||
|
||||
filterLoop:
|
||||
for _, c := range lines {
|
||||
t := strings.TrimSpace(strings.TrimLeft(c.Text, doubleSlash))
|
||||
if strings.HasPrefix(t, "@Filter") {
|
||||
fv := getparams(strings.TrimSpace(strings.TrimLeft(t, "@Filter")))
|
||||
if len(fv) < 3 {
|
||||
logs.Error("Invalid @Filter format. Needs at least 3 parameters")
|
||||
continue filterLoop
|
||||
}
|
||||
|
||||
p := parsedFilter{}
|
||||
p.pattern = fv[0]
|
||||
posName := fv[1]
|
||||
if pos, exists := routerHooks[posName]; exists {
|
||||
p.pos = pos
|
||||
} else {
|
||||
logs.Error("Invalid @Filter pos: ", posName)
|
||||
continue filterLoop
|
||||
}
|
||||
|
||||
p.filter = fv[2]
|
||||
fvParams := fv[3:]
|
||||
for _, fvParam := range fvParams {
|
||||
switch fvParam {
|
||||
case "true":
|
||||
p.params = append(p.params, true)
|
||||
case "false":
|
||||
p.params = append(p.params, false)
|
||||
default:
|
||||
logs.Error("Invalid @Filter param: ", fvParam)
|
||||
continue filterLoop
|
||||
}
|
||||
}
|
||||
|
||||
filters = append(filters, p)
|
||||
}
|
||||
}
|
||||
|
||||
for _, c := range lines {
|
||||
var pc = &parsedComment{}
|
||||
pc.params = params
|
||||
pc.filters = filters
|
||||
pc.imports = imports
|
||||
|
||||
t := strings.TrimSpace(strings.TrimLeft(c.Text, doubleSlash))
|
||||
if strings.HasPrefix(t, "@router") {
|
||||
t := strings.TrimSpace(strings.TrimLeft(c.Text, doubleSlash))
|
||||
matches := routeRegex.FindStringSubmatch(t)
|
||||
if len(matches) == 3 {
|
||||
pc.routerPath = matches[1]
|
||||
methods := matches[2]
|
||||
if methods == "" {
|
||||
pc.methods = []string{"get"}
|
||||
// pc.hasGet = true
|
||||
} else {
|
||||
pc.methods = strings.Split(methods, ",")
|
||||
// pc.hasGet = strings.Contains(methods, "get")
|
||||
}
|
||||
pcs = append(pcs, pc)
|
||||
} else {
|
||||
return nil, errors.New("router information is missing")
|
||||
}
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// direct copy from bee\g_docs.go
|
||||
// analysis params return []string
|
||||
// @Param query form string true "The email for login"
|
||||
// [query form string true "The email for login"]
|
||||
func getparams(str string) []string {
|
||||
var s []rune
|
||||
var j int
|
||||
var start bool
|
||||
var r []string
|
||||
var quoted int8
|
||||
for _, c := range str {
|
||||
if unicode.IsSpace(c) && quoted == 0 {
|
||||
if !start {
|
||||
continue
|
||||
} else {
|
||||
start = false
|
||||
j++
|
||||
r = append(r, string(s))
|
||||
s = make([]rune, 0)
|
||||
continue
|
||||
}
|
||||
}
|
||||
|
||||
start = true
|
||||
if c == '"' {
|
||||
quoted ^= 1
|
||||
continue
|
||||
}
|
||||
s = append(s, c)
|
||||
}
|
||||
if len(s) > 0 {
|
||||
r = append(r, string(s))
|
||||
}
|
||||
return r
|
||||
}
|
||||
|
||||
func genRouterCode(routersPath string) error {
|
||||
logs.Info("generate router from comments")
|
||||
var (
|
||||
globalinfo string
|
||||
globalimport string
|
||||
sortKey []string
|
||||
)
|
||||
for k := range genInfoList {
|
||||
sortKey = append(sortKey, k)
|
||||
}
|
||||
sort.Strings(sortKey)
|
||||
for _, k := range sortKey {
|
||||
cList := genInfoList[k]
|
||||
sort.Sort(web.ControllerCommentsSlice(cList))
|
||||
for _, c := range cList {
|
||||
allmethod := "nil"
|
||||
if len(c.AllowHTTPMethods) > 0 {
|
||||
allmethod = "[]string{"
|
||||
for _, m := range c.AllowHTTPMethods {
|
||||
allmethod += `"` + m + `",`
|
||||
}
|
||||
allmethod = strings.TrimRight(allmethod, ",") + "}"
|
||||
}
|
||||
|
||||
params := "nil"
|
||||
if len(c.Params) > 0 {
|
||||
params = "[]map[string]string{"
|
||||
for _, p := range c.Params {
|
||||
for k, v := range p {
|
||||
params = params + `map[string]string{` + k + `:"` + v + `"},`
|
||||
}
|
||||
}
|
||||
params = strings.TrimRight(params, ",") + "}"
|
||||
}
|
||||
|
||||
methodParams := "param.Make("
|
||||
if len(c.MethodParams) > 0 {
|
||||
lines := make([]string, 0, len(c.MethodParams))
|
||||
for _, m := range c.MethodParams {
|
||||
lines = append(lines, fmt.Sprint(m))
|
||||
}
|
||||
methodParams += "\n " +
|
||||
strings.Join(lines, ",\n ") +
|
||||
",\n "
|
||||
}
|
||||
methodParams += ")"
|
||||
|
||||
imports := ""
|
||||
if len(c.ImportComments) > 0 {
|
||||
for _, i := range c.ImportComments {
|
||||
var s string
|
||||
if i.ImportAlias != "" {
|
||||
s = fmt.Sprintf(`
|
||||
%s "%s"`, i.ImportAlias, i.ImportPath)
|
||||
} else {
|
||||
s = fmt.Sprintf(`
|
||||
"%s"`, i.ImportPath)
|
||||
}
|
||||
if !strings.Contains(globalimport, s) {
|
||||
imports += s
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
filters := ""
|
||||
if len(c.FilterComments) > 0 {
|
||||
for _, f := range c.FilterComments {
|
||||
filters += fmt.Sprintf(` &beego.ControllerFilter{
|
||||
Pattern: "%s",
|
||||
Pos: %s,
|
||||
Filter: %s,
|
||||
ReturnOnOutput: %v,
|
||||
ResetParams: %v,
|
||||
},`, f.Pattern, routerHooksMapping[f.Pos], f.Filter, f.ReturnOnOutput, f.ResetParams)
|
||||
}
|
||||
}
|
||||
|
||||
if filters == "" {
|
||||
filters = "nil"
|
||||
} else {
|
||||
filters = fmt.Sprintf(`[]*beego.ControllerFilter{
|
||||
%s
|
||||
}`, filters)
|
||||
}
|
||||
|
||||
globalimport += imports
|
||||
|
||||
globalinfo = globalinfo + `
|
||||
beego.GlobalControllerRouter["` + k + `"] = append(beego.GlobalControllerRouter["` + k + `"],
|
||||
beego.ControllerComments{
|
||||
Method: "` + strings.TrimSpace(c.Method) + `",
|
||||
` + "Router: `" + c.Router + "`" + `,
|
||||
AllowHTTPMethods: ` + allmethod + `,
|
||||
MethodParams: ` + methodParams + `,
|
||||
Filters: ` + filters + `,
|
||||
Params: ` + params + `})
|
||||
`
|
||||
}
|
||||
}
|
||||
|
||||
if globalinfo != "" {
|
||||
|
||||
routersPathDir := filepath.Dir(routersPath)
|
||||
err := os.MkdirAll(routersPathDir, os.ModePerm)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
f, err := os.Create(routersPath)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer f.Close()
|
||||
|
||||
routersDir := RouterPkg.String()
|
||||
if len(routersDir) == 0{
|
||||
routersDir = "routers"
|
||||
}
|
||||
|
||||
beeLogger.Log.Infof("using %s as routers file's package", routersDir)
|
||||
|
||||
content := strings.Replace(globalRouterTemplate, "{{.globalinfo}}", globalinfo, -1)
|
||||
content = strings.Replace(content, "{{.routersDir}}", routersDir, -1)
|
||||
content = strings.Replace(content, "{{.globalimport}}", globalimport, -1)
|
||||
_, err = f.WriteString(content)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
|
@ -35,9 +35,11 @@ import (
|
|||
|
||||
yaml "gopkg.in/yaml.v2"
|
||||
|
||||
"github.com/astaxie/beego/swagger"
|
||||
"github.com/astaxie/beego/utils"
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
bu "github.com/beego/bee/v2/utils"
|
||||
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
"github.com/beego/beego/v2/core/utils"
|
||||
"github.com/beego/beego/v2/server/web/swagger"
|
||||
)
|
||||
|
||||
const (
|
||||
|
@ -61,6 +63,7 @@ var controllerList map[string]map[string]*swagger.Item //controllername Paths it
|
|||
var modelsList map[string]map[string]swagger.Schema
|
||||
var rootapi swagger.Swagger
|
||||
var astPkgs []*ast.Package
|
||||
var pkgLoadedCache map[string]struct{}
|
||||
|
||||
// refer to builtin.go
|
||||
var basicTypes = map[string]string{
|
||||
|
@ -93,6 +96,10 @@ var stdlibObject = map[string]string{
|
|||
"&{json RawMessage}": "json.RawMessage",
|
||||
}
|
||||
|
||||
var customObject = map[string]string{
|
||||
"&{base ObjectID}": "string",
|
||||
}
|
||||
|
||||
func init() {
|
||||
pkgCache = make(map[string]struct{})
|
||||
controllerComments = make(map[string]string)
|
||||
|
@ -100,6 +107,7 @@ func init() {
|
|||
controllerList = make(map[string]map[string]*swagger.Item)
|
||||
modelsList = make(map[string]map[string]swagger.Schema)
|
||||
astPkgs = make([]*ast.Package, 0)
|
||||
pkgLoadedCache = make(map[string]struct{})
|
||||
}
|
||||
|
||||
// parsePackagesFromDir parses packages from a given directory
|
||||
|
@ -152,6 +160,16 @@ func parsePackageFromDir(path string) error {
|
|||
astPkgs = append(astPkgs, v)
|
||||
}
|
||||
|
||||
if len(folderPkgs) != 0 {
|
||||
workPath := bu.GetBeeWorkPath()
|
||||
parentPath := filepath.Dir(workPath)
|
||||
rel, err := filepath.Rel(parentPath, path)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
pkgLoadedCache[rel] = struct{}{}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
|
@ -182,7 +200,7 @@ func GenerateDocs(curpath string) {
|
|||
} else if strings.HasPrefix(s, "@Title") {
|
||||
rootapi.Infos.Title = strings.TrimSpace(s[len("@Title"):])
|
||||
} else if strings.HasPrefix(s, "@Description") {
|
||||
rootapi.Infos.Description = strings.TrimSpace(s[len("@Description"):])
|
||||
rootapi.Infos.Description += fmt.Sprintf("%s\n", strings.TrimSpace(s[len("@Description"):]))
|
||||
} else if strings.HasPrefix(s, "@TermsOfServiceUrl") {
|
||||
rootapi.Infos.TermsOfService = strings.TrimSpace(s[len("@TermsOfServiceUrl"):])
|
||||
} else if strings.HasPrefix(s, "@Contact") {
|
||||
|
@ -429,7 +447,7 @@ func analyseControllerPkg(localName, pkgpath string) {
|
|||
if isSystemPackage(pkgpath) {
|
||||
return
|
||||
}
|
||||
if pkgpath == "github.com/astaxie/beego" {
|
||||
if pkgpath == "github.com/beego/beego/v2/server/web" {
|
||||
return
|
||||
}
|
||||
if localName != "" {
|
||||
|
@ -552,7 +570,7 @@ func parserComments(f *ast.FuncDecl, controllerName, pkgpath string) error {
|
|||
} else if strings.HasPrefix(t, "@Title") {
|
||||
opts.OperationID = controllerName + "." + strings.TrimSpace(t[len("@Title"):])
|
||||
} else if strings.HasPrefix(t, "@Description") {
|
||||
opts.Description = strings.TrimSpace(t[len("@Description"):])
|
||||
opts.Description += fmt.Sprintf("%s\n<br>", strings.TrimSpace(t[len("@Description"):]))
|
||||
} else if strings.HasPrefix(t, "@Summary") {
|
||||
opts.Summary = strings.TrimSpace(t[len("@Summary"):])
|
||||
} else if strings.HasPrefix(t, "@Success") {
|
||||
|
@ -933,7 +951,8 @@ L:
|
|||
// Still searching for the right object
|
||||
continue
|
||||
}
|
||||
parseObject(d, k, &m, &realTypes, astPkgs, packageName)
|
||||
|
||||
parseObject(fl.Imports, d, k, &m, &realTypes, astPkgs, packageName)
|
||||
|
||||
// When we've found the correct object, we can stop searching
|
||||
break L
|
||||
|
@ -958,7 +977,7 @@ L:
|
|||
return str, m, realTypes
|
||||
}
|
||||
|
||||
func parseObject(d *ast.Object, k string, m *swagger.Schema, realTypes *[]string, astPkgs []*ast.Package, packageName string) {
|
||||
func parseObject(imports []*ast.ImportSpec, d *ast.Object, k string, m *swagger.Schema, realTypes *[]string, astPkgs []*ast.Package, packageName string) {
|
||||
ts, ok := d.Decl.(*ast.TypeSpec)
|
||||
if !ok {
|
||||
beeLogger.Log.Fatalf("Unknown type without TypeSec: %v", d)
|
||||
|
@ -983,7 +1002,7 @@ func parseObject(d *ast.Object, k string, m *swagger.Schema, realTypes *[]string
|
|||
case *ast.Ident:
|
||||
parseIdent(t, k, m, astPkgs)
|
||||
case *ast.StructType:
|
||||
parseStruct(t, k, m, realTypes, astPkgs, packageName)
|
||||
parseStruct(imports, t, k, m, realTypes, astPkgs, packageName)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1068,7 +1087,7 @@ func parseIdent(st *ast.Ident, k string, m *swagger.Schema, astPkgs []*ast.Packa
|
|||
|
||||
}
|
||||
|
||||
func parseStruct(st *ast.StructType, k string, m *swagger.Schema, realTypes *[]string, astPkgs []*ast.Package, packageName string) {
|
||||
func parseStruct(imports []*ast.ImportSpec, st *ast.StructType, k string, m *swagger.Schema, realTypes *[]string, astPkgs []*ast.Package, packageName string) {
|
||||
m.Title = k
|
||||
if st.Fields.List != nil {
|
||||
m.Properties = make(map[string]swagger.Propertie)
|
||||
|
@ -1084,6 +1103,11 @@ func parseStruct(st *ast.StructType, k string, m *swagger.Schema, realTypes *[]s
|
|||
realType = packageName + "." + realType
|
||||
}
|
||||
}
|
||||
|
||||
if !isBasicType(realType) && sType == astTypeObject {
|
||||
checkAndLoadPackage(imports, realType, packageName)
|
||||
}
|
||||
|
||||
*realTypes = append(*realTypes, realType)
|
||||
mp := swagger.Propertie{}
|
||||
isObject := false
|
||||
|
@ -1143,6 +1167,10 @@ func parseStruct(st *ast.StructType, k string, m *swagger.Schema, realTypes *[]s
|
|||
}
|
||||
}
|
||||
|
||||
if ignore := stag.Get("ignore"); ignore != "" {
|
||||
continue
|
||||
}
|
||||
|
||||
tag := stag.Get("json")
|
||||
if tag != "" {
|
||||
tagValues = strings.Split(tag, ",")
|
||||
|
@ -1156,34 +1184,46 @@ func parseStruct(st *ast.StructType, k string, m *swagger.Schema, realTypes *[]s
|
|||
name = tagValues[0]
|
||||
}
|
||||
|
||||
// set property type to the second tag value only if it is not omitempty and isBasicType
|
||||
if len(tagValues) > 1 && tagValues[1] != "omitempty" && isBasicType(tagValues[1]) {
|
||||
typeFormat := strings.Split(basicTypes[tagValues[1]], ":")
|
||||
mp.Type = typeFormat[0]
|
||||
mp.Format = typeFormat[1]
|
||||
mp.Ref = ""
|
||||
}
|
||||
|
||||
if thrifttag := stag.Get("thrift"); thrifttag != "" {
|
||||
ts := strings.Split(thrifttag, ",")
|
||||
if ts[0] != "" {
|
||||
name = ts[0]
|
||||
}
|
||||
}
|
||||
if required := stag.Get("required"); required != "" {
|
||||
if required := stag.Get("required"); strings.EqualFold(required, "true") {
|
||||
m.Required = append(m.Required, name)
|
||||
}
|
||||
if desc := stag.Get("description"); desc != "" {
|
||||
mp.Description = desc
|
||||
}
|
||||
|
||||
if mp.Description == "" && field.Comment != nil {
|
||||
mp.Description = strings.TrimSpace(field.Comment.Text())
|
||||
}
|
||||
|
||||
if example := stag.Get("example"); example != "" && !isObject && !isSlice {
|
||||
mp.Example = str2RealType(example, realType)
|
||||
}
|
||||
|
||||
m.Properties[name] = mp
|
||||
}
|
||||
if ignore := stag.Get("ignore"); ignore != "" {
|
||||
continue
|
||||
}
|
||||
} else {
|
||||
// only parse case of when embedded field is TypeName
|
||||
// cases of *TypeName and Interface are not handled, maybe useless for swagger spec
|
||||
tag := ""
|
||||
if field.Tag != nil {
|
||||
stag := reflect.StructTag(strings.Trim(field.Tag.Value, "`"))
|
||||
if ignore := stag.Get("ignore"); ignore != "" {
|
||||
continue
|
||||
}
|
||||
tag = stag.Get("json")
|
||||
}
|
||||
|
||||
|
@ -1204,7 +1244,7 @@ func parseStruct(st *ast.StructType, k string, m *swagger.Schema, realTypes *[]s
|
|||
for _, fl := range pkg.Files {
|
||||
for nameOfObj, obj := range fl.Scope.Objects {
|
||||
if pkg.Name+"."+obj.Name == realType {
|
||||
parseObject(obj, nameOfObj, nm, realTypes, astPkgs, pkg.Name)
|
||||
parseObject(imports, obj, nameOfObj, nm, realTypes, astPkgs, pkg.Name)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1212,6 +1252,7 @@ func parseStruct(st *ast.StructType, k string, m *swagger.Schema, realTypes *[]s
|
|||
for name, p := range nm.Properties {
|
||||
m.Properties[name] = p
|
||||
}
|
||||
m.Required = append(m.Required, nm.Required...)
|
||||
continue
|
||||
}
|
||||
}
|
||||
|
@ -1224,6 +1265,9 @@ func typeAnalyser(f *ast.Field) (isSlice bool, realType, swaggerType string) {
|
|||
if isBasicType(fmt.Sprint(arr.Elt)) {
|
||||
return true, fmt.Sprintf("[]%v", arr.Elt), basicTypes[fmt.Sprint(arr.Elt)]
|
||||
}
|
||||
if object, isCustomObject := customObject[fmt.Sprint(arr.Elt)]; isCustomObject {
|
||||
return true, fmt.Sprintf("[]%v", object), basicTypes[object]
|
||||
}
|
||||
if mp, ok := arr.Elt.(*ast.MapType); ok {
|
||||
return false, fmt.Sprintf("map[%v][%v]", mp.Key, mp.Value), astTypeObject
|
||||
}
|
||||
|
@ -1248,6 +1292,8 @@ func typeAnalyser(f *ast.Field) (isSlice bool, realType, swaggerType string) {
|
|||
return false, astTypeMap, basicTypes[val]
|
||||
}
|
||||
return false, val, astTypeObject
|
||||
case *ast.InterfaceType:
|
||||
return false, "interface", astTypeObject
|
||||
}
|
||||
basicType := fmt.Sprint(f.Type)
|
||||
if object, isStdLibObject := stdlibObject[basicType]; isStdLibObject {
|
||||
|
@ -1340,3 +1386,70 @@ func str2RealType(s string, typ string) interface{} {
|
|||
|
||||
return ret
|
||||
}
|
||||
|
||||
func checkAndLoadPackage(imports []*ast.ImportSpec, realType, curPkgName string) {
|
||||
arr := strings.Split(realType, ".")
|
||||
if len(arr) != 2 {
|
||||
return
|
||||
}
|
||||
objectPkgName := arr[0]
|
||||
if objectPkgName == curPkgName {
|
||||
return
|
||||
}
|
||||
pkgPath := ""
|
||||
for _, im := range imports {
|
||||
importPath := ""
|
||||
if im.Path != nil {
|
||||
importPath = strings.Trim(im.Path.Value, `"`)
|
||||
}
|
||||
|
||||
if importPath == "" {
|
||||
continue
|
||||
}
|
||||
|
||||
if im.Name != nil && im.Name.Name == objectPkgName {
|
||||
pkgPath = importPath
|
||||
break
|
||||
}
|
||||
|
||||
_, pkgName := filepath.Split(importPath)
|
||||
if pkgName == objectPkgName {
|
||||
pkgPath = importPath
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
if pkgPath == "" {
|
||||
beeLogger.Log.Warnf("%s missing import package", realType)
|
||||
return
|
||||
}
|
||||
|
||||
if isSystemPackage(pkgPath) {
|
||||
return
|
||||
}
|
||||
if _, ok := pkgLoadedCache[pkgPath]; ok {
|
||||
return
|
||||
}
|
||||
|
||||
pkg, err := build.Default.Import(pkgPath, ".", build.FindOnly)
|
||||
if err != nil {
|
||||
beeLogger.Log.Warnf("Package %s cannot be imported, err:%v", pkgPath, err)
|
||||
return
|
||||
}
|
||||
pkgRealpath := pkg.Dir
|
||||
|
||||
fileSet := token.NewFileSet()
|
||||
pkgs, err := parser.ParseDir(fileSet, pkgRealpath, func(info os.FileInfo) bool {
|
||||
name := info.Name()
|
||||
return !info.IsDir() && !strings.HasPrefix(name, ".") && strings.HasSuffix(name, ".go")
|
||||
}, parser.ParseComments)
|
||||
if err != nil {
|
||||
beeLogger.Log.Warnf("Error while parsing dir at '%s': %s", pkgRealpath, err)
|
||||
}
|
||||
|
||||
for _, pkg := range pkgs {
|
||||
astPkgs = append(astPkgs, pkg)
|
||||
}
|
||||
|
||||
pkgLoadedCache[pkgPath] = struct{}{}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,224 @@
|
|||
// Copyright 2013 bee authors
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License"): you may
|
||||
// not use this file except in compliance with the License. You may obtain
|
||||
// a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
// License for the specific language governing permissions and limitations
|
||||
// under the License.
|
||||
|
||||
package swaggergen
|
||||
|
||||
import (
|
||||
_ "github.com/shopspring/decimal"
|
||||
"go/ast"
|
||||
"go/build"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// package model
|
||||
//
|
||||
// import (
|
||||
// "sync"
|
||||
//
|
||||
// "example.com/pkgnotexist"
|
||||
// "github.com/shopspring/decimal"
|
||||
// )
|
||||
//
|
||||
// type Object struct {
|
||||
// Field1 decimal.Decimal
|
||||
// Field2 pkgnotexist.TestType
|
||||
// Field3 sync.Map
|
||||
// }
|
||||
func TestCheckAndLoadPackageOnGoMod(t *testing.T) {
|
||||
defer os.Setenv("GO111MODULE", os.Getenv("GO111MODULE"))
|
||||
os.Setenv("GO111MODULE", "on")
|
||||
|
||||
testCases := []struct {
|
||||
pkgName string
|
||||
pkgImportPath string
|
||||
imports []*ast.ImportSpec
|
||||
realType string
|
||||
curPkgName string
|
||||
expected bool
|
||||
}{
|
||||
{
|
||||
pkgName: "decimal",
|
||||
pkgImportPath: "github.com/shopspring/decimal",
|
||||
imports: []*ast.ImportSpec{
|
||||
{
|
||||
Path: &ast.BasicLit{
|
||||
Value: "github.com/shopspring/decimal",
|
||||
},
|
||||
},
|
||||
},
|
||||
realType: "decimal.Decimal",
|
||||
curPkgName: "model",
|
||||
expected: true,
|
||||
},
|
||||
{
|
||||
pkgName: "pkgnotexist",
|
||||
pkgImportPath: "example.com/pkgnotexist",
|
||||
imports: []*ast.ImportSpec{
|
||||
{
|
||||
Path: &ast.BasicLit{
|
||||
Value: "example.com/pkgnotexist",
|
||||
},
|
||||
},
|
||||
},
|
||||
realType: "pkgnotexist.TestType",
|
||||
curPkgName: "model",
|
||||
expected: false,
|
||||
},
|
||||
{
|
||||
pkgName: "sync",
|
||||
pkgImportPath: "sync",
|
||||
imports: []*ast.ImportSpec{
|
||||
{
|
||||
Path: &ast.BasicLit{
|
||||
Value: "sync",
|
||||
},
|
||||
},
|
||||
},
|
||||
realType: "sync.Map",
|
||||
curPkgName: "model",
|
||||
expected: false,
|
||||
},
|
||||
}
|
||||
|
||||
for _, test := range testCases {
|
||||
checkAndLoadPackage(test.imports, test.realType, test.curPkgName)
|
||||
result := false
|
||||
for _, v := range astPkgs {
|
||||
if v.Name == test.pkgName {
|
||||
result = true
|
||||
break
|
||||
}
|
||||
}
|
||||
if test.expected != result {
|
||||
t.Fatalf("load module error, expected: %v, result: %v", test.expected, result)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// package model
|
||||
//
|
||||
// import (
|
||||
// "sync"
|
||||
//
|
||||
// "example.com/comm"
|
||||
// "example.com/pkgnotexist"
|
||||
// )
|
||||
//
|
||||
// type Object struct {
|
||||
// Field1 comm.Common
|
||||
// Field2 pkgnotexist.TestType
|
||||
// Field3 sync.Map
|
||||
// }
|
||||
func TestCheckAndLoadPackageOnGoPath(t *testing.T) {
|
||||
var (
|
||||
testCommPkg = `
|
||||
package comm
|
||||
|
||||
type Common struct {
|
||||
Code string
|
||||
Error string
|
||||
}
|
||||
`
|
||||
)
|
||||
|
||||
gopath, err := ioutil.TempDir("", "gobuild-gopath")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
defer os.RemoveAll(gopath)
|
||||
|
||||
if err := os.MkdirAll(filepath.Join(gopath, "src/example.com/comm"), 0777); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if err := ioutil.WriteFile(filepath.Join(gopath, "src/example.com/comm/comm.go"), []byte(testCommPkg), 0666); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
defer os.Setenv("GO111MODULE", os.Getenv("GO111MODULE"))
|
||||
os.Setenv("GO111MODULE", "off")
|
||||
defer os.Setenv("GOPATH", os.Getenv("GOPATH"))
|
||||
os.Setenv("GOPATH", gopath)
|
||||
build.Default.GOPATH = gopath
|
||||
|
||||
testCases := []struct {
|
||||
pkgName string
|
||||
pkgImportPath string
|
||||
imports []*ast.ImportSpec
|
||||
realType string
|
||||
curPkgName string
|
||||
expected bool
|
||||
}{
|
||||
{
|
||||
pkgName: "comm",
|
||||
pkgImportPath: "example.com/comm",
|
||||
imports: []*ast.ImportSpec{
|
||||
{
|
||||
Path: &ast.BasicLit{
|
||||
Value: "example.com/comm",
|
||||
},
|
||||
},
|
||||
},
|
||||
realType: "comm.Common",
|
||||
curPkgName: "model",
|
||||
expected: true,
|
||||
},
|
||||
{
|
||||
pkgName: "pkgnotexist",
|
||||
pkgImportPath: "example.com/pkgnotexist",
|
||||
imports: []*ast.ImportSpec{
|
||||
{
|
||||
Path: &ast.BasicLit{
|
||||
Value: "example.com/pkgnotexist",
|
||||
},
|
||||
},
|
||||
},
|
||||
realType: "pkgnotexist.TestType",
|
||||
curPkgName: "model",
|
||||
expected: false,
|
||||
},
|
||||
{
|
||||
pkgName: "sync",
|
||||
pkgImportPath: "sync",
|
||||
imports: []*ast.ImportSpec{
|
||||
{
|
||||
Path: &ast.BasicLit{
|
||||
Value: "sync",
|
||||
},
|
||||
},
|
||||
},
|
||||
realType: "sync.Map",
|
||||
curPkgName: "model",
|
||||
expected: false,
|
||||
},
|
||||
}
|
||||
|
||||
for _, test := range testCases {
|
||||
checkAndLoadPackage(test.imports, test.realType, test.curPkgName)
|
||||
result := false
|
||||
for _, v := range astPkgs {
|
||||
if v.Name == test.pkgName {
|
||||
result = true
|
||||
break
|
||||
}
|
||||
}
|
||||
if test.expected != result {
|
||||
t.Fatalf("load module error, expected: %v, result: %v", test.expected, result)
|
||||
}
|
||||
}
|
||||
}
|
62
go.mod
62
go.mod
|
@ -1,19 +1,63 @@
|
|||
module github.com/beego/bee
|
||||
module github.com/beego/bee/v2
|
||||
|
||||
go 1.13
|
||||
go 1.18
|
||||
|
||||
require (
|
||||
github.com/BurntSushi/toml v0.3.1
|
||||
github.com/astaxie/beego v1.12.1
|
||||
github.com/beego/beego/v2 v2.1.0
|
||||
github.com/davecgh/go-spew v1.1.1
|
||||
github.com/flosch/pongo2 v0.0.0-20200529170236-5abacdfa4915
|
||||
github.com/fsnotify/fsnotify v1.4.9
|
||||
github.com/gadelkareem/delve v1.4.2-0.20200619175259-dcd01330766f
|
||||
github.com/go-sql-driver/mysql v1.5.0
|
||||
github.com/go-delve/delve v1.20.2
|
||||
github.com/go-sql-driver/mysql v1.7.0
|
||||
github.com/gorilla/websocket v1.4.2
|
||||
github.com/lib/pq v1.7.0
|
||||
github.com/pelletier/go-toml v1.2.0
|
||||
github.com/lib/pq v1.10.5
|
||||
github.com/pelletier/go-toml v1.9.2
|
||||
github.com/shopspring/decimal v1.3.1
|
||||
github.com/smartwalle/pongo2render v1.0.1
|
||||
github.com/spf13/viper v1.7.0
|
||||
gopkg.in/yaml.v2 v2.3.0
|
||||
golang.org/x/tools v0.1.12
|
||||
gopkg.in/yaml.v2 v2.4.0
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/beorn7/perks v1.0.1 // indirect
|
||||
github.com/cespare/xxhash/v2 v2.2.0 // indirect
|
||||
github.com/cilium/ebpf v0.7.0 // indirect
|
||||
github.com/cosiner/argv v0.1.0 // indirect
|
||||
github.com/derekparker/trie v0.0.0-20221213183930-4c74548207f4 // indirect
|
||||
github.com/go-delve/liner v1.2.3-0.20220127212407-d32d89dd2a5d // indirect
|
||||
github.com/golang/protobuf v1.5.3 // indirect
|
||||
github.com/google/go-dap v0.7.0 // indirect
|
||||
github.com/hashicorp/golang-lru v0.5.4 // indirect
|
||||
github.com/hashicorp/hcl v1.0.0 // indirect
|
||||
github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
|
||||
github.com/magiconair/properties v1.8.1 // indirect
|
||||
github.com/mattn/go-colorable v0.0.9 // indirect
|
||||
github.com/mattn/go-isatty v0.0.3 // indirect
|
||||
github.com/mattn/go-runewidth v0.0.13 // indirect
|
||||
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
|
||||
github.com/mitchellh/mapstructure v1.5.0 // indirect
|
||||
github.com/pkg/errors v0.9.1 // indirect
|
||||
github.com/prometheus/client_golang v1.15.1 // indirect
|
||||
github.com/prometheus/client_model v0.3.0 // indirect
|
||||
github.com/prometheus/common v0.42.0 // indirect
|
||||
github.com/prometheus/procfs v0.9.0 // indirect
|
||||
github.com/rivo/uniseg v0.2.0 // indirect
|
||||
github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 // indirect
|
||||
github.com/sirupsen/logrus v1.6.0 // indirect
|
||||
github.com/spf13/afero v1.1.2 // indirect
|
||||
github.com/spf13/cast v1.3.0 // indirect
|
||||
github.com/spf13/jwalterweatherman v1.0.0 // indirect
|
||||
github.com/spf13/pflag v1.0.5 // indirect
|
||||
github.com/subosito/gotenv v1.2.0 // indirect
|
||||
go.starlark.net v0.0.0-20220816155156-cfacd8902214 // indirect
|
||||
golang.org/x/arch v0.0.0-20190927153633-4e8777c89be4 // indirect
|
||||
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
|
||||
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
|
||||
golang.org/x/net v0.7.0 // indirect
|
||||
golang.org/x/sys v0.6.0 // indirect
|
||||
golang.org/x/text v0.7.0 // indirect
|
||||
google.golang.org/protobuf v1.30.0 // indirect
|
||||
gopkg.in/ini.v1 v1.51.0 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
)
|
||||
|
|
205
go.sum
205
go.sum
|
@ -11,33 +11,32 @@ cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqCl
|
|||
cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
|
||||
cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
|
||||
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
|
||||
github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
|
||||
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
|
||||
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
|
||||
github.com/Knetic/govaluate v3.0.0+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
|
||||
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
|
||||
github.com/OwnLocal/goes v1.0.0/go.mod h1:8rIFjBGTue3lCU0wplczcUgt9Gxgrkkrw7etMIcn8TM=
|
||||
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
|
||||
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
|
||||
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
|
||||
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
|
||||
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
|
||||
github.com/astaxie/beego v1.12.1 h1:dfpuoxpzLVgclveAXe4PyNKqkzgm5zF4tgF2B3kkM2I=
|
||||
github.com/astaxie/beego v1.12.1/go.mod h1:kPBWpSANNbSdIqOc8SUL9h+1oyBMZhROeYsXQDbidWQ=
|
||||
github.com/beego/goyaml2 v0.0.0-20130207012346-5545475820dd/go.mod h1:1b+Y/CofkYwXMUU0OhQqGvsY2Bvgr4j6jfT699wyZKQ=
|
||||
github.com/beego/x2j v0.0.0-20131220205130-a0352aadc542/go.mod h1:kSeGC/p1AbBiEp5kat81+DSQrZenVBZXklMLaELspWU=
|
||||
github.com/beego/beego/v2 v2.1.0 h1:Lk0FtQGvDQCx5V5yEu4XwDsIgt+QOlNjt5emUa3/ZmA=
|
||||
github.com/beego/beego/v2 v2.1.0/go.mod h1:6h36ISpaxNrrpJ27siTpXBG8d/Icjzsc7pU1bWpp0EE=
|
||||
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
|
||||
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
|
||||
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
|
||||
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
|
||||
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
|
||||
github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
|
||||
github.com/bradfitz/gomemcache v0.0.0-20180710155616-bc664df96737/go.mod h1:PmM6Mmwb0LSuEubjR8N7PtNe1KxZLtOUHtbeikc5h60=
|
||||
github.com/casbin/casbin v1.7.0/go.mod h1:c67qKN6Oum3UF5Q1+BByfFxkwKvhwW57ITjqwtzR1KE=
|
||||
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
|
||||
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
|
||||
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
|
||||
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
|
||||
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
|
||||
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
|
||||
github.com/cilium/ebpf v0.7.0 h1:1k/q3ATgxSXRdrmPfH8d7YK0GfqVsEKZAX9dQZvs56k=
|
||||
github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA=
|
||||
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
|
||||
github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80=
|
||||
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
|
||||
github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
|
||||
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
|
||||
|
@ -45,38 +44,41 @@ github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7
|
|||
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
|
||||
github.com/cosiner/argv v0.1.0 h1:BVDiEL32lwHukgJKP87btEPenzrrHUjajs/8yzaqcXg=
|
||||
github.com/cosiner/argv v0.1.0/go.mod h1:EusR6TucWKX+zFgtdUsKT2Cvg45K5rtpCcWz4hK06d8=
|
||||
github.com/couchbase/go-couchbase v0.0.0-20181122212707-3e9b6e1258bb/go.mod h1:TWI8EKQMs5u5jLKW/tsb9VwauIrMIxQG1r5fMsswK5U=
|
||||
github.com/couchbase/gomemcached v0.0.0-20181122193126-5125a94a666c/go.mod h1:srVSlQLB8iXBVXHgnqemxUXqN6FCvClgCMPCsjBDR7c=
|
||||
github.com/couchbase/goutils v0.0.0-20180530154633-e865a1461c8a/go.mod h1:BQwMFlJzDjFDG3DJUdU0KORxn88UlsOULuxLExMh3Hs=
|
||||
github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
|
||||
github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
|
||||
github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w=
|
||||
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
|
||||
github.com/cupcake/rdb v0.0.0-20161107195141-43ba34106c76/go.mod h1:vYwsqCOLxGiisLwp9rITslkFNpZD5rz43tf41QFkTWY=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/derekparker/trie v0.0.0-20221213183930-4c74548207f4 h1:atN94qKNhLpy+9BwbE5nxvFj4rScJi6W3x/NfFmMDg4=
|
||||
github.com/derekparker/trie v0.0.0-20221213183930-4c74548207f4/go.mod h1:C7Es+DLenIpPc9J6IYw4jrK0h7S9bKj4DNl8+KxGEXU=
|
||||
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
|
||||
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
|
||||
github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
|
||||
github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
|
||||
github.com/elazarl/go-bindata-assetfs v1.0.1 h1:m0kkaHRKEu7tUIUFVwhGGGYClXvyl4RE03qmvRTNfbw=
|
||||
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
||||
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
|
||||
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
|
||||
github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4/go.mod h1:T9YF2M40nIgbVgp3rreNmTged+9HrbNTIQf1PsaIiTA=
|
||||
github.com/flosch/pongo2 v0.0.0-20200529170236-5abacdfa4915 h1:rNVrewdFbSujcoKZifC6cHJfqCTbCIR7XTLHW5TqUWU=
|
||||
github.com/flosch/pongo2 v0.0.0-20200529170236-5abacdfa4915/go.mod h1:fB4mx6dzqFinCxIf3a7Mf5yLk+18Bia9mPAnuejcvDA=
|
||||
github.com/frankban/quicktest v1.11.3 h1:8sXhOn0uLys67V8EsXLc6eszDs8VXWxL3iRvebPhedY=
|
||||
github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
|
||||
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
|
||||
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
|
||||
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
|
||||
github.com/gadelkareem/delve v1.4.2-0.20200619175259-dcd01330766f h1:SXR+MNQLeyoKOHwKziU6RU8wKEaGTNhL9rkHRuKND3A=
|
||||
github.com/gadelkareem/delve v1.4.2-0.20200619175259-dcd01330766f/go.mod h1:yRnaIw9CedrRtnrIhNVh1JLOz0cjEUWOEM5FaWEMOV0=
|
||||
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
|
||||
github.com/go-check/check v0.0.0-20180628173108-788fd7840127 h1:0gkP6mzaMqkmpcJYCFOLkIBwI7xFExG03bbkOkCvUPI=
|
||||
github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98=
|
||||
github.com/go-delve/delve v1.20.2 h1:rgPK7Iqb1oQk+i2Ilg0fpH6p5LqyixYiAt4N3Lhx4/Y=
|
||||
github.com/go-delve/delve v1.20.2/go.mod h1:KQtnLRy2M+cNHCRnDzURxljVNbRTdvVDD5Mb10KGP18=
|
||||
github.com/go-delve/liner v1.2.3-0.20220127212407-d32d89dd2a5d h1:pxjSLshkZJGLVm0wv20f/H0oTWiq/egkoJQ2ja6LEvo=
|
||||
github.com/go-delve/liner v1.2.3-0.20220127212407-d32d89dd2a5d/go.mod h1:biJCRbqp51wS+I92HMqn5H8/A0PAhxn2vyOT+JqhiGI=
|
||||
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
|
||||
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
|
||||
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
|
||||
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
|
||||
github.com/go-redis/redis v6.14.2+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
|
||||
github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
|
||||
github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
|
||||
github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
|
||||
github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc=
|
||||
github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
|
||||
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
|
||||
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
|
||||
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
|
||||
|
@ -88,19 +90,36 @@ github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFU
|
|||
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
|
||||
github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
|
||||
github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
|
||||
github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
|
||||
github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
|
||||
github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
|
||||
github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
|
||||
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
|
||||
github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
|
||||
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
|
||||
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
|
||||
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
|
||||
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
|
||||
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
|
||||
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
|
||||
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
||||
github.com/google/go-dap v0.2.0/go.mod h1:5q8aYQFnHOAZEMP+6vmq25HKYAEwE+LF5yh7JKrrhSQ=
|
||||
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
||||
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
|
||||
github.com/google/go-dap v0.7.0 h1:088PdKBUkxAxrXrnY8FREUJXpS6Y6jhAyZIuJv3OGOM=
|
||||
github.com/google/go-dap v0.7.0/go.mod h1:5q8aYQFnHOAZEMP+6vmq25HKYAEwE+LF5yh7JKrrhSQ=
|
||||
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
|
||||
github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
|
||||
github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
|
||||
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
|
||||
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
|
||||
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
|
||||
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
|
||||
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
|
||||
github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
|
||||
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
|
||||
|
@ -134,6 +153,7 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
|
|||
github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
|
||||
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
|
||||
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
|
||||
github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
|
||||
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
|
||||
github.com/juju/errors v0.0.0-20181118221551-089d3ea4e4d5/go.mod h1:W54LbzXuIE0boCoNJfwqpmkKJ1O4TCTZMetAt6jGk7Q=
|
||||
github.com/juju/errors v0.0.0-20190930114154-d42613fe1ab9/go.mod h1:W54LbzXuIE0boCoNJfwqpmkKJ1O4TCTZMetAt6jGk7Q=
|
||||
|
@ -147,66 +167,91 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJ
|
|||
github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
|
||||
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
|
||||
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
|
||||
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
|
||||
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
||||
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
||||
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
|
||||
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
||||
github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
|
||||
github.com/lib/pq v1.7.0 h1:h93mCPfUSkaul3Ka/VG8uZdmW1uMHDGxzu0NWHuJmHY=
|
||||
github.com/lib/pq v1.7.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
|
||||
github.com/lib/pq v1.10.5 h1:J+gdV2cUmX7ZqL2B0lFcW0m+egaHC2V3lpO8nWxyYiQ=
|
||||
github.com/lib/pq v1.10.5/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
|
||||
github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
|
||||
github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
|
||||
github.com/mattn/go-colorable v0.0.0-20170327083344-ded68f7a9561 h1:isR/L+BIZ+rqODWYR/f526ygrBMGKZYFhaaFRDGvuZ8=
|
||||
github.com/mattn/go-colorable v0.0.0-20170327083344-ded68f7a9561/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
|
||||
github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=
|
||||
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
|
||||
github.com/mattn/go-isatty v0.0.3 h1:ns/ykhmWi7G9O+8a448SecJU3nSMBXJfqQkl0upE1jI=
|
||||
github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
|
||||
github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
|
||||
github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
|
||||
github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
|
||||
github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
|
||||
github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
|
||||
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
|
||||
github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
|
||||
github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
|
||||
github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
|
||||
github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
|
||||
github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
|
||||
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
|
||||
github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
|
||||
github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
|
||||
github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
|
||||
github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
|
||||
github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
|
||||
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
|
||||
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
|
||||
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
||||
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
|
||||
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
|
||||
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
|
||||
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
|
||||
github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
|
||||
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
|
||||
github.com/peterh/liner v0.0.0-20170317030525-88609521dc4b h1:8uaXtUkxiy+T/zdLWuxa/PG4so0TPZDZfafFNNSaptE=
|
||||
github.com/peterh/liner v0.0.0-20170317030525-88609521dc4b/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc=
|
||||
github.com/pelletier/go-toml v1.9.2 h1:7NiByeVF4jKSG1lDF3X8LTIkq2/bu+1uYbIm1eS5tzk=
|
||||
github.com/pelletier/go-toml v1.9.2/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
|
||||
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
||||
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
|
||||
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
|
||||
github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
|
||||
github.com/prometheus/client_golang v1.15.1 h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI=
|
||||
github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk=
|
||||
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
|
||||
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
||||
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
||||
github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4=
|
||||
github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
|
||||
github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
|
||||
github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
|
||||
github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM=
|
||||
github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc=
|
||||
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
|
||||
github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
|
||||
github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI=
|
||||
github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY=
|
||||
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
|
||||
github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
|
||||
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
|
||||
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
|
||||
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
|
||||
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
|
||||
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
|
||||
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
||||
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
|
||||
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
|
||||
github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726/go.mod h1:3yhqj7WBBfRhbBlzyOC3gUxftwsU0u8gqevxwIHQpMw=
|
||||
github.com/siddontang/ledisdb v0.0.0-20181029004158-becf5f38d373/go.mod h1:mF1DpOSOUiJRMR+FDqaqu3EBqrybQtrDDszLUZ6oxPg=
|
||||
github.com/siddontang/rdb v0.0.0-20150307021120-fc89ed2e418d/go.mod h1:AMEsy7v5z92TR1JKMkLLoaOQk++LVnOKL3ScbJ8GNGA=
|
||||
github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 h1:DAYUYH5869yV94zvCES9F51oYtN5oGlwjxJJz7ZCnik=
|
||||
github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18/go.mod h1:nkxAfR/5quYxwPZhyDxgasBMnRtBZd0FCEpawpjMUFg=
|
||||
github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
|
||||
github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
|
||||
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
|
||||
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
|
||||
github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
|
||||
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
|
||||
github.com/smartwalle/pongo2render v1.0.1 h1:rsPnDTu/+zIT5HEB5RbMjxKY5hisov26j0isZL/7YS0=
|
||||
github.com/smartwalle/pongo2render v1.0.1/go.mod h1:MGnTzND7nEMz7g194kjlnw8lx/V5JJlb1hr5kDXEO0I=
|
||||
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
|
||||
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
|
||||
github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
|
||||
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
|
||||
github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
|
||||
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
|
||||
|
@ -214,30 +259,30 @@ github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI=
|
|||
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
|
||||
github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
|
||||
github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
|
||||
github.com/spf13/cobra v0.0.0-20170417170307-b6cb39589372/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
|
||||
github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo=
|
||||
github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
|
||||
github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
|
||||
github.com/spf13/pflag v0.0.0-20170417173400-9e4c21054fa1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
|
||||
github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
|
||||
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
|
||||
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
|
||||
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
|
||||
github.com/spf13/viper v1.7.0 h1:xVKxvI7ouOI5I+U9s2eeiUfMaWBVoXA3AWskkrqK0VM=
|
||||
github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
|
||||
github.com/ssdb/gossdb v0.0.0-20180723034631-88f6b59b84ec/go.mod h1:QBvMkMya+gXctz3kmljlUCu/yB3GZ6oee+dUozsezQE=
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
|
||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
||||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
|
||||
github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
|
||||
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
|
||||
github.com/syndtr/goleveldb v0.0.0-20181127023241-353a9fca669c/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
|
||||
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
|
||||
github.com/wendal/errors v0.0.0-20130201093226-f66c77a7882b/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc=
|
||||
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
|
||||
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
||||
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
|
||||
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
|
||||
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
|
||||
go.starlark.net v0.0.0-20190702223751-32f345186213 h1:lkYv5AKwvvduv5XWP6szk/bvvgO6aDeUujhZQXIFTes=
|
||||
go.starlark.net v0.0.0-20190702223751-32f345186213/go.mod h1:c1/X6cHgvdXj6pUlmWKMkuqRnW4K8x2vwt6JAaaircg=
|
||||
go.starlark.net v0.0.0-20220816155156-cfacd8902214 h1:MqijAN3S61c7KWasOk+zIqIjHQPN6WUra/X3+YAkQxQ=
|
||||
go.starlark.net v0.0.0-20220816155156-cfacd8902214/go.mod h1:VZcBMdr3cT3PnBoWunTabuSEXwVAH+ZJ5zxfs3AdASk=
|
||||
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
|
||||
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
|
||||
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
|
||||
|
@ -248,7 +293,9 @@ golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnf
|
|||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
||||
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd h1:XcWmESyNjXJMLahc3mqVQJcgSTDxFxhETVlfk9uGc38=
|
||||
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
||||
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
|
||||
|
@ -267,7 +314,8 @@ golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU
|
|||
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
|
||||
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
|
||||
golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
|
||||
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
|
||||
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
|
||||
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
||||
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
|
@ -282,6 +330,10 @@ golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn
|
|||
golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
|
||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
||||
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
|
||||
golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
|
||||
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
|
||||
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
||||
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||
|
@ -290,6 +342,7 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ
|
|||
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
|
@ -304,13 +357,26 @@ golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7w
|
|||
golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9 h1:L2auWcuQIvxz9xSEqzESnV/QN/gNRXNApHi3fYwl2w0=
|
||||
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
|
||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
|
||||
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
||||
golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
|
||||
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
||||
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
|
@ -324,6 +390,7 @@ golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3
|
|||
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
||||
golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
|
||||
golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
|
||||
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
|
||||
golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
|
||||
golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
|
||||
golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
|
||||
|
@ -331,10 +398,12 @@ golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtn
|
|||
golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.0.0-20191127201027-ecd32218bd7f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.0.0-20200117065230-39095c1d176c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
||||
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
|
||||
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
|
||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
|
||||
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
|
||||
google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
|
||||
|
@ -353,12 +422,28 @@ google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98
|
|||
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
|
||||
google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
|
||||
google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
|
||||
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
|
||||
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
|
||||
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
|
||||
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
|
||||
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
|
||||
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
|
||||
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
|
||||
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
|
||||
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
|
||||
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
|
||||
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
|
||||
google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
||||
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
||||
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
|
||||
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
|
||||
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
|
||||
google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
|
||||
google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
|
||||
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
|
||||
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
|
||||
gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno=
|
||||
gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
|
||||
|
@ -368,11 +453,15 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl
|
|||
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
|
||||
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
|
||||
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
|
||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
||||
rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
github.com/beego/bee/cmd/commands/run/*.go:S1024
|
||||
github.com/beego/bee/cmd/commands/dlv/*.go:S1024
|
||||
github.com/beego/bee/utils/*.go:S1026
|
||||
github.com/beego/bee/v2/cmd/commands/run/*.go:S1024
|
||||
github.com/beego/bee/v2/cmd/commands/dlv/*.go:S1024
|
||||
github.com/beego/bee/v2/utils/*.go:S1026
|
||||
|
|
|
@ -1,11 +1,14 @@
|
|||
package beegopro
|
||||
|
||||
import (
|
||||
"github.com/beego/bee/internal/pkg/utils"
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
"io/ioutil"
|
||||
|
||||
"github.com/beego/bee/v2/internal/pkg/utils"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
)
|
||||
|
||||
var CompareExcept = []string{"@BeeGenerateTime"}
|
||||
|
||||
func (c *Container) GenConfig() {
|
||||
if utils.IsExist(c.BeegoProFile) {
|
||||
beeLogger.Log.Fatalf("beego pro toml exist")
|
||||
|
|
|
@ -2,18 +2,23 @@ package beegopro
|
|||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/beego/bee/internal/pkg/git"
|
||||
"github.com/beego/bee/internal/pkg/system"
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
"github.com/beego/bee/utils"
|
||||
"io/ioutil"
|
||||
"net/url"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/beego/bee/v2/internal/pkg/git"
|
||||
"github.com/beego/bee/v2/internal/pkg/system"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
"github.com/beego/bee/v2/utils"
|
||||
"github.com/davecgh/go-spew/spew"
|
||||
"github.com/pelletier/go-toml"
|
||||
"github.com/spf13/viper"
|
||||
"io/ioutil"
|
||||
"sync"
|
||||
"time"
|
||||
)
|
||||
|
||||
var GitRemotePath utils.DocValue
|
||||
|
||||
const MDateFormat = "20060102_150405"
|
||||
|
||||
var DefaultBeegoPro = &Container{
|
||||
|
@ -29,9 +34,10 @@ var DefaultBeegoPro = &Container{
|
|||
ApiPrefix: "/api",
|
||||
EnableModule: nil,
|
||||
Models: make(map[string]TextModel),
|
||||
GitRemotePath: "https://github.com/beego/beego-pro.git",
|
||||
Branch: "master",
|
||||
GitLocalPath: system.BeegoHome + "/beego-pro",
|
||||
GitRemotePath: "",
|
||||
//GitRemotePath: "https://github.com/beego/beego-pro.git",
|
||||
Branch: "master",
|
||||
//GitLocalPath: system.BeegoHome + "/beego-pro",
|
||||
EnableFormat: true,
|
||||
SourceGen: "text",
|
||||
EnableGitPull: true,
|
||||
|
@ -71,7 +77,6 @@ func (c *Container) initUserOption() {
|
|||
beeLogger.Log.Fatalf("read beego pro config content, err: %s", err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
err = viper.Unmarshal(&c.UserOption)
|
||||
if err != nil {
|
||||
beeLogger.Log.Fatalf("beego pro config unmarshal error, err: %s", err.Error())
|
||||
|
@ -99,10 +104,10 @@ func (c *Container) initUserOption() {
|
|||
if c.UserOption.Debug {
|
||||
fmt.Println("c.modules", c.EnableModules)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func (c *Container) initTemplateOption() {
|
||||
c.GetLocalPath()
|
||||
if c.UserOption.EnableGitPull && (c.GenerateTimeUnix-c.Timestamp.GitCacheLastRefresh > c.UserOption.RefreshGitTime) {
|
||||
err := git.CloneORPullRepo(c.UserOption.GitRemotePath, c.UserOption.GitLocalPath)
|
||||
if err != nil {
|
||||
|
@ -207,3 +212,43 @@ func (c *Container) flushTimestamp() {
|
|||
beeLogger.Log.Fatalf("flush timestamp tmpl parse error, err: %s", err)
|
||||
}
|
||||
}
|
||||
|
||||
func (c *Container) InitToml() {
|
||||
if exist := utils.IsExist(c.BeegoProFile); exist {
|
||||
beeLogger.Log.Fatalf("file beegopro.toml already exists")
|
||||
}
|
||||
sourceFile := c.UserOption.GitLocalPath + "/beegopro.toml"
|
||||
input, err := ioutil.ReadFile(sourceFile)
|
||||
if err != nil {
|
||||
beeLogger.Log.Fatalf("read beegopro.toml file err, %s", err.Error())
|
||||
return
|
||||
}
|
||||
err = ioutil.WriteFile(c.BeegoProFile, input, 0644)
|
||||
if err != nil {
|
||||
beeLogger.Log.Fatalf("create beegopro.toml file err, %s", err.Error())
|
||||
return
|
||||
}
|
||||
beeLogger.Log.Success("Successfully created file beegopro.toml")
|
||||
}
|
||||
|
||||
//form https://github.com/beego/beego-pro.git
|
||||
//get beego/beego-pro
|
||||
func (c *Container) GetLocalPath() {
|
||||
if c.UserOption.GitLocalPath != "" {
|
||||
return
|
||||
}
|
||||
if GitRemotePath != "" {
|
||||
c.UserOption.GitRemotePath = GitRemotePath.String()
|
||||
}
|
||||
if c.UserOption.GitRemotePath == "" {
|
||||
c.UserOption.GitRemotePath = "https://github.com/beego/beego-pro.git"
|
||||
}
|
||||
parse, err := url.Parse(c.UserOption.GitRemotePath)
|
||||
if err != nil {
|
||||
beeLogger.Log.Fatalf("git GitRemotePath err, %s", err.Error())
|
||||
return
|
||||
}
|
||||
s := parse.Path
|
||||
s = strings.TrimRight(s, ".git")
|
||||
c.UserOption.GitLocalPath = system.BeegoHome + s
|
||||
}
|
||||
|
|
|
@ -2,11 +2,12 @@ package beegopro
|
|||
|
||||
import (
|
||||
"database/sql"
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
"github.com/beego/bee/utils"
|
||||
"io/ioutil"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
"github.com/beego/bee/v2/utils"
|
||||
)
|
||||
|
||||
var SQL utils.DocValue
|
||||
|
|
|
@ -3,8 +3,9 @@ package beegopro
|
|||
import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"github.com/beego/bee/internal/pkg/utils"
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
|
||||
"github.com/beego/bee/v2/internal/pkg/utils"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
)
|
||||
|
||||
type MysqlParser struct {
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
package beegopro
|
||||
|
||||
import (
|
||||
"github.com/beego/bee/utils"
|
||||
"github.com/flosch/pongo2"
|
||||
"strings"
|
||||
"unicode/utf8"
|
||||
|
||||
"github.com/beego/bee/v2/utils"
|
||||
"github.com/flosch/pongo2"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
|
|
@ -11,8 +11,8 @@ import (
|
|||
"github.com/flosch/pongo2"
|
||||
"github.com/smartwalle/pongo2render"
|
||||
|
||||
"github.com/beego/bee/internal/pkg/system"
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
"github.com/beego/bee/v2/internal/pkg/system"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
)
|
||||
|
||||
// render
|
||||
|
@ -123,7 +123,7 @@ func (r *RenderFile) Exec(name string) {
|
|||
var orgContent []byte
|
||||
if err == nil {
|
||||
if org, err := os.OpenFile(r.Descriptor.DstPath, os.O_RDONLY, 0666); err == nil {
|
||||
orgContent,_ = ioutil.ReadAll(org)
|
||||
orgContent, _ = ioutil.ReadAll(org)
|
||||
org.Close()
|
||||
} else {
|
||||
beeLogger.Log.Infof("file err %s", err)
|
||||
|
@ -151,4 +151,3 @@ func (r *RenderFile) Exec(name string) {
|
|||
beeLogger.Log.Infof("create file '%s' from %s", r.FlushFile, r.PackageName)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -2,15 +2,16 @@ package beegopro
|
|||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/beego/bee/internal/pkg/command"
|
||||
"github.com/beego/bee/internal/pkg/system"
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
"github.com/beego/bee/utils"
|
||||
"github.com/flosch/pongo2"
|
||||
"github.com/smartwalle/pongo2render"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"sync"
|
||||
|
||||
"github.com/beego/bee/v2/internal/pkg/command"
|
||||
"github.com/beego/bee/v2/internal/pkg/system"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
"github.com/beego/bee/v2/utils"
|
||||
"github.com/flosch/pongo2"
|
||||
"github.com/smartwalle/pongo2render"
|
||||
)
|
||||
|
||||
// store all data
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
package beegopro
|
||||
|
||||
import (
|
||||
"github.com/beego/bee/utils"
|
||||
"strings"
|
||||
|
||||
"github.com/beego/bee/v2/utils"
|
||||
)
|
||||
|
||||
// parse get the model info
|
||||
|
|
|
@ -3,7 +3,8 @@ package beegopro
|
|||
import (
|
||||
"database/sql"
|
||||
"errors"
|
||||
"github.com/beego/bee/logger"
|
||||
|
||||
"github.com/beego/bee/v2/logger"
|
||||
)
|
||||
|
||||
type TableSchema struct {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package beegopro
|
||||
|
||||
import (
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
)
|
||||
|
||||
type TextModel struct {
|
||||
|
|
|
@ -11,8 +11,8 @@ import (
|
|||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/beego/bee/internal/pkg/utils"
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
"github.com/beego/bee/v2/internal/pkg/utils"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
)
|
||||
|
||||
// write to file
|
||||
|
@ -173,14 +173,14 @@ func getModelType(orm string) (inputType, goType, mysqlType, tag string) {
|
|||
return
|
||||
}
|
||||
|
||||
func FileContentChange(org,new []byte, seg string) bool {
|
||||
func FileContentChange(org, new []byte, seg string) bool {
|
||||
if len(org) == 0 {
|
||||
return true
|
||||
}
|
||||
orgContent := GetFilterContent(string(org),seg)
|
||||
newContent := GetFilterContent(string(new),seg)
|
||||
orgContent := GetFilterContent(string(org), seg)
|
||||
newContent := GetFilterContent(string(new), seg)
|
||||
orgMd5 := md5.Sum([]byte(orgContent))
|
||||
newMd5:= md5.Sum([]byte(newContent))
|
||||
newMd5 := md5.Sum([]byte(newContent))
|
||||
if orgMd5 != newMd5 {
|
||||
return true
|
||||
}
|
||||
|
@ -193,7 +193,7 @@ func GetFilterContent(content string, seg string) string {
|
|||
for _, s := range strings.Split(content, "\n") {
|
||||
s = strings.TrimSpace(strings.TrimPrefix(s, seg))
|
||||
var have bool
|
||||
for _,except := range CompareExcept{
|
||||
for _, except := range CompareExcept {
|
||||
if strings.HasPrefix(s, except) {
|
||||
have = true
|
||||
}
|
||||
|
|
|
@ -3,13 +3,14 @@ package git
|
|||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"github.com/beego/bee/internal/pkg/command"
|
||||
"github.com/beego/bee/internal/pkg/utils"
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
"path/filepath"
|
||||
"sort"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/beego/bee/v2/internal/pkg/command"
|
||||
"github.com/beego/bee/v2/internal/pkg/utils"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
)
|
||||
|
||||
// git tag
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
package utils
|
||||
|
||||
import (
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
"os"
|
||||
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
)
|
||||
|
||||
// Mkdir ...
|
||||
|
|
|
@ -54,7 +54,7 @@ func NewModeColorWriter(w io.Writer, mode outputMode) io.Writer {
|
|||
}
|
||||
|
||||
func Bold(message string) string {
|
||||
return fmt.Sprintf("\x1b[1m%s\x1b[21m", message)
|
||||
return fmt.Sprintf("\x1b[1m%s\x1b[0m", message)
|
||||
}
|
||||
|
||||
// Black returns a black string
|
||||
|
|
|
@ -378,7 +378,6 @@ func (cw *colorWriter) Write(p []byte) (int, error) {
|
|||
switch ch {
|
||||
case firstCsiChar:
|
||||
cw.paramStartBuf.WriteByte(ch)
|
||||
break
|
||||
case secondeCsiChar:
|
||||
cw.paramStartBuf.WriteByte(ch)
|
||||
cw.state = secondCsiCode
|
||||
|
|
|
@ -24,7 +24,7 @@ import (
|
|||
"text/template"
|
||||
"time"
|
||||
|
||||
"github.com/beego/bee/logger/colors"
|
||||
"github.com/beego/bee/v2/logger/colors"
|
||||
)
|
||||
|
||||
var errInvalidLogLevel = errors.New("logger: invalid log level")
|
||||
|
|
8
main.go
8
main.go
|
@ -18,10 +18,10 @@ import (
|
|||
"log"
|
||||
"os"
|
||||
|
||||
"github.com/beego/bee/cmd"
|
||||
"github.com/beego/bee/cmd/commands"
|
||||
"github.com/beego/bee/config"
|
||||
"github.com/beego/bee/utils"
|
||||
"github.com/beego/bee/v2/cmd"
|
||||
"github.com/beego/bee/v2/cmd/commands"
|
||||
"github.com/beego/bee/v2/config"
|
||||
"github.com/beego/bee/v2/utils"
|
||||
)
|
||||
|
||||
func main() {
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
#!/bin/sh
|
||||
|
||||
export GO111MODULE=on
|
||||
go get github.com/beego/bee/v2@latest
|
||||
bee new hello
|
||||
cd hello
|
||||
bee run
|
|
@ -1 +1 @@
|
|||
github.com/beego/bee/generate/swaggergen/*.go:SA1024
|
||||
github.com/beego/bee/v2/generate/swaggergen/*.go:SA1024
|
||||
|
|
|
@ -21,7 +21,7 @@ import (
|
|||
|
||||
"runtime"
|
||||
|
||||
"github.com/beego/bee/config"
|
||||
"github.com/beego/bee/v2/config"
|
||||
)
|
||||
|
||||
const appName = "Beego"
|
||||
|
|
105
utils/utils.go
105
utils/utils.go
|
@ -32,14 +32,24 @@ import (
|
|||
"time"
|
||||
"unicode"
|
||||
|
||||
"github.com/beego/bee/config"
|
||||
"github.com/beego/bee/internal/pkg/system"
|
||||
beeLogger "github.com/beego/bee/logger"
|
||||
"github.com/beego/bee/logger/colors"
|
||||
"github.com/beego/bee/v2/config"
|
||||
"github.com/beego/bee/v2/internal/pkg/system"
|
||||
beeLogger "github.com/beego/bee/v2/logger"
|
||||
"github.com/beego/bee/v2/logger/colors"
|
||||
)
|
||||
|
||||
type tagName struct {
|
||||
Name string `json:"name"`
|
||||
Name string `json:"name"`
|
||||
}
|
||||
|
||||
type Repos struct {
|
||||
UpdatedAt time.Time `json:"updated_at"`
|
||||
PushedAt time.Time `json:"pushed_at"`
|
||||
}
|
||||
|
||||
type Releases struct {
|
||||
PublishedAt time.Time `json:"published_at"`
|
||||
TagName string `json:"tag_name"`
|
||||
}
|
||||
|
||||
func GetBeeWorkPath() string {
|
||||
|
@ -88,7 +98,7 @@ func IsInGOPATH(thePath string) bool {
|
|||
// IsBeegoProject checks whether the current path is a Beego application or not
|
||||
func IsBeegoProject(thePath string) bool {
|
||||
mainFiles := []string{}
|
||||
hasBeegoRegex := regexp.MustCompile(`(?s)package main.*?import.*?\(.*?github.com/astaxie/beego".*?\).*func main()`)
|
||||
hasBeegoRegex := regexp.MustCompile(`(?s)package main.*?import.*?\(.*?github.com/beego/beego/v2".*?\).*func main()`)
|
||||
c := make(chan error)
|
||||
// Walk the application path tree to look for main files.
|
||||
// Main files must satisfy the 'hasBeegoRegex' regular expression.
|
||||
|
@ -521,7 +531,7 @@ func NoticeUpdateBee() {
|
|||
beeLogger.Log.Info("Getting bee latest version...")
|
||||
versionLast := BeeLastVersion()
|
||||
versionNow := config.Version
|
||||
if versionLast == ""{
|
||||
if versionLast == "" {
|
||||
beeLogger.Log.Warn("Get latest version err")
|
||||
return
|
||||
}
|
||||
|
@ -559,3 +569,84 @@ func BeeLastVersion() (version string) {
|
|||
beeLogger.Log.Warn("There is no tags!")
|
||||
return
|
||||
}
|
||||
|
||||
// get info of bee repos
|
||||
func BeeReposInfo() (repos Repos) {
|
||||
var url = "https://api.github.com/repos/beego/bee"
|
||||
resp, err := http.Get(url)
|
||||
if err != nil {
|
||||
beeLogger.Log.Warnf("Get bee repos from github error: %s", err)
|
||||
return
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
bodyContent, _ := ioutil.ReadAll(resp.Body)
|
||||
if err = json.Unmarshal(bodyContent, &repos); err != nil {
|
||||
beeLogger.Log.Warnf("Unmarshal repos body error: %s", err)
|
||||
return
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// get info of bee releases
|
||||
func BeeReleasesInfo() (repos []Releases) {
|
||||
var url = "https://api.github.com/repos/beego/bee/releases"
|
||||
resp, err := http.Get(url)
|
||||
if err != nil {
|
||||
beeLogger.Log.Warnf("Get bee releases from github error: %s", err)
|
||||
return
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
bodyContent, _ := ioutil.ReadAll(resp.Body)
|
||||
if err = json.Unmarshal(bodyContent, &repos); err != nil {
|
||||
beeLogger.Log.Warnf("Unmarshal releases body error: %s", err)
|
||||
return
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
//TODO merge UpdateLastPublishedTime and NoticeUpdateBee
|
||||
func UpdateLastPublishedTime() {
|
||||
info := BeeReleasesInfo()
|
||||
if len(info) == 0 {
|
||||
beeLogger.Log.Warn("Has no releases")
|
||||
return
|
||||
}
|
||||
createdAt := info[0].PublishedAt.Format("2006-01-02")
|
||||
beeHome := system.BeegoHome
|
||||
if !IsExist(beeHome) {
|
||||
if err := os.MkdirAll(beeHome, 0755); err != nil {
|
||||
beeLogger.Log.Fatalf("Could not create the directory: %s", err)
|
||||
return
|
||||
}
|
||||
}
|
||||
fp := beeHome + "/.lastPublishedAt"
|
||||
w, err := os.OpenFile(fp, os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0644)
|
||||
if err != nil {
|
||||
beeLogger.Log.Warnf("Open .lastPublishedAt file err: %s", err)
|
||||
return
|
||||
}
|
||||
defer w.Close()
|
||||
if _, err := w.WriteString(createdAt); err != nil {
|
||||
beeLogger.Log.Warnf("Update .lastPublishedAt file err: %s", err)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
func GetLastPublishedTime() string {
|
||||
fp := system.BeegoHome + "/.lastPublishedAt"
|
||||
if !IsExist(fp) {
|
||||
UpdateLastPublishedTime()
|
||||
}
|
||||
w, err := os.OpenFile(fp, os.O_RDONLY, 0644)
|
||||
if err != nil {
|
||||
beeLogger.Log.Warnf("Open .lastPublishedAt file err: %s", err)
|
||||
return "unknown"
|
||||
}
|
||||
t := make([]byte, 1024)
|
||||
read, err := w.Read(t)
|
||||
if err != nil {
|
||||
beeLogger.Log.Warnf("read .lastPublishedAt file err: %s", err)
|
||||
return "unknown"
|
||||
}
|
||||
return string(t[:read])
|
||||
}
|
||||
|
|
|
@ -0,0 +1,17 @@
|
|||
// Copyright 2020
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package utils
|
||||
|
||||
const BEEGO_VERSION = "v2.1.0"
|
Loading…
Reference in New Issue