From 99520e87d434ba084938d3d074606dfe07ea1a64 Mon Sep 17 00:00:00 2001 From: daiyb <570956418@qq.com> Date: Fri, 6 Jun 2025 14:15:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=B4=A6=E5=8F=B7=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/cast/cast.validator.pb.go | 38 ----------------------------------- cmd/config/config.go | 1 + docs/dev/conf.ini | 2 +- docs/prod/conf.ini | 2 +- docs/test/conf.ini | 2 +- pkg/middleware/logging.go | 7 +------ pkg/service/cast/media.go | 25 ++++++++++++++++++++++- 7 files changed, 29 insertions(+), 48 deletions(-) delete mode 100644 api/cast/cast.validator.pb.go diff --git a/api/cast/cast.validator.pb.go b/api/cast/cast.validator.pb.go deleted file mode 100644 index c352583..0000000 --- a/api/cast/cast.validator.pb.go +++ /dev/null @@ -1,38 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: pb/fiee/cast.proto - -package cast - -import ( - fmt "fmt" - math "math" - proto "github.com/golang/protobuf/proto" - _ "github.com/envoyproxy/protoc-gen-validate/validate" - _ "google.golang.org/protobuf/types/known/wrapperspb" - _ "google.golang.org/protobuf/types/descriptorpb" - _ "google.golang.org/protobuf/types/known/emptypb" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -func (this *MediaUserListReq) Validate() error { - return nil -} -func (this *MediaUserListResp) Validate() error { - return nil -} -func (this *UpdateMediaAccountReq) Validate() error { - return nil -} -func (this *UpdateMediaAccountResp) Validate() error { - return nil -} -func (this *UpdateWorkReq) Validate() error { - return nil -} -func (this *UpdateWorkResp) Validate() error { - return nil -} diff --git a/cmd/config/config.go b/cmd/config/config.go index f02dec1..11d4629 100644 --- a/cmd/config/config.go +++ b/cmd/config/config.go @@ -109,6 +109,7 @@ type Redis struct { type System struct { Mode string + AppMode string Version string HttpPort string Host string diff --git a/docs/dev/conf.ini b/docs/dev/conf.ini index 90addfe..0761869 100644 --- a/docs/dev/conf.ini +++ b/docs/dev/conf.ini @@ -1,6 +1,6 @@ [system] Domain = "artistinfo" -AppMode = "debug" +AppMode = "dev" HttpPort = ":8085" Host = "https://common.szjixun.cn" RedirectUri = "/api/redirect/url" diff --git a/docs/prod/conf.ini b/docs/prod/conf.ini index 2c887ae..bd00c95 100644 --- a/docs/prod/conf.ini +++ b/docs/prod/conf.ini @@ -1,6 +1,6 @@ [system] Domain = "artistinfo" -AppMode = "debug" +AppMode = "prod" HttpPort = ":8085" Host = "https://common.szjixun.cn" RedirectUri = "/api/redirect/url" diff --git a/docs/test/conf.ini b/docs/test/conf.ini index eff0c7d..7d85948 100644 --- a/docs/test/conf.ini +++ b/docs/test/conf.ini @@ -1,6 +1,6 @@ [system] Domain = "artistinfo" -AppMode = "debug" +AppMode = "test" HttpPort = ":8085" Host = "https://common.szjixun.cn" RedirectUri = "/api/redirect/url" diff --git a/pkg/middleware/logging.go b/pkg/middleware/logging.go index a97c7f3..bfe95a3 100644 --- a/pkg/middleware/logging.go +++ b/pkg/middleware/logging.go @@ -2,9 +2,7 @@ package middleware import ( "bytes" - "fmt" "io" - "io/ioutil" "log" "net" "net/http" @@ -31,12 +29,9 @@ func NewLogger() gin.HandlerFunc { if val == "" { c.Request.Header.Set("Accept-Language", "zh-CN") } - val2 := c.GetHeader("Accept-Language") - fmt.Println(val2) log.Printf("[%s] %s %d %s %s %s %s %s %s", path, c.Request.Method, c.Writer.Status(), query, string(data), c.ClientIP(), c.Request.UserAgent(), c.Errors.ByType(gin.ErrorTypePrivate).String(), latencyTime.String()) - - c.Request.Body = ioutil.NopCloser(bytes.NewBuffer(data)) + c.Request.Body = io.NopCloser(bytes.NewBuffer(data)) c.Next() } } diff --git a/pkg/service/cast/media.go b/pkg/service/cast/media.go index 8115e45..e086059 100644 --- a/pkg/service/cast/media.go +++ b/pkg/service/cast/media.go @@ -1,13 +1,18 @@ package cast import ( + "context" + "fonchain-fiee/api/accountFiee" "fonchain-fiee/api/cast" + "fonchain-fiee/cmd/config" "fonchain-fiee/pkg/service" "github.com/gin-gonic/gin" + "strconv" ) func UpdateMediaAccount(ctx *gin.Context) { var req *cast.UpdateMediaAccountReq + var infoResp *accountFiee.UserInfoResponse var err error if err = ctx.ShouldBind(&req); err != nil { service.Error(ctx, err) @@ -18,7 +23,25 @@ func UpdateMediaAccount(ctx *gin.Context) { return } // 查询艺人的信息 - service.AccountFieeProvider.Info + // 字符串转整型 + artistID, err := strconv.ParseUint(req.ArtistUuid, 10, 64) + if config.AppConfig.System.AppMode != "dev" { + infoResp, err = service.AccountFieeProvider.Info(context.Background(), &accountFiee.InfoRequest{ + ID: artistID, + Domain: "app", + }) + if err != nil { + service.Error(ctx, err) + return + } + } else { + infoResp = &accountFiee.UserInfoResponse{ + Name: "小波", + TelNum: "18288888888", + } + } + req.ArtistUserName = infoResp.Name + req.ArtistPhone = infoResp.TelNum resp, err := service.CastProvider.UpdateMediaAccount(ctx, req) if err != nil { service.Error(ctx, err)