2
0
mirror of https://github.com/acepanel/panel.git synced 2026-02-04 07:57:21 +08:00

feat: 优化去掉go-yaml依赖

This commit is contained in:
耗子
2024-10-27 16:23:52 +08:00
parent 2a61f8939f
commit cf26063287
5 changed files with 18 additions and 41 deletions

View File

@@ -8,8 +8,8 @@ import (
"slices"
"github.com/go-rat/utils/hash"
"github.com/goccy/go-yaml"
"github.com/spf13/cast"
"gopkg.in/yaml.v3"
"gorm.io/gorm"
"github.com/TheTNB/panel/internal/app"
@@ -194,12 +194,11 @@ func (r *settingRepo) UpdatePanelSetting(ctx context.Context, setting *request.P
// 面板主配置
config := new(types.PanelConfig)
cm := yaml.CommentMap{}
raw, err := io.Read("/usr/local/etc/panel/config.yml")
if err != nil {
return false, err
}
if err = yaml.UnmarshalWithOptions([]byte(raw), config, yaml.CommentToMap(cm)); err != nil {
if err = yaml.Unmarshal([]byte(raw), config); err != nil {
return false, err
}
@@ -221,7 +220,7 @@ func (r *settingRepo) UpdatePanelSetting(ctx context.Context, setting *request.P
return false, err
}
encoded, err := yaml.MarshalWithOptions(config, yaml.WithComment(cm))
encoded, err := yaml.Marshal(config)
if err != nil {
return false, err
}