Skip to content

Commit 5146d95

Browse files
committed
fix: parse current user numeric settings
1 parent ba5163f commit 5146d95

5 files changed

Lines changed: 10 additions & 6 deletions

File tree

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ core/router/entry_xpack.go
5050
core/router/entry_xpackee.go
5151
core/server/init_xpack.go
5252
core/server/init_xpackee.go
53+
core/utils/xpack/xpack.go
54+
core/utils/xpack/xpackee.go
5355

5456
.history/
5557
dist/

core/app/auth/auth.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,13 @@ func GetCurrentUserInfo() (*dto.CurrentUserInfo, error) {
218218
settingMap[set.Key] = set.Value
219219
}
220220
var info dto.CurrentUserInfo
221-
arr, err := json.Marshal(settingMap)
221+
stringSettingMap := make(map[string]string, len(settingMap))
222+
for key, value := range settingMap {
223+
stringSettingMap[key] = value
224+
}
225+
delete(stringSettingMap, "SessionTimeout")
226+
delete(stringSettingMap, "ExpirationDays")
227+
arr, err := json.Marshal(stringSettingMap)
222228
if err != nil {
223229
return nil, err
224230
}

core/utils/xpack/xpack.go

Lines changed: 0 additions & 1 deletion
This file was deleted.

core/utils/xpack/xpackee.go

Lines changed: 0 additions & 1 deletion
This file was deleted.

frontend/src/layout/components/Sidebar/components/Collapse.vue

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -292,9 +292,7 @@ const changeUserInfo = () => {
292292
onMounted(() => {
293293
loadNodes();
294294
checkTask();
295-
if (isXpackOrEE.value) {
296-
loadCurrentUser();
297-
}
295+
loadCurrentUser();
298296
});
299297
</script>
300298

0 commit comments

Comments
 (0)