V3dev (#463)

* statistics user register

* refactor: router change

* minio init

---------

Co-authored-by: withchao <993506633@qq.com>
Co-authored-by: Gordon <1432970085@qq.com>

internal/api/route.go

@@ -34,15 +34,16 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive
 		r.GET("/metrics", prome.PrometheusHandler())
 	}
 	ParseToken := mw.GinParseToken(rdb)
-	userRouterGroup := r.Group("/user", ParseToken)
+	userRouterGroup := r.Group("/user")
 	{
-		userRouterGroup.POST("/update_user_info", u.UpdateUserInfo)
+		userRouterGroup.POST("/user_register", u.UserRegister)
-		userRouterGroup.POST("/set_global_msg_recv_opt", u.SetGlobalRecvMessageOpt)
+		userRouterGroup.POST("/update_user_info", ParseToken, u.UpdateUserInfo)
-		userRouterGroup.POST("/get_users_info", u.GetUsersPublicInfo)
+		userRouterGroup.POST("/set_global_msg_recv_opt", ParseToken, u.SetGlobalRecvMessageOpt)
-		userRouterGroup.POST("/get_all_users_uid", u.GetAllUsersID)
+		userRouterGroup.POST("/get_users_info", ParseToken, u.GetUsersPublicInfo)
-		userRouterGroup.POST("/account_check", u.AccountCheck)
+		userRouterGroup.POST("/get_all_users_uid", ParseToken, u.GetAllUsersID)
-		userRouterGroup.POST("/get_users", u.GetUsers)
+		userRouterGroup.POST("/account_check", ParseToken, u.AccountCheck)
-		userRouterGroup.POST("/get_users_online_status", u.GetUsersOnlineStatus)
+		userRouterGroup.POST("/get_users", ParseToken, u.GetUsers)
+		userRouterGroup.POST("/get_users_online_status", ParseToken, u.GetUsersOnlineStatus)
 	}
 	//friend routing group
 	friendRouterGroup := r.Group("/friend", ParseToken)

pkg/common/db/obj/minio.go

@@ -33,10 +33,11 @@ func NewMinioInterface() (Interface, error) {
 	}
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*20)
 	defer cancel()
+	initBucket := func(ctx context.Context) error {
 		for _, bucket := range utils.Distinct([]string{conf.TempBucket, conf.DataBucket}) {
 			exists, err := client.BucketExists(ctx, bucket)
 			if err != nil {
-			return nil, fmt.Errorf("minio bucket %s exists %w", bucket, err)
+				return fmt.Errorf("minio bucket %s exists %w", bucket, err)
 			}
 			if exists {
 				continue
@@ -46,9 +47,14 @@ func NewMinioInterface() (Interface, error) {
 				ObjectLocking: conf.IsDistributedMod,
 			}
 			if err := client.MakeBucket(ctx, bucket, opt); err != nil {
-			return nil, fmt.Errorf("minio make bucket %s %w", bucket, err)
+				return fmt.Errorf("minio make bucket %s %w", bucket, err)
 			}
 		}
+		return nil
+	}
+	if err := initBucket(ctx); err != nil {
+		fmt.Println("minio init error:", err)
+	}
 	return &minioImpl{
 		client:     client,
 		tempBucket: conf.TempBucket,

pkg/common/db/relation/user_model.go

@@ -74,7 +74,7 @@ func (u *UserGorm) CountTotal(ctx context.Context) (count int64, err error) {
 
 func (u *UserGorm) CountRangeEverydayTotal(ctx context.Context, start time.Time, end time.Time) (map[string]int64, error) {
 	var res []struct {
-		Date  string `gorm:"column:date"`
+		Date  time.Time `gorm:"column:date"`
 		Count int64     `gorm:"column:count"`
 	}
 	err := u.db(ctx).Model(&relation.UserModel{}).Select("DATE(create_time) AS date, count(1) AS count").Where("create_time >= ? and create_time < ?", start, end).Group("date").Find(&res).Error
@@ -83,7 +83,7 @@ func (u *UserGorm) CountRangeEverydayTotal(ctx context.Context, start time.Time,
 	}
 	v := make(map[string]int64)
 	for _, r := range res {
-		v[r.Date] = r.Count
+		v[r.Date.Format("2006-01-02")] = r.Count
 	}
 	return v, nil
 }