move Dir "kite_gen pack dal" to root

.gitignore

@@ -1,7 +1,6 @@
 .lh
 output/
 .vscode/
-log/
 
 *.log
 

cmd/api/handlers/user.go

@@ -21,8 +21,8 @@ import (
 
 	"github.com/a76yyyy/tiktok/pkg/errno"
 
-	"github.com/a76yyyy/tiktok/cmd/user/kitex_gen/user"
-	"github.com/a76yyyy/tiktok/cmd/user/pack"
+	"github.com/a76yyyy/tiktok/kitex_gen/user"
+	"github.com/a76yyyy/tiktok/pack"
 
 	"github.com/a76yyyy/tiktok/cmd/api/rpc"
 

cmd/api/rpc/user.go

@@ -21,8 +21,8 @@ import (
 	"time"
 
 	etcd "github.com/a76yyyy/registry-etcd"
-	"github.com/a76yyyy/tiktok/cmd/user/kitex_gen/user"
-	"github.com/a76yyyy/tiktok/cmd/user/kitex_gen/user/usersrv"
+	"github.com/a76yyyy/tiktok/kitex_gen/user"
+	"github.com/a76yyyy/tiktok/kitex_gen/user/usersrv"
 	"github.com/a76yyyy/tiktok/pkg/errno"
 	"github.com/a76yyyy/tiktok/pkg/middleware"
 	"github.com/a76yyyy/tiktok/pkg/ttviper"

cmd/user/command/getUserByID.go

@@ -3,10 +3,10 @@ package command
 import (
 	"context"
 
-	"github.com/a76yyyy/tiktok/cmd/user/kitex_gen/user"
+	"github.com/a76yyyy/tiktok/kitex_gen/user"
 
-	"github.com/a76yyyy/tiktok/cmd/user/dal/db"
-	"github.com/a76yyyy/tiktok/cmd/user/pack"
+	"github.com/a76yyyy/tiktok/dal/db"
+	"github.com/a76yyyy/tiktok/pack"
 )
 
 type MGetUserService struct {

cmd/user/command/login.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/a76yyyy/tiktok/pkg/errno"
 
-	"github.com/a76yyyy/tiktok/cmd/user/kitex_gen/user"
+	"github.com/a76yyyy/tiktok/kitex_gen/user"
 
-	"github.com/a76yyyy/tiktok/cmd/user/dal/db"
+	"github.com/a76yyyy/tiktok/dal/db"
 )
 
 type CheckUserService struct {

cmd/user/command/register.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/a76yyyy/tiktok/pkg/errno"
 
-	"github.com/a76yyyy/tiktok/cmd/user/kitex_gen/user"
+	"github.com/a76yyyy/tiktok/kitex_gen/user"
 
-	"github.com/a76yyyy/tiktok/cmd/user/dal/db"
+	"github.com/a76yyyy/tiktok/dal/db"
 )
 
 type CreateUserService struct {

cmd/user/handler.go

@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/a76yyyy/tiktok/cmd/user/command"
-	"github.com/a76yyyy/tiktok/cmd/user/kitex_gen/user"
-	"github.com/a76yyyy/tiktok/cmd/user/pack"
+	"github.com/a76yyyy/tiktok/kitex_gen/user"
+	"github.com/a76yyyy/tiktok/pack"
 	"github.com/a76yyyy/tiktok/pkg/errno"
 	"github.com/a76yyyy/tiktok/pkg/jwt"
 )

cmd/user/main.go

@@ -8,8 +8,8 @@ import (
 	"github.com/cloudwego/kitex/pkg/klog"
 
 	etcd "github.com/a76yyyy/registry-etcd"
-	"github.com/a76yyyy/tiktok/cmd/user/dal"
-	user "github.com/a76yyyy/tiktok/cmd/user/kitex_gen/user/usersrv"
+	"github.com/a76yyyy/tiktok/dal"
+	user "github.com/a76yyyy/tiktok/kitex_gen/user/usersrv"
 	"github.com/a76yyyy/tiktok/pkg/dlog"
 	"github.com/a76yyyy/tiktok/pkg/jwt"
 	"github.com/a76yyyy/tiktok/pkg/middleware"

dal/db/feed.go

@@ -0,0 +1,30 @@
+package db
+
+import (
+	"context"
+	"time"
+
+	"gorm.io/gorm"
+)
+
+type Video struct {
+	gorm.Model
+	// UpdatedAt     time.Time `gorm:"column:update_time;not null;index:idx_update" `
+	Author        User `gorm:"ForeignKey:AuthorID;AssociationForeignKey:ID"`
+	AuthorID      int
+	PlayUrl       string `gorm:"type:varchar(255);not null"`
+	CoverUrl      string `gorm:"type:varchar(255)"`
+	FavoriteCount int    `gorm:"default:0"`
+	CommentCount  int    `gorm:"default:0"`
+	Title         string `gorm:"type:varchar(50);not null"`
+}
+
+// MGetVideoss multiple get list of videos info
+func MGetVideos(ctx context.Context, latestTime int64) ([]*Video, error) {
+	videos := make([]*Video, 0)
+
+	if err := DB.WithContext(ctx).Limit(30).Order("update_time desc").Find(&videos, "update_time < ?", time.UnixMilli(latestTime)).Error; err != nil {
+		return nil, err
+	}
+	return videos, nil
+}

cmd/user/dal/db/init.go → dal/db/init.go

@@ -19,22 +19,19 @@ import (
 	"fmt"
 
 	"github.com/a76yyyy/tiktok/pkg/ttviper"
-	"github.com/spf13/pflag"
 	"github.com/uptrace/opentelemetry-go-extra/otelgorm"
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
 )
 
 var (
-	DB        *gorm.DB
-	TableName = pflag.String("mysql.tablename", "", "Mysql Table Name")
+	DB *gorm.DB
 )
 
 // Init init DB
 func InitDB(config *ttviper.Config) {
 	var err error
 	viper := config.Viper
-	*TableName = viper.GetString("mysql.tablename")
 	dsn := fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?charset=%s&parseTime=%t&loc=%s",
 		viper.GetString("mysql.user"),
 		viper.GetString("mysql.password"),
@@ -59,7 +56,7 @@ func InitDB(config *ttviper.Config) {
 		panic(err)
 	}
 
-	if err := DB.AutoMigrate(&User{}); err != nil {
+	if err := DB.AutoMigrate(&User{}, &Video{}); err != nil {
 		panic(err)
 	}
 }

cmd/user/dal/db/user.go → dal/db/user.go

@@ -29,10 +29,6 @@ type User struct {
 	FollowerCount  int    `gorm:"default:0"`
 }
 
-func (u *User) TableName() string {
-	return *TableName
-}
-
 // MGetUsers multiple get list of user info
 func MGetUsers(ctx context.Context, userIDs []int64) ([]*User, error) {
 	res := make([]*User, 0)

cmd/user/dal/init.go → dal/init.go

@@ -16,7 +16,7 @@
 package dal
 
 import (
-	db "github.com/a76yyyy/tiktok/cmd/user/dal/db"
+	db "github.com/a76yyyy/tiktok/dal/db"
 	"github.com/a76yyyy/tiktok/pkg/ttviper"
 )