diff --git a/algo/qmc/key_mmkv_loader_darwin.go b/algo/qmc/key_mmkv_loader_darwin.go index 23a8db4..28ef9f1 100644 --- a/algo/qmc/key_mmkv_loader_darwin.go +++ b/algo/qmc/key_mmkv_loader_darwin.go @@ -3,7 +3,6 @@ package qmc import ( "git.um-react.app/um/cli/algo/common" "git.um-react.app/um/cli/algo/qmc/qmmac" - "git.um-react.app/um/cli/internal/mmkv" "go.uber.org/zap" ) @@ -20,7 +19,7 @@ func LoadMMKVOrDefault(opts MMKVLoaderOptions, logger *zap.Logger) (result commo logger.Warn("LoadMMKVOrDefault: could not read QQMusic v10.x keys", zap.Error(err)) } - allKeys := mmkv.Merge(key1, key2) + allKeys := common.MergeQMCKeys(key1, key2) logger.Debug("Keys loaded", zap.Any("keys", allKeys), zap.Int("len", len(allKeys))) return allKeys, nil } diff --git a/algo/qmc/qmmac/v10_darwin.go b/algo/qmc/qmmac/v10_darwin.go index d3ddd2d..d33838f 100644 --- a/algo/qmc/qmmac/v10_darwin.go +++ b/algo/qmc/qmmac/v10_darwin.go @@ -159,5 +159,5 @@ func LoadMacKeysV10(logger *zap.Logger) (common.QMCKeys, error) { return nil, err } - return mmkv.Merge(append(keys1, keys2...)...), nil + return common.MergeQMCKeys(append(keys1, keys2...)...), nil }