fix(ci): sync pnpm lockfile for admin image build (#43)

* fix(ci): sync pnpm lockfile for admin image build

* fix(app): escape comparator in bill usage mapper xml

---------

Co-authored-by: BrunoGaoSZ <bruno@example.com>
This commit is contained in:
BrunoGao
2026-03-04 00:52:58 +01:00
committed by GitHub
co-authored by BrunoGaoSZ
parent e29e2eed81
commit ac372a31a5
2 changed files with 38 additions and 1 deletions
@@ -85,7 +85,7 @@
COALESCE(s.storage_mb, 0) AS storageMb,
COALESCE(a.api_calls_total, 0) AS apiCallsTotal,
COALESCE(l.login_count_last30d, 0) AS loginCountLast30d,
CASE WHEN t.expire_time IS NOT NULL AND t.expire_time <= CURRENT_TIMESTAMP + INTERVAL '30 days' THEN TRUE ELSE FALSE END AS isExpiringSoon
CASE WHEN t.expire_time IS NOT NULL AND t.expire_time &lt;= CURRENT_TIMESTAMP + INTERVAL '30 days' THEN TRUE ELSE FALSE END AS isExpiringSoon
FROM sys_tenant t
LEFT JOIN (
SELECT tenant_id, usage_value AS user_count
+37
View File
@@ -25,9 +25,15 @@ importers:
dayjs:
specifier: ~1.11.19
version: 1.11.19
dompurify:
specifier: ~3.2.6
version: 3.2.7
element-plus:
specifier: ~2.13.2
version: 2.13.2(vue@3.5.28(typescript@5.9.3))
marked:
specifier: ~15.0.6
version: 15.0.12
nprogress:
specifier: ~0.2.0
version: 0.2.0
@@ -41,6 +47,9 @@ importers:
specifier: ~5.0.2
version: 5.0.3(@vue/compiler-sfc@3.5.28)(pinia@3.0.4(typescript@5.9.3)(vue@3.5.28(typescript@5.9.3)))(vue@3.5.28(typescript@5.9.3))
devDependencies:
'@types/dompurify':
specifier: ~3.2.0
version: 3.2.0
'@types/nprogress':
specifier: ~0.2.3
version: 0.2.3
@@ -1379,6 +1388,10 @@ packages:
'@sxzz/popperjs-es@2.11.8':
resolution: {integrity: sha512-wOwESXvvED3S8xBmcPWHs2dUuzrE4XiZeFu7e1hROIJkm02a49N120pmOXxY33sBb6hArItm5W5tcg1cBtV+HQ==}
'@types/dompurify@3.2.0':
resolution: {integrity: sha512-Fgg31wv9QbLDA0SpTOXO3MaxySc4DKGLi8sna4/Utjo4r3ZRPdCt4UQee8BWr+Q5z21yifghREPJGYaEOEIACg==}
deprecated: This is a stub types definition. dompurify provides its own type definitions, so you do not need this installed.
'@types/estree@1.0.8':
resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==}
@@ -1391,6 +1404,9 @@ packages:
'@types/nprogress@0.2.3':
resolution: {integrity: sha512-k7kRA033QNtC+gLc4VPlfnue58CM1iQLgn1IMAU8VPHGOj7oIHPp9UlhedEnD/Gl8evoCjwkZjlBORtZ3JByUA==}
'@types/trusted-types@2.0.7':
resolution: {integrity: sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==}
'@types/web-bluetooth@0.0.20':
resolution: {integrity: sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==}
@@ -1839,6 +1855,9 @@ packages:
resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==}
engines: {node: '>=8'}
dompurify@3.2.7:
resolution: {integrity: sha512-WhL/YuveyGXJaerVlMYGWhvQswa7myDG17P7Vu65EWC05o8vfeNbvNf4d/BOvH99+ZW+LlQsc1GDKMa1vNK6dw==}
dunder-proto@1.0.1:
resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==}
engines: {node: '>= 0.4'}
@@ -2201,6 +2220,11 @@ packages:
magic-string@0.30.21:
resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==}
marked@15.0.12:
resolution: {integrity: sha512-8dD6FusOQSrpv9Z1rdNMdlSgQOIP880DHqnohobOmYLElGEqAL/JvxvuxZO16r4HtjTlfPRDC1hbvxC9dPN2nA==}
engines: {node: '>= 18'}
hasBin: true
math-intrinsics@1.1.0:
resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
engines: {node: '>= 0.4'}
@@ -4343,6 +4367,10 @@ snapshots:
'@sxzz/popperjs-es@2.11.8': {}
'@types/dompurify@3.2.0':
dependencies:
dompurify: 3.2.7
'@types/estree@1.0.8': {}
'@types/lodash-es@4.17.12':
@@ -4353,6 +4381,9 @@ snapshots:
'@types/nprogress@0.2.3': {}
'@types/trusted-types@2.0.7':
optional: true
'@types/web-bluetooth@0.0.20': {}
'@types/web-bluetooth@0.0.21': {}
@@ -4874,6 +4905,10 @@ snapshots:
detect-libc@2.1.2:
optional: true
dompurify@3.2.7:
optionalDependencies:
'@types/trusted-types': 2.0.7
dunder-proto@1.0.1:
dependencies:
call-bind-apply-helpers: 1.0.2
@@ -5276,6 +5311,8 @@ snapshots:
dependencies:
'@jridgewell/sourcemap-codec': 1.5.5
marked@15.0.12: {}
math-intrinsics@1.1.0: {}
media-typer@0.3.0: {}