Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
陈曦
sub2api
Commits
0c72be04
Commit
0c72be04
authored
Apr 05, 2026
by
erio
Browse files
fix: gofmt alignment and remove media_type from usage_log repo queries
parent
b4bd89b9
Changes
4
Show whitespace changes
Inline
Side-by-side
backend/internal/repository/usage_log_repo.go
View file @
0c72be04
...
@@ -800,7 +800,7 @@ func buildUsageLogBatchInsertQuery(keys []string, preparedByKey map[string]usage
...
@@ -800,7 +800,7 @@ func buildUsageLogBatchInsertQuery(keys []string, preparedByKey map[string]usage
created_at
created_at
) AS (VALUES `
)
) AS (VALUES `
)
args
:=
make
([]
any
,
0
,
len
(
keys
)
*
4
7
)
args
:=
make
([]
any
,
0
,
len
(
keys
)
*
4
6
)
argPos
:=
1
argPos
:=
1
for
idx
,
key
:=
range
keys
{
for
idx
,
key
:=
range
keys
{
if
idx
>
0
{
if
idx
>
0
{
...
@@ -864,7 +864,6 @@ func buildUsageLogBatchInsertQuery(keys []string, preparedByKey map[string]usage
...
@@ -864,7 +864,6 @@ func buildUsageLogBatchInsertQuery(keys []string, preparedByKey map[string]usage
ip_address,
ip_address,
image_count,
image_count,
image_size,
image_size,
media_type,
service_tier,
service_tier,
reasoning_effort,
reasoning_effort,
inbound_endpoint,
inbound_endpoint,
...
@@ -912,7 +911,6 @@ func buildUsageLogBatchInsertQuery(keys []string, preparedByKey map[string]usage
...
@@ -912,7 +911,6 @@ func buildUsageLogBatchInsertQuery(keys []string, preparedByKey map[string]usage
ip_address,
ip_address,
image_count,
image_count,
image_size,
image_size,
media_type,
service_tier,
service_tier,
reasoning_effort,
reasoning_effort,
inbound_endpoint,
inbound_endpoint,
...
@@ -1012,7 +1010,7 @@ func buildUsageLogBestEffortInsertQuery(preparedList []usageLogInsertPrepared) (
...
@@ -1012,7 +1010,7 @@ func buildUsageLogBestEffortInsertQuery(preparedList []usageLogInsertPrepared) (
created_at
created_at
) AS (VALUES `
)
) AS (VALUES `
)
args
:=
make
([]
any
,
0
,
len
(
preparedList
)
*
4
6
)
args
:=
make
([]
any
,
0
,
len
(
preparedList
)
*
4
5
)
argPos
:=
1
argPos
:=
1
for
idx
,
prepared
:=
range
preparedList
{
for
idx
,
prepared
:=
range
preparedList
{
if
idx
>
0
{
if
idx
>
0
{
...
@@ -1191,7 +1189,7 @@ func execUsageLogInsertNoResult(ctx context.Context, sqlq sqlExecutor, prepared
...
@@ -1191,7 +1189,7 @@ func execUsageLogInsertNoResult(ctx context.Context, sqlq sqlExecutor, prepared
$10, $11, $12, $13,
$10, $11, $12, $13,
$14, $15, $16, $17,
$14, $15, $16, $17,
$18, $19, $20, $21, $22, $23,
$18, $19, $20, $21, $22, $23,
$24, $25, $26, $27, $28, $29, $30, $31, $32, $33, $34, $35, $36, $37, $38, $39, $40, $41, $42, $43, $44, $45
, $46
$24, $25, $26, $27, $28, $29, $30, $31, $32, $33, $34, $35, $36, $37, $38, $39, $40, $41, $42, $43, $44, $45
)
)
ON CONFLICT (request_id, api_key_id) DO NOTHING
ON CONFLICT (request_id, api_key_id) DO NOTHING
`
,
prepared
.
args
...
)
`
,
prepared
.
args
...
)
...
@@ -1218,7 +1216,6 @@ func prepareUsageLogInsert(log *service.UsageLog) usageLogInsertPrepared {
...
@@ -1218,7 +1216,6 @@ func prepareUsageLogInsert(log *service.UsageLog) usageLogInsertPrepared {
userAgent
:=
nullString
(
log
.
UserAgent
)
userAgent
:=
nullString
(
log
.
UserAgent
)
ipAddress
:=
nullString
(
log
.
IPAddress
)
ipAddress
:=
nullString
(
log
.
IPAddress
)
imageSize
:=
nullString
(
log
.
ImageSize
)
imageSize
:=
nullString
(
log
.
ImageSize
)
mediaType
:=
nullString
(
log
.
MediaType
)
serviceTier
:=
nullString
(
log
.
ServiceTier
)
serviceTier
:=
nullString
(
log
.
ServiceTier
)
reasoningEffort
:=
nullString
(
log
.
ReasoningEffort
)
reasoningEffort
:=
nullString
(
log
.
ReasoningEffort
)
inboundEndpoint
:=
nullString
(
log
.
InboundEndpoint
)
inboundEndpoint
:=
nullString
(
log
.
InboundEndpoint
)
...
@@ -1279,7 +1276,6 @@ func prepareUsageLogInsert(log *service.UsageLog) usageLogInsertPrepared {
...
@@ -1279,7 +1276,6 @@ func prepareUsageLogInsert(log *service.UsageLog) usageLogInsertPrepared {
ipAddress
,
ipAddress
,
log
.
ImageCount
,
log
.
ImageCount
,
imageSize
,
imageSize
,
mediaType
,
serviceTier
,
serviceTier
,
reasoningEffort
,
reasoningEffort
,
inboundEndpoint
,
inboundEndpoint
,
...
@@ -4044,7 +4040,6 @@ func scanUsageLog(scanner interface{ Scan(...any) error }) (*service.UsageLog, e
...
@@ -4044,7 +4040,6 @@ func scanUsageLog(scanner interface{ Scan(...any) error }) (*service.UsageLog, e
ipAddress
sql
.
NullString
ipAddress
sql
.
NullString
imageCount
int
imageCount
int
imageSize
sql
.
NullString
imageSize
sql
.
NullString
mediaType
sql
.
NullString
serviceTier
sql
.
NullString
serviceTier
sql
.
NullString
reasoningEffort
sql
.
NullString
reasoningEffort
sql
.
NullString
inboundEndpoint
sql
.
NullString
inboundEndpoint
sql
.
NullString
...
@@ -4094,7 +4089,6 @@ func scanUsageLog(scanner interface{ Scan(...any) error }) (*service.UsageLog, e
...
@@ -4094,7 +4089,6 @@ func scanUsageLog(scanner interface{ Scan(...any) error }) (*service.UsageLog, e
&
ipAddress
,
&
ipAddress
,
&
imageCount
,
&
imageCount
,
&
imageSize
,
&
imageSize
,
&
mediaType
,
&
serviceTier
,
&
serviceTier
,
&
reasoningEffort
,
&
reasoningEffort
,
&
inboundEndpoint
,
&
inboundEndpoint
,
...
@@ -4172,9 +4166,6 @@ func scanUsageLog(scanner interface{ Scan(...any) error }) (*service.UsageLog, e
...
@@ -4172,9 +4166,6 @@ func scanUsageLog(scanner interface{ Scan(...any) error }) (*service.UsageLog, e
if
imageSize
.
Valid
{
if
imageSize
.
Valid
{
log
.
ImageSize
=
&
imageSize
.
String
log
.
ImageSize
=
&
imageSize
.
String
}
}
if
mediaType
.
Valid
{
log
.
MediaType
=
&
mediaType
.
String
}
if
serviceTier
.
Valid
{
if
serviceTier
.
Valid
{
log
.
ServiceTier
=
&
serviceTier
.
String
log
.
ServiceTier
=
&
serviceTier
.
String
}
}
...
...
backend/internal/repository/usage_log_repo_request_type_test.go
View file @
0c72be04
...
@@ -76,7 +76,6 @@ func TestUsageLogRepositoryCreateSyncRequestTypeAndLegacyFields(t *testing.T) {
...
@@ -76,7 +76,6 @@ func TestUsageLogRepositoryCreateSyncRequestTypeAndLegacyFields(t *testing.T) {
sqlmock
.
AnyArg
(),
// ip_address
sqlmock
.
AnyArg
(),
// ip_address
log
.
ImageCount
,
log
.
ImageCount
,
sqlmock
.
AnyArg
(),
// image_size
sqlmock
.
AnyArg
(),
// image_size
sqlmock
.
AnyArg
(),
// media_type
sqlmock
.
AnyArg
(),
// service_tier
sqlmock
.
AnyArg
(),
// service_tier
sqlmock
.
AnyArg
(),
// reasoning_effort
sqlmock
.
AnyArg
(),
// reasoning_effort
sqlmock
.
AnyArg
(),
// inbound_endpoint
sqlmock
.
AnyArg
(),
// inbound_endpoint
...
...
backend/internal/service/account_test_service.go
View file @
0c72be04
...
@@ -614,7 +614,6 @@ func (s *AccountTestService) testGeminiAccountConnection(c *gin.Context, account
...
@@ -614,7 +614,6 @@ func (s *AccountTestService) testGeminiAccountConnection(c *gin.Context, account
return
s
.
processGeminiStream
(
c
,
resp
.
Body
)
return
s
.
processGeminiStream
(
c
,
resp
.
Body
)
}
}
// routeAntigravityTest 路由 Antigravity 账号的测试请求。
// routeAntigravityTest 路由 Antigravity 账号的测试请求。
// APIKey 类型走原生协议(与 gateway_handler 路由一致),OAuth/Upstream 走 CRS 中转。
// APIKey 类型走原生协议(与 gateway_handler 路由一致),OAuth/Upstream 走 CRS 中转。
func
(
s
*
AccountTestService
)
routeAntigravityTest
(
c
*
gin
.
Context
,
account
*
Account
,
modelID
string
,
prompt
string
)
error
{
func
(
s
*
AccountTestService
)
routeAntigravityTest
(
c
*
gin
.
Context
,
account
*
Account
,
modelID
string
,
prompt
string
)
error
{
...
...
backend/internal/service/admin_service.go
View file @
0c72be04
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment