Merge branch 'main' into feature-userinfo-daiyb

This commit is contained in:
戴育兵 2026-01-07 09:18:43 +08:00
commit 6c7a8eb654

View File

@ -186,11 +186,10 @@ func UpdateMediaAccount(ctx *gin.Context) {
service.Error(ctx, errors.New("用户不存在")) service.Error(ctx, errors.New("用户不存在"))
return return
} }
//FIXME 临时取出关联第三方 if err = CheckAsProfile(infoResp); err != nil {
/*if err = CheckAsProfile(infoResp); err != nil {
service.Error(ctx, err) service.Error(ctx, err)
return return
}*/ }
req.ArtistName = infoResp.Name req.ArtistName = infoResp.Name
req.ArtistPhone = infoResp.TelNum req.ArtistPhone = infoResp.TelNum
req.ArtistPhoneAreaCode = infoResp.TelAreaCode req.ArtistPhoneAreaCode = infoResp.TelAreaCode
@ -259,11 +258,10 @@ func OAuthAccount(ctx *gin.Context) {
service.Error(ctx, errors.New("未找到该账号")) service.Error(ctx, errors.New("未找到该账号"))
return return
} }
//FIXME if err = SyncAsAuth(mediaResp.Data[0].ArtistUuid); err != nil {
/*if err = SyncAsAuth(mediaResp.Data[0].ArtistUuid); err != nil {
service.Error(ctx, err) service.Error(ctx, err)
return return
}*/ }
if resp, err = service.CastProvider.OAuthAccountV2(ctx, req); err != nil { if resp, err = service.CastProvider.OAuthAccountV2(ctx, req); err != nil {
service.Error(ctx, err) service.Error(ctx, err)
return return
@ -639,8 +637,7 @@ func ImportMediaAccount(ctx *gin.Context) {
excelSetRemark(excelData, line, fmt.Sprintf("%s:%s", dmName, err.Error())) excelSetRemark(excelData, line, fmt.Sprintf("%s:%s", dmName, err.Error()))
} }
} }
// FIXME 临时关闭同步ayr _ = CheckAsProfile(subInfoResp)
//_ = CheckAsProfile(subInfoResp)
} }
// 保存Excel文件到磁盘 // 保存Excel文件到磁盘
resultPath := fmt.Sprintf("./runtime/media/%s", fileName) resultPath := fmt.Sprintf("./runtime/media/%s", fileName)