lbsadmin
/
bee
mirror of https://github.com/beego/bee.git
1
0
Fork 0
Code Issues Releases Activity

print lastPushedTime & update readme.md

This commit is contained in:
wangle 2020-09-14 23:27:33 +08:00
parent 81ed06ea01
commit 7a7357a983
9 changed files with 230 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

242
README.md
View File

@ -41,6 +41,7 @@ Bee provides a variety of commands which can be helpful at various stages of dev
api Creates a Beego API application api Creates a Beego API application
bale Transforms non-Go files to Go source files bale Transforms non-Go files to Go source files
fix Fixes your application by making it compatible with newer versions of Beego fix Fixes your application by making it compatible with newer versions of Beego
pro Source code generator
dlv Start a debugging session using Delve dlv Start a debugging session using Delve
dockerize Generates a Dockerfile for your Beego application dockerize Generates a Dockerfile for your Beego application
generate Source code generator generate Source code generator
@ -49,7 +50,8 @@ Bee provides a variety of commands which can be helpful at various stages of dev
pack Compresses a Beego application into a single file pack Compresses a Beego application into a single file
rs Run customized scripts rs Run customized scripts
run Run the application by starting a local development server run Run the application by starting a local development server
server serving static content over HTTP on port
update Update Bee
``` ```
### bee version ### bee version
@ -63,17 +65,17 @@ ______
| |_/ / ___ ___ | |_/ / ___ ___
| ___ \ / _ \ / _ \ | ___ \ / _ \ / _ \
| |_/ /| __/| __/ | |_/ /| __/| __/
\____/ \___| \___| v1.6.2 \____/ \___| \___| v1.12.1
├── Beego : 1.7.2 ├── Beego : 1.12.2
├── GoVersion : go1.7.4 ├── GoVersion : go1.14.1
├── GOOS : linux ├── GOOS : darwin
├── GOARCH : amd64 ├── GOARCH : amd64
├── NumCPU : 2 ├── NumCPU : 4
├── GOPATH : /home/beeuser/.go ├── GOPATH : /home/beeuser/.go
├── GOROOT : /usr/lib/go ├── GOROOT : /usr/local/Cellar/go/1.14.1/libexec
├── Compiler : gc ├── Compiler : gc
└── Date : Monday, 26 Dec 2016 └── UpdatedAt : 2020-09-13
``` ```
You can also change the output format using `-o` flag: You can also change the output format using `-o` flag:
@ -81,15 +83,16 @@ You can also change the output format using `-o` flag:
```bash ```bash
$ bee version -o json $ bee version -o json
{ {
"GoVersion": "go1.7.4", "GoVersion": "go1.14.1",
"GOOS": "linux", "GOOS": "darwin",
"GOARCH": "amd64", "GOARCH": "amd64",
"NumCPU": 2, "NumCPU": 4,
"GOPATH": "/home/beeuser/.go", "GOPATH": "/home/beeuser/.go",
"GOROOT": "/usr/lib/go", "GOROOT": "/usr/local/Cellar/go/1.14.1/libexec",
"Compiler": "gc", "Compiler": "gc",
"BeeVersion": "1.6.2", "BeeVersion": "1.12.1",
"BeegoVersion": "1.7.2" "BeegoVersion": "1.12.2",
"UpdatedAt": "2020-09-13"
} }
``` ```
@ -101,31 +104,27 @@ To create a new Beego web application:
```bash ```bash
$ bee new my-web-app $ bee new my-web-app
______ 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/
\____/ \___| \___| v1.6.2 create /Users/beeuser/learn/my-web-app/controllers/
2016/12/26 22:28:11 INFO ▶ 0001 Creating application... create /Users/beeuser/learn/my-web-app/models/
create /home/beeuser/.go/src/github.com/user/my-web-app/ create /Users/beeuser/learn/my-web-app/routers/
create /home/beeuser/.go/src/github.com/user/my-web-app/conf/ create /Users/beeuser/learn/my-web-app/tests/
create /home/beeuser/.go/src/github.com/user/my-web-app/controllers/ create /Users/beeuser/learn/my-web-app/static/
create /home/beeuser/.go/src/github.com/user/my-web-app/models/ create /Users/beeuser/learn/my-web-app/static/js/
create /home/beeuser/.go/src/github.com/user/my-web-app/routers/ create /Users/beeuser/learn/my-web-app/static/css/
create /home/beeuser/.go/src/github.com/user/my-web-app/tests/ create /Users/beeuser/learn/my-web-app/static/img/
create /home/beeuser/.go/src/github.com/user/my-web-app/static/ create /Users/beeuser/learn/my-web-app/views/
create /home/beeuser/.go/src/github.com/user/my-web-app/static/js/ create /Users/beeuser/learn/my-web-app/conf/app.conf
create /home/beeuser/.go/src/github.com/user/my-web-app/static/css/ create /Users/beeuser/learn/my-web-app/controllers/default.go
create /home/beeuser/.go/src/github.com/user/my-web-app/static/img/ create /Users/beeuser/learn/my-web-app/views/index.tpl
create /home/beeuser/.go/src/github.com/user/my-web-app/views/ create /Users/beeuser/learn/my-web-app/routers/router.go
create /home/beeuser/.go/src/github.com/user/my-web-app/conf/app.conf create /Users/beeuser/learn/my-web-app/tests/default_test.go
create /home/beeuser/.go/src/github.com/user/my-web-app/controllers/default.go create /Users/beeuser/learn/my-web-app/main.go
create /home/beeuser/.go/src/github.com/user/my-web-app/views/index.tpl 2020/09/14 22:28:51 SUCCESS ▶ 0003 New application successfully created!
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!
``` ```
For more information on the usage, run `bee help new`. For more information on the usage, run `bee help new`.
@ -138,12 +137,6 @@ To run the application we just created, you can navigate to the application fold
$ cd my-web-app && bee run $ 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`. For more information on the usage, run `bee help run`.
### bee pack ### bee pack
@ -157,7 +150,7 @@ ______
| |_/ / ___ ___ | |_/ / ___ ___
| ___ \ / _ \ / _ \ | ___ \ / _ \ / _ \
| |_/ /| __/| __/ | |_/ /| __/| __/
\____/ \___| \___| v1.6.2 \____/ \___| \___| v1.12.1
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 ▶ 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 ▶ 0002 Building application...
2016/12/26 22:29:29 INFO ▶ 0003 Using: GOOS=linux GOARCH=amd64 2016/12/26 22:29:29 INFO ▶ 0003 Using: GOOS=linux GOARCH=amd64
@ -213,23 +206,25 @@ ______
| |_/ / ___ ___ | |_/ / ___ ___
| ___ \ / _ \ / _ \ | ___ \ / _ \ / _ \
| |_/ /| __/| __/ | |_/ /| __/| __/
\____/ \___| \___| v1.6.2 \____/ \___| \___| v1.12.1
2016/12/26 22:30:12 INFO ▶ 0001 Creating API... 2020/09/14 22:35:11 INFO ▶ 0001 generate api project support go modules.
create /home/beeuser/.go/src/github.com/user/my-api 2020/09/14 22:35:11 INFO ▶ 0002 Creating API...
create /home/beeuser/.go/src/github.com/user/my-api/conf create /Users/beeuser/code/learn/my-api/go.mod
create /home/beeuser/.go/src/github.com/user/my-api/controllers create /Users/beeuser/code/learn/my-api
create /home/beeuser/.go/src/github.com/user/my-api/tests create /Users/beeuser/code/learn/my-api/conf
create /home/beeuser/.go/src/github.com/user/my-api/conf/app.conf create /Users/beeuser/code/learn/my-api/controllers
create /home/beeuser/.go/src/github.com/user/my-api/models create /Users/beeuser/code/learn/my-api/tests
create /home/beeuser/.go/src/github.com/user/my-api/routers/ create /Users/beeuser/code/learn/my-api/conf/app.conf
create /home/beeuser/.go/src/github.com/user/my-api/controllers/object.go create /Users/beeuser/code/learn/my-api/models
create /home/beeuser/.go/src/github.com/user/my-api/controllers/user.go create /Users/beeuser/code/learn/my-api/routers/
create /home/beeuser/.go/src/github.com/user/my-api/tests/default_test.go create /Users/beeuser/code/learn/my-api/controllers/object.go
create /home/beeuser/.go/src/github.com/user/my-api/routers/router.go create /Users/beeuser/code/learn/my-api/controllers/user.go
create /home/beeuser/.go/src/github.com/user/my-api/models/object.go create /Users/beeuser/code/learn/my-api/tests/default_test.go
create /home/beeuser/.go/src/github.com/user/my-api/models/user.go create /Users/beeuser/code/learn/my-api/routers/router.go
create /home/beeuser/.go/src/github.com/user/my-api/main.go create /Users/beeuser/code/learn/my-api/models/object.go
2016/12/26 22:30:12 SUCCESS ▶ 0002 New API successfully created! 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`. For more information on the usage, run `bee help api`.
@ -245,26 +240,18 @@ ______
| |_/ / ___ ___ | |_/ / ___ ___
| ___ \ / _ \ / _ \ | ___ \ / _ \ / _ \
| |_/ /| __/| __/ | |_/ /| __/| __/
\____/ \___| \___| v1.6.2 \____/ \___| \___| v1.12.1
2016/12/26 22:30:58 INFO ▶ 0001 Creating application... 2020/09/14 22:36:39 INFO ▶ 0001 generate api project support go modules.
create /home/beeuser/.go/src/github.com/user/my-rpc-app/ 2020/09/14 22:36:39 INFO ▶ 0002 Creating Hprose application...
create /home/beeuser/.go/src/github.com/user/my-rpc-app/conf/ create /Users/beeuser/code/learn/my-rpc-app/go.mod
create /home/beeuser/.go/src/github.com/user/my-rpc-app/controllers/ create /Users/beeuser/code/learn/my-rpc-app
create /home/beeuser/.go/src/github.com/user/my-rpc-app/models/ create /Users/beeuser/code/learn/my-rpc-app/conf
create /home/beeuser/.go/src/github.com/user/my-rpc-app/routers/ create /Users/beeuser/code/learn/my-rpc-app/conf/app.conf
create /home/beeuser/.go/src/github.com/user/my-rpc-app/tests/ create /Users/beeuser/code/learn/my-rpc-app/models
create /home/beeuser/.go/src/github.com/user/my-rpc-app/static/ create /Users/beeuser/code/learn/my-rpc-app/models/object.go
create /home/beeuser/.go/src/github.com/user/my-rpc-app/static/js/ create /Users/beeuser/code/learn/my-rpc-app/models/user.go
create /home/beeuser/.go/src/github.com/user/my-rpc-app/static/css/ create /Users/beeuser/code/learn/my-rpc-app/main.go
create /home/beeuser/.go/src/github.com/user/my-rpc-app/static/img/ 2020/09/14 22:36:39 SUCCESS ▶ 0003 New Hprose application successfully created!
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!
``` ```
For more information on the usage, run `bee help hprose`. For more information on the usage, run `bee help hprose`.
@ -280,9 +267,8 @@ ______
| |_/ / ___ ___ | |_/ / ___ ___
| ___ \ / _ \ / _ \ | ___ \ / _ \ / _ \
| |_/ /| __/| __/ | |_/ /| __/| __/
\____/ \___| \___| v1.6.2 \____/ \___| \___| v1.12.1
2016/12/26 22:32:41 INFO ▶ 0001 Loading configuration from 'bee.json'... 2020/09/14 22:37:56 SUCCESS ▶ 0001 Baled resources successfully!
2016/12/26 22:32:41 SUCCESS ▶ 0002 Baled resources successfully!
``` ```
For more information on the usage, run `bee help bale`. For more information on the usage, run `bee help bale`.
@ -306,11 +292,11 @@ ______
| |_/ / ___ ___ | |_/ / ___ ___
| ___ \ / _ \ / _ \ | ___ \ / _ \ / _ \
| |_/ /| __/| __/ | |_/ /| __/| __/
\____/ \___| \___| v1.6.2 \____/ \___| \___| v1.12.1
2016/12/26 22:33:58 INFO ▶ 0001 Using 'Hello' as controller name 2020/09/14 22:38:44 INFO ▶ 0001 Using 'Hello' as controller name
2016/12/26 22:33:58 INFO ▶ 0002 Using 'controllers' as package name 2020/09/14 22:38:44 INFO ▶ 0002 Using 'controllers' as package name
create /home/beeuser/.go/src/github.com/user/my-web-app/controllers/hello.go create /Users/beeuser/code/learn/my-api/controllers/hello.go
2016/12/26 22:33:58 SUCCESS ▶ 0003 Controller successfully generated! 2020/09/14 22:38:44 SUCCESS ▶ 0003 Controller successfully generated!
``` ```
For more information on the usage, run `bee help generate`. For more information on the usage, run `bee help generate`.
@ -328,9 +314,9 @@ ______
| |_/ / ___ ___ | |_/ / ___ ___
| ___ \ / _ \ / _ \ | ___ \ / _ \ / _ \
| |_/ /| __/| __/ | |_/ /| __/| __/
\____/ \___| \___| v1.6.2 \____/ \___| \___| v1.12.1
2016/12/26 22:34:54 INFO ▶ 0001 Generating Dockerfile... 2020/09/14 22:40:12 INFO ▶ 0001 Generating Dockerfile...
2016/12/26 22:34:54 SUCCESS ▶ 0002 Dockerfile generated. 2020/09/14 22:40:12 SUCCESS ▶ 0002 Dockerfile generated.
``` ```
For more information on the usage, run `bee help dockerize`. For more information on the usage, run `bee help dockerize`.
@ -345,8 +331,8 @@ ______
| |_/ / ___ ___ | |_/ / ___ ___
| ___ \ / _ \ / _ \ | ___ \ / _ \ / _ \
| |_/ /| __/| __/ | |_/ /| __/| __/
\____/ \___| \___| v1.8.0 \____/ \___| \___| v1.12.1
2017/03/22 11:17:05 INFO ▶ 0001 Starting Delve Debugger... 2020/09/14 22:40:12 INFO ▶ 0001 Starting Delve Debugger...
Type 'help' for list of commands. Type 'help' for list of commands.
(dlv) break main.main (dlv) break main.main
Breakpoint 1 set at 0x40100f for main.main() ./main.go:8 Breakpoint 1 set at 0x40100f for main.main() ./main.go:8
@ -366,6 +352,68 @@ Breakpoint 1 set at 0x40100f for main.main() ./main.go:8
For more information on the usage, run `bee help dlv`. 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 ## Shortcuts
Because you'll likely type these generator commands over and over, it makes sense to create aliases: Because you'll likely type these generator commands over and over, it makes sense to create aliases:
@ -520,7 +568,7 @@ Rebasing will update your branch with the most recent code and make your changes
## Licence ## Licence
```text ```text
Copyright 2016 bee authors Copyright 2020 bee authors
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.

