Merge branch 'main' into i18n-dev-new

MohamedHassanNasr · MohamedHassanNasr · commit 15f6e74104ca · 2022-05-03T00:36:43.000+02:00
diff --git a/docker-compose-dev.yaml b/docker-compose-dev.yaml
@@ -24,7 +24,9 @@ services:
     depends_on:
       - server
     working_dir: /gva-web       # 如果docker 设置了workdir 则此处不需要设置
-    command: bash -c "yarn config set registry https://registry.npm.taobao.org --global && yarn install && yarn serve"
+    #若网络不太好，请自行换源，如下
+    #command: bash -c "yarn config set registry https://registry.npm.taobao.org --global && yarn install && yarn serve"
+    command: bash -c "yarn install && yarn serve"
     volumes:
       - ./web:/gva-web
     networks:
diff --git a/server/api/v1/system/sys_user.go b/server/api/v1/system/sys_user.go
@@ -294,6 +294,7 @@ func (b *BaseApi) SetUserInfo(c *gin.Context) {
 		HeaderImg: user.HeaderImg,
 		Phone:     user.Phone,
 		Email:     user.Email,
+		SideMode:  user.SideMode,
 	}); err != nil {
 		global.GVA_LOG.Error(global.Translate("general.setupFailErr"), zap.Error(err))
 		response.FailWithMessage(global.Translate("general.setupFail"), c)
@@ -322,6 +323,7 @@ func (b *BaseApi) SetSelfInfo(c *gin.Context) {
 		HeaderImg: user.HeaderImg,
 		Phone:     user.Phone,
 		Email:     user.Email,
+		SideMode:  user.SideMode,
 	}); err != nil {
 		global.GVA_LOG.Error(global.Translate("general.setupFailErr"), zap.Error(err))
 		response.FailWithMessage(global.Translate("general.setupFail"), c)
diff --git a/server/core/zap.go b/server/core/zap.go
@@ -33,11 +33,13 @@ func Zap() (logger *zap.Logger) {
 		return lev >= zap.ErrorLevel
 	})
 
+	now := time.Now().Format("2006-01-02")
+
 	cores := [...]zapcore.Core{
-		getEncoderCore(fmt.Sprintf("./%s/server_debug.log", global.GVA_CONFIG.Zap.Director), debugPriority),
-		getEncoderCore(fmt.Sprintf("./%s/server_info.log", global.GVA_CONFIG.Zap.Director), infoPriority),
-		getEncoderCore(fmt.Sprintf("./%s/server_warn.log", global.GVA_CONFIG.Zap.Director), warnPriority),
-		getEncoderCore(fmt.Sprintf("./%s/server_error.log", global.GVA_CONFIG.Zap.Director), errorPriority),
+		getEncoderCore(fmt.Sprintf("./%s/%s/debug.log", global.GVA_CONFIG.Zap.Director, now), debugPriority),
+		getEncoderCore(fmt.Sprintf("./%s/%s/info.log", global.GVA_CONFIG.Zap.Director, now), infoPriority),
+		getEncoderCore(fmt.Sprintf("./%s/%s/warn.log", global.GVA_CONFIG.Zap.Director, now), warnPriority),
+		getEncoderCore(fmt.Sprintf("./%s/%s/error.log", global.GVA_CONFIG.Zap.Director, now), errorPriority),
 	}
 	logger = zap.New(zapcore.NewTee(cores[:]...), zap.AddCaller())
 
@@ -91,7 +93,7 @@ func getEncoderCore(fileName string, level zapcore.LevelEnabler) (core zapcore.C
 	return zapcore.NewCore(getEncoder(), writer, level)
 }
 
-// 自定义日志输出时间格式
+// CustomTimeEncoder 自定义日志输出时间格式
 func CustomTimeEncoder(t time.Time, enc zapcore.PrimitiveArrayEncoder) {
 	enc.AppendString(t.Format(global.GVA_CONFIG.Zap.Prefix + "2006/01/02 - 15:04:05.000"))
 }
diff --git a/server/model/system/request/sys_user.go b/server/model/system/request/sys_user.go
@@ -45,5 +45,6 @@ type ChangeUserInfo struct {
 	AuthorityIds []string             `json:"authorityIds" gorm:"-"`                                                                // 角色ID
 	Email        string               `json:"email"  gorm:"comment:用户邮箱"`                                                           // 用户邮箱
 	HeaderImg    string               `json:"headerImg" gorm:"default:https://qmplusimg.henrongyi.top/gva_header.jpg;comment:用户头像"` // 用户头像
+	SideMode     string               `json:"sideMode"  gorm:"comment:用户侧边主题"`                                                      // 用户侧边主题
 	Authorities  []model.SysAuthority `json:"-" gorm:"many2many:sys_user_authority;"`
 }

Original file line number	Diff line number	Diff line change
`@@ -45,5 +45,6 @@ type ChangeUserInfo struct {`
`45`	`45`	AuthorityIds []string `json:"authorityIds" gorm:"-"` // 角色ID
`46`	`46`	Email string `json:"email" gorm:"comment:用户邮箱"` // 用户邮箱
`47`	`47`	HeaderImg string `json:"headerImg" gorm:"default:https://qmplusimg.henrongyi.top/gva_header.jpg;comment:用户头像"` // 用户头像
	`48`	+ SideMode string `json:"sideMode" gorm:"comment:用户侧边主题"` // 用户侧边主题
`48`	`49`	Authorities []model.SysAuthority `json:"-" gorm:"many2many:sys_user_authority;"`
`49`	`50`	`}`