From 58021611027f9a3f755f8e086bfdcc8347b17cf6 Mon Sep 17 00:00:00 2001 From: HFO4 <912394456@qq.com> Date: Sun, 20 Mar 2022 11:17:04 +0800 Subject: [PATCH] Fix: inherited policy ID didn't pass through second layer in Folder / version verification in Ping router --- assets | 2 +- service/admin/policy.go | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/assets b/assets index e0da8f4..8a94d68 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit e0da8f48856e3fb6e3e9cc920a32390ca132935e +Subproject commit 8a94d68f17c170a1055e2d57c2a2a55d18868a9e diff --git a/service/admin/policy.go b/service/admin/policy.go index 5c648ec..6d44b6b 100644 --- a/service/admin/policy.go +++ b/service/admin/policy.go @@ -207,8 +207,12 @@ func (service *SlavePingService) Test() serializer.Response { return serializer.ParamErr("从机无法向主机发送回调请求,请检查主机端 参数设置 - 站点信息 - 站点URL设置,并确保从机可以连接到此地址,"+err.Error(), nil) } - if res.Data.(string) != conf.BackendVersion { - return serializer.ParamErr("Cloudreve版本不一致,主机:"+res.Data.(string)+",从机:"+conf.BackendVersion, nil) + version := conf.BackendVersion + if conf.IsPro == "true" { + version += "-pro" + } + if res.Data.(string) != version { + return serializer.ParamErr("Cloudreve版本不一致,主机:"+res.Data.(string)+",从机:"+version, nil) } return serializer.Response{}