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

重命名包为 core

Browse Source
This commit is contained in:
luorijun
2025-05-07 17:38:27 +08:00
parent 60bbe47368
commit 0a16f9923c
43 changed files with 349 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/services/auth.go
View File

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

18
web/services/channel.go
View File

@@ -13,7 +13,7 @@ import (
"platform/pkg/orm"
"platform/pkg/rds"
"platform/pkg/u"
"platform/web/common"
"platform/web/core"
g "platform/web/globals"
"platform/web/models"
q "platform/web/queries"
@@ -56,10 +56,10 @@ type ResourceInfo struct {
Live int32
DailyLimit int32
DailyUsed int32
DailyLast common.LocalDateTime
DailyLast core.LocalDateTime
Quota int32
Used int32
Expire common.LocalDateTime
Expire core.LocalDateTime
}
// region RemoveChannel
@@ -83,7 +83,7 @@ func (s *channelService) RemoveChannels(ctx context.Context, auth *AuthContext,
// 检查权限，如果为用户操作的话，则只能删除自己的通道
for _, channel := range channels {
if auth.Payload.Type == PayloadUser && auth.Payload.Id != channel.UserID {
return common.AuthForbiddenErr("无权限访问")
return core.AuthForbiddenErr("无权限访问")
}
}
@@ -301,7 +301,7 @@ func (s *channelService) CreateChannel(
// 分配端口
step = time.Now()
expiration := common.LocalDateTime(now.Add(time.Duration(resource.Live) * time.Second))
expiration := core.LocalDateTime(now.Add(time.Duration(resource.Live) * time.Second))
_addr, channels, err := assignPort(q, edgeAssigns, auth.Payload.Id, protocol, authType, expiration, filter)
if err != nil {
return err
@@ -315,7 +315,7 @@ func (s *channelService) CreateChannel(
toUpdate := models.ResourcePss{
Used: resource.Used + int32(count),
DailyLast: common.LocalDateTime(now),
DailyLast: core.LocalDateTime(now),
}
var last = time.Time(resource.DailyLast)
if now.Year() != last.Year() || now.Month() != last.Month() || now.Day() != last.Day() {
@@ -360,7 +360,7 @@ func checkUser(auth *AuthContext, resource *ResourceInfo, count int) error {
// 检查使用人
if auth.Payload.Type == PayloadUser && auth.Payload.Id != resource.UserId {
return common.AuthForbiddenErr("无权限访问")
return core.AuthForbiddenErr("无权限访问")
}
// 检查套餐状态
@@ -428,7 +428,7 @@ func assignEdge(q *q.Query, count int, filter NodeFilterConfig) (*AssignEdgeResu
q.Channel.ProxyPort).
Where(
q.Channel.ProxyID.In(proxyIds...),
q.Channel.Expiration.Gt(common.LocalDateTime(time.Now()))).
q.Channel.Expiration.Gt(core.LocalDateTime(time.Now()))).
Group(
q.Channel.ProxyPort,
q.Channel.ProxyID).
@@ -549,7 +549,7 @@ func assignPort(
userId int32,
protocol ChannelProtocol,
authType ChannelAuthType,
expiration common.LocalDateTime,
expiration core.LocalDateTime,
filter NodeFilterConfig,
) ([]*PortInfo, []*models.Channel, error) {
var step time.Time

28
web/services/channel_test.go
View File

@@ -5,7 +5,7 @@ import (
"encoding/json"
"fmt"
"platform/pkg/testutil"
"platform/web/common"
"platform/web/core"
g "platform/web/globals"
"platform/web/models"
"reflect"
@@ -109,7 +109,7 @@ func Test_cache(t *testing.T) {
// 准备测试数据
now := time.Now()
expiration := common.LocalDateTime(now.Add(24 * time.Hour))
expiration := core.LocalDateTime(now.Add(24 * time.Hour))
testChannels := []*models.Channel{
{
@@ -341,7 +341,7 @@ func Test_channelService_CreateChannel(t *testing.T) {
ResourceID: 1,
Type: 1,
Live: 180,
Expire: common.LocalDateTime(time.Now().AddDate(1, 0, 0)),
Expire: core.LocalDateTime(time.Now().AddDate(1, 0, 0)),
DailyLimit: 10000,
}
db.Exec("delete from resource_pss where true")
@@ -844,7 +844,7 @@ func Test_channelService_CreateChannel(t *testing.T) {
ResourceID: 2,
Type: 1,
Live: 180,
Expire: common.LocalDateTime(time.Now().AddDate(1, 0, 0)),
Expire: core.LocalDateTime(time.Now().AddDate(1, 0, 0)),
DailyLimit: 10000,
}
db.Create(resourcePss2)
@@ -914,7 +914,7 @@ func Test_channelService_CreateChannel(t *testing.T) {
ProxyID: 1,
ProxyPort: int32(i + 10000),
UserID: 101,
Expiration: common.LocalDateTime(expr),
Expiration: core.LocalDateTime(expr),
}
}
db.CreateInBatches(channels, 1000)
@@ -1040,9 +1040,9 @@ func Test_channelService_RemoveChannels(t *testing.T) {
// 创建通道
channels := []models.Channel{
{ID: 1, UserID: 101, ProxyID: 1, ProxyPort: 10001, Protocol: 1, Expiration: common.LocalDateTime(time.Now().Add(24 * time.Hour))},
{ID: 2, UserID: 101, ProxyID: 1, ProxyPort: 10002, Protocol: 1, Expiration: common.LocalDateTime(time.Now().Add(24 * time.Hour))},
{ID: 3, UserID: 101, ProxyID: 2, ProxyPort: 10001, Protocol: 3, Expiration: common.LocalDateTime(time.Now().Add(24 * time.Hour))},
{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))},
}
// 保存预设数据
@@ -1154,9 +1154,9 @@ func Test_channelService_RemoveChannels(t *testing.T) {
// 创建通道
channels := []models.Channel{
{ID: 1, UserID: 101, ProxyID: 1, ProxyPort: 10001, Protocol: 1, Expiration: common.LocalDateTime(time.Now().Add(24 * time.Hour))},
{ID: 2, UserID: 101, ProxyID: 1, ProxyPort: 10002, Protocol: 1, Expiration: common.LocalDateTime(time.Now().Add(24 * time.Hour))},
{ID: 3, UserID: 101, ProxyID: 2, ProxyPort: 10001, Protocol: 3, Expiration: common.LocalDateTime(time.Now().Add(24 * time.Hour))},
{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))},
}
// 保存预设数据
@@ -1268,9 +1268,9 @@ func Test_channelService_RemoveChannels(t *testing.T) {
// 创建通道
channels := []models.Channel{
{ID: 1, UserID: 101, ProxyID: 1, ProxyPort: 10001, Protocol: 1, Expiration: common.LocalDateTime(time.Now().Add(24 * time.Hour))},
{ID: 2, UserID: 101, ProxyID: 1, ProxyPort: 10002, Protocol: 1, Expiration: common.LocalDateTime(time.Now().Add(24 * time.Hour))},
{ID: 3, UserID: 102, ProxyID: 2, ProxyPort: 10001, Protocol: 3, Expiration: common.LocalDateTime(time.Now().Add(24 * time.Hour))},
{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))},
}
// 保存预设数据

4
web/services/resource.go
View File

@@ -6,7 +6,7 @@ import (
"encoding/json"
"fmt"
"platform/pkg/rds"
"platform/web/common"
"platform/web/core"
m "platform/web/models"
q "platform/web/queries"
"strings"
@@ -248,7 +248,7 @@ func createResource(data *CreateResourceData, uid int32) (*m.Resource, error) {
Type: data.Type,
Live: data.Live,
Quota: data.Quota,
Expire: common.LocalDateTime(time.Now().Add(time.Duration(data.Expire) * 24 * time.Hour)),
Expire: core.LocalDateTime(time.Now().Add(time.Duration(data.Expire) * 24 * time.Hour)),
DailyLimit: data.DailyLimit,
},
}

10
web/services/transaction.go
View File

@@ -8,7 +8,7 @@ import (
"net/http"
"platform/pkg/env"
"platform/pkg/u"
"platform/web/common"
"platform/web/core"
g "platform/web/globals"
m "platform/web/models"
q "platform/web/queries"
@@ -275,7 +275,7 @@ func (s *transactionService) CompleteTransaction(ctx context.Context, q *q.Query
trade.Status = 1
trade.OuterNo = transId
trade.Payment = payment
trade.PaidAt = common.LocalDateTime(paidAt)
trade.PaidAt = core.LocalDateTime(paidAt)
trade.PayURL = ""
_, err = q.Trade.WithContext(ctx).Updates(trade)
if err != nil {
@@ -327,7 +327,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: 2,
CancelAt: common.LocalDateTime(time),
CancelAt: core.LocalDateTime(time),
PayURL: "",
})
if err != nil {
@@ -388,6 +388,6 @@ type TransactionCompleteResult struct {
}
var (
ErrTransactionNotPaid = common.NewErr("transaction", "交易未完成")
ErrTransactionNotSupported = common.NewErr("transaction", "不支持的支付方式")
ErrTransactionNotPaid = core.NewErr("transaction", "交易未完成")
ErrTransactionNotSupported = core.NewErr("transaction", "不支持的支付方式")
)