diff --git a/model/gmodel/fs_user_logic.go b/model/gmodel/fs_user_logic.go index b20a1bb7..a0a46b6d 100644 --- a/model/gmodel/fs_user_logic.go +++ b/model/gmodel/fs_user_logic.go @@ -152,12 +152,17 @@ type SubscriptionStatus struct { } `json:"item_map"` } -// UserProfile 个人信息 -type UserProfile struct { - FirstName string `json:"first_name"` - LastName string `json:"last_name"` - Resetaurant string `json:"resetaurant"` - SubStatus SubscriptionStatus `json:"sub_status"` +type UserAddress struct { +} + +// UserProfileBase 个人信息 +type UserProfileBase struct { + Base struct { + FirstName string `json:"first_name"` + LastName string `json:"last_name"` + Resetaurant string `json:"resetaurant"` + } `json:"base"` + SubStatus SubscriptionStatus `json:"sub_status"` } // 自平台的注册流程 @@ -189,10 +194,16 @@ func (u *FsUserModel) RegisterByFusen(ctx context.Context, token *auth.RegisterT // 继承guest_id的资源表 err = InheritGuestIdResource(tx, user.Id, token.GuestId, func(txResouce, txUserMaterial, txUserInfo *gorm.DB) error { - userProfile := &UserProfile{ - FirstName: FirstName, - LastName: LastName, - Resetaurant: Resetaurant, + userProfile := &UserProfileBase{ + Base: struct { + FirstName string "json:\"first_name\"" + LastName string "json:\"last_name\"" + Resetaurant string "json:\"resetaurant\"" + }{ + FirstName: FirstName, + LastName: LastName, + Resetaurant: Resetaurant, + }, } metadata, err := json.Marshal(userProfile) if err != nil { diff --git a/server/info/internal/logic/infologic_test.go b/server/info/internal/logic/infologic_test.go index 040b4c7f..18a434ca 100644 --- a/server/info/internal/logic/infologic_test.go +++ b/server/info/internal/logic/infologic_test.go @@ -157,10 +157,16 @@ func TestMain(t *testing.T) { func TestCaseJSON_EXTRACT(t *testing.T) { - userProfile := &gmodel.UserProfile{ - FirstName: "FirstName", - LastName: "LastName", - Resetaurant: "Resetaurant", + userProfile := &gmodel.UserProfileBase{ + Base: struct { + FirstName string "json:\"first_name\"" + LastName string "json:\"last_name\"" + Resetaurant string "json:\"resetaurant\"" + }{ + FirstName: "FirstName", + LastName: "LastName", + Resetaurant: "Resetaurant", + }, } metadata, err := json.Marshal(userProfile) if err != nil { diff --git a/utils/fssql/metadata_test.go b/utils/fssql/metadata_test.go index 7cdf3e54..30ed39e4 100644 --- a/utils/fssql/metadata_test.go +++ b/utils/fssql/metadata_test.go @@ -8,9 +8,12 @@ import ( ) func TestCase1(t *testing.T) { - u := gmodel.UserProfile{ - FirstName: "h", - LastName: "sm", + u := gmodel.UserProfileBase{ + Base: struct { + FirstName string "json:\"first_name\"" + LastName string "json:\"last_name\"" + Resetaurant string "json:\"resetaurant\"" + }{}, } conn := initalize.InitMysql("fsreaderwriter:XErSYmLELKMnf3Dh@tcp(fusen.cdmigcvz3rle.us-east-2.rds.amazonaws.com:3306)/fusen")