Merge pull request #10495 from zhaoxiangchun/automated-cherry-pick-of-#10494-upstream-release-3.7

Automated cherry pick of #10494: fix(monitor): modify onecloud replacement code
This commit is contained in:
Zexi Li
2021-03-24 19:35:40 +08:00
committed by GitHub
+28
View File
@@ -1187,6 +1187,34 @@ type SCompanyInfo struct {
}
func GetCompanyInfo(ctx context.Context) (SCompanyInfo, error) {
info, err := getBrandFromCopyrightApi(ctx)
if err == nil && len(info.Name) != 0 {
return *info, nil
}
if err != nil {
log.Errorf("getBrandFromCopyrightApi err:%v", err)
}
return getBrandFromInfoApi(ctx)
}
func getBrandFromCopyrightApi(ctx context.Context) (*SCompanyInfo, error) {
session := auth.GetAdminSession(context.Background(), "", "")
obj, err := modules.Copyright.Update(session, "copyright", jsonutils.NewDict())
if err != nil {
return nil, err
}
var info SCompanyInfo
lang := i18n.Lang(ctx)
switch lang {
case language.English:
info.Name, _ = obj.GetString("brand_en")
default:
info.Name, _ = obj.GetString("brand_cn")
}
return &info, nil
}
func getBrandFromInfoApi(ctx context.Context) (SCompanyInfo, error) {
session := auth.GetAdminSession(context.Background(), "", "")
obj, err := modules.Info.Get(session, "info", jsonutils.NewDict())
if err != nil {