info get profile
This commit is contained in:
eson
parent
4dfeebeaed
commit
f387e46977
model/gmodel
server/info/internal
server_api
utils/fssql
|
|
@ -7,16 +7,12 @@ import (
|
|||
|
||||
// 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删除
|
||||
Ctime *time.Time `gorm:"index;default:'0000-00-00 00:00:00';" json:"ctime"` //
|
||||
Utime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"utime"` //
|
||||
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删除
|
||||
Ctime *time.Time `gorm:"index;default:'0000-00-00 00:00:00';" json:"ctime"` //
|
||||
Utime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"utime"` //
|
||||
}
|
||||
type FsGuestModel struct {
|
||||
db *gorm.DB
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ type FsUser struct {
|
|||
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"` // 手机号码
|
||||
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"` //
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ package gmodel
|
|||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"fusenapi/utils/fssql"
|
||||
"fusenapi/utils/handlers"
|
||||
|
||||
|
|
@ -49,3 +51,33 @@ func (m *FsUserInfoModel) MergeMetadata(userId int64, meta any) error {
|
|||
"base": meta,
|
||||
}, "user_id = ?", userId)
|
||||
}
|
||||
|
||||
func (m *FsUserInfoModel) GetProfile(ctx context.Context, pkey string, userId int64) (map[string]any, error) {
|
||||
|
||||
var baseinfo map[string]any
|
||||
tname := fssql.GetGormTableName(m.db, FsUserInfo{})
|
||||
|
||||
if pkey == "." {
|
||||
pkey = ""
|
||||
} else {
|
||||
pkey = "." + pkey
|
||||
}
|
||||
|
||||
rawsql := fmt.Sprintf("select JSON_EXTRACT(metadata,'$%s') as query from %s where user_id = ? and module = 'profile' order by ctime DESC limit 1", pkey, tname)
|
||||
err := m.db.Raw(rawsql, userId).Take(&baseinfo).Error
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
v, ok := baseinfo["query"].(string)
|
||||
if !ok {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
var info map[string]any
|
||||
err = json.Unmarshal([]byte(v), &info)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return info, nil
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,6 +17,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
|
|||
Path: "/api/info/user",
|
||||
Handler: InfoHandler(serverCtx),
|
||||
},
|
||||
{
|
||||
Method: http.MethodGet,
|
||||
Path: "/api/info/user/profile",
|
||||
Handler: UserGetProfileHandler(serverCtx),
|
||||
},
|
||||
{
|
||||
Method: http.MethodPost,
|
||||
Path: "/api/info/user/profile/update",
|
||||
|
|
|
|||
35
server/info/internal/handler/usergetprofilehandler.go
Normal file
35
server/info/internal/handler/usergetprofilehandler.go
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
package handler
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"reflect"
|
||||
|
||||
"fusenapi/utils/basic"
|
||||
|
||||
"fusenapi/server/info/internal/logic"
|
||||
"fusenapi/server/info/internal/svc"
|
||||
"fusenapi/server/info/internal/types"
|
||||
)
|
||||
|
||||
func UserGetProfileHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
var req types.QueryProfileRequest
|
||||
userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
// 创建一个业务逻辑层实例
|
||||
l := logic.NewUserGetProfileLogic(r.Context(), svcCtx)
|
||||
|
||||
rl := reflect.ValueOf(l)
|
||||
basic.BeforeLogic(w, r, rl)
|
||||
|
||||
resp := l.UserGetProfile(&req, userinfo)
|
||||
|
||||
if !basic.AfterLogic(w, r, rl, resp) {
|
||||
basic.NormalAfterLogic(w, r, resp)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -5,8 +5,8 @@ import (
|
|||
"fmt"
|
||||
"fusenapi/initalize"
|
||||
"fusenapi/model/gmodel"
|
||||
"fusenapi/server/info/internal/types"
|
||||
"fusenapi/utils/check"
|
||||
"fusenapi/utils/fssql"
|
||||
"log"
|
||||
"strings"
|
||||
"testing"
|
||||
|
|
@ -176,24 +176,14 @@ func TestCaseJSON_EXTRACT(t *testing.T) {
|
|||
|
||||
conn := initalize.InitMysql("fsreaderwriter:XErSYmLELKMnf3Dh@tcp(fusen.cdmigcvz3rle.us-east-2.rds.amazonaws.com:3306)/fusen")
|
||||
// err = conn.Exec(updatesql, 6).Error
|
||||
fname := "asd"
|
||||
r := &types.ProfileRequest{
|
||||
FirstName: &fname,
|
||||
}
|
||||
info := gmodel.UserProfileBase{}
|
||||
|
||||
m := map[string]any{
|
||||
"base": r,
|
||||
}
|
||||
var baseinfo map[string]any
|
||||
tname := fssql.GetGormTableName(conn, gmodel.FsUserInfo{})
|
||||
rawsql := fmt.Sprintf("select JSON_EXTRACT(metadata,'$.base') as base from %s where user_id = ? and module = ? order by ctime DESC limit 1", tname)
|
||||
tx := conn.Raw(rawsql, 162, "profile").Take(&baseinfo)
|
||||
log.Println(tx.Error)
|
||||
json.Unmarshal([]byte(baseinfo["base"].(string)), &info)
|
||||
|
||||
data, err := json.Marshal(m)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
log.Println(string(data))
|
||||
|
||||
var result []gmodel.FsAddress
|
||||
conn.Model(&gmodel.FsAddress{}).Find(&result)
|
||||
|
||||
log.Println(conn.Model(&gmodel.FsChangeCode{}).Select("id").Where("id = 5").Take(nil).Error)
|
||||
log.Println(err)
|
||||
}
|
||||
|
|
|
|||
52
server/info/internal/logic/usergetprofilelogic.go
Normal file
52
server/info/internal/logic/usergetprofilelogic.go
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
package logic
|
||||
|
||||
import (
|
||||
"fusenapi/utils/auth"
|
||||
"fusenapi/utils/basic"
|
||||
|
||||
"context"
|
||||
|
||||
"fusenapi/server/info/internal/svc"
|
||||
"fusenapi/server/info/internal/types"
|
||||
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
)
|
||||
|
||||
type UserGetProfileLogic struct {
|
||||
logx.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
func NewUserGetProfileLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UserGetProfileLogic {
|
||||
return &UserGetProfileLogic{
|
||||
Logger: logx.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
// 处理进入前逻辑w,r
|
||||
// func (l *UserGetProfileLogic) BeforeLogic(w http.ResponseWriter, r *http.Request) {
|
||||
// }
|
||||
|
||||
func (l *UserGetProfileLogic) UserGetProfile(req *types.QueryProfileRequest, userinfo *auth.UserInfo) (resp *basic.Response) {
|
||||
// 返回值必须调用Set重新返回, resp可以空指针调用 resp.SetStatus(basic.CodeOK, data)
|
||||
// userinfo 传入值时, 一定不为null
|
||||
|
||||
if !userinfo.IsUser() {
|
||||
return resp.SetStatus(basic.CodeUnAuth)
|
||||
}
|
||||
|
||||
profileBase, err := l.svcCtx.AllModels.FsUserInfo.GetProfile(l.ctx, req.TopKey, userinfo.UserId)
|
||||
if err != nil {
|
||||
return resp.SetStatusWithMessage(basic.CodeApiErr, err.Error())
|
||||
}
|
||||
|
||||
return resp.SetStatus(basic.CodeOK, profileBase)
|
||||
}
|
||||
|
||||
// 处理逻辑后 w,r 如:重定向, resp 必须重新处理
|
||||
// func (l *UserGetProfileLogic) AfterLogic(w http.ResponseWriter, r *http.Request, resp *basic.Response) {
|
||||
// // httpx.OkJsonCtx(r.Context(), w, resp)
|
||||
// }
|
||||
|
|
@ -45,6 +45,10 @@ type ProfileRequest struct {
|
|||
Company *string `json:"company,optional,omitempty"` // 公司
|
||||
}
|
||||
|
||||
type QueryProfileRequest struct {
|
||||
TopKey string `json:"top_key"` // 首名
|
||||
}
|
||||
|
||||
type Request struct {
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,6 +13,9 @@ service info {
|
|||
@handler InfoHandler
|
||||
post /api/info/user(UserInfoRequest) returns (response);
|
||||
|
||||
@handler UserGetProfileHandler
|
||||
get /api/info/user/profile(QueryProfileRequest) returns (response);
|
||||
|
||||
@handler UpdateProfileHandler
|
||||
post /api/info/user/profile/update(ProfileRequest) returns (response);
|
||||
|
||||
|
|
@ -72,4 +75,8 @@ type (
|
|||
Resetaurant *string `json:"resetaurant,optional,omitempty"` // 不知道干什么
|
||||
Company *string `json:"company,optional,omitempty"` // 公司
|
||||
}
|
||||
|
||||
QueryProfileRequest {
|
||||
TopKey string `json:"top_key"` // 首名
|
||||
}
|
||||
)
|
||||
|
|
@ -191,3 +191,12 @@ func MetadataOrderPATCH(tx *gorm.DB, sql string, orderSn string, tableStructPoin
|
|||
|
||||
return nil
|
||||
}
|
||||
|
||||
func GetGormTableName(tx *gorm.DB, tableStructPointer any) string {
|
||||
stype := reflect.TypeOf(tableStructPointer)
|
||||
if stype.Kind() == reflect.Pointer {
|
||||
stype = stype.Elem()
|
||||
}
|
||||
tname := tx.NamingStrategy.TableName(stype.Name())
|
||||
return tname
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user