diff --git a/model/gmodel/fs_guest_gen.go b/model/gmodel/fs_guest_gen.go index 4cf788b4..99ade951 100644 --- a/model/gmodel/fs_guest_gen.go +++ b/model/gmodel/fs_guest_gen.go @@ -2,20 +2,21 @@ package gmodel import ( "gorm.io/gorm" + "time" ) // fs_guest 游客表 type FsGuest struct { - GuestId int64 `gorm:"primary_key;default:0;auto_increment;" json:"guest_id"` // ID - AuthKey *string `gorm:"default:'';" json:"auth_key"` // jwt token - Status *int64 `gorm:"index;default:1;" json:"status"` // 1正常 0不正常 - IsDel *int64 `gorm:"index;default:0;" json:"is_del"` // 是否删除 1删除 - CreatedAt *int64 `gorm:"index;default:0;" json:"created_at"` // 添加时间 - UpdatedAt *int64 `gorm:"default:0;" json:"updated_at"` // 更新时间 - IsOpenRender *int64 `gorm:"default:0;" json:"is_open_render"` // 是否打开个性化渲染（1：开启，0：关闭） - IsThousandFace *int64 `gorm:"default:0;" json:"is_thousand_face"` // 是否已经存在千人千面（1：存在，0：不存在） - IsLowRendering *int64 `gorm:"default:0;" json:"is_low_rendering"` // 是否开启低渲染模型渲染 - IsRemoveBg *int64 `gorm:"default:1;" json:"is_remove_bg"` // 用户上传logo是否去除背景 + GuestId int64 `gorm:"primary_key;default:0;auto_increment;" json:"guest_id"` // ID + AuthKey *string `gorm:"default:'';" json:"auth_key"` // jwt token + Status *int64 `gorm:"index;default:1;" json:"status"` // 1正常 0不正常 + IsDel *int64 `gorm:"index;default:0;" json:"is_del"` // 是否删除 1删除 + CreatedAt *time.Time `gorm:"index;default:'0000-00-00 00:00:00';" json:"created_at"` // + UpdatedAt *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"updated_at"` // + IsOpenRender *int64 `gorm:"default:0;" json:"is_open_render"` // 是否打开个性化渲染（1：开启，0：关闭） + IsThousandFace *int64 `gorm:"default:0;" json:"is_thousand_face"` // 是否已经存在千人千面（1：存在，0：不存在） + IsLowRendering *int64 `gorm:"default:0;" json:"is_low_rendering"` // 是否开启低渲染模型渲染 + IsRemoveBg *int64 `gorm:"default:1;" json:"is_remove_bg"` // 用户上传logo是否去除背景 } type FsGuestModel struct { db *gorm.DB diff --git a/model/gmodel/fs_guest_logic.go b/model/gmodel/fs_guest_logic.go index a75639a3..120d0f6a 100755 --- a/model/gmodel/fs_guest_logic.go +++ b/model/gmodel/fs_guest_logic.go @@ -12,11 +12,11 @@ import ( func (m *FsGuestModel) GenerateGuestID(ctx context.Context, AccessSecret uint64) (authKey string, err error) { err = m.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error { - now := time.Now().UTC().Unix() + now := time.Now().UTC() var record = &FsGuest{} tx.Create(record) - authKey, err = auth.GenerateJwtTokenUint64(AccessSecret, now, 31536000, 0, int64(record.GuestId)) + authKey, err = auth.GenerateJwtTokenUint64(AccessSecret, now.Unix(), 31536000, 0, int64(record.GuestId)) if err != nil { logx.Error(err) err = tx.Rollback().Error diff --git a/model/gmodel/fs_product_model3d_gen.go b/model/gmodel/fs_product_model3d_gen.go index 884d73e4..f8647a23 100644 --- a/model/gmodel/fs_product_model3d_gen.go +++ b/model/gmodel/fs_product_model3d_gen.go @@ -29,7 +29,7 @@ type FsProductModel3d struct { IsCloudRender *int64 `gorm:"default:0;" json:"is_cloud_render"` // 是否设置为云渲染模型 Utime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"utime"` // StepPrice *[]byte `gorm:"default:'';" json:"step_price"` // - PackedUnit *int64 `gorm:"default:0;" json:"packed_unit"` // + PackedUnit *int64 `gorm:"default:0;" json:"packed_unit"` // 被打包的数量单位 } type FsProductModel3dModel struct { db *gorm.DB diff --git a/model/gmodel/fs_user_gen.go b/model/gmodel/fs_user_gen.go index 6eb80dc1..3e18b2fd 100644 --- a/model/gmodel/fs_user_gen.go +++ b/model/gmodel/fs_user_gen.go @@ -2,35 +2,28 @@ package gmodel import ( "gorm.io/gorm" + "time" ) // fs_user 用户表 type FsUser struct { - Id int64 `gorm:"primary_key;default:0;auto_increment;" json:"id"` // ID - FaceId *string `gorm:"default:'0';" json:"face_id"` // facebook的userid - GoogleId *string `gorm:"default:'0';" json:"google_id"` // google的sub - FirstName *string `gorm:"default:'';" json:"first_name"` // FirstName - LastName *string `gorm:"default:'';" json:"last_name"` // LastName - Username *string `gorm:"index;default:'';" json:"username"` // - Company *string `gorm:"default:'';" json:"company"` // 公司名称 - Mobile *string `gorm:"default:'';" json:"mobile"` // 手机号码 - PasswordHash *string `gorm:"default:'';" json:"password_hash"` // - VerificationToken *string `gorm:"default:'';" json:"verification_token"` // - PasswordResetToken *string `gorm:"default:'';" json:"password_reset_token"` // - Email *string `gorm:"unique_key;default:'';" json:"email"` // 邮箱 - Type *int64 `gorm:"default:0;" json:"type"` // 1普通餐厅 2连锁餐厅 - Status *int64 `gorm:"default:1;" json:"status"` // 1正常 0不正常 - IsDel *int64 `gorm:"default:0;" json:"is_del"` // 是否删除 1删除 - CreatedAt *int64 `gorm:"default:0;" json:"created_at"` // 添加时间 - UpdatedAt *int64 `gorm:"default:0;" json:"updated_at"` // 更新时间 - IsOrderStatusEmail *int64 `gorm:"default:0;" json:"is_order_status_email"` // 订单状态改变时是否接收邮件 - IsEmailAdvertisement *int64 `gorm:"default:0;" json:"is_email_advertisement"` // 是否接收邮件广告 - IsOrderStatusPhone *int64 `gorm:"default:0;" json:"is_order_status_phone"` // 订单状态改变是是否接收电话 - IsPhoneAdvertisement *int64 `gorm:"default:0;" json:"is_phone_advertisement"` // 是否接收短信广告 - IsOpenRender *int64 `gorm:"default:0;" json:"is_open_render"` // 是否打开个性化渲染（1：开启，0：关闭） - IsThousandFace *int64 `gorm:"default:0;" json:"is_thousand_face"` // 是否已经存在千人千面（1：存在，0：不存在） - IsLowRendering *int64 `gorm:"default:0;" json:"is_low_rendering"` // - IsRemoveBg *int64 `gorm:"default:1;" json:"is_remove_bg"` // 用户上传logo是否去除背景 + Id int64 `gorm:"primary_key;default:0;auto_increment;" json:"id"` // ID + FaceId *string `gorm:"default:'0';" json:"face_id"` // facebook的userid + GoogleId *string `gorm:"default:'0';" json:"google_id"` // google的sub + FirstName *string `gorm:"default:'';" json:"first_name"` // FirstName + LastName *string `gorm:"default:'';" json:"last_name"` // LastName + Username *string `gorm:"index;default:'';" json:"username"` // + Company *string `gorm:"default:'';" json:"company"` // 公司名称 + Mobile *string `gorm:"default:'';" json:"mobile"` // 手机号码 + PasswordHash *string `gorm:"default:'';" json:"password_hash"` // + VerificationToken *string `gorm:"default:'';" json:"verification_token"` // + PasswordResetToken *string `gorm:"default:'';" json:"password_reset_token"` // + Email *string `gorm:"unique_key;default:'';" json:"email"` // 邮箱 + Type *int64 `gorm:"default:0;" json:"type"` // 1普通餐厅 2连锁餐厅 + Status *int64 `gorm:"default:1;" json:"status"` // 1正常 0不正常 + IsDel *int64 `gorm:"default:0;" json:"is_del"` // 是否删除 1删除 + CreatedAt *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"created_at"` // + UpdatedAt *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"updated_at"` // } type FsUserModel struct { db *gorm.DB diff --git a/model/gmodel/fs_user_logic.go b/model/gmodel/fs_user_logic.go index 439178d4..69c8e1e5 100644 --- a/model/gmodel/fs_user_logic.go +++ b/model/gmodel/fs_user_logic.go @@ -115,7 +115,7 @@ func (u *FsUserModel) RegisterByGoogleOAuth(ctx context.Context, token *auth.Reg if err != nil { // 没有找到在数据库就创建注册 if err == gorm.ErrRecordNotFound { - createAt := time.Now().UTC().Unix() + createAt := time.Now().UTC() user.Email = &token.Email user.CreatedAt = &createAt user.GoogleId = &googleId @@ -182,7 +182,7 @@ func (u *FsUserModel) RegisterByFusen(ctx context.Context, token *auth.RegisterT LastName := token.Extend["last_name"].(string) Resetaurant := token.Extend["resetaurant"].(string) - createAt := time.Now().UTC().Unix() + createAt := time.Now().UTC() user.Email = &token.Email user.CreatedAt = &createAt user.PasswordHash = &token.Password diff --git a/server/home-user-auth/internal/logic/userbasicinfologic.go b/server/home-user-auth/internal/logic/userbasicinfologic.go index 188e8e64..71e0cf93 100644 --- a/server/home-user-auth/internal/logic/userbasicinfologic.go +++ b/server/home-user-auth/internal/logic/userbasicinfologic.go @@ -7,6 +7,7 @@ import ( "fusenapi/server/home-user-auth/internal/types" "fusenapi/utils/auth" "fusenapi/utils/basic" + "gorm.io/gorm" "github.com/zeromicro/go-zero/core/logx" @@ -45,13 +46,13 @@ func (l *UserBasicInfoLogic) UserBasicInfo(req *types.Request, userinfo *auth.Us } return resp.SetStatus(basic.CodeOK, types.DataUserBasicInfo{ - Type: *user.Type, - IsOrderStatusEmail: *user.IsOrderStatusEmail, - IsEmailAdvertisement: *user.IsEmailAdvertisement, - IsOrderStatusPhone: *user.IsOrderStatusPhone, - IsPhoneAdvertisement: *user.IsPhoneAdvertisement, - IsOpenRender: *user.IsOpenRender, - IsLowRendering: *user.IsLowRendering, - IsRemoveBg: *user.IsRemoveBg, + Type: *user.Type, + // IsOrderStatusEmail: *user.IsOrderStatusEmail, + // IsEmailAdvertisement: *user.IsEmailAdvertisement, + // IsOrderStatusPhone: *user.IsOrderStatusPhone, + // IsPhoneAdvertisement: *user.IsPhoneAdvertisement, + // IsOpenRender: *user.IsOpenRender, + // IsLowRendering: *user.IsLowRendering, + // IsRemoveBg: *user.IsRemoveBg, }) } diff --git a/server/product/internal/logic/getlastproductdesignlogic.go b/server/product/internal/logic/getlastproductdesignlogic.go index e1624c92..e7b4c0fa 100644 --- a/server/product/internal/logic/getlastproductdesignlogic.go +++ b/server/product/internal/logic/getlastproductdesignlogic.go @@ -2,12 +2,9 @@ package logic import ( "context" - "errors" "fusenapi/utils/auth" "fusenapi/utils/basic" - "gorm.io/gorm" - "fusenapi/server/product/internal/svc" "fusenapi/server/product/internal/types" @@ -33,18 +30,18 @@ func (l *GetLastProductDesignLogic) GetLastProductDesign(req *types.Request, use return resp.SetStatusAddMessage(basic.CodeUnAuth, "please sign in") } //获取用户信息 - user, err := l.svcCtx.AllModels.FsUser.FindUserById(l.ctx, userinfo.UserId) - if err != nil { - if errors.Is(err, gorm.ErrRecordNotFound) { - return resp.SetStatusWithMessage(basic.CodeUnAuth, "user not found") - } - logx.Error(err) - return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get user info") - } - //若没打开了个性化渲染按钮 - if *user.IsOpenRender != 1 { - return resp.SetStatusWithMessage(basic.CodeOK, "success:IsOpenRender switch is closed") - } + // user, err := l.svcCtx.AllModels.FsUser.FindUserById(l.ctx, userinfo.UserId) + // if err != nil { + // if errors.Is(err, gorm.ErrRecordNotFound) { + // return resp.SetStatusWithMessage(basic.CodeUnAuth, "user not found") + // } + // logx.Error(err) + // return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get user info") + // } + // //若没打开了个性化渲染按钮 + // if *user.IsOpenRender != 1 { + // return resp.SetStatusWithMessage(basic.CodeOK, "success:IsOpenRender switch is closed") + // } //查询用户最近下单成功的数据 // orderInfo, err := l.svcCtx.AllModels.FsOrder.FindLastSuccessOneOrder(l.ctx, user.Id, int64(constants.STATUS_NEW_NOT_PAY)) // if err != nil { diff --git a/server/product/internal/logic/getproductinfologic.go b/server/product/internal/logic/getproductinfologic.go index 7db20475..ea3f27f8 100644 --- a/server/product/internal/logic/getproductinfologic.go +++ b/server/product/internal/logic/getproductinfologic.go @@ -377,8 +377,8 @@ func (l *GetProductInfoLogic) GetProductInfo(req *types.GetProductInfoReq, useri logx.Error(err) return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get user info") } - isLowRendering = *user.IsLowRendering > 0 - isRemoveBg = *user.IsRemoveBg > 0 + isLowRendering = true + isRemoveBg = true lastDesign = l.getLastDesign(user) } var renderDesign interface{} diff --git a/server/product/internal/logic/getproductlistlogic.go b/server/product/internal/logic/getproductlistlogic.go index d12bc4dd..aa8d4daa 100644 --- a/server/product/internal/logic/getproductlistlogic.go +++ b/server/product/internal/logic/getproductlistlogic.go @@ -12,12 +12,13 @@ import ( "fusenapi/utils/basic" "fusenapi/utils/format" "fusenapi/utils/image" - "github.com/zeromicro/go-zero/core/logx" - "github.com/zeromicro/go-zero/core/stores/sqlc" - "gorm.io/gorm" "math" "sort" "strings" + + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stores/sqlc" + "gorm.io/gorm" ) type GetProductListLogic struct { @@ -163,7 +164,7 @@ func (l *GetProductListLogic) GetProductList(req *types.GetProductListReq, useri UserId: user.Id, } if user.Id != 0 { - r.IsThousandFace = int(*user.IsThousandFace) + r.IsThousandFace = 1 } image.ThousandFaceImageFormat(&r) item.Cover = r.Cover diff --git a/server/product/internal/logic/getrendersettingbypidlogic.go b/server/product/internal/logic/getrendersettingbypidlogic.go index 94a2d546..648b7ce7 100644 --- a/server/product/internal/logic/getrendersettingbypidlogic.go +++ b/server/product/internal/logic/getrendersettingbypidlogic.go @@ -77,8 +77,8 @@ func (l *GetRenderSettingByPidLogic) GetRenderSettingByPid(req *types.GetRenderS logx.Error(err) return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get user info") } - isLowRendering = *user.IsLowRendering > 0 - isRemoveBg = *user.IsRemoveBg > 0 + isLowRendering = true + isRemoveBg = true lastDesign, err = l.checkLastDesignExists(user.Id) if err != nil { logx.Error(err) diff --git a/server/product/internal/logic/getsuccessrecommandlogic.go b/server/product/internal/logic/getsuccessrecommandlogic.go index 67f6902c..6fa90620 100644 --- a/server/product/internal/logic/getsuccessrecommandlogic.go +++ b/server/product/internal/logic/getsuccessrecommandlogic.go @@ -9,6 +9,7 @@ import ( "fusenapi/utils/auth" "fusenapi/utils/basic" "fusenapi/utils/image" + "github.com/zeromicro/go-zero/core/logx" "gorm.io/gorm" ) @@ -75,7 +76,7 @@ func (l *GetSuccessRecommandLogic) GetSuccessRecommand(req *types.GetSuccessReco UserId: user.Id, } if user.Id > 0 { - r.IsThousandFace = int(*user.IsThousandFace) + r.IsThousandFace = int(1) } image.ThousandFaceImageFormat(&r) data.Cover = r.Cover diff --git a/server/product/internal/logic/otherproductlistlogic.go b/server/product/internal/logic/otherproductlistlogic.go index 09853418..fbc68f67 100644 --- a/server/product/internal/logic/otherproductlistlogic.go +++ b/server/product/internal/logic/otherproductlistlogic.go @@ -8,9 +8,10 @@ import ( "fusenapi/utils/basic" "fusenapi/utils/format" "fusenapi/utils/image" - "gorm.io/gorm" "strings" + "gorm.io/gorm" + "fusenapi/server/product/internal/svc" "fusenapi/server/product/internal/types" @@ -83,7 +84,7 @@ func (l *OtherProductListLogic) OtherProductList(req *types.OtherProductListReq, UserId: user.Id, } if user.Id > 0 { - r.IsThousandFace = int(*user.IsThousandFace) + r.IsThousandFace = 1 } image.ThousandFaceImageFormat(r) v.Cover = r.Cover