A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.
feat(router): add middleware for user router
LinkinStars2a121c573ba6
diff --git a/go.mod b/go.modindex 4007f17c..40de6032 100644--- a/go.mod+++ b/go.mod@@ -21,6 +21,7 @@ require (github.com/google/wire v0.5.0github.com/gosimple/slug v1.13.1github.com/grokify/html-strip-tags-go v0.0.1+ github.com/imroc/req/v3 v3.33.1github.com/jinzhu/copier v0.3.5github.com/jinzhu/now v1.1.5github.com/lib/pq v1.10.7@@ -41,8 +42,9 @@ require (github.com/swaggo/swag v1.8.10github.com/tidwall/gjson v1.14.4github.com/yuin/goldmark v1.4.13- golang.org/x/crypto v0.1.0+ golang.org/x/crypto v0.4.0golang.org/x/net v0.5.0+ google.golang.org/grpc v1.46.2gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23dfgopkg.in/yaml.v3 v3.0.1modernc.org/sqlite v1.14.2@@ -71,13 +73,18 @@ require (github.com/go-openapi/jsonreference v0.20.0 // indirectgithub.com/go-openapi/spec v0.20.7 // indirectgithub.com/go-openapi/swag v0.22.3 // indirect+ github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirectgithub.com/gogo/protobuf v1.3.2 // indirectgithub.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect+ github.com/golang/protobuf v1.5.2 // indirectgithub.com/golang/snappy v0.0.4 // indirectgithub.com/google/go-cmp v0.5.9 // indirect+ github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirectgithub.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirectgithub.com/gorilla/css v1.0.0 // indirectgithub.com/gosimple/unidecode v1.0.1 // indirect+ github.com/hashicorp/errwrap v1.1.0 // indirect+ github.com/hashicorp/go-multierror v1.1.1 // indirectgithub.com/hashicorp/hcl v1.0.0 // indirectgithub.com/imdario/mergo v0.3.12 // indirectgithub.com/inconshreveable/mousetrap v1.0.1 // indirect@@ -95,6 +102,7 @@ require (github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirectgithub.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirectgithub.com/modern-go/reflect2 v1.0.2 // indirect+ github.com/onsi/ginkgo/v2 v2.2.0 // indirectgithub.com/opencontainers/go-digest v1.0.0 // indirectgithub.com/opencontainers/image-spec v1.0.2 // indirectgithub.com/opencontainers/runc v1.1.2 // indirect@@ -103,6 +111,11 @@ require (github.com/pelletier/go-toml/v2 v2.0.5 // indirectgithub.com/pkg/errors v0.9.1 // indirectgithub.com/pmezard/go-difflib v1.0.0 // indirect+ github.com/quic-go/qpack v0.4.0 // indirect+ github.com/quic-go/qtls-go1-18 v0.2.0 // indirect+ github.com/quic-go/qtls-go1-19 v0.2.0 // indirect+ github.com/quic-go/qtls-go1-20 v0.1.0 // indirect+ github.com/quic-go/quic-go v0.32.0 // indirectgithub.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirectgithub.com/sirupsen/logrus v1.8.1 // indirectgithub.com/spf13/afero v1.9.2 // indirect@@ -121,11 +134,13 @@ require (go.uber.org/atomic v1.10.0 // indirectgo.uber.org/multierr v1.8.0 // indirectgo.uber.org/zap v1.23.0 // indirect+ golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirectgolang.org/x/image v0.1.0 // indirectgolang.org/x/mod v0.6.0 // indirectgolang.org/x/sys v0.4.0 // indirectgolang.org/x/text v0.6.0 // indirectgolang.org/x/tools v0.2.0 // indirect+ google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirectgoogle.golang.org/protobuf v1.28.1 // indirectgopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirectgopkg.in/ini.v1 v1.67.0 // indirectdiff --git a/go.sum b/go.sumindex 9e59aca6..0df6aa34 100644--- a/go.sum+++ b/go.sum@@ -74,6 +74,7 @@ github.com/anargu/gin-brotli v0.0.0-20220116052358-12bf532d5267/go.mod h1:Yj3yPPgithub.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=@@ -110,6 +111,10 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkgithub.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=+github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=+github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=+github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=+github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=@@ -157,6 +162,7 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mgithub.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=+github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=@@ -213,6 +219,8 @@ github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOGgithub.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=github.com/goccy/go-json v0.8.1/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk=@@ -259,6 +267,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDgithub.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=@@ -276,6 +286,7 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=@@ -292,6 +303,8 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfgithub.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=@@ -321,13 +334,18 @@ github.com/grokify/html-strip-tags-go v0.0.1/go.mod h1:2Su6romC5/1VXOQMaWL2yb618github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=+github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE=github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=+github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=+github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=+github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=+github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=@@ -350,6 +368,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=+github.com/imroc/req/v3 v3.33.1 h1:BZnyl+K0hXcJlZBHY2CqbPgmVc1pPJDzjn6aJfB6shI=+github.com/imroc/req/v3 v3.33.1/go.mod h1:cZ+7C3L/AYOr4tLGG16hZF90F1WzAdAdzt1xFSlizXY=github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc=github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=@@ -524,8 +544,10 @@ github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vgithub.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs=github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=-github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU=+github.com/onsi/ginkgo/v2 v2.2.0 h1:3ZNA3L1c5FYDFTTxbFeVGGD8jYvjYauHD30YgLxVsNI=+github.com/onsi/ginkgo/v2 v2.2.0/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7AG4VIk=github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=+github.com/onsi/gomega v1.20.1 h1:PA/3qinGoukvymdIDV8pii6tiZgC8kbmJO6Z5+b002Q=github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=@@ -589,12 +611,23 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6Rgithub.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=+github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=+github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=+github.com/quic-go/qtls-go1-18 v0.2.0 h1:5ViXqBZ90wpUcZS0ge79rf029yx0dYB0McyPJwqqj7U=+github.com/quic-go/qtls-go1-18 v0.2.0/go.mod h1:moGulGHK7o6O8lSPSZNoOwcLvJKJ85vVNc7oJFD65bc=+github.com/quic-go/qtls-go1-19 v0.2.0 h1:Cvn2WdhyViFUHoOqK52i51k4nDX8EwIh5VJiVM4nttk=+github.com/quic-go/qtls-go1-19 v0.2.0/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=+github.com/quic-go/qtls-go1-20 v0.1.0 h1:d1PK3ErFy9t7zxKsG3NXBJXZjp/kMLoIb3y/kV54oAI=+github.com/quic-go/qtls-go1-20 v0.1.0/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM=+github.com/quic-go/quic-go v0.32.0 h1:lY02md31s1JgPiiyfqJijpu/UX/Iun304FI3yUqX7tA=+github.com/quic-go/quic-go v0.32.0/go.mod h1:/fCsKANhQIeD5l76c2JFU+07gVE3KaA0FP+0zMWwfwo=github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=@@ -725,6 +758,7 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=+go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=@@ -765,8 +799,8 @@ golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ygolang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=-golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=-golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=+golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8=+golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=@@ -777,6 +811,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=+golang.org/x/exp v0.0.0-20221205204356-47842c84f3db h1:D/cFflL63o2KSLJIwjlcIt8PR064j/xsmdEJL/YvY/o=+golang.org/x/exp v0.0.0-20221205204356-47842c84f3db/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=golang.org/x/image v0.0.0-20190501045829-6d32002ffd75/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=@@ -961,6 +997,7 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=+golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=@@ -1094,6 +1131,7 @@ google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGgoogle.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=+google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=@@ -1107,6 +1145,8 @@ google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6Dgoogle.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=+google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd h1:e0TwkXOdbnH/1x5rc5MZ/VYyiZ4v+RdVfrGMqEwT68I=+google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM=@@ -1125,9 +1165,14 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Ijigoogle.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=+google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=+google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=+google.golang.org/grpc v1.46.2 h1:u+MLGgVf7vRdjEYZ8wDFhAVNmhkbJ5hmrA1LMWK1CAQ=+google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=@@ -1139,6 +1184,7 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADgoogle.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=diff --git a/i18n/en_US.yaml b/i18n/en_US.yamlindex b4d1dcc0..c255d9fb 100644--- a/i18n/en_US.yaml+++ b/i18n/en_US.yaml@@ -12,6 +12,8 @@ backend:other: Unauthorized.database_error:other: Data server error.+ forbidden_error:+ other: Forbidden.role:name:user:diff --git a/internal/base/middleware/user_center_plugin_auth.go b/internal/base/middleware/user_center_plugin_auth.gonew file mode 100644index 00000000..c6a190a4--- /dev/null+++ b/internal/base/middleware/user_center_plugin_auth.go@@ -0,0 +1,19 @@+package middleware++import (+ "github.com/answerdev/answer/internal/base/handler"+ "github.com/answerdev/answer/internal/base/reason"+ "github.com/answerdev/answer/plugin"+ "github.com/gin-gonic/gin"+ "github.com/segmentfault/pacman/errors"+)++// BanAPIWhenUserCenterEnabled ban api when user center enabled+func BanAPIWhenUserCenterEnabled(ctx *gin.Context) {+ if plugin.UserCenterEnabled() {+ handler.HandleResponse(ctx, errors.Forbidden(reason.ForbiddenError), nil)+ ctx.Abort()+ return+ }+ ctx.Next()+}diff --git a/internal/base/reason/reason.go b/internal/base/reason/reason.goindex b03ad55c..d155c4b5 100644--- a/internal/base/reason/reason.go+++ b/internal/base/reason/reason.go@@ -11,6 +11,8 @@ const (UnauthorizedError = "base.unauthorized_error"// DatabaseError database errorDatabaseError = "base.database_error"+ // ForbiddenError forbidden error+ ForbiddenError = "base.forbidden_error")const (@@ -25,7 +27,7 @@ const (AnswerNotFound = "error.answer.not_found"AnswerCannotDeleted = "error.answer.cannot_deleted"AnswerCannotUpdate = "error.answer.cannot_update"- AnswerCannotAddByClosedQuestion = "error.answer.question_closed_cannot_add"+ AnswerCannotAddByClosedQuestion = "error.answer.question_closed_cannot_add"CommentEditWithoutPermission = "error.comment.edit_without_permission"DisallowVote = "error.object.disallow_vote"DisallowFollow = "error.object.disallow_follow"@@ -46,7 +48,7 @@ const (TagNotContainSynonym = "error.tag.not_contain_synonym_tags"TagCannotUpdate = "error.tag.cannot_update"TagIsUsedCannotDelete = "error.tag.is_used_cannot_delete"- TagAlreadyExist = "error.tag.already_exist"+ TagAlreadyExist = "error.tag.already_exist"RankFailToMeetTheCondition = "error.rank.fail_to_meet_the_condition"ThemeNotFound = "error.theme.not_found"LangNotFound = "error.lang.not_found"diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.goindex a12a7523..c882f422 100644--- a/internal/controller/question_controller.go+++ b/internal/controller/question_controller.go@@ -515,6 +515,9 @@ func (qc *QuestionController) AdminSearchAnswerList(ctx *gin.Context) {return}req.QuestionID = uid.DeShortID(req.QuestionID)+ if req.QuestionID == "0" {+ req.QuestionID = ""+ }userID := middleware.GetLoginUserIDFromContext(ctx)questionList, count, err := qc.questionService.AdminSearchAnswerList(ctx, req, userID)handler.HandleResponse(ctx, err, gin.H{diff --git a/internal/controller_admin/user_backyard_controller.go b/internal/controller_admin/user_backyard_controller.goindex eaa06f73..76fb8378 100644--- a/internal/controller_admin/user_backyard_controller.go+++ b/internal/controller_admin/user_backyard_controller.go@@ -3,9 +3,12 @@ package controller_adminimport ("github.com/answerdev/answer/internal/base/handler""github.com/answerdev/answer/internal/base/middleware"+ "github.com/answerdev/answer/internal/base/reason""github.com/answerdev/answer/internal/schema""github.com/answerdev/answer/internal/service/user_admin"+ "github.com/answerdev/answer/plugin""github.com/gin-gonic/gin"+ "github.com/segmentfault/pacman/errors")// UserAdminController user controller@@ -29,6 +32,10 @@ func NewUserAdminController(userService *user_admin.UserAdminService) *UserAdmin// @Success 200 {object} handler.RespBody// @Router /answer/admin/api/user/status [put]func (uc *UserAdminController) UpdateUserStatus(ctx *gin.Context) {+ if plugin.UserCenterEnabled() {+ handler.HandleResponse(ctx, errors.Forbidden(reason.ForbiddenError), nil)+ return+ }req := &schema.UpdateUserStatusReq{}if handler.BindAndCheck(ctx, req) {return@@ -73,6 +80,10 @@ func (uc *UserAdminController) UpdateUserRole(ctx *gin.Context) {// @Success 200 {object} handler.RespBody// @Router /answer/admin/api/user [post]func (uc *UserAdminController) AddUser(ctx *gin.Context) {+ if plugin.UserCenterEnabled() {+ handler.HandleResponse(ctx, errors.Forbidden(reason.ForbiddenError), nil)+ return+ }req := &schema.AddUserReq{}if handler.BindAndCheck(ctx, req) {return@@ -95,6 +106,10 @@ func (uc *UserAdminController) AddUser(ctx *gin.Context) {// @Success 200 {object} handler.RespBody// @Router /answer/admin/api/user/password [put]func (uc *UserAdminController) UpdateUserPassword(ctx *gin.Context) {+ if plugin.UserCenterEnabled() {+ handler.HandleResponse(ctx, errors.Forbidden(reason.ForbiddenError), nil)+ return+ }req := &schema.UpdateUserPasswordReq{}if handler.BindAndCheck(ctx, req) {returndiff --git a/internal/repo/rank/user_rank_repo.go b/internal/repo/rank/user_rank_repo.goindex 65174999..462f999e 100644--- a/internal/repo/rank/user_rank_repo.go+++ b/internal/repo/rank/user_rank_repo.go@@ -9,6 +9,7 @@ import ("github.com/answerdev/answer/internal/entity""github.com/answerdev/answer/internal/service/config""github.com/answerdev/answer/internal/service/rank"+ "github.com/answerdev/answer/plugin""github.com/jinzhu/now""github.com/segmentfault/pacman/errors""github.com/segmentfault/pacman/log"@@ -36,6 +37,10 @@ func NewUserRankRepo(data *data.Data, configRepo config.ConfigRepo) rank.UserRanfunc (ur *UserRankRepo) TriggerUserRank(ctx context.Context,session *xorm.Session, userID string, deltaRank int, activityType int,) (isReachStandard bool, err error) {+ // IMPORTANT: If user center enabled the rank agent, then we should not change user rank.+ if plugin.RankAgentEnabled() {+ return false, nil+ }if deltaRank == 0 {return false, nil}diff --git a/internal/repo/user/user_backyard_repo.go b/internal/repo/user/user_backyard_repo.goindex 1b6cb2f1..6c7efe3f 100644--- a/internal/repo/user/user_backyard_repo.go+++ b/internal/repo/user/user_backyard_repo.go@@ -86,6 +86,10 @@ func (ur *userAdminRepo) GetUserInfo(ctx context.Context, userID string) (user *if err != nil {return nil, false, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()}+ err = tryToDecorateUserInfoFromUserCenter(ctx, ur.data, user)+ if err != nil {+ return nil, false, err+ }return}@@ -96,6 +100,11 @@ func (ur *userAdminRepo) GetUserInfoByEmail(ctx context.Context, email string) (Where("status != ?", entity.UserStatusDeleted).Get(userInfo)if err != nil {err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()+ return+ }+ err = tryToDecorateUserInfoFromUserCenter(ctx, ur.data, user)+ if err != nil {+ return nil, false, err}return}@@ -127,6 +136,8 @@ func (ur *userAdminRepo) GetUserPage(ctx context.Context, page, pageSize int, ustotal, err = pager.Help(page, pageSize, &users, user, session)if err != nil {err = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()+ return}+ tryToDecorateUserListFromUserCenter(ctx, ur.data, users)return}diff --git a/internal/repo/user/user_repo.go b/internal/repo/user/user_repo.goindex 0a553521..d0226a41 100644--- a/internal/repo/user/user_repo.go+++ b/internal/repo/user/user_repo.go@@ -142,7 +142,10 @@ func (ur *userRepo) GetByUserID(ctx context.Context, userID string) (userInfo *eerr = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()return}- ur.tryToDecorateUserInfoFromUserCenter(ctx, userInfo)+ err = tryToDecorateUserInfoFromUserCenter(ctx, ur.data, userInfo)+ if err != nil {+ return nil, false, err+ }return}@@ -152,7 +155,7 @@ func (ur *userRepo) BatchGetByID(ctx context.Context, ids []string) ([]*entity.Uif err != nil {return nil, errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()}- ur.tryToDecorateUserListFromUserCenter(ctx, list)+ tryToDecorateUserListFromUserCenter(ctx, ur.data, list)return list, nil}@@ -164,7 +167,10 @@ func (ur *userRepo) GetByUsername(ctx context.Context, username string) (userInferr = errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()return}- ur.tryToDecorateUserInfoFromUserCenter(ctx, userInfo)+ err = tryToDecorateUserInfoFromUserCenter(ctx, ur.data, userInfo)+ if err != nil {+ return nil, false, err+ }return}@@ -188,28 +194,27 @@ func (ur *userRepo) GetUserCount(ctx context.Context) (count int64, err error) {return}-func (ur *userRepo) tryToDecorateUserInfoFromUserCenter(ctx context.Context, original *entity.User) {+func tryToDecorateUserInfoFromUserCenter(ctx context.Context, data *data.Data, original *entity.User) (err error) {uc, ok := plugin.GetUserCenter()if !ok {- return+ return nil}userInfo := &entity.UserExternalLogin{}- session := ur.data.DB.Where("user_id = ?", original.ID)+ session := data.DB.Where("user_id = ?", original.ID)session.Where("provider = ?", uc.Info().SlugName)exist, err := session.Get(userInfo)if err != nil {- log.Error(err)- return+ return errors.InternalServer(reason.DatabaseError).WithError(err).WithStack()}if !exist {- return+ return nil}userCenterBasicUserInfo, err := uc.UserInfo(userInfo.ExternalID)if err != nil {log.Error(err)- return+ return errors.BadRequest(reason.UserNotFound).WithError(err).WithStack()}// In general, usernames should be guaranteed unique by the User Center plugin, so there are no inconsistencies.@@ -217,10 +222,10 @@ func (ur *userRepo) tryToDecorateUserInfoFromUserCenter(ctx context.Context, orilog.Warnf("user %s username is inconsistent with user center", original.ID)}decorateByUserCenterUser(original, userCenterBasicUserInfo)+ return nil}-func (ur *userRepo) tryToDecorateUserListFromUserCenter(ctx context.Context, original []*entity.User) {- log.Debugf("try to decorate user list from user center, original: %+v", original)+func tryToDecorateUserListFromUserCenter(ctx context.Context, data *data.Data, original []*entity.User) {uc, ok := plugin.GetUserCenter()if !ok {return@@ -234,7 +239,7 @@ func (ur *userRepo) tryToDecorateUserListFromUserCenter(ctx context.Context, ori}userExternalLoginList := make([]*entity.UserExternalLogin, 0)- session := ur.data.DB.Where("provider = ?", uc.Info().SlugName)+ session := data.DB.Where("provider = ?", uc.Info().SlugName)session.In("user_id", ids)err := session.Find(&userExternalLoginList)if err != nil {@@ -248,10 +253,13 @@ func (ur *userRepo) tryToDecorateUserListFromUserCenter(ctx context.Context, orioriginalExternalIDMapping[u.ExternalID] = originalUserIDMapping[u.UserID]userExternalIDs = append(userExternalIDs, u.ExternalID)}+ if len(userExternalIDs) == 0 {+ return+ }ucUsers, err := uc.UserList(userExternalIDs)if err != nil {- log.Error(err)+ log.Errorf("get user list from user center failed: %v, %v", err, userExternalIDs)return}@@ -277,4 +285,5 @@ func decorateByUserCenterUser(original *entity.User, ucUser *plugin.UserCenterBaif plugin.RankAgentEnabled() {original.Rank = ucUser.Rank}+ original.Status = int(ucUser.Status)}diff --git a/internal/router/answer_api_router.go b/internal/router/answer_api_router.goindex 22b11603..015bfcac 100644--- a/internal/router/answer_api_router.go+++ b/internal/router/answer_api_router.go@@ -1,6 +1,7 @@package routerimport (+ "github.com/answerdev/answer/internal/base/middleware""github.com/answerdev/answer/internal/controller""github.com/answerdev/answer/internal/controller_admin""github.com/gin-gonic/gin"@@ -100,23 +101,24 @@ func (a *AnswerAPIRouter) RegisterMustUnAuthAnswerAPIRouter(r *gin.RouterGroup)r.GET("/siteinfo/legal", a.siteinfoController.GetSiteLegalInfo)// user- r.POST("/user/login/email", a.userController.UserEmailLogin)- r.POST("/user/register/email", a.userController.UserRegisterByEmail)- r.GET("/user/register/captcha", a.userController.UserRegisterCaptcha)- r.POST("/user/email/verification", a.userController.UserVerifyEmail)- r.PUT("/user/email", a.userController.UserChangeEmailVerify)- r.GET("/user/action/record", a.userController.ActionRecord)- r.POST("/user/password/reset", a.userController.RetrievePassWord)- r.POST("/user/password/replacement", a.userController.UseRePassWord)r.GET("/user/info", a.userController.GetUserInfoByUserID)- r.PUT("/user/email/notification", a.userController.UserUnsubscribeEmailNotification)+ routerGroup := r.Group("", middleware.BanAPIWhenUserCenterEnabled)+ routerGroup.POST("/user/login/email", a.userController.UserEmailLogin)+ routerGroup.POST("/user/register/email", a.userController.UserRegisterByEmail)+ routerGroup.GET("/user/register/captcha", a.userController.UserRegisterCaptcha)+ routerGroup.POST("/user/email/verification", a.userController.UserVerifyEmail)+ routerGroup.PUT("/user/email", a.userController.UserChangeEmailVerify)+ routerGroup.GET("/user/action/record", a.userController.ActionRecord)+ routerGroup.POST("/user/password/reset", a.userController.RetrievePassWord)+ routerGroup.POST("/user/password/replacement", a.userController.UseRePassWord)+ routerGroup.PUT("/user/email/notification", a.userController.UserUnsubscribeEmailNotification)}func (a *AnswerAPIRouter) RegisterUnAuthAnswerAPIRouter(r *gin.RouterGroup) {// userr.GET("/user/logout", a.userController.UserLogout)- r.POST("/user/email/change/code", a.userController.UserChangeEmailSendCode)- r.POST("/user/email/verification/send", a.userController.UserVerifyEmailSend)+ r.POST("/user/email/change/code", middleware.BanAPIWhenUserCenterEnabled, a.userController.UserChangeEmailSendCode)+ r.POST("/user/email/verification/send", middleware.BanAPIWhenUserCenterEnabled, a.userController.UserVerifyEmailSend)r.GET("/personal/user/info", a.userController.GetOtherUserInfoByUsername)r.GET("/user/ranking", a.userController.UserRanking)@@ -202,8 +204,8 @@ func (a *AnswerAPIRouter) RegisterAnswerAPIRouter(r *gin.RouterGroup) {r.DELETE("/answer", a.answerController.RemoveAnswer)// user- r.PUT("/user/password", a.userController.UserModifyPassWord)- r.PUT("/user/info", a.userController.UserUpdateInfo)+ r.PUT("/user/password", middleware.BanAPIWhenUserCenterEnabled, a.userController.UserModifyPassWord)+ r.PUT("/user/info", middleware.BanAPIWhenUserCenterEnabled, a.userController.UserUpdateInfo)r.PUT("/user/interface", a.userController.UserUpdateInterface)r.POST("/user/notice/set", a.userController.UserNoticeSet)@@ -242,10 +244,10 @@ func (a *AnswerAPIRouter) RegisterAnswerAdminAPIRouter(r *gin.RouterGroup) {// userr.GET("/users/page", a.adminUserController.GetUserPage)- r.PUT("/user/status", a.adminUserController.UpdateUserStatus)+ r.PUT("/user/status", middleware.BanAPIWhenUserCenterEnabled, a.adminUserController.UpdateUserStatus)r.PUT("/user/role", a.adminUserController.UpdateUserRole)- r.POST("/user", a.adminUserController.AddUser)- r.PUT("/user/password", a.adminUserController.UpdateUserPassword)+ r.POST("/user", middleware.BanAPIWhenUserCenterEnabled, a.adminUserController.AddUser)+ r.PUT("/user/password", middleware.BanAPIWhenUserCenterEnabled, a.adminUserController.UpdateUserPassword)// reasonr.GET("/reasons", a.reasonController.Reasons)diff --git a/internal/service/rank/rank_service.go b/internal/service/rank/rank_service.goindex b079bed5..534913d8 100644--- a/internal/service/rank/rank_service.go+++ b/internal/service/rank/rank_service.go@@ -16,6 +16,7 @@ import (usercommon "github.com/answerdev/answer/internal/service/user_common""github.com/answerdev/answer/pkg/htmltext""github.com/answerdev/answer/pkg/uid"+ "github.com/answerdev/answer/plugin""github.com/segmentfault/pacman/errors""github.com/segmentfault/pacman/log""xorm.io/xorm"@@ -228,6 +229,9 @@ func (rs *RankService) checkUserRank(ctx context.Context, userID string, userRan// GetRankPersonalWithPage get personal comment list pagefunc (rs *RankService) GetRankPersonalWithPage(ctx context.Context, req *schema.GetRankPersonalWithPageReq) (pageModel *pager.PageModel, err error) {+ if plugin.RankAgentEnabled() {+ return pager.NewPageModel(0, []string{}), nil+ }if len(req.Username) > 0 {userInfo, exist, err := rs.userCommon.GetUserBasicInfoByUserName(ctx, req.Username)if err != nil {diff --git a/plugin/user_center.go b/plugin/user_center.goindex a32e6276..adc064f5 100644--- a/plugin/user_center.go+++ b/plugin/user_center.go@@ -2,13 +2,21 @@ package plugintype UserCenter interface {Base+ // Description returns the description of the user center, including the name, icon, url, etc.Description() UserCenterDesc+ // ControlCenterItems returns the items that will be displayed in the control centerControlCenterItems() []ControlCenter+ // LoginCallback is called when the user center login callback is calledLoginCallback(ctx *GinContext) (userInfo *UserCenterBasicUserInfo, err error)+ // SignUpCallback is called when the user center sign up callback is calledSignUpCallback(ctx *GinContext) (userInfo *UserCenterBasicUserInfo, err error)+ // UserInfo returns the user informationUserInfo(externalID string) (userInfo *UserCenterBasicUserInfo, err error)+ // UserList returns the user list informationUserList(externalIDs []string) (userInfo []*UserCenterBasicUserInfo, err error)+ // UserSettings returns the user settingsUserSettings(externalID string) (userSettings *SettingInfo, err error)+ // PersonalBranding returns the personal branding informationPersonalBranding(externalID string) (branding []*PersonalBranding)}@@ -21,14 +29,23 @@ type UserCenterDesc struct {RankAgentEnabled bool `json:"rank_agent_enabled"`}+type UserStatus int++const (+ UserStatusAvailable UserStatus = 1+ UserStatusSuspended UserStatus = 9+ UserStatusDeleted UserStatus = 10+)+type UserCenterBasicUserInfo struct {- ExternalID string `json:"external_id"`- Username string `json:"username"`- DisplayName string `json:"display_name"`- Email string `json:"email"`- Rank int `json:"rank"`- Avatar string `json:"avatar"`- Mobile string `json:"mobile"`+ ExternalID string `json:"external_id"`+ Username string `json:"username"`+ DisplayName string `json:"display_name"`+ Email string `json:"email"`+ Rank int `json:"rank"`+ Avatar string `json:"avatar"`+ Mobile string `json:"mobile"`+ Status UserStatus `json:"status"`}type ControlCenter struct {