Skip to content

Commit 811df12

Browse files
committed
Fix the error that windows cannot create soft connection
1 parent 3ee469a commit 811df12

File tree

4 files changed

+52
-19
lines changed

4 files changed

+52
-19
lines changed

server/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ mysql:
5656
config: 'charset=utf8mb4&parseTime=True&loc=Local'
5757
db-name: 'qmPlus'
5858
username: 'root'
59-
password: 'Aa@6447985'
59+
password: 'gdkid,,..'
6060
max-idle-conns: 10
6161
max-open-conns: 10
6262
log-mode: false

server/core/zap.go

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,13 @@ import (
44
"fmt"
55
"gin-vue-admin/global"
66
"gin-vue-admin/utils"
7-
zaprotatelogs "github.com/lestrrat-go/file-rotatelogs"
87
"go.uber.org/zap"
98
"go.uber.org/zap/zapcore"
109
"os"
11-
"path"
1210
"time"
1311
)
1412

15-
var level zapcore.Level
13+
var level zapcore.Level
1614

1715
func Zap() (logger *zap.Logger) {
1816
if ok, _ := utils.PathExists(global.GVA_CONFIG.Zap.Director); !ok { // 判断是否有Director文件夹
@@ -50,20 +48,6 @@ func Zap() (logger *zap.Logger) {
5048
return logger
5149
}
5250

53-
// getWriteSyncer zap logger中加入file-rotatelogs
54-
func getWriteSyncer() (zapcore.WriteSyncer, error) {
55-
fileWriter, err := zaprotatelogs.New(
56-
path.Join(global.GVA_CONFIG.Zap.Director, "%Y-%m-%d.log"),
57-
zaprotatelogs.WithLinkName(global.GVA_CONFIG.Zap.LinkName),
58-
zaprotatelogs.WithMaxAge(7*24*time.Hour),
59-
zaprotatelogs.WithRotationTime(24*time.Hour),
60-
)
61-
if global.GVA_CONFIG.Zap.LogInConsole {
62-
return zapcore.NewMultiWriteSyncer(zapcore.AddSync(os.Stdout), zapcore.AddSync(fileWriter)), err
63-
}
64-
return zapcore.AddSync(fileWriter), err
65-
}
66-
6751
// getEncoderConfig 获取zapcore.EncoderConfig
6852
func getEncoderConfig() (config zapcore.EncoderConfig) {
6953
config = zapcore.EncoderConfig{
@@ -104,7 +88,7 @@ func getEncoder() zapcore.Encoder {
10488

10589
// getEncoderCore 获取Encoder的zapcore.Core
10690
func getEncoderCore() (core zapcore.Core) {
107-
writer, err := getWriteSyncer() // 使用file-rotatelogs进行日志分割
91+
writer, err := utils.GetWriteSyncer() // 使用file-rotatelogs进行日志分割
10892
if err != nil {
10993
fmt.Printf("Get Write Syncer Failed err:%v", err.Error())
11094
return

server/utils/rotatelogs_unix.go

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// +build !windows
2+
3+
package utils
4+
5+
import (
6+
"gin-vue-admin/global"
7+
zaprotatelogs "github.com/lestrrat-go/file-rotatelogs"
8+
"go.uber.org/zap/zapcore"
9+
"os"
10+
"path"
11+
"time"
12+
)
13+
14+
// GetWriteSyncer zap logger中加入file-rotatelogs
15+
func GetWriteSyncer() (zapcore.WriteSyncer, error) {
16+
fileWriter, err := zaprotatelogs.New(
17+
path.Join(global.GVA_CONFIG.Zap.Director, "%Y-%m-%d.log"),
18+
zaprotatelogs.WithLinkName(global.GVA_CONFIG.Zap.LinkName),
19+
zaprotatelogs.WithMaxAge(7*24*time.Hour),
20+
zaprotatelogs.WithRotationTime(24*time.Hour),
21+
)
22+
if global.GVA_CONFIG.Zap.LogInConsole {
23+
return zapcore.NewMultiWriteSyncer(zapcore.AddSync(os.Stdout), zapcore.AddSync(fileWriter)), err
24+
}
25+
return zapcore.AddSync(fileWriter), err
26+
}

server/utils/rotatelogs_windows.go

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package utils
2+
3+
import (
4+
"gin-vue-admin/global"
5+
zaprotatelogs "github.com/lestrrat-go/file-rotatelogs"
6+
"go.uber.org/zap/zapcore"
7+
"os"
8+
"path"
9+
"time"
10+
)
11+
12+
// GetWriteSyncer zap logger中加入file-rotatelogs
13+
func GetWriteSyncer() (zapcore.WriteSyncer, error) {
14+
fileWriter, err := zaprotatelogs.New(
15+
path.Join(global.GVA_CONFIG.Zap.Director, "%Y-%m-%d.log"),
16+
zaprotatelogs.WithMaxAge(7*24*time.Hour),
17+
zaprotatelogs.WithRotationTime(24*time.Hour),
18+
)
19+
if global.GVA_CONFIG.Zap.LogInConsole {
20+
return zapcore.NewMultiWriteSyncer(zapcore.AddSync(os.Stdout), zapcore.AddSync(fileWriter)), err
21+
}
22+
return zapcore.AddSync(fileWriter), err
23+
}

0 commit comments

Comments
 (0)