Skip to content

Commit 8d25aad

Browse files
lwchlwch
authored
Merge pull request #56 from lwch/dev
v0.11.2
2 parents f4250dc + c72c261 commit 8d25aad

File tree

5 files changed

+39
-12
lines changed

5 files changed

+39
-12
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,4 +174,9 @@
174174
## v0.11.1
175175

176176
1. go版本升级到1.19.2
177-
2. 实现actions自动打包
177+
2. 实现actions自动打包
178+
179+
## v0.11.2
180+
181+
1. 修正windows下日志文件无法rotate的问题
182+
2. 增加未配置项的默认配置

‎code/client/global/conf.go‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,20 @@ func LoadConf(dir string) *Configure {
7373
Rules []Rule `yaml:"rules"`
7474
CodeDir string `yaml:"codedir"`
7575
}
76+
cfg.ID = "unset"
77+
cfg.Server = "127.0.0.1:6154"
78+
cfg.SSL.Enabled = false
79+
cfg.SSL.Insecure = false
80+
cfg.Dashboard.Enabled = true
81+
cfg.Dashboard.Listen = "0.0.0.0"
82+
cfg.Dashboard.Port = 8080
83+
cfg.Secret = "0123456789"
84+
cfg.Link.ReadTimeout = time.Second
85+
cfg.Link.WriteTimeout = time.Second
86+
cfg.Log.Dir = "./logs"
87+
cfg.Log.Size = 50 * 1024 * 1024
88+
cfg.Log.Rotate = 7
89+
cfg.CodeDir = "./code"
7690
runtime.Assert(yaml.Decode(dir, &cfg))
7791
for i, t := range cfg.Rules {
7892
switch t.Type {

‎code/server/global/conf.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,13 @@ func LoadConf(dir string) *Configure {
4343
Crt string `yaml:"crt"`
4444
} `yaml:"tls"`
4545
}
46+
cfg.Listen = 6154
47+
cfg.Secret = "0123456789"
48+
cfg.Link.ReadTimeout = time.Second
49+
cfg.Link.WriteTimeout = time.Second
50+
cfg.Log.Dir = "./logs"
51+
cfg.Log.Size = 50 * 1024 * 1024
52+
cfg.Log.Rotate = 7
4653
runtime.Assert(yaml.Decode(dir, &cfg))
4754
if !filepath.IsAbs(cfg.Log.Dir) {
4855
dir, err := os.Executable()

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ require (
88
github.com/go-bindata/go-bindata/v3 v3.1.3
99
github.com/gorilla/websocket v1.5.0
1010
github.com/kardianos/service v1.2.2
11-
github.com/lwch/logging v0.0.0-20220322084100-ec48185d95ab
11+
github.com/lwch/logging v0.0.0-20221013035348-e250895ebb72
1212
github.com/lwch/rdesktop v1.1.1
1313
github.com/lwch/runtime v1.0.0
1414
github.com/lwch/yaml v0.0.0-20220711084242-14c4f5845abe
15-
golang.org/x/sys v0.0.0-20221010170243-090e33056c14
16-
golang.org/x/text v0.3.7
15+
golang.org/x/sys v0.1.0
16+
golang.org/x/text v0.4.0
1717
google.golang.org/protobuf v1.28.1
1818
)
1919

2020
require (
2121
github.com/kisielk/errcheck v1.6.2 // indirect
22-
golang.org/x/image v0.0.0-20220902085622-e7cb96979f69 // indirect
22+
golang.org/x/image v0.0.0-20221017200508-ffcb3fe7d1bf // indirect
2323
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
2424
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
2525
golang.org/x/tools v0.1.12 // indirect

‎go.sum‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQL
1515
github.com/kisielk/errcheck v1.6.2 h1:uGQ9xI8/pgc9iOoCe7kWQgRE6SBTrCGmTSf0LrEtY7c=
1616
github.com/kisielk/errcheck v1.6.2/go.mod h1:nXw/i/MfnvRHqXa7XXmQMUB0oNFGuBrNI8d8NLy0LPw=
1717
github.com/lwch/logging v0.0.0-20211115073745-0db19179db17/go.mod h1:aXQui5bsF/d4I+z6szuiBWY5m4y9t6pyZ2Q/sLgkBBg=
18-
github.com/lwch/logging v0.0.0-20220322084100-ec48185d95ab h1:zqeHtNXEg707Tq8gv5yE//rc6ue/SVSaUxlslbGBxrg=
19-
github.com/lwch/logging v0.0.0-20220322084100-ec48185d95ab/go.mod h1:aXQui5bsF/d4I+z6szuiBWY5m4y9t6pyZ2Q/sLgkBBg=
18+
github.com/lwch/logging v0.0.0-20221013035348-e250895ebb72 h1:F2ZW/bIZQ+uYB1VsJ+H6355/0U+FOef+YAw39ZYTE0c=
19+
github.com/lwch/logging v0.0.0-20221013035348-e250895ebb72/go.mod h1:aXQui5bsF/d4I+z6szuiBWY5m4y9t6pyZ2Q/sLgkBBg=
2020
github.com/lwch/rdesktop v1.1.1 h1:rcKfHDo9PbCFBwX+PEwXANufhnkfRa7E/hg0R/4VhnM=
2121
github.com/lwch/rdesktop v1.1.1/go.mod h1:9AqIceehSOVcxwpXDPEdYchCyJXT99bd9PpsaTHALlg=
2222
github.com/lwch/runtime v0.0.0-20190520054850-8c97e19e0c6d/go.mod h1:uEt0zu1MDC7WnVvodPBGSYAD/KMKk0v36xE8UE5veM8=
@@ -30,8 +30,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
3030
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
3131
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
3232
golang.org/x/image v0.0.0-20220617043117-41969df76e82/go.mod h1:doUCurBvlfPMKfmIpRIywoHmhN3VyhnoFDbvIEWF4hY=
33-
golang.org/x/image v0.0.0-20220902085622-e7cb96979f69 h1:Lj6HJGCSn5AjxRAH2+r35Mir4icalbqku+CLUtjnvXY=
34-
golang.org/x/image v0.0.0-20220902085622-e7cb96979f69/go.mod h1:doUCurBvlfPMKfmIpRIywoHmhN3VyhnoFDbvIEWF4hY=
33+
golang.org/x/image v0.0.0-20221017200508-ffcb3fe7d1bf h1:nq7IoIHc0jQHd2/cn0Oedp7Z9gH80pVTiDd9bF7u+O4=
34+
golang.org/x/image v0.0.0-20221017200508-ffcb3fe7d1bf/go.mod h1:iyPr49SD/G/TBxYVB/9RRtGUT5eNbo2u4NamWeQcD5c=
3535
golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
3636
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
3737
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
@@ -56,15 +56,16 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
5656
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
5757
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
5858
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
59-
golang.org/x/sys v0.0.0-20221010170243-090e33056c14 h1:k5II8e6QD8mITdi+okbbmR/cIyEbeXLBhy5Ha4nevyc=
60-
golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
59+
golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
60+
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
6161
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
6262
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
6363
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
6464
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
6565
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
66-
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
6766
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
67+
golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
68+
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
6869
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
6970
golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
7071
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=

0 commit comments

Comments
 (0)