From 0364b5c376d58d575eda4fc4355212784abe6dce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Sep 2025 10:21:46 +0000 Subject: [PATCH 01/22] mod: bump go.opentelemetry.io/contrib/instrumentation/runtime Bumps [go.opentelemetry.io/contrib/instrumentation/runtime](https://github.com/open-telemetry/opentelemetry-go-contrib) from 0.61.0 to 0.63.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-go-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go-contrib/compare/zpages/v0.61.0...zpages/v0.63.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/contrib/instrumentation/runtime dependency-version: 0.63.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 12 ++++++------ go.sum | 28 ++++++++++++++-------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/go.mod b/go.mod index 509c42b9..da524c84 100644 --- a/go.mod +++ b/go.mod @@ -43,15 +43,15 @@ require ( github.com/tencentyun/cos-go-sdk-v5 v0.7.65 github.com/yinheli/mahonia v0.0.0-20131226213531-0eef680515cc go.opentelemetry.io/contrib/bridges/otellogrus v0.11.0 - go.opentelemetry.io/contrib/instrumentation/runtime v0.61.0 - go.opentelemetry.io/otel v1.37.0 + go.opentelemetry.io/contrib/instrumentation/runtime v0.63.0 + go.opentelemetry.io/otel v1.38.0 go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.10.0 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.36.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.36.0 go.opentelemetry.io/otel/log v0.12.2 - go.opentelemetry.io/otel/sdk v1.36.0 + go.opentelemetry.io/otel/sdk v1.38.0 go.opentelemetry.io/otel/sdk/log v0.12.2 - go.opentelemetry.io/otel/sdk/metric v1.36.0 + go.opentelemetry.io/otel/sdk/metric v1.38.0 go.uber.org/automaxprocs v1.6.0 golang.org/x/crypto v0.41.0 google.golang.org/grpc v1.72.1 @@ -154,9 +154,9 @@ require ( go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0 // indirect go.opentelemetry.io/otel/log/logtest v0.0.0-20250602073710-889a4862b40f // indirect - go.opentelemetry.io/otel/metric v1.37.0 // indirect + go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/sdk/log/logtest v0.0.0-20250602073710-889a4862b40f // indirect - go.opentelemetry.io/otel/trace v1.37.0 // indirect + go.opentelemetry.io/otel/trace v1.38.0 // indirect go.opentelemetry.io/proto/otlp v1.6.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.9.0 // indirect diff --git a/go.sum b/go.sum index d2df8e83..5f0377fd 100644 --- a/go.sum +++ b/go.sum @@ -314,8 +314,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= -github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.563/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y= @@ -342,10 +342,10 @@ go.opentelemetry.io/contrib/bridges/otellogrus v0.11.0 h1:xtdcSRdq9aSkOyQ7KWzGoP go.opentelemetry.io/contrib/bridges/otellogrus v0.11.0/go.mod h1:67ZsrX7nSiMQdyCdTpIID954mZ/+MMtLJXWOhU49cjM= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 h1:TT4fX+nBOA/+LUkobKGW1ydGcn+G3vRw9+g5HwCphpk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0/go.mod h1:L7UH0GbB0p47T4Rri3uHjbpCFYrVrwc1I25QhNPiGK8= -go.opentelemetry.io/contrib/instrumentation/runtime v0.61.0 h1:oIZsTHd0YcrvvUCN2AaQqyOcd685NQ+rFmrajveCIhA= -go.opentelemetry.io/contrib/instrumentation/runtime v0.61.0/go.mod h1:X4KSPIvxnY/G5c9UOGXtFoL91t1gmlHpDQzeK5Zc/Bw= -go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ= -go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I= +go.opentelemetry.io/contrib/instrumentation/runtime v0.63.0 h1:PeBoRj6af6xMI7qCupwFvTbbnd49V7n5YpG6pg8iDYQ= +go.opentelemetry.io/contrib/instrumentation/runtime v0.63.0/go.mod h1:ingqBCtMCe8I4vpz/UVzCW6sxoqgZB37nao91mLQ3Bw= +go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= +go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.10.0 h1:5dTKu4I5Dn4P2hxyW3l3jTaZx9ACgg0ECos1eAVrheY= go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.10.0/go.mod h1:P5HcUI8obLrCCmM3sbVBohZFH34iszk/+CPWuakZWL8= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.36.0 h1:zwdo1gS2eH26Rg+CoqVQpEK1h8gvt5qyU5Kk5Bixvow= @@ -358,18 +358,18 @@ go.opentelemetry.io/otel/log v0.12.2 h1:yob9JVHn2ZY24byZeaXpTVoPS6l+UrrxmxmPKohX go.opentelemetry.io/otel/log v0.12.2/go.mod h1:ShIItIxSYxufUMt+1H5a2wbckGli3/iCfuEbVZi/98E= go.opentelemetry.io/otel/log/logtest v0.0.0-20250602073710-889a4862b40f h1:9Pi4jxdmTyGsCi5eOvNHKLw3GiUyRdG9EA7EIj6WMYk= go.opentelemetry.io/otel/log/logtest v0.0.0-20250602073710-889a4862b40f/go.mod h1:DqYX8Lp2A/RnuxXuoVtsRqYvx6Io0PtSxF5v9MnHJyU= -go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE= -go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E= -go.opentelemetry.io/otel/sdk v1.36.0 h1:b6SYIuLRs88ztox4EyrvRti80uXIFy+Sqzoh9kFULbs= -go.opentelemetry.io/otel/sdk v1.36.0/go.mod h1:+lC+mTgD+MUWfjJubi2vvXWcVxyr9rmlshZni72pXeY= +go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= +go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= +go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= +go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg= go.opentelemetry.io/otel/sdk/log v0.12.2 h1:yNoETvTByVKi7wHvYS6HMcZrN5hFLD7I++1xIZ/k6W0= go.opentelemetry.io/otel/sdk/log v0.12.2/go.mod h1:DcpdmUXHJgSqN/dh+XMWa7Vf89u9ap0/AAk/XGLnEzY= go.opentelemetry.io/otel/sdk/log/logtest v0.0.0-20250602073710-889a4862b40f h1:Dq4Eyw+4KQq8/FCXHX9EAw1dTzyya6sm99gFhg2aSSE= go.opentelemetry.io/otel/sdk/log/logtest v0.0.0-20250602073710-889a4862b40f/go.mod h1:FaVwnf8BvLN80gFy4T+wMovR87QQonsHsGFFn0R+jw8= -go.opentelemetry.io/otel/sdk/metric v1.36.0 h1:r0ntwwGosWGaa0CrSt8cuNuTcccMXERFwHX4dThiPis= -go.opentelemetry.io/otel/sdk/metric v1.36.0/go.mod h1:qTNOhFDfKRwX0yXOqJYegL5WRaW376QbB7P4Pb0qva4= -go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4= -go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0= +go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM= +go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA= +go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= +go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs= go.opentelemetry.io/proto/otlp v1.6.0 h1:jQjP+AQyTf+Fe7OKj/MfkDrmK4MNVtw2NpXsf9fefDI= go.opentelemetry.io/proto/otlp v1.6.0/go.mod h1:cicgGehlFuNdgZkcALOCh3VE6K/u2tAjzlRhDwmVpZc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= From 856e293fbf81dcf7d11e932ebdf205897543141c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Sep 2025 10:23:15 +0000 Subject: [PATCH 02/22] mod: bump github.com/Masterminds/semver/v3 from 3.2.1 to 3.4.0 Bumps [github.com/Masterminds/semver/v3](https://github.com/Masterminds/semver) from 3.2.1 to 3.4.0. - [Release notes](https://github.com/Masterminds/semver/releases) - [Changelog](https://github.com/Masterminds/semver/blob/master/CHANGELOG.md) - [Commits](https://github.com/Masterminds/semver/compare/v3.2.1...v3.4.0) --- updated-dependencies: - dependency-name: github.com/Masterminds/semver/v3 dependency-version: 3.4.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 509c42b9..cde09fec 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/rocboss/paopao-ce go 1.24.0 require ( - github.com/Masterminds/semver/v3 v3.2.1 + github.com/Masterminds/semver/v3 v3.4.0 github.com/RoaringBitmap/roaring v1.9.4 github.com/afocus/captcha v0.0.0-20191010092841-4bd1f21c8868 github.com/alimy/mir/v5 v5.3.1 diff --git a/go.sum b/go.sum index d2df8e83..fd213378 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= -github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0= -github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= +github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0= +github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod h1:1pk82RBxDY/JZnPQrtqHlUFfCctgdorsd9M06fMynOM= From 57b38220bcee55fee3cf7cfb9592fe93d3942148 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Oct 2025 10:35:11 +0000 Subject: [PATCH 03/22] mod: bump google.golang.org/protobuf from 1.36.6 to 1.36.10 Bumps google.golang.org/protobuf from 1.36.6 to 1.36.10. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-version: 1.36.10 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 509c42b9..16a01b26 100644 --- a/go.mod +++ b/go.mod @@ -55,7 +55,7 @@ require ( go.uber.org/automaxprocs v1.6.0 golang.org/x/crypto v0.41.0 google.golang.org/grpc v1.72.1 - google.golang.org/protobuf v1.36.6 + google.golang.org/protobuf v1.36.10 gopkg.in/natefinch/lumberjack.v2 v2.2.1 gopkg.in/resty.v1 v1.12.0 gorm.io/driver/mysql v1.6.0 diff --git a/go.sum b/go.sum index d2df8e83..66ccd506 100644 --- a/go.sum +++ b/go.sum @@ -450,8 +450,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= google.golang.org/grpc v1.72.1 h1:HR03wO6eyZ7lknl75XlxABNVLLFc2PAb6mHlYh756mA= google.golang.org/grpc v1.72.1/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM= -google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY= -google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= +google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE= +google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= From 5d361dc1756e2872364bf8a7676e53e8b6a0e5f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Oct 2025 11:03:38 +0000 Subject: [PATCH 04/22] mod: bump github.com/tencentyun/cos-go-sdk-v5 from 0.7.65 to 0.7.71 Bumps [github.com/tencentyun/cos-go-sdk-v5](https://github.com/tencentyun/cos-go-sdk-v5) from 0.7.65 to 0.7.71. - [Release notes](https://github.com/tencentyun/cos-go-sdk-v5/releases) - [Changelog](https://github.com/tencentyun/cos-go-sdk-v5/blob/master/CHANGELOG.md) - [Commits](https://github.com/tencentyun/cos-go-sdk-v5/compare/v0.7.65...v0.7.71) --- updated-dependencies: - dependency-name: github.com/tencentyun/cos-go-sdk-v5 dependency-version: 0.7.71 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 509c42b9..17ff9c7b 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/go-resty/resty/v2 v2.16.5 github.com/goccy/go-json v0.10.5 github.com/gofrs/uuid/v5 v5.3.2 - github.com/golang-jwt/jwt/v5 v5.2.2 + github.com/golang-jwt/jwt/v5 v5.2.3 github.com/golang-migrate/migrate/v4 v4.18.3 github.com/grafana/pyroscope-go v1.2.4 github.com/huaweicloud/huaweicloud-sdk-go-obs v3.25.4+incompatible @@ -40,7 +40,7 @@ require ( github.com/sourcegraph/conc v0.3.0 github.com/spf13/cobra v1.9.1 github.com/spf13/viper v1.20.1 - github.com/tencentyun/cos-go-sdk-v5 v0.7.65 + github.com/tencentyun/cos-go-sdk-v5 v0.7.71 github.com/yinheli/mahonia v0.0.0-20131226213531-0eef680515cc go.opentelemetry.io/contrib/bridges/otellogrus v0.11.0 go.opentelemetry.io/contrib/instrumentation/runtime v0.61.0 diff --git a/go.sum b/go.sum index d2df8e83..c07d7407 100644 --- a/go.sum +++ b/go.sum @@ -6,7 +6,6 @@ github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0 github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= -github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod h1:1pk82RBxDY/JZnPQrtqHlUFfCctgdorsd9M06fMynOM= github.com/RoaringBitmap/roaring v1.9.4 h1:yhEIoH4YezLYT04s1nHehNO64EKFTop/wBhxv2QzDdQ= github.com/RoaringBitmap/roaring v1.9.4/go.mod h1:6AXUsoIEzDTFFQCe1RbGA6uFONMhvejWj5rqITANK90= github.com/afocus/captcha v0.0.0-20191010092841-4bd1f21c8868 h1:uFrPOl1VBt/Abfl2z+A/DFc+AwmFLxEHR1+Yq6cXvww= @@ -123,9 +122,8 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69 github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI= github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= -github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= -github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8= -github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= +github.com/golang-jwt/jwt/v5 v5.2.3 h1:kkGXqQOBSDDWRhWNXTFpqGSCMyh/PLnqUvMGJPDJDs0= +github.com/golang-jwt/jwt/v5 v5.2.3/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang-migrate/migrate/v4 v4.18.3 h1:EYGkoOsvgHHfm5U/naS1RP/6PL/Xv3S4B/swMiAmDLs= github.com/golang-migrate/migrate/v4 v4.18.3/go.mod h1:99BKpIi6ruaaXRM1A77eqZ+FWPQ3cfRa+ZVy5bmWMaY= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= @@ -276,6 +274,7 @@ github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzG github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= +github.com/rs/dnscache v0.0.0-20230804202142-fc85eb664529/go.mod h1:qe5TWALJ8/a1Lqznoc5BDHpYX/8HU60Hm2AwRmqzxqA= github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU= github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -320,8 +319,9 @@ github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.563/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.563/go.mod h1:uom4Nvi9W+Qkom0exYiJ9VWJjXwyxtPYTkKkaLMlfE0= -github.com/tencentyun/cos-go-sdk-v5 v0.7.65 h1:+WBbfwThfZSbxpf1Dw6fyMwyzVtWBBExqfDJ5giiR2s= -github.com/tencentyun/cos-go-sdk-v5 v0.7.65/go.mod h1:8+hG+mQMuRP/OIS9d83syAvXvrMj9HhkND6Q1fLghw0= +github.com/tencentyun/cos-go-sdk-v5 v0.7.71 h1:dV0doQK6k0MTdNIIWqP23ESvlPPI1ZZCCIBZGjsWR2Y= +github.com/tencentyun/cos-go-sdk-v5 v0.7.71/go.mod h1:STbTNaNKq03u+gscPEGOahKzLcGSYOj6Dzc5zNay7Pg= +github.com/tencentyun/qcloud-cos-sts-sdk v0.0.0-20250515025012-e0eec8a5d123/go.mod h1:b18KQa4IxHbxeseW1GcZox53d7J0z39VNONTxvvlkXw= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.3.0 h1:Qd2W2sQawAfG8XSvzwhBeoGq71zXOC/Q1E9y/wUcsUA= From eaec7bc0b70da5a91ae4f7e2e5a9b416fd110879 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Oct 2025 11:20:44 +0000 Subject: [PATCH 05/22] mod: bump github.com/getsentry/sentry-go from 0.33.0 to 0.36.1 Bumps [github.com/getsentry/sentry-go](https://github.com/getsentry/sentry-go) from 0.33.0 to 0.36.1. - [Release notes](https://github.com/getsentry/sentry-go/releases) - [Changelog](https://github.com/getsentry/sentry-go/blob/master/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-go/compare/v0.33.0...v0.36.1) --- updated-dependencies: - dependency-name: github.com/getsentry/sentry-go dependency-version: 0.36.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 509c42b9..1a4c7597 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/cockroachdb/errors v1.11.3 github.com/disintegration/imaging v1.6.2 github.com/fatih/color v1.18.0 - github.com/getsentry/sentry-go v0.33.0 + github.com/getsentry/sentry-go v0.36.1 github.com/getsentry/sentry-go/gin v0.33.0 github.com/getsentry/sentry-go/logrus v0.31.1 github.com/gin-contrib/cors v1.7.6 diff --git a/go.sum b/go.sum index d2df8e83..dbd6806b 100644 --- a/go.sum +++ b/go.sum @@ -77,8 +77,8 @@ github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/ github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= github.com/gabriel-vasile/mimetype v1.4.9 h1:5k+WDwEsD9eTLL8Tz3L0VnmVh9QxGjRmjBvAG7U/oYY= github.com/gabriel-vasile/mimetype v1.4.9/go.mod h1:WnSQhFKJuBlRyLiKohA/2DtIlPFAbguNaG7QCHcyGok= -github.com/getsentry/sentry-go v0.33.0 h1:YWyDii0KGVov3xOaamOnF0mjOrqSjBqwv48UEzn7QFg= -github.com/getsentry/sentry-go v0.33.0/go.mod h1:C55omcY9ChRQIUcVcGcs+Zdy4ZpQGvNJ7JYHIoSWOtE= +github.com/getsentry/sentry-go v0.36.1 h1:kMJt0WWsxWATUxkvFgVBZdIeHSk/Oiv5P0jZ9e5m/Lw= +github.com/getsentry/sentry-go v0.36.1/go.mod h1:p5Im24mJBeruET8Q4bbcMfCQ+F+Iadc4L48tB1apo2c= github.com/getsentry/sentry-go/gin v0.33.0 h1:8oH2ydD/EeKlDMoENhCtq3rJ7EcQtjfdzrMM1Ku2J3I= github.com/getsentry/sentry-go/gin v0.33.0/go.mod h1:uwqds9mMjBCn/+WcgtX0z+mBq487macTzDxNljM+/g8= github.com/getsentry/sentry-go/logrus v0.31.1 h1:561777lxQWZl4qpte67Wp4zQB7V1oNVriZNN5hiOooI= From 0a79a062f423a70303fdcdcbdbc66637c87122df Mon Sep 17 00:00:00 2001 From: alimy Date: Thu, 19 Feb 2026 20:30:06 +0800 Subject: [PATCH 06/22] use build tagged constraint to check api interface implement --- internal/dao/cache/bigcache.go | 2 -- internal/dao/cache/constraint.go | 20 ++++++++++++ internal/dao/cache/none.go | 5 --- internal/dao/cache/redis.go | 6 ---- internal/dao/cache/simple.go | 5 --- internal/dao/jinzhu/constraint.go | 13 ++++++++ internal/dao/jinzhu/jinzhu.go | 10 +----- internal/dao/search/bridge.go | 2 -- internal/dao/search/constraint.go | 15 +++++++++ internal/dao/search/meili.go | 5 --- internal/dao/search/zinc.go | 5 --- internal/dao/security/attachment_check.go | 2 -- internal/dao/security/constraint.go | 12 +++++++ internal/dao/security/phone_verify_juhe.go | 3 -- internal/dao/storage/alioss.go | 8 ----- internal/dao/storage/constraint.go | 37 ++++++++++++++++++++++ internal/dao/storage/cos.go | 7 ---- internal/dao/storage/huaweiobs.go | 8 ----- internal/dao/storage/localoss.go | 7 ---- internal/dao/storage/minio.go | 8 ----- internal/servants/admin/constraint.go | 9 ++++++ internal/servants/admin/user.go | 2 -- internal/servants/bot/constraint.go | 9 ++++++ internal/servants/bot/user.go | 2 -- internal/servants/localoss/constraint.go | 9 ++++++ internal/servants/localoss/user.go | 2 -- internal/servants/mobile/constraint.go | 9 ++++++ internal/servants/mobile/greet.go | 2 -- internal/servants/space/constraint.go | 9 ++++++ internal/servants/space/user.go | 2 -- internal/servants/web/admin.go | 2 -- internal/servants/web/alipay.go | 5 --- internal/servants/web/constraint.go | 23 ++++++++++++++ internal/servants/web/core.go | 2 -- internal/servants/web/followship.go | 2 -- internal/servants/web/friendship.go | 2 -- internal/servants/web/loose.go | 2 -- internal/servants/web/priv.go | 17 ++++------ internal/servants/web/pub.go | 2 -- internal/servants/web/relax.go | 2 -- internal/servants/web/site.go | 2 -- internal/servants/web/trends.go | 2 -- internal/service/admin.go | 2 -- internal/service/bot.go | 2 -- internal/service/constraint.go | 18 +++++++++++ internal/service/frontend_web.go | 2 -- internal/service/grpc_server.go | 2 -- internal/service/http_server.go | 2 -- internal/service/localoss.go | 2 -- internal/service/metrics.go | 2 -- internal/service/mobile.go | 2 -- internal/service/pprof.go | 2 -- internal/service/space.go | 2 -- internal/service/web.go | 2 -- 54 files changed, 190 insertions(+), 148 deletions(-) create mode 100644 internal/dao/cache/constraint.go create mode 100644 internal/dao/jinzhu/constraint.go create mode 100644 internal/dao/search/constraint.go create mode 100644 internal/dao/security/constraint.go create mode 100644 internal/dao/storage/constraint.go create mode 100644 internal/servants/admin/constraint.go create mode 100644 internal/servants/bot/constraint.go create mode 100644 internal/servants/localoss/constraint.go create mode 100644 internal/servants/mobile/constraint.go create mode 100644 internal/servants/space/constraint.go create mode 100644 internal/servants/web/constraint.go create mode 100644 internal/service/constraint.go diff --git a/internal/dao/cache/bigcache.go b/internal/dao/cache/bigcache.go index 1fb5130f..5a9f779b 100644 --- a/internal/dao/cache/bigcache.go +++ b/internal/dao/cache/bigcache.go @@ -9,8 +9,6 @@ import ( "github.com/allegro/bigcache/v3" ) -var _ tweetsCache = (*bigCacheTweetsCache)(nil) - type bigCacheTweetsCache struct { bc *bigcache.BigCache } diff --git a/internal/dao/cache/constraint.go b/internal/dao/cache/constraint.go new file mode 100644 index 00000000..bc42072c --- /dev/null +++ b/internal/dao/cache/constraint.go @@ -0,0 +1,20 @@ +//go:build constraint + +package cache + +import ( + "github.com/rocboss/paopao-ce/internal/core" +) + +var ( + _ tweetsCache = (*bigCacheTweetsCache)(nil) + + _ core.RedisCache = (*redisCache)(nil) + _ tweetsCache = (*redisCacheTweetsCache)(nil) + + _ core.CacheIndexService = (*noneCacheIndexServant)(nil) + _ core.VersionInfo = (*noneCacheIndexServant)(nil) + + _ core.CacheIndexService = (*simpleCacheIndexServant)(nil) + _ core.VersionInfo = (*simpleCacheIndexServant)(nil) +) diff --git a/internal/dao/cache/none.go b/internal/dao/cache/none.go index 079c453b..0b165ed6 100644 --- a/internal/dao/cache/none.go +++ b/internal/dao/cache/none.go @@ -12,11 +12,6 @@ import ( "github.com/rocboss/paopao-ce/pkg/debug" ) -var ( - _ core.CacheIndexService = (*noneCacheIndexServant)(nil) - _ core.VersionInfo = (*noneCacheIndexServant)(nil) -) - type noneCacheIndexServant struct { ips core.IndexPostsService } diff --git a/internal/dao/cache/redis.go b/internal/dao/cache/redis.go index 0e106c5a..8b466e8c 100644 --- a/internal/dao/cache/redis.go +++ b/internal/dao/cache/redis.go @@ -12,12 +12,6 @@ import ( "github.com/Masterminds/semver/v3" "github.com/redis/rueidis" - "github.com/rocboss/paopao-ce/internal/core" -) - -var ( - _ core.RedisCache = (*redisCache)(nil) - _ tweetsCache = (*redisCacheTweetsCache)(nil) ) const ( diff --git a/internal/dao/cache/simple.go b/internal/dao/cache/simple.go index a1c230d3..fb6ea951 100644 --- a/internal/dao/cache/simple.go +++ b/internal/dao/cache/simple.go @@ -16,11 +16,6 @@ import ( "github.com/sirupsen/logrus" ) -var ( - _ core.CacheIndexService = (*simpleCacheIndexServant)(nil) - _ core.VersionInfo = (*simpleCacheIndexServant)(nil) -) - type simpleCacheIndexServant struct { ips core.IndexPostsService diff --git a/internal/dao/jinzhu/constraint.go b/internal/dao/jinzhu/constraint.go new file mode 100644 index 00000000..eb65e121 --- /dev/null +++ b/internal/dao/jinzhu/constraint.go @@ -0,0 +1,13 @@ +//go:build constraint + +package jinzhu + +import "github.com/rocboss/paopao-ce/internal/core" + +var ( + _ core.DataService = (*dataSrv)(nil) + _ core.VersionInfo = (*dataSrv)(nil) + + _ core.WebDataServantA = (*webDataSrvA)(nil) + _ core.VersionInfo = (*webDataSrvA)(nil) +) diff --git a/internal/dao/jinzhu/jinzhu.go b/internal/dao/jinzhu/jinzhu.go index 16b6d64a..444cb141 100644 --- a/internal/dao/jinzhu/jinzhu.go +++ b/internal/dao/jinzhu/jinzhu.go @@ -18,15 +18,7 @@ import ( "github.com/rocboss/paopao-ce/internal/dao/security" ) -var ( - _ core.DataService = (*dataSrv)(nil) - _ core.VersionInfo = (*dataSrv)(nil) - - _ core.WebDataServantA = (*webDataSrvA)(nil) - _ core.VersionInfo = (*webDataSrvA)(nil) - - _onceInitial sync.Once -) +var _onceInitial sync.Once type dataSrv struct { core.WalletService diff --git a/internal/dao/search/bridge.go b/internal/dao/search/bridge.go index 43028c95..60b0f99a 100644 --- a/internal/dao/search/bridge.go +++ b/internal/dao/search/bridge.go @@ -12,8 +12,6 @@ import ( "github.com/sirupsen/logrus" ) -var _ core.TweetSearchService = (*bridgeTweetSearchServant)(nil) - type documents struct { primaryKey []string docItems []core.TsDocItem diff --git a/internal/dao/search/constraint.go b/internal/dao/search/constraint.go new file mode 100644 index 00000000..5af8ee94 --- /dev/null +++ b/internal/dao/search/constraint.go @@ -0,0 +1,15 @@ +//go:build constraint + +package search + +import "github.com/rocboss/paopao-ce/internal/core" + +var ( + _ core.TweetSearchService = (*bridgeTweetSearchServant)(nil) + + _ core.TweetSearchService = (*meiliTweetSearchServant)(nil) + _ core.VersionInfo = (*meiliTweetSearchServant)(nil) + + _ core.TweetSearchService = (*zincTweetSearchServant)(nil) + _ core.VersionInfo = (*zincTweetSearchServant)(nil) +) diff --git a/internal/dao/search/meili.go b/internal/dao/search/meili.go index 74391ef3..70bad1ca 100644 --- a/internal/dao/search/meili.go +++ b/internal/dao/search/meili.go @@ -16,11 +16,6 @@ import ( "github.com/sirupsen/logrus" ) -var ( - _ core.TweetSearchService = (*meiliTweetSearchServant)(nil) - _ core.VersionInfo = (*meiliTweetSearchServant)(nil) -) - type meiliTweetSearchServant struct { tweetSearchFilter diff --git a/internal/dao/search/zinc.go b/internal/dao/search/zinc.go index 91f74b42..4dd688c9 100644 --- a/internal/dao/search/zinc.go +++ b/internal/dao/search/zinc.go @@ -15,11 +15,6 @@ import ( "github.com/sirupsen/logrus" ) -var ( - _ core.TweetSearchService = (*zincTweetSearchServant)(nil) - _ core.VersionInfo = (*zincTweetSearchServant)(nil) -) - type zincTweetSearchServant struct { tweetSearchFilter diff --git a/internal/dao/security/attachment_check.go b/internal/dao/security/attachment_check.go index 591554e8..706621ac 100644 --- a/internal/dao/security/attachment_check.go +++ b/internal/dao/security/attachment_check.go @@ -12,8 +12,6 @@ import ( "github.com/rocboss/paopao-ce/internal/core" ) -var _ core.AttachmentCheckService = (*attachmentCheckServant)(nil) - type attachmentCheckServant struct { domain string } diff --git a/internal/dao/security/constraint.go b/internal/dao/security/constraint.go new file mode 100644 index 00000000..1172e157 --- /dev/null +++ b/internal/dao/security/constraint.go @@ -0,0 +1,12 @@ +//go:build constraint + +package security + +import ( + "github.com/rocboss/paopao-ce/internal/core" +) + +var ( + _ core.AttachmentCheckService = (*attachmentCheckServant)(nil) + _ core.PhoneVerifyService = (*juheSmsServant)(nil) +) diff --git a/internal/dao/security/phone_verify_juhe.go b/internal/dao/security/phone_verify_juhe.go index 25dfd553..efc246d4 100644 --- a/internal/dao/security/phone_verify_juhe.go +++ b/internal/dao/security/phone_verify_juhe.go @@ -7,13 +7,10 @@ import ( "github.com/cockroachdb/errors" "github.com/rocboss/paopao-ce/internal/conf" - "github.com/rocboss/paopao-ce/internal/core" "github.com/rocboss/paopao-ce/pkg/json" "gopkg.in/resty.v1" ) -var _ core.PhoneVerifyService = (*juheSmsServant)(nil) - type juhePhoneCaptchaRsp struct { ErrorCode int `json:"error_code"` Reason string `json:"reason"` diff --git a/internal/dao/storage/alioss.go b/internal/dao/storage/alioss.go index e72fa44c..3d6ead5f 100644 --- a/internal/dao/storage/alioss.go +++ b/internal/dao/storage/alioss.go @@ -16,14 +16,6 @@ import ( "github.com/sirupsen/logrus" ) -var ( - _ core.ObjectStorageService = (*aliossServant)(nil) - _ core.OssCreateService = (*aliossCreateServant)(nil) - _ core.OssCreateService = (*aliossCreateRetentionServant)(nil) - _ core.OssCreateService = (*aliossCreateTempDirServant)(nil) - _ core.VersionInfo = (*aliossServant)(nil) -) - type aliossCreateServant struct { bucket *oss.Bucket domain string diff --git a/internal/dao/storage/constraint.go b/internal/dao/storage/constraint.go new file mode 100644 index 00000000..416d2e36 --- /dev/null +++ b/internal/dao/storage/constraint.go @@ -0,0 +1,37 @@ +//go:build constraint + +package storage + +import ( + "github.com/rocboss/paopao-ce/internal/core" +) + +var ( + _ core.ObjectStorageService = (*aliossServant)(nil) + _ core.OssCreateService = (*aliossCreateServant)(nil) + _ core.OssCreateService = (*aliossCreateRetentionServant)(nil) + _ core.OssCreateService = (*aliossCreateTempDirServant)(nil) + _ core.VersionInfo = (*aliossServant)(nil) + + _ core.ObjectStorageService = (*cosServant)(nil) + _ core.OssCreateService = (*cosCreateServant)(nil) + _ core.OssCreateService = (*cosCreateTempDirServant)(nil) + _ core.VersionInfo = (*cosServant)(nil) + + _ core.ObjectStorageService = (*huaweiobsServant)(nil) + _ core.OssCreateService = (*hwobsCreateServant)(nil) + _ core.OssCreateService = (*hwobsCreateRetentionServant)(nil) + _ core.OssCreateService = (*hwobsCreateTempDirServant)(nil) + _ core.VersionInfo = (*huaweiobsServant)(nil) + + _ core.ObjectStorageService = (*localossServant)(nil) + _ core.OssCreateService = (*localossCreateServant)(nil) + _ core.OssCreateService = (*localossCreateTempDirServant)(nil) + _ core.VersionInfo = (*localossServant)(nil) + + _ core.ObjectStorageService = (*minioServant)(nil) + _ core.OssCreateService = (*minioCreateServant)(nil) + _ core.OssCreateService = (*minioCreateRetentionServant)(nil) + _ core.OssCreateService = (*minioCreateTempDirServant)(nil) + _ core.VersionInfo = (*minioServant)(nil) +) diff --git a/internal/dao/storage/cos.go b/internal/dao/storage/cos.go index bb2790f4..3582deec 100644 --- a/internal/dao/storage/cos.go +++ b/internal/dao/storage/cos.go @@ -19,13 +19,6 @@ import ( "github.com/tencentyun/cos-go-sdk-v5" ) -var ( - _ core.ObjectStorageService = (*cosServant)(nil) - _ core.OssCreateService = (*cosCreateServant)(nil) - _ core.OssCreateService = (*cosCreateTempDirServant)(nil) - _ core.VersionInfo = (*cosServant)(nil) -) - type cosCreateServant struct { client *cos.Client domain string diff --git a/internal/dao/storage/huaweiobs.go b/internal/dao/storage/huaweiobs.go index 7db9818b..ea225da4 100644 --- a/internal/dao/storage/huaweiobs.go +++ b/internal/dao/storage/huaweiobs.go @@ -15,14 +15,6 @@ import ( "github.com/sirupsen/logrus" ) -var ( - _ core.ObjectStorageService = (*huaweiobsServant)(nil) - _ core.OssCreateService = (*hwobsCreateServant)(nil) - _ core.OssCreateService = (*hwobsCreateRetentionServant)(nil) - _ core.OssCreateService = (*hwobsCreateTempDirServant)(nil) - _ core.VersionInfo = (*huaweiobsServant)(nil) -) - type hwobsCreateServant struct { client *obs.ObsClient bucket string diff --git a/internal/dao/storage/localoss.go b/internal/dao/storage/localoss.go index d110b371..6359a9fc 100644 --- a/internal/dao/storage/localoss.go +++ b/internal/dao/storage/localoss.go @@ -18,13 +18,6 @@ import ( "github.com/sirupsen/logrus" ) -var ( - _ core.ObjectStorageService = (*localossServant)(nil) - _ core.OssCreateService = (*localossCreateServant)(nil) - _ core.OssCreateService = (*localossCreateTempDirServant)(nil) - _ core.VersionInfo = (*localossServant)(nil) -) - type localossCreateServant struct { savePath string domain string diff --git a/internal/dao/storage/minio.go b/internal/dao/storage/minio.go index 028e331a..9220eda8 100644 --- a/internal/dao/storage/minio.go +++ b/internal/dao/storage/minio.go @@ -17,14 +17,6 @@ import ( "github.com/sirupsen/logrus" ) -var ( - _ core.ObjectStorageService = (*minioServant)(nil) - _ core.OssCreateService = (*minioCreateServant)(nil) - _ core.OssCreateService = (*minioCreateRetentionServant)(nil) - _ core.OssCreateService = (*minioCreateTempDirServant)(nil) - _ core.VersionInfo = (*minioServant)(nil) -) - type minioCreateServant struct { client *minio.Client bucket string diff --git a/internal/servants/admin/constraint.go b/internal/servants/admin/constraint.go new file mode 100644 index 00000000..24aa29b2 --- /dev/null +++ b/internal/servants/admin/constraint.go @@ -0,0 +1,9 @@ +//go:build constraint + +package admin + +import ( + api "github.com/rocboss/paopao-ce/auto/api/m/v1" +) + +var _ api.User = (*userSrv)(nil) diff --git a/internal/servants/admin/user.go b/internal/servants/admin/user.go index 1233e715..92679de4 100644 --- a/internal/servants/admin/user.go +++ b/internal/servants/admin/user.go @@ -9,8 +9,6 @@ import ( "github.com/rocboss/paopao-ce/internal/servants/base" ) -var _ api.User = (*userSrv)(nil) - type userSrv struct { *base.BaseServant api.UnimplementedUserServant diff --git a/internal/servants/bot/constraint.go b/internal/servants/bot/constraint.go new file mode 100644 index 00000000..e0306280 --- /dev/null +++ b/internal/servants/bot/constraint.go @@ -0,0 +1,9 @@ +//go:build constraint + +package bot + +import ( + api "github.com/rocboss/paopao-ce/auto/api/r/v1" +) + +var _ api.User = (*userSrv)(nil) diff --git a/internal/servants/bot/user.go b/internal/servants/bot/user.go index 714f299b..80d10387 100644 --- a/internal/servants/bot/user.go +++ b/internal/servants/bot/user.go @@ -9,8 +9,6 @@ import ( "github.com/rocboss/paopao-ce/internal/servants/base" ) -var _ api.User = (*userSrv)(nil) - type userSrv struct { *base.BaseServant api.UnimplementedUserServant diff --git a/internal/servants/localoss/constraint.go b/internal/servants/localoss/constraint.go new file mode 100644 index 00000000..e955aa14 --- /dev/null +++ b/internal/servants/localoss/constraint.go @@ -0,0 +1,9 @@ +//go:build constraint + +package localoss + +import ( + api "github.com/rocboss/paopao-ce/auto/api/s/v1" +) + +var _ api.User = (*userSrv)(nil) diff --git a/internal/servants/localoss/user.go b/internal/servants/localoss/user.go index d0cfe93e..167f38f9 100644 --- a/internal/servants/localoss/user.go +++ b/internal/servants/localoss/user.go @@ -9,8 +9,6 @@ import ( "github.com/rocboss/paopao-ce/internal/servants/base" ) -var _ api.User = (*userSrv)(nil) - type userSrv struct { *base.BaseServant api.UnimplementedUserServant diff --git a/internal/servants/mobile/constraint.go b/internal/servants/mobile/constraint.go new file mode 100644 index 00000000..5cf9a2fd --- /dev/null +++ b/internal/servants/mobile/constraint.go @@ -0,0 +1,9 @@ +//go:build constraint + +package mobile + +import ( + api "github.com/rocboss/paopao-ce/auto/rpc/greet/v1" +) + +var _ api.GreetServiceServer = (*greetServiceSrv)(nil) diff --git a/internal/servants/mobile/greet.go b/internal/servants/mobile/greet.go index 0e5a1f10..3fd30653 100644 --- a/internal/servants/mobile/greet.go +++ b/internal/servants/mobile/greet.go @@ -8,8 +8,6 @@ import ( api "github.com/rocboss/paopao-ce/auto/rpc/greet/v1" ) -var _ api.GreetServiceServer = (*greetServiceSrv)(nil) - type greetServiceSrv struct { api.UnimplementedGreetServiceServer } diff --git a/internal/servants/space/constraint.go b/internal/servants/space/constraint.go new file mode 100644 index 00000000..a0e26dc6 --- /dev/null +++ b/internal/servants/space/constraint.go @@ -0,0 +1,9 @@ +//go:build constraint + +package space + +import ( + api "github.com/rocboss/paopao-ce/auto/api/x/v1" +) + +var _ api.User = (*userSrv)(nil) diff --git a/internal/servants/space/user.go b/internal/servants/space/user.go index c83b98d1..f2075530 100644 --- a/internal/servants/space/user.go +++ b/internal/servants/space/user.go @@ -9,8 +9,6 @@ import ( "github.com/rocboss/paopao-ce/internal/servants/base" ) -var _ api.User = (*userSrv)(nil) - type userSrv struct { *base.BaseServant api.UnimplementedUserServant diff --git a/internal/servants/web/admin.go b/internal/servants/web/admin.go index f38d4aaf..0b393cba 100644 --- a/internal/servants/web/admin.go +++ b/internal/servants/web/admin.go @@ -18,8 +18,6 @@ import ( "github.com/sirupsen/logrus" ) -var _ api.Admin = (*adminSrv)(nil) - type adminSrv struct { api.UnimplementedAdminServant *base.DaoServant diff --git a/internal/servants/web/alipay.go b/internal/servants/web/alipay.go index 1fed1408..3734d2d9 100644 --- a/internal/servants/web/alipay.go +++ b/internal/servants/web/alipay.go @@ -16,11 +16,6 @@ import ( "github.com/smartwalle/alipay/v3" ) -var ( - _ api.AlipayPub = (*alipayPubSrv)(nil) - _ api.AlipayPriv = (*alipayPrivSrv)(nil) -) - type alipayPubSrv struct { api.UnimplementedAlipayPubServant *base.DaoServant diff --git a/internal/servants/web/constraint.go b/internal/servants/web/constraint.go new file mode 100644 index 00000000..cd46137b --- /dev/null +++ b/internal/servants/web/constraint.go @@ -0,0 +1,23 @@ +//go:build constraint + +package web + +import ( + api "github.com/rocboss/paopao-ce/auto/api/v1" +) + +var ( + _ api.Admin = (*adminSrv)(nil) + _ api.AlipayPub = (*alipayPubSrv)(nil) + _ api.AlipayPriv = (*alipayPrivSrv)(nil) + _ api.Core = (*coreSrv)(nil) + _ api.Followship = (*followshipSrv)(nil) + _ api.Friendship = (*friendshipSrv)(nil) + _ api.Loose = (*looseSrv)(nil) + _ api.Pub = (*pubSrv)(nil) + _ api.Relax = (*relaxSrv)(nil) + _ api.Site = (*siteSrv)(nil) + _ api.Trends = (*trendsSrv)(nil) + _ api.Priv = (*privSrv)(nil) + _ api.PrivChain = (*privChain)(nil) +) diff --git a/internal/servants/web/core.go b/internal/servants/web/core.go index d0fbeb79..677db40a 100644 --- a/internal/servants/web/core.go +++ b/internal/servants/web/core.go @@ -29,8 +29,6 @@ var ( _maxCaptchaTimes int = 2 ) -var _ api.Core = (*coreSrv)(nil) - type coreSrv struct { api.UnimplementedCoreServant *base.DaoServant diff --git a/internal/servants/web/followship.go b/internal/servants/web/followship.go index bd9caf34..75dc930b 100644 --- a/internal/servants/web/followship.go +++ b/internal/servants/web/followship.go @@ -15,8 +15,6 @@ import ( "github.com/sirupsen/logrus" ) -var _ api.Followship = (*followshipSrv)(nil) - type followshipSrv struct { api.UnimplementedFollowshipServant *base.DaoServant diff --git a/internal/servants/web/friendship.go b/internal/servants/web/friendship.go index 1851fc21..977250e5 100644 --- a/internal/servants/web/friendship.go +++ b/internal/servants/web/friendship.go @@ -14,8 +14,6 @@ import ( "github.com/sirupsen/logrus" ) -var _ api.Friendship = (*friendshipSrv)(nil) - type friendshipSrv struct { api.UnimplementedFriendshipServant *base.DaoServant diff --git a/internal/servants/web/loose.go b/internal/servants/web/loose.go index 66f9335d..5d484c3e 100644 --- a/internal/servants/web/loose.go +++ b/internal/servants/web/loose.go @@ -21,8 +21,6 @@ import ( "github.com/sirupsen/logrus" ) -var _ api.Loose = (*looseSrv)(nil) - type looseSrv struct { api.UnimplementedLooseServant *base.DaoServant diff --git a/internal/servants/web/priv.go b/internal/servants/web/priv.go index 9835bf24..50d6f338 100644 --- a/internal/servants/web/priv.go +++ b/internal/servants/web/priv.go @@ -27,17 +27,12 @@ import ( "github.com/sirupsen/logrus" ) -var ( - _ api.Priv = (*privSrv)(nil) - _ api.PrivChain = (*privChain)(nil) - - _uploadAttachmentTypeMap = map[string]ms.AttachmentType{ - "public/image": ms.AttachmentTypeImage, - "public/avatar": ms.AttachmentTypeImage, - "public/video": ms.AttachmentTypeVideo, - "attachment": ms.AttachmentTypeOther, - } -) +var _uploadAttachmentTypeMap = map[string]ms.AttachmentType{ + "public/image": ms.AttachmentTypeImage, + "public/avatar": ms.AttachmentTypeImage, + "public/video": ms.AttachmentTypeVideo, + "attachment": ms.AttachmentTypeOther, +} type privSrv struct { api.UnimplementedPrivServant diff --git a/internal/servants/web/pub.go b/internal/servants/web/pub.go index 59bbff04..377ab832 100644 --- a/internal/servants/web/pub.go +++ b/internal/servants/web/pub.go @@ -27,8 +27,6 @@ import ( "github.com/sirupsen/logrus" ) -var _ api.Pub = (*pubSrv)(nil) - const ( _MaxLoginErrTimes = 10 _MaxPhoneCaptcha = 10 diff --git a/internal/servants/web/relax.go b/internal/servants/web/relax.go index 468c033c..869ef4e6 100644 --- a/internal/servants/web/relax.go +++ b/internal/servants/web/relax.go @@ -15,8 +15,6 @@ import ( "github.com/sirupsen/logrus" ) -var _ api.Relax = (*relaxSrv)(nil) - type relaxSrv struct { api.UnimplementedRelaxServant *base.DaoServant diff --git a/internal/servants/web/site.go b/internal/servants/web/site.go index 54636afa..262c1336 100644 --- a/internal/servants/web/site.go +++ b/internal/servants/web/site.go @@ -12,8 +12,6 @@ import ( "github.com/rocboss/paopao-ce/pkg/version" ) -var _ api.Site = (*siteSrv)(nil) - type siteSrv struct { api.UnimplementedSiteServant *base.BaseServant diff --git a/internal/servants/web/trends.go b/internal/servants/web/trends.go index bf04fd1a..d44f84a0 100644 --- a/internal/servants/web/trends.go +++ b/internal/servants/web/trends.go @@ -18,8 +18,6 @@ import ( "github.com/sirupsen/logrus" ) -var _ api.Trends = (*trendsSrv)(nil) - type trendsSrv struct { api.UnimplementedTrendsServant *base.DaoServant diff --git a/internal/service/admin.go b/internal/service/admin.go index 47ac6659..22ca066d 100644 --- a/internal/service/admin.go +++ b/internal/service/admin.go @@ -16,8 +16,6 @@ import ( "github.com/rocboss/paopao-ce/internal/servants" ) -var _ Service = (*adminService)(nil) - type adminService struct { *baseHttpService } diff --git a/internal/service/bot.go b/internal/service/bot.go index 62d245e6..cf4b85ed 100644 --- a/internal/service/bot.go +++ b/internal/service/bot.go @@ -16,8 +16,6 @@ import ( "github.com/rocboss/paopao-ce/internal/servants" ) -var _ Service = (*botService)(nil) - type botService struct { *baseHttpService } diff --git a/internal/service/constraint.go b/internal/service/constraint.go new file mode 100644 index 00000000..eada6001 --- /dev/null +++ b/internal/service/constraint.go @@ -0,0 +1,18 @@ +//go:build constraint + +package service + +var ( + _ server = (*grpcServer)(nil) + _ server = (*httpServer)(nil) + + _ Service = (*adminService)(nil) + _ Service = (*botService)(nil) + _ Service = (*frontendWebService)(nil) + _ Service = (*localossService)(nil) + _ Service = (*metricsService)(nil) + _ Service = (*pprofService)(nil) + _ Service = (*mobileService)(nil) + _ Service = (*spaceXService)(nil) + _ Service = (*webService)(nil) +) diff --git a/internal/service/frontend_web.go b/internal/service/frontend_web.go index 7873c8a5..4e9bd181 100644 --- a/internal/service/frontend_web.go +++ b/internal/service/frontend_web.go @@ -14,8 +14,6 @@ import ( "github.com/rocboss/paopao-ce/internal/servants" ) -var _ Service = (*frontendWebService)(nil) - type frontendWebService struct { *baseHttpService } diff --git a/internal/service/grpc_server.go b/internal/service/grpc_server.go index 23d92da5..837c6932 100644 --- a/internal/service/grpc_server.go +++ b/internal/service/grpc_server.go @@ -10,8 +10,6 @@ import ( "google.golang.org/grpc" ) -var _ server = (*grpcServer)(nil) - // grpcServer wraper for grpc.Server type grpcServer struct { *baseServer diff --git a/internal/service/http_server.go b/internal/service/http_server.go index f34eef2a..ebbaeeb9 100644 --- a/internal/service/http_server.go +++ b/internal/service/http_server.go @@ -11,8 +11,6 @@ import ( "github.com/gin-gonic/gin" ) -var _ server = (*httpServer)(nil) - // httpServer wraper for gin.engine and http.Server type httpServer struct { *baseServer diff --git a/internal/service/localoss.go b/internal/service/localoss.go index b0789acc..43d14e34 100644 --- a/internal/service/localoss.go +++ b/internal/service/localoss.go @@ -15,8 +15,6 @@ import ( "github.com/rocboss/paopao-ce/internal/servants" ) -var _ Service = (*localossService)(nil) - type localossService struct { *baseHttpService } diff --git a/internal/service/metrics.go b/internal/service/metrics.go index fb81bfb6..0dffeba0 100644 --- a/internal/service/metrics.go +++ b/internal/service/metrics.go @@ -17,8 +17,6 @@ import ( "github.com/rocboss/paopao-ce/internal/infra/metrics/statistics" ) -var _ Service = (*metricsService)(nil) - type metricsService struct { *baseHttpService } diff --git a/internal/service/mobile.go b/internal/service/mobile.go index 8b74b06f..48186ec4 100644 --- a/internal/service/mobile.go +++ b/internal/service/mobile.go @@ -16,8 +16,6 @@ import ( "google.golang.org/grpc" ) -var _ Service = (*mobileService)(nil) - type mobileService struct { *baseGRPCService } diff --git a/internal/service/pprof.go b/internal/service/pprof.go index 731c70c1..12706557 100644 --- a/internal/service/pprof.go +++ b/internal/service/pprof.go @@ -13,8 +13,6 @@ import ( "github.com/rocboss/paopao-ce/internal/conf" ) -var _ Service = (*pprofService)(nil) - type pprofService struct { *baseHttpService } diff --git a/internal/service/space.go b/internal/service/space.go index f4c7ae0b..b8bf524f 100644 --- a/internal/service/space.go +++ b/internal/service/space.go @@ -16,8 +16,6 @@ import ( "github.com/rocboss/paopao-ce/internal/servants" ) -var _ Service = (*spaceXService)(nil) - type spaceXService struct { *baseHttpService } diff --git a/internal/service/web.go b/internal/service/web.go index 3c1ec97e..9cea8e1f 100644 --- a/internal/service/web.go +++ b/internal/service/web.go @@ -17,8 +17,6 @@ import ( "github.com/rocboss/paopao-ce/internal/servants" ) -var _ Service = (*webService)(nil) - type webService struct { *baseHttpService } From 4a72833f88c61ede1a4f3e2babad042e03e55770 Mon Sep 17 00:00:00 2001 From: alimy Date: Thu, 19 Feb 2026 20:46:25 +0800 Subject: [PATCH 07/22] add missing constraint for internal/dao/jinzhu --- internal/dao/jinzhu/authority.go | 2 -- internal/dao/jinzhu/comments.go | 5 ----- internal/dao/jinzhu/constraint.go | 31 ++++++++++++++++++++++++++++++- internal/dao/jinzhu/contacts.go | 2 -- internal/dao/jinzhu/following.go | 2 -- internal/dao/jinzhu/messages.go | 2 -- internal/dao/jinzhu/security.go | 2 -- internal/dao/jinzhu/timeline.go | 5 ----- internal/dao/jinzhu/topics.go | 5 ----- internal/dao/jinzhu/tweets.go | 10 ---------- internal/dao/jinzhu/user.go | 2 -- internal/dao/jinzhu/wallet.go | 2 -- 12 files changed, 30 insertions(+), 40 deletions(-) diff --git a/internal/dao/jinzhu/authority.go b/internal/dao/jinzhu/authority.go index caef4438..a86e5061 100644 --- a/internal/dao/jinzhu/authority.go +++ b/internal/dao/jinzhu/authority.go @@ -12,8 +12,6 @@ import ( "gorm.io/gorm" ) -var _ core.AuthorizationManageService = (*authorizationManageSrv)(nil) - type authorizationManageSrv struct { db *gorm.DB } diff --git a/internal/dao/jinzhu/comments.go b/internal/dao/jinzhu/comments.go index 7660dc16..d3520454 100644 --- a/internal/dao/jinzhu/comments.go +++ b/internal/dao/jinzhu/comments.go @@ -16,11 +16,6 @@ import ( "gorm.io/gorm" ) -var ( - _ core.CommentService = (*commentSrv)(nil) - _ core.CommentManageService = (*commentManageSrv)(nil) -) - type commentSrv struct { db *gorm.DB } diff --git a/internal/dao/jinzhu/constraint.go b/internal/dao/jinzhu/constraint.go index eb65e121..34f7bffa 100644 --- a/internal/dao/jinzhu/constraint.go +++ b/internal/dao/jinzhu/constraint.go @@ -2,9 +2,38 @@ package jinzhu -import "github.com/rocboss/paopao-ce/internal/core" +import ( + "github.com/rocboss/paopao-ce/internal/core" +) var ( + _ core.AuthorizationManageService = (*authorizationManageSrv)(nil) + _ core.CommentService = (*commentSrv)(nil) + _ core.CommentManageService = (*commentManageSrv)(nil) + + _ core.ContactManageService = (*contactManageSrv)(nil) + _ core.FollowingManageService = (*followingManageSrv)(nil) + + _ core.MessageService = (*messageSrv)(nil) + _ core.SecurityService = (*securitySrv)(nil) + + _ core.TopicService = (*topicSrv)(nil) + _ core.TopicServantA = (*topicSrvA)(nil) + + _ core.IndexPostsService = (*shipIndexSrv)(nil) + _ core.IndexPostsService = (*simpleIndexPostsSrv)(nil) + + _ core.TweetService = (*tweetSrv)(nil) + _ core.TweetManageService = (*tweetManageSrv)(nil) + _ core.TweetHelpService = (*tweetHelpSrv)(nil) + + _ core.TweetServantA = (*tweetSrvA)(nil) + _ core.TweetManageServantA = (*tweetManageSrvA)(nil) + _ core.TweetHelpServantA = (*tweetHelpSrvA)(nil) + + _ core.UserManageService = (*userManageSrv)(nil) + _ core.WalletService = (*walletSrv)(nil) + _ core.DataService = (*dataSrv)(nil) _ core.VersionInfo = (*dataSrv)(nil) diff --git a/internal/dao/jinzhu/contacts.go b/internal/dao/jinzhu/contacts.go index 349c605d..c8a319c8 100644 --- a/internal/dao/jinzhu/contacts.go +++ b/internal/dao/jinzhu/contacts.go @@ -14,8 +14,6 @@ import ( "gorm.io/gorm" ) -var _ core.ContactManageService = (*contactManageSrv)(nil) - type contactManageSrv struct { db *gorm.DB } diff --git a/internal/dao/jinzhu/following.go b/internal/dao/jinzhu/following.go index 19787008..0de96eec 100644 --- a/internal/dao/jinzhu/following.go +++ b/internal/dao/jinzhu/following.go @@ -12,8 +12,6 @@ import ( "gorm.io/gorm" ) -var _ core.FollowingManageService = (*followingManageSrv)(nil) - type followingManageSrv struct { db *gorm.DB f *dbr.Following diff --git a/internal/dao/jinzhu/messages.go b/internal/dao/jinzhu/messages.go index 0eb83cf3..7a53d6f7 100644 --- a/internal/dao/jinzhu/messages.go +++ b/internal/dao/jinzhu/messages.go @@ -12,8 +12,6 @@ import ( "gorm.io/gorm" ) -var _ core.MessageService = (*messageSrv)(nil) - type messageSrv struct { db *gorm.DB } diff --git a/internal/dao/jinzhu/security.go b/internal/dao/jinzhu/security.go index 4980763e..1f7cfdf3 100644 --- a/internal/dao/jinzhu/security.go +++ b/internal/dao/jinzhu/security.go @@ -15,8 +15,6 @@ import ( "gorm.io/gorm" ) -var _ core.SecurityService = (*securitySrv)(nil) - type securitySrv struct { db *gorm.DB rand *rand.Rand diff --git a/internal/dao/jinzhu/timeline.go b/internal/dao/jinzhu/timeline.go index 456d90ab..05c5f74f 100644 --- a/internal/dao/jinzhu/timeline.go +++ b/internal/dao/jinzhu/timeline.go @@ -14,11 +14,6 @@ import ( "gorm.io/gorm" ) -var ( - _ core.IndexPostsService = (*shipIndexSrv)(nil) - _ core.IndexPostsService = (*simpleIndexPostsSrv)(nil) -) - type shipIndexSrv struct { ams core.AuthorizationManageService ths core.TweetHelpService diff --git a/internal/dao/jinzhu/topics.go b/internal/dao/jinzhu/topics.go index 68b59f42..9c717d96 100644 --- a/internal/dao/jinzhu/topics.go +++ b/internal/dao/jinzhu/topics.go @@ -15,11 +15,6 @@ import ( "gorm.io/gorm" ) -var ( - _ core.TopicService = (*topicSrv)(nil) - _ core.TopicServantA = (*topicSrvA)(nil) -) - type topicSrv struct { db *gorm.DB tnTopicUser string diff --git a/internal/dao/jinzhu/tweets.go b/internal/dao/jinzhu/tweets.go index 8074d28e..b9edb666 100644 --- a/internal/dao/jinzhu/tweets.go +++ b/internal/dao/jinzhu/tweets.go @@ -17,16 +17,6 @@ import ( "gorm.io/gorm" ) -var ( - _ core.TweetService = (*tweetSrv)(nil) - _ core.TweetManageService = (*tweetManageSrv)(nil) - _ core.TweetHelpService = (*tweetHelpSrv)(nil) - - _ core.TweetServantA = (*tweetSrvA)(nil) - _ core.TweetManageServantA = (*tweetManageSrvA)(nil) - _ core.TweetHelpServantA = (*tweetHelpSrvA)(nil) -) - type tweetSrv struct { db *gorm.DB } diff --git a/internal/dao/jinzhu/user.go b/internal/dao/jinzhu/user.go index 66e6d158..265c7928 100644 --- a/internal/dao/jinzhu/user.go +++ b/internal/dao/jinzhu/user.go @@ -15,8 +15,6 @@ import ( "gorm.io/gorm" ) -var _ core.UserManageService = (*userManageSrv)(nil) - type userManageSrv struct { db *gorm.DB ums core.UserMetricServantA diff --git a/internal/dao/jinzhu/wallet.go b/internal/dao/jinzhu/wallet.go index e479bc92..ff4c98da 100644 --- a/internal/dao/jinzhu/wallet.go +++ b/internal/dao/jinzhu/wallet.go @@ -12,8 +12,6 @@ import ( "gorm.io/gorm" ) -var _ core.WalletService = (*walletSrv)(nil) - type walletSrv struct { db *gorm.DB } From c97f143cac97b811a27e080a3bbe87b8255b6d74 Mon Sep 17 00:00:00 2001 From: orzi <1063614727@qq.com> Date: Fri, 13 Mar 2026 10:59:49 +0800 Subject: [PATCH 08/22] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=BC=94=E7=A4=BA?= =?UTF-8?q?=E7=AB=99=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deployed-sites.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/deployed-sites.md b/deployed-sites.md index a5ea4e8d..ef489984 100644 --- a/deployed-sites.md +++ b/deployed-sites.md @@ -3,7 +3,8 @@ PaoPao部署站点信息。 | 名称 | 网址 | 站长 | 备注 | | ----- | ----- | ----- | ----- | -|泡泡|[www.paopao.info](https://www.paopao.info)|[ROC](https://www.paopao.info/#/user?username=roc 'roc(@paopao.info)')|PaoPao官方站点| -|布里塔|[bulita.cn](https://bulita.cn)|[chendong](https://www.paopao.info/#/user?username=chendong 'chendong(@paopao.info)')|招聘求职等信息| -|提示词社区|[promptser.cn](https://promptser.cn)|[henryspace](https://paopao.info/#/user?username=henryspace 'henryspace(@paopao.info)')|提示词社区| -|iiBiuBiu|[iibiubiu.com](https://iibiubiu.com)|[北野](https://www.paopao.info/#/user?username=alimy 'alimy(@paopao.info)')|开发、测试备用机，可以体验最新版本paopao-ce| +|泡泡|[www.paopao.info](https://www.paopao.info)|[ROC](https://www.paopao.info/#/u?s=roc 'roc(@paopao.info)')|PaoPao官方站点| +|布里塔|[bulita.cn](https://bulita.cn)|[chendong](https://www.paopao.info/#/u?s=chendong 'chendong(@paopao.info)')|招聘求职等信息| +|提示词社区|[promptser.cn](https://promptser.cn)|[henryspace](https://www.paopao.info/#/u?s=henryspace 'henryspace(@paopao.info)')|提示词社区| +|iiBiuBiu|[iibiubiu.com](https://iibiubiu.com)|[北野](https://www.paopao.info/#/u?s=alimy 'alimy(@paopao.info)')|开发、测试备用机，可以体验最新版本paopao-ce| +|稍言|[slowsay.com](https://slowsay.com)|[orzi](https://www.paopao.info/#/u?s=orzi 'orzi(@paopao.info)')|测试演示，修改了用户系统等内容| \ No newline at end of file From bfffadf8205a9b98e6f5487ec3001b5f825a70b6 Mon Sep 17 00:00:00 2001 From: orzi <1063614727@qq.com> Date: Fri, 13 Mar 2026 19:12:57 +0800 Subject: [PATCH 09/22] =?UTF-8?q?1.=20vuex=20->=20pinia=202.=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=BD=91=E7=BB=9C=E8=AF=B7=E6=B1=82=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/package.json | 8 +- web/src/App.vue | 36 +- web/src/api/auth.ts | 55 +-- web/src/api/post.ts | 16 +- web/src/api/site.ts | 13 +- web/src/api/user.ts | 440 ---------------------- web/src/components/auth.vue | 52 +-- web/src/components/comment-item.vue | 17 +- web/src/components/compose-comment.vue | 22 +- web/src/components/compose-reply.vue | 22 +- web/src/components/compose.vue | 49 +-- web/src/components/contact-item.vue | 3 +- web/src/components/follow-item.vue | 9 +- web/src/components/main-nav.vue | 20 +- web/src/components/message-item.vue | 62 ++- web/src/components/mobile-post-item.vue | 17 +- web/src/components/post-attachment.vue | 10 +- web/src/components/post-detail.vue | 30 +- web/src/components/post-item.vue | 14 +- web/src/components/reply-item.vue | 24 +- web/src/components/rightbar.vue | 42 ++- web/src/components/sidebar.vue | 64 ++-- web/src/components/whisper-add-friend.vue | 4 +- web/src/components/whisper.vue | 4 +- web/src/main.ts | 7 +- web/src/store/index.ts | 201 ---------- web/src/store/main.ts | 70 ++++ web/src/store/profile.ts | 131 +++++++ web/src/store/user.ts | 44 +++ web/src/types/Api.d.ts | 14 + web/src/types/Item.d.ts | 2 +- web/src/types/NetParams.d.ts | 143 +------ web/src/types/NetReq.d.ts | 110 +----- web/src/types/api/Admin.d.ts | 42 +++ web/src/types/api/Attachment.d.ts | 38 ++ web/src/types/api/Auth.d.ts | 42 +++ web/src/types/api/Captcha.d.ts | 38 ++ web/src/types/api/Friend.d.ts | 44 +++ web/src/types/api/Suggest.d.ts | 34 ++ web/src/types/api/User.d.ts | 224 +++++++++++ web/src/utils/request.ts | 117 ++++-- web/src/views/Anouncement.vue | 9 +- web/src/views/Collection.vue | 24 +- web/src/views/Contacts.vue | 4 +- web/src/views/Following.vue | 6 +- web/src/views/Home.vue | 56 +-- web/src/views/Messages.vue | 21 +- web/src/views/Profile.vue | 88 +++-- web/src/views/Setting.vue | 109 +++--- web/src/views/Topic.vue | 19 +- web/src/views/User.vue | 81 ++-- web/src/views/Wallet.vue | 60 +-- web/src/vite-env.d.ts | 1 - web/src/vuex.d.ts | 14 - web/vite.config.ts | 11 +- 55 files changed, 1394 insertions(+), 1443 deletions(-) delete mode 100644 web/src/api/user.ts delete mode 100644 web/src/store/index.ts create mode 100644 web/src/store/main.ts create mode 100644 web/src/store/profile.ts create mode 100644 web/src/store/user.ts create mode 100644 web/src/types/Api.d.ts create mode 100644 web/src/types/api/Admin.d.ts create mode 100644 web/src/types/api/Attachment.d.ts create mode 100644 web/src/types/api/Auth.d.ts create mode 100644 web/src/types/api/Captcha.d.ts create mode 100644 web/src/types/api/Friend.d.ts create mode 100644 web/src/types/api/Suggest.d.ts create mode 100644 web/src/types/api/User.d.ts delete mode 100644 web/src/vuex.d.ts diff --git a/web/package.json b/web/package.json index 03cc1b95..074a57d0 100644 --- a/web/package.json +++ b/web/package.json @@ -24,12 +24,13 @@ "moment": "^2.30.1", "naive-ui": "^2.41.0", "paopao-video-player": "^1.0.0", + "pinia": "^3.0.4", "qrcanvas-vue": "^3.0.0", "qrcode": "^1.5.4", "unplugin-vue-components": "^28.5.0", "v3-infinite-loading": "^1.3.2", "vfonts": "^0.0.3", - "vue": "^3.5.13", + "vue": "^3.5.30", "vue-router": "4", "vuex": "^4.1.0" }, @@ -38,11 +39,10 @@ "@tauri-apps/cli": "^1.5.10", "@types/node": "^22.14.1", "@types/qrcode": "^1.5.5", - "@vitejs/plugin-vue": "^5.2.3", + "@vitejs/plugin-vue": "^6.0.5", "@vue/compiler-sfc": "^3.5.13", - "rollup-plugin-visualizer": "^5.14.0", "typescript": "^5.8.3", - "vite": "^6.2.6" + "vite": "^8.0.0" }, "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" } diff --git a/web/src/App.vue b/web/src/App.vue index 1beb2978..09d3a167 100644 --- a/web/src/App.vue +++ b/web/src/App.vue @@ -1,14 +1,14 @@