This is an automated email from the ASF dual-hosted git repository.
linkinstar pushed a commit to branch test
in repository https://gitbox.apache.org/repos/asf/answer.git
commit b691e143a289d93adb2a560fa6a7a20bc3c59432
Merge: 84cc97dc afdf6ce7
Author: LinkinStars <linkins...@foxmail.com>
AuthorDate: Fri May 23 15:11:03 2025 +0800
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# internal/migrations/init_data.go
cmd/wire_gen.go | 8 ++--
docs/docs.go | 8 ++--
docs/swagger.json | 8 ++--
docs/swagger.yaml | 4 +-
i18n/af_ZA.yaml | 4 +-
i18n/ar_SA.yaml | 4 +-
i18n/ca_ES.yaml | 4 +-
i18n/cs_CZ.yaml | 8 ++--
i18n/cy_GB.yaml | 8 ++--
i18n/el_GR.yaml | 4 +-
i18n/en_US.yaml | 8 ++--
i18n/fa_IR.yaml | 4 +-
i18n/fi_FI.yaml | 4 +-
i18n/he_IL.yaml | 4 +-
i18n/hi_IN.yaml | 8 ++--
i18n/hu_HU.yaml | 4 +-
i18n/id_ID.yaml | 8 ++--
i18n/ko_KR.yaml | 4 +-
i18n/ml_IN.yaml | 8 ++--
i18n/nl_NL.yaml | 4 +-
i18n/no_NO.yaml | 4 +-
i18n/ro_RO.yaml | 4 +-
i18n/ru_RU.yaml | 4 +-
i18n/sk_SK.yaml | 4 +-
i18n/sr_SP.yaml | 4 +-
i18n/sv_SE.yaml | 8 ++--
i18n/te_IN.yaml | 8 ++--
i18n/tr_TR.yaml | 8 ++--
i18n/zh_TW.yaml | 4 +-
internal/base/middleware/avatar.go | 4 +-
internal/controller_admin/siteinfo_controller.go | 14 ++++++-
internal/migrations/init_data.go | 1 +
internal/repo/file_record/file_record_repo.go | 15 +++++++
internal/repo/site_info/siteinfo_repo.go | 15 +++++++
internal/repo/user/user_repo.go | 15 +++++++
internal/schema/backyard_user_schema.go | 4 +-
internal/schema/user_schema.go | 2 +-
internal/service/content/user_service.go | 45 +++++++++++++++++++-
.../service/file_record/file_record_service.go | 38 ++++++++++++++++-
internal/service/siteinfo/siteinfo_service.go | 49 ++++++++++++++++++++++
.../service/siteinfo_common/siteinfo_service.go | 12 ++++++
internal/service/uploader/upload.go | 18 ++++++--
internal/service/user_common/user.go | 11 +++++
ui/src/hooks/useChangeProfileModal/index.tsx | 4 +-
44 files changed, 318 insertions(+), 93 deletions(-)
