lanhu/platform
2
0
Fork 0
Code Issues Actions Packages Releases 13 Activity

将 LocalDateTime 迁移到 orm

Browse Source
This commit is contained in:
luorijun
2025-05-10 15:00:03 +08:00
parent 3140d35a95
commit 37e6e58816
39 changed files with 414 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/services/auth.go
View File

@@ -3,8 +3,8 @@ package services
import (
"context"
"errors"
"platform/pkg/orm"
auth2 "platform/web/auth"
"platform/web/core"
client2 "platform/web/domains/client"
m "platform/web/models"
q "platform/web/queries"
@@ -122,7 +122,7 @@ func (s *authService) OauthPassword(ctx context.Context, _ *m.Client, data *Gran
}
// 更新用户的登录时间
user.LastLogin = core.LocalDateTime(time.Now())
user.LastLogin = orm.LocalDateTime(time.Now())
user.LastLoginHost = ip
user.LastLoginAgent = agent
if err := tx.User.Omit(q.User.AdminID).Save(user); err != nil {

10
web/services/channel.go
View File

@@ -42,10 +42,10 @@ type ResourceInfo struct {
Live int32
DailyLimit int32
DailyUsed int32
DailyLast core.LocalDateTime
DailyLast orm.LocalDateTime
Quota int32
Used int32
Expire core.LocalDateTime
Expire orm.LocalDateTime
}
// region RemoveChannel
@@ -362,7 +362,7 @@ func findChannels(q *q.Query, proxies []*m.Proxy) (channels []*m.Channel, err er
q.Channel.ProxyPort).
Where(
q.Channel.ProxyID.In(proxyIds...),
q.Channel.Expiration.Gt(core.LocalDateTime(time.Now()))).
q.Channel.Expiration.Gt(orm.LocalDateTime(time.Now()))).
Group(
q.Channel.ProxyPort,
q.Channel.ProxyID).
@@ -520,7 +520,7 @@ func calcChannels(
ProxyHost: proxy.Host,
ProxyPort: int32(port),
Protocol: int32(protocol),
Expiration: core.LocalDateTime(expiration),
Expiration: orm.LocalDateTime(expiration),
}
switch authType {
@@ -575,7 +575,7 @@ func calcChannels(
func updateResource(rid string, resource *ResourceInfo, count int, now time.Time) (err error) {
toUpdate := m.ResourcePss{
Used: resource.Used + int32(count),
DailyLast: core.LocalDateTime(now),
DailyLast: orm.LocalDateTime(now),
}
var last = time.Time(resource.DailyLast)
if now.Year() != last.Year() || now.Month() != last.Month() || now.Day() != last.Day() {

28
web/services/channel_test.go
View File

@@ -4,9 +4,9 @@ import (
"context"
"encoding/json"
"fmt"
"platform/pkg/orm"
"platform/pkg/testutil"
"platform/web/auth"
"platform/web/core"
g "platform/web/globals"
"platform/web/models"
"reflect"
@@ -110,7 +110,7 @@ func Test_cache(t *testing.T) {
// 准备测试数据
now := time.Now()
expiration := core.LocalDateTime(now.Add(24 * time.Hour))
expiration := orm.LocalDateTime(now.Add(24 * time.Hour))
testChannels := []*models.Channel{
{
@@ -342,7 +342,7 @@ func Test_channelService_CreateChannel(t *testing.T) {
ResourceID: 1,
Type: 1,
Live: 180,
Expire: core.LocalDateTime(time.Now().AddDate(1, 0, 0)),
Expire: orm.LocalDateTime(time.Now().AddDate(1, 0, 0)),
DailyLimit: 10000,
}
db.Exec("delete from resource_pss where true")
@@ -845,7 +845,7 @@ func Test_channelService_CreateChannel(t *testing.T) {
ResourceID: 2,
Type: 1,
Live: 180,
Expire: core.LocalDateTime(time.Now().AddDate(1, 0, 0)),
Expire: orm.LocalDateTime(time.Now().AddDate(1, 0, 0)),
DailyLimit: 10000,
}
db.Create(resourcePss2)
@@ -915,7 +915,7 @@ func Test_channelService_CreateChannel(t *testing.T) {
ProxyID: 1,
ProxyPort: int32(i + 10000),
UserID: 101,
Expiration: core.LocalDateTime(expr),
Expiration: orm.LocalDateTime(expr),
}
}
db.CreateInBatches(channels, 1000)
@@ -1041,9 +1041,9 @@ func Test_channelService_RemoveChannels(t *testing.T) {
// 创建通道
channels := []models.Channel{
{ID: 1, UserID: 101, ProxyID: 1, ProxyPort: 10001, Protocol: 1, Expiration: core.LocalDateTime(time.Now().Add(24 * time.Hour))},
{ID: 2, UserID: 101, ProxyID: 1, ProxyPort: 10002, Protocol: 1, Expiration: core.LocalDateTime(time.Now().Add(24 * time.Hour))},
{ID: 3, UserID: 101, ProxyID: 2, ProxyPort: 10001, Protocol: 3, Expiration: core.LocalDateTime(time.Now().Add(24 * time.Hour))},
{ID: 1, UserID: 101, ProxyID: 1, ProxyPort: 10001, Protocol: 1, Expiration: orm.LocalDateTime(time.Now().Add(24 * time.Hour))},
{ID: 2, UserID: 101, ProxyID: 1, ProxyPort: 10002, Protocol: 1, Expiration: orm.LocalDateTime(time.Now().Add(24 * time.Hour))},
{ID: 3, UserID: 101, ProxyID: 2, ProxyPort: 10001, Protocol: 3, Expiration: orm.LocalDateTime(time.Now().Add(24 * time.Hour))},
}
// 保存预设数据
@@ -1155,9 +1155,9 @@ func Test_channelService_RemoveChannels(t *testing.T) {
// 创建通道
channels := []models.Channel{
{ID: 1, UserID: 101, ProxyID: 1, ProxyPort: 10001, Protocol: 1, Expiration: core.LocalDateTime(time.Now().Add(24 * time.Hour))},
{ID: 2, UserID: 101, ProxyID: 1, ProxyPort: 10002, Protocol: 1, Expiration: core.LocalDateTime(time.Now().Add(24 * time.Hour))},
{ID: 3, UserID: 101, ProxyID: 2, ProxyPort: 10001, Protocol: 3, Expiration: core.LocalDateTime(time.Now().Add(24 * time.Hour))},
{ID: 1, UserID: 101, ProxyID: 1, ProxyPort: 10001, Protocol: 1, Expiration: orm.LocalDateTime(time.Now().Add(24 * time.Hour))},
{ID: 2, UserID: 101, ProxyID: 1, ProxyPort: 10002, Protocol: 1, Expiration: orm.LocalDateTime(time.Now().Add(24 * time.Hour))},
{ID: 3, UserID: 101, ProxyID: 2, ProxyPort: 10001, Protocol: 3, Expiration: orm.LocalDateTime(time.Now().Add(24 * time.Hour))},
}
// 保存预设数据
@@ -1269,9 +1269,9 @@ func Test_channelService_RemoveChannels(t *testing.T) {
// 创建通道
channels := []models.Channel{
{ID: 1, UserID: 101, ProxyID: 1, ProxyPort: 10001, Protocol: 1, Expiration: core.LocalDateTime(time.Now().Add(24 * time.Hour))},
{ID: 2, UserID: 101, ProxyID: 1, ProxyPort: 10002, Protocol: 1, Expiration: core.LocalDateTime(time.Now().Add(24 * time.Hour))},
{ID: 3, UserID: 102, ProxyID: 2, ProxyPort: 10001, Protocol: 3, Expiration: core.LocalDateTime(time.Now().Add(24 * time.Hour))},
{ID: 1, UserID: 101, ProxyID: 1, ProxyPort: 10001, Protocol: 1, Expiration: orm.LocalDateTime(time.Now().Add(24 * time.Hour))},
{ID: 2, UserID: 101, ProxyID: 1, ProxyPort: 10002, Protocol: 1, Expiration: orm.LocalDateTime(time.Now().Add(24 * time.Hour))},
{ID: 3, UserID: 102, ProxyID: 2, ProxyPort: 10001, Protocol: 3, Expiration: orm.LocalDateTime(time.Now().Add(24 * time.Hour))},
}
// 保存预设数据

4
web/services/resource.go
View File

@@ -5,8 +5,8 @@ import (
"database/sql"
"encoding/json"
"fmt"
"platform/pkg/orm"
"platform/pkg/rds"
"platform/web/core"
bill2 "platform/web/domains/bill"
resource2 "platform/web/domains/resource"
trade2 "platform/web/domains/trade"
@@ -251,7 +251,7 @@ func createResource(q *q.Query, data *CreateResourceData, uid int32) (*m.Resourc
Type: data.Type,
Live: data.Live,
Quota: data.Quota,
Expire: core.LocalDateTime(time.Now().Add(time.Duration(data.Expire) * 24 * time.Hour)),
Expire: orm.LocalDateTime(time.Now().Add(time.Duration(data.Expire) * 24 * time.Hour)),
DailyLimit: data.DailyLimit,
},
}

6
web/services/transaction.go
View File

@@ -7,8 +7,8 @@ import (
"log/slog"
"net/http"
"platform/pkg/env"
"platform/pkg/orm"
"platform/pkg/u"
"platform/web/core"
bill2 "platform/web/domains/bill"
coupon2 "platform/web/domains/coupon"
trade2 "platform/web/domains/trade"
@@ -283,7 +283,7 @@ func (s *transactionService) CompleteTransaction(ctx context.Context, q *q.Query
trade.Status = int32(trade2.StatusSuccess)
trade.OuterNo = transId
trade.Payment = payment
trade.PaidAt = core.LocalDateTime(paidAt)
trade.PaidAt = orm.LocalDateTime(paidAt)
trade.PayURL = ""
_, err = q.Trade.WithContext(ctx).Updates(trade)
if err != nil {
@@ -335,7 +335,7 @@ func (s *transactionService) FinishTransaction(ctx context.Context, q *q.Query,
Select(q.Trade.Status, q.Trade.CancelAt, q.Trade.PayURL).
Updates(m.Trade{
Status: int32(trade2.StatusCanceled),
CancelAt: core.LocalDateTime(time),
CancelAt: orm.LocalDateTime(time),
PayURL: "",
})
if err != nil {