furryboard/spider-scheduler
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2022-2023稳定运行版本

Browse Source
This commit is contained in:
Eigeen
2023-04-09 13:35:34 +08:00
parent 4f44e60168
commit cf80b07977
21 changed files with 332 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/logic/liveroom.go
View File

@@ -1,8 +1,8 @@
package logic
import (
"github.com/eigeen/furryboard/spider-scheduler/pkg/dao"
"github.com/eigeen/furryboard/spider-scheduler/pkg/dao/model"
"github.com/furryboard/spider-scheduler/pkg/dao"
"github.com/furryboard/spider-scheduler/pkg/dao/model"
)
func GetLiveRoomsFromDB(roomIDs *[]uint64) ([]*model.LiveRoom, error) {

4
pkg/logic/metadata.go
View File

@@ -2,8 +2,8 @@ package logic
import (
"errors"
"github.com/eigeen/furryboard/spider-scheduler/pkg/dao"
"github.com/eigeen/furryboard/spider-scheduler/pkg/dao/model"
"github.com/furryboard/spider-scheduler/pkg/dao"
"github.com/furryboard/spider-scheduler/pkg/dao/model"
"gorm.io/gorm"
)

10
pkg/logic/search.go
View File

@@ -3,11 +3,11 @@ package logic
import (
"context"
"fmt"
"github.com/eigeen/furryboard/spider-scheduler/pkg/dao"
"github.com/eigeen/furryboard/spider-scheduler/pkg/dao/model"
"github.com/eigeen/furryboard/spider-scheduler/pkg/exception"
"github.com/eigeen/furryboard/spider-scheduler/rpc"
"github.com/eigeen/furryboard/spider-scheduler/rpc/pb"
"github.com/furryboard/spider-scheduler/pkg/dao"
"github.com/furryboard/spider-scheduler/pkg/dao/model"
"github.com/furryboard/spider-scheduler/pkg/exception"
"github.com/furryboard/spider-scheduler/rpc"
"github.com/furryboard/spider-scheduler/rpc/pb"
"gorm.io/gorm"
"time"
)

2
pkg/logic/search_test.go
View File

@@ -1,7 +1,7 @@
package logic
import (
"github.com/eigeen/furryboard/spider-scheduler/pkg/conf"
"github.com/furryboard/spider-scheduler/pkg/conf"
"testing"
)

23
pkg/logic/user.go
View File

@@ -4,12 +4,13 @@ import (
"context"
"encoding/json"
"fmt"
"github.com/eigeen/furryboard/spider-scheduler/pkg/dao"
"github.com/eigeen/furryboard/spider-scheduler/pkg/dao/model"
"github.com/eigeen/furryboard/spider-scheduler/pkg/exception"
"github.com/eigeen/furryboard/spider-scheduler/pkg/log"
"github.com/eigeen/furryboard/spider-scheduler/rpc"
"github.com/eigeen/furryboard/spider-scheduler/rpc/pb"
"github.com/furryboard/spider-scheduler/pkg/conf"
"github.com/furryboard/spider-scheduler/pkg/dao"
"github.com/furryboard/spider-scheduler/pkg/dao/model"
"github.com/furryboard/spider-scheduler/pkg/exception"
"github.com/furryboard/spider-scheduler/pkg/log"
"github.com/furryboard/spider-scheduler/rpc"
"github.com/furryboard/spider-scheduler/rpc/pb"
"gorm.io/gorm"
"strconv"
"sync"
@@ -20,7 +21,8 @@ import (
func GetValidUsers(page, pageSize int) ([]*model.Furry, error) {
// 分页查询
var furries []*model.Furry
tx := dao.DB().Where("status = 0").Offset((page - 1) * pageSize).Limit(pageSize).Find(&furries)
//tx := dao.DB().Where("status = 0").Offset((page - 1) * pageSize).Limit(pageSize).Find(&furries)
tx := dao.DB().Offset((page - 1) * pageSize).Limit(pageSize).Find(&furries)
if tx.Error != nil {
return nil, exception.ErrFetchFurries("分页获取Furry列表时失败：" + tx.Error.Error())
}
@@ -31,10 +33,14 @@ func GetValidUsers(page, pageSize int) ([]*model.Furry, error) {
func GetUserInfoByUID(uid uint) (*pb.InfoReply_Data, error) {
ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
defer cancel()
info, err := rpc.SpiderCore().GetUserBasicInfo(ctx, &pb.InfoRequest{Uid: uint64(uid)})
info, err := rpc.SpiderCore().GetUserBasicInfo(ctx, &pb.InfoRequest{
Uid: uint64(uid),
Cookie: conf.Conf.SpiderCore.BiliCookie,
})
if err != nil {
return nil, exception.InternalError("获取用户信息失败：" + err.Error())
}
if info.Code != 200 {
if info.Msg == "" {
info.Msg = "Unknown"
@@ -42,6 +48,7 @@ func GetUserInfoByUID(uid uint) (*pb.InfoReply_Data, error) {
return nil, exception.ErrFetchUserInfo(
fmt.Sprintf("用户[%d]基础信息获取失败：%s(Code: %d)", uid, info.Msg, info.Code))
}
return info.Data, nil
}

4
pkg/logic/user_test.go
View File

@@ -1,8 +1,8 @@
package logic
import (
"github.com/eigeen/furryboard/spider-scheduler/pkg/conf"
"github.com/eigeen/furryboard/spider-scheduler/pkg/log"
"github.com/furryboard/spider-scheduler/pkg/conf"
"github.com/furryboard/spider-scheduler/pkg/log"
"testing"
)