MiaoStars/cloudreve
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modify: return user information in siteConfig while logged in

Browse Source
This commit is contained in:
HFO4
2019-11-25 14:08:11 +08:00
parent 5e1e76719f
commit 28df5ca833
5 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/serializer/setting.go
View File

@@ -12,6 +12,7 @@ type SiteConfig struct {
QQLogin bool `json:"QQLogin"`
Themes string `json:"themes"`
DefaultTheme string `json:"defaultTheme"`
User User `json:"user"`
}
func checkSettingValue(setting map[string]string, key string) string {
@@ -22,7 +23,11 @@ func checkSettingValue(setting map[string]string, key string) string {
}
// BuildSiteConfig 站点全局设置
func BuildSiteConfig(settings map[string]string) Response {
func BuildSiteConfig(settings map[string]string, user *model.User) Response {
var userRes User
if user != nil {
userRes = BuildUser(*user)
}
return Response{
Data: SiteConfig{
SiteName: checkSettingValue(settings, "siteName"),
@@ -33,5 +38,6 @@ func BuildSiteConfig(settings map[string]string) Response {
QQLogin: model.IsTrueVal(checkSettingValue(settings, "qq_login")),
Themes: checkSettingValue(settings, "themes"),
DefaultTheme: checkSettingValue(settings, "defaultTheme"),
User: userRes,
}}
}