5
cmd/commands/update/update.go
View File

@ -8,6 +8,7 @@ import (
"github.com/beego/bee/cmd/commands" "github.com/beego/bee/cmd/commands"
"github.com/beego/bee/config" "github.com/beego/bee/config"
beeLogger "github.com/beego/bee/logger" beeLogger "github.com/beego/bee/logger"
"github.com/beego/bee/utils"
) )
var CmdUpdate = &commands.Command{ var CmdUpdate = &commands.Command{
@ -32,7 +33,9 @@ func updateBee(cmd *commands.Command, args []string) int {
cmdUp.Stdout = os.Stdout cmdUp.Stdout = os.Stdout
cmdUp.Stderr = os.Stderr cmdUp.Stderr = os.Stderr
if err := cmdUp.Run(); err != nil { if err := cmdUp.Run(); err != nil {
beeLogger.Log.Warnf("Run cmd err:%s",err) beeLogger.Log.Warnf("Run cmd err:%s", err)
} }
// update the pushedTime when updateBee every time
utils.UpdateLastPushedTime()
return 0 return 0
} }

3
cmd/commands/version/banner.go
View File

@ -10,6 +10,7 @@ import (
"time" "time"
beeLogger "github.com/beego/bee/logger" beeLogger "github.com/beego/bee/logger"
"github.com/beego/bee/utils"
) )
// RuntimeInfo holds information about the current runtime. // RuntimeInfo holds information about the current runtime.
@ -23,6 +24,7 @@ type RuntimeInfo struct {
Compiler string Compiler string
BeeVersion string BeeVersion string
BeegoVersion string BeegoVersion string
UpdatedAt string
} }
// InitBanner loads the banner and prints it to output // InitBanner loads the banner and prints it to output
@ -60,6 +62,7 @@ func show(out io.Writer, content string) {
runtime.Compiler, runtime.Compiler,
version, version,
GetBeegoVersion(), GetBeegoVersion(),
utils.GetLastPushedTime(),
}) })
if err != nil { if err != nil {
beeLogger.Log.Error(err.Error()) beeLogger.Log.Error(err.Error())

3
cmd/commands/version/version.go
View File

@ -38,7 +38,7 @@ const verboseVersionBanner string = `%s%s______
├── GOPATH : {{ .GOPATH }} ├── GOPATH : {{ .GOPATH }}
├── GOROOT : {{ .GOROOT }} ├── GOROOT : {{ .GOROOT }}
├── Compiler : {{ .Compiler }} ├── Compiler : {{ .Compiler }}
└── Date : {{ Now "Monday, 2 Jan 2006" }}%s └── UpdatedAt : {{ .UpdatedAt }}%s
` `
const shortVersionBanner = `______ const shortVersionBanner = `______
@ -84,6 +84,7 @@ func versionCmd(cmd *commands.Command, args []string) int {
runtime.Compiler, runtime.Compiler,
version, version,
GetBeegoVersion(), GetBeegoVersion(),
utils.GetLastPushedTime(),
} }
switch outputFormat { switch outputFormat {
case "json": case "json":

3
config/conf.go
View File

@ -27,11 +27,10 @@ import (
const confVer = 0 const confVer = 0
const ( const (
Version = "1.12.0" Version = "1.12.1"
GitRemotePath = "github.com/beego/bee" GitRemotePath = "github.com/beego/bee"
) )
var Conf = struct { var Conf = struct {
Version int Version int
WatchExts []string `json:"watch_ext" yaml:"watch_ext"` WatchExts []string `json:"watch_ext" yaml:"watch_ext"`

2
internal/app/module/beegopro/config.go
View File

@ -5,7 +5,9 @@ import (
beeLogger "github.com/beego/bee/logger" beeLogger "github.com/beego/bee/logger"
"io/ioutil" "io/ioutil"
) )
var CompareExcept = []string{"@BeeGenerateTime"} var CompareExcept = []string{"@BeeGenerateTime"}
func (c *Container) GenConfig() { func (c *Container) GenConfig() {
if utils.IsExist(c.BeegoProFile) { if utils.IsExist(c.BeegoProFile) {
beeLogger.Log.Fatalf("beego pro toml exist") beeLogger.Log.Fatalf("beego pro toml exist")

3
internal/app/module/beegopro/render.go
View File

@ -123,7 +123,7 @@ func (r *RenderFile) Exec(name string) {
var orgContent []byte var orgContent []byte
if err == nil { if err == nil {
if org, err := os.OpenFile(r.Descriptor.DstPath, os.O_RDONLY, 0666); 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() org.Close()
} else { } else {
beeLogger.Log.Infof("file err %s", err) 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) beeLogger.Log.Infof("create file '%s' from %s", r.FlushFile, r.PackageName)
} }
} }

10
internal/app/module/beegopro/util.go
View File

@ -173,14 +173,14 @@ func getModelType(orm string) (inputType, goType, mysqlType, tag string) {
return return
} }
func FileContentChange(org,new []byte, seg string) bool { func FileContentChange(org, new []byte, seg string) bool {
if len(org) == 0 { if len(org) == 0 {
return true return true
} }
orgContent := GetFilterContent(string(org),seg) orgContent := GetFilterContent(string(org), seg)
newContent := GetFilterContent(string(new),seg) newContent := GetFilterContent(string(new), seg)
orgMd5 := md5.Sum([]byte(orgContent)) orgMd5 := md5.Sum([]byte(orgContent))
newMd5:= md5.Sum([]byte(newContent)) newMd5 := md5.Sum([]byte(newContent))
if orgMd5 != newMd5 { if orgMd5 != newMd5 {
return true return true
} }
@ -193,7 +193,7 @@ func GetFilterContent(content string, seg string) string {
for _, s := range strings.Split(content, "\n") { for _, s := range strings.Split(content, "\n") {
s = strings.TrimSpace(strings.TrimPrefix(s, seg)) s = strings.TrimSpace(strings.TrimPrefix(s, seg))
var have bool var have bool
for _,except := range CompareExcept{ for _, except := range CompareExcept {
if strings.HasPrefix(s, except) { if strings.HasPrefix(s, except) {
have = true have = true
} }

69
utils/utils.go
View File

@ -39,7 +39,12 @@ import (
) )
type tagName struct { 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"`
} }
func GetBeeWorkPath() string { func GetBeeWorkPath() string {
@ -521,7 +526,7 @@ func NoticeUpdateBee() {
beeLogger.Log.Info("Getting bee latest version...") beeLogger.Log.Info("Getting bee latest version...")
versionLast := BeeLastVersion() versionLast := BeeLastVersion()
versionNow := config.Version versionNow := config.Version
if versionLast == ""{ if versionLast == "" {
beeLogger.Log.Warn("Get latest version err") beeLogger.Log.Warn("Get latest version err")
return return
} }
@ -559,3 +564,63 @@ func BeeLastVersion() (version string) {
beeLogger.Log.Warn("There is no tags！") beeLogger.Log.Warn("There is no tags！")
return return
} }
// get info of repos bee
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
}
//TODO UpdateLastTime and NoticeUpdateBee
func UpdateLastPushedTime() {
info := BeeReposInfo()
createdAt := info.PushedAt.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 + "/.lastUpdatedAt"
w, err := os.OpenFile(fp, os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0644)
if err != nil {
beeLogger.Log.Warnf("Open .lastUpdatedAt file err: %s", err)
return
}
defer w.Close()
if _, err := w.WriteString(createdAt); err != nil {
beeLogger.Log.Warnf("Update lastUpdatedAt file err: %s", err)
return
}
}
func GetLastPushedTime() string {
fp := system.BeegoHome + "/.lastUpdatedAt"
if !IsExist(fp) {
UpdateLastPushedTime()
}
w, err := os.OpenFile(fp, os.O_RDONLY, 0644)
if err != nil {
beeLogger.Log.Warnf("Open .lastUpdatedAt file err: %s", err)
return "unknown"
}
t := make([]byte, 1024)
read, err := w.Read(t)
if err != nil {
beeLogger.Log.Warnf("read .lastUpdatedAt file err: %s", err)
return "unknown"
}
return string(t[:read])
}