Skip to content

Commit 1760203

Browse files
committed
feat(jzero): Update template log and gitignore
feat(jzero): Update template log and gitignore
1 parent 338c281 commit 1760203

10 files changed

Lines changed: 24 additions & 54 deletions

File tree

.github/workflows/upload.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
cd simpleapi
4141
jzero gen swagger
4242
jzero gen sdk
43-
jzero format
43+
jzero format --git-change=false
4444
go mod tidy && go mod download
4545
go run main.go version
4646
git config user.name "dependabot[bot]"
@@ -57,7 +57,7 @@ jobs:
5757
jzero gen swagger
5858
jzero gen sdk
5959
jzero gen zrpcclient
60-
jzero format
60+
jzero format --git-change=false
6161
go mod tidy && go mod download
6262
go run main.go version
6363
git add .
@@ -71,7 +71,7 @@ jobs:
7171
cd simplerpc
7272
jzero gen swagger
7373
jzero gen zrpcclient
74-
jzero format
74+
jzero format --git-change=false
7575
go mod tidy && go mod download
7676
go run main.go version
7777
git add .
@@ -84,7 +84,7 @@ jobs:
8484
jzero new simpleapi-serverless --frame api --features serverless
8585
cd simpleapi-serverless
8686
jzero gen swagger
87-
jzero format
87+
jzero format --git-change=false
8888
go mod tidy && go mod download
8989
go run main.go version
9090
git add .
@@ -99,7 +99,7 @@ jobs:
9999
cd simplerpc-goctl
100100
jzero gen swagger
101101
jzero gen zrpcclient
102-
jzero format
102+
jzero format --git-change=false
103103
go mod tidy && go mod download
104104
go build && rm -rf simplerpc-goctl
105105
git add .

cmd/jzero/.template/frame/api/app/.gitignore.tpl

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
# Go workspace file
2121
go.work
22+
go.work.sum
2223

2324
# idea
2425
.idea
@@ -27,12 +28,4 @@ go.work
2728
.vscode
2829

2930
# logs
30-
logs
31-
32-
# goreleaser output
33-
dist
34-
35-
# unix sock
36-
*.sock
37-
38-
/{{ .APP }}
31+
logs

cmd/jzero/.template/frame/api/app/cmd/server.go.tpl

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package cmd
22

33
import (
4-
"os"
5-
64
"github.com/spf13/cobra"
75
configurator "github.com/zeromicro/go-zero/core/configcenter"
86
"github.com/jzero-io/jzero/core/configcenter/subscriber"
@@ -31,12 +29,7 @@ var serverCmd = &cobra.Command{
3129
logx.Must(err)
3230

3331
// set up logger
34-
if err := logx.SetUp(c.Log.LogConf); err != nil {
35-
logx.Must(err)
36-
}
37-
if c.Log.LogConf.Mode != "console" {
38-
logx.AddWriter(logx.NewWriter(os.Stdout))
39-
}
32+
logx.Must(logx.SetUp(c.Log.LogConf))
4033

4134
svcCtx := svc.NewServiceContext(cc)
4235
run(svcCtx)

cmd/jzero/.template/frame/api/app/etc/etc.yaml.tpl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@ rest:
44
port: 8001
55

66
log:
7+
serviceName: {{ .APP }}
78
encoding: plain
9+
level: info
10+
mode: console

cmd/jzero/.template/frame/gateway/app/.gitignore.tpl

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
# Go workspace file
2121
go.work
22+
go.work.sum
2223

2324
# idea
2425
.idea
@@ -27,12 +28,4 @@ go.work
2728
.vscode
2829

2930
# logs
30-
logs
31-
32-
# goreleaser output
33-
dist
34-
35-
# unix sock
36-
*.sock
37-
38-
/{{ .APP }}
31+
logs

cmd/jzero/.template/frame/gateway/app/cmd/server.go.tpl

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package cmd
22

33
import (
4-
"os"
54
"path/filepath"
65

76
configurator "github.com/zeromicro/go-zero/core/configcenter"
@@ -33,12 +32,7 @@ var serverCmd = &cobra.Command{
3332
logx.Must(err)
3433

3534
// set up logger
36-
if err = logx.SetUp(c.Log.LogConf); err != nil {
37-
logx.Must(err)
38-
}
39-
if c.Log.LogConf.Mode != "console" {
40-
logx.AddWriter(logx.NewWriter(os.Stdout))
41-
}
35+
logx.Must(logx.SetUp(c.Log.LogConf))
4236

4337
// write pb to local
4438
c.Gateway.Upstreams[0].ProtoSets, err = embedx.WriteToLocal(pb.Embed, embedx.WithFileMatchFunc(func(path string) bool {

cmd/jzero/.template/frame/gateway/app/etc/etc.yaml.tpl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,7 @@ gateway:
1212
name: {{ .APP }}.gw
1313

1414
log:
15-
encoding: plain
15+
serviceName: {{ .APP }}
16+
encoding: plain
17+
level: info
18+
mode: console

cmd/jzero/.template/frame/rpc/app/.gitignore.tpl

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
# Go workspace file
2121
go.work
22+
go.work.sum
2223

2324
# idea
2425
.idea
@@ -27,10 +28,4 @@ go.work
2728
.vscode
2829

2930
# logs
30-
logs
31-
32-
# goreleaser output
33-
dist
34-
35-
# unix sock
36-
*.sock
31+
logs

cmd/jzero/.template/frame/rpc/app/cmd/server.go.tpl

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package cmd
22

33
import (
4-
"os"
5-
64
configurator "github.com/zeromicro/go-zero/core/configcenter"
75
"github.com/jzero-io/jzero/core/configcenter/subscriber"
86
"github.com/spf13/cobra"
@@ -29,12 +27,7 @@ var serverCmd = &cobra.Command{
2927
logx.Must(err)
3028

3129
// set up logger
32-
if err := logx.SetUp(c.Log.LogConf); err != nil {
33-
logx.Must(err)
34-
}
35-
if c.Log.LogConf.Mode != "console" {
36-
logx.AddWriter(logx.NewWriter(os.Stdout))
37-
}
30+
logx.Must(logx.SetUp(c.Log.LogConf))
3831

3932
svcCtx := svc.NewServiceContext(cc)
4033
run(svcCtx)

cmd/jzero/.template/frame/rpc/app/etc/etc.yaml.tpl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@ zrpc:
44
name: {{ .APP }}.rpc
55

66
log:
7+
serviceName: {{ .APP }}
78
encoding: plain
9+
level: info
10+
mode: console

0 commit comments

Comments
 (0)