This is an automated email from the ASF dual-hosted git repository. kumfo pushed a commit to branch feat/1.3.5/embed in repository https://gitbox.apache.org/repos/asf/incubator-answer.git
commit 04541ccb8cbe0d58f289156bb85f45e2b1373f27 Merge: 1a7cbb78 9ebf95ca Author: kumfo <[email protected]> AuthorDate: Tue Mar 26 17:24:15 2024 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # cmd/wire_gen.go # internal/controller/collection_controller.go # internal/service/collection_service.go .github/ISSUE_TEMPLATE/bug_report.md | 28 +- .../ISSUE_TEMPLATE/config.yaml | 17 +- .../{feature_request.md => enhancement_request.md} | 13 +- .github/ISSUE_TEMPLATE/feature_request.md | 13 +- .github/workflows/build-binary-for-release.yml | 1 + .github/workflows/build-image-for-manual.yml | 1 + .github/workflows/build-image-for-release.yml | 1 + .github/workflows/build-image-for-test.yml | 1 + .github/workflows/uffizzi-build.yml | 115 - .github/workflows/uffizzi-preview.yml | 105 - .goreleaser.yaml | 14 +- Dockerfile | 8 +- Makefile | 4 +- NOTICE | 2 +- README.md | 10 +- charts/README.md | 6 +- charts/values.yaml | 2 +- cmd/command.go | 38 +- cmd/main.go | 8 +- cmd/wire_gen.go | 84 +- configs/config.yaml | 2 - docker-compose.uffizzi.yml | 77 - docker-compose.yaml | 2 +- docs/docs.go | 1071 +++++++-- docs/img/logo.svg | 18 + docs/swagger.json | 1071 +++++++-- docs/swagger.yaml | 576 ++++- go.mod | 29 +- go.sum | 28 +- i18n/af_ZA.yaml | 6 +- i18n/ar_SA.yaml | 6 +- i18n/az_AZ.yaml | 6 +- i18n/bal_BA.yaml | 6 +- i18n/ban_ID.yaml | 6 +- i18n/bn_BD.yaml | 6 +- i18n/bs_BA.yaml | 6 +- i18n/ca_ES.yaml | 6 +- i18n/cs_CZ.yaml | 164 +- i18n/cy_GB.yaml | 164 +- i18n/da_DK.yaml | 164 +- i18n/de_DE.yaml | 442 ++-- i18n/el_GR.yaml | 6 +- i18n/en_US.yaml | 162 +- i18n/es_ES.yaml | 913 ++++---- i18n/fa_IR.yaml | 312 ++- i18n/fi_FI.yaml | 6 +- i18n/fr_FR.yaml | 676 +++--- i18n/he_IL.yaml | 6 +- i18n/{uk_UA.yaml => hi_IN.yaml} | 164 +- i18n/hu_HU.yaml | 6 +- i18n/hy_AM.yaml | 6 +- i18n/i18n.yaml | 3 + i18n/id_ID.yaml | 164 +- i18n/it_IT.yaml | 2200 +++++++++--------- i18n/ja_JP.yaml | 268 ++- i18n/ko_KR.yaml | 164 +- i18n/nl_NL.yaml | 6 +- i18n/no_NO.yaml | 6 +- i18n/pl_PL.yaml | 538 +++-- i18n/pt_BR.yaml | 2 +- i18n/pt_PT.yaml | 166 +- i18n/ro_RO.yaml | 2378 +++++++++++-------- i18n/ru_RU.yaml | 1806 ++++++++------- i18n/sk_SK.yaml | 164 +- i18n/sq_AL.yaml | 6 +- i18n/sr_SP.yaml | 6 +- i18n/sv_SE.yaml | 1242 ++++++---- i18n/{uk_UA.yaml => te_IN.yaml} | 200 +- i18n/tr_TR.yaml | 176 +- i18n/uk_UA.yaml | 1370 +++++------ i18n/vi_VN.yaml | 164 +- i18n/zh_CN.yaml | 474 ++-- i18n/zh_TW.yaml | 152 +- internal/base/constant/constant.go | 5 +- internal/base/constant/privilege.go | 2 +- internal/base/constant/reason.go | 42 + .../base/constant/{site_info.go => revision.go} | 31 +- internal/base/constant/site_info.go | 7 + internal/base/cron/cron.go | 6 +- internal/base/middleware/auth.go | 41 +- internal/base/reason/privilege.go | 7 +- internal/base/reason/reason.go | 9 +- internal/base/server/http.go | 7 +- internal/cli/config.go | 84 + internal/controller/answer_controller.go | 42 +- internal/controller/collection_controller.go | 6 +- internal/controller/controller.go | 2 + internal/controller/notification_controller.go | 1 + internal/controller/question_controller.go | 31 +- internal/controller/report_controller.go | 51 + internal/controller/review_controller.go | 112 + internal/controller/revision_controller.go | 35 +- internal/controller/search_controller.go | 6 +- internal/controller/siteinfo_controller.go | 4 + internal/controller/template_controller.go | 19 +- internal/controller/template_render/controller.go | 17 +- internal/controller/template_render/question.go | 2 +- internal/controller/template_render/userinfo.go | 2 +- internal/controller/user_controller.go | 20 +- internal/controller/user_plugin_controller.go | 153 ++ internal/controller/vote_controller.go | 6 +- internal/controller_admin/controller.go | 1 - internal/controller_admin/plugin_controller.go | 10 +- internal/controller_admin/report_controller.go | 96 - internal/entity/answer_entity.go | 11 + internal/entity/comment_entity.go | 1 + .../entity/plugin_user_config_entity.go | 19 +- internal/entity/question_entity.go | 3 + internal/entity/report_entity.go | 1 + .../entity/{report_entity.go => review_entity.go} | 36 +- internal/entity/user_entity.go | 3 +- internal/migrations/init.go | 14 + internal/migrations/init_data.go | 4 +- internal/migrations/migrations.go | 5 +- internal/migrations/v13.go | 5 +- internal/migrations/v18.go | 75 + .../userinfo.go => migrations/v19.go} | 15 +- .../report_common.go => migrations/v20.go} | 20 +- internal/repo/activity/activity_repo.go | 2 +- internal/repo/activity/answer_repo.go | 6 +- internal/repo/activity/review_repo.go | 125 + internal/repo/activity/vote_repo.go | 7 +- internal/repo/answer/answer_repo.go | 76 +- internal/repo/collection/collection_group_repo.go | 6 +- internal/repo/comment/comment_repo.go | 12 + internal/repo/plugin_config/plugin_config_repo.go | 2 +- .../repo/plugin_config/plugin_user_config_repo.go | 99 + internal/repo/provider.go | 4 + internal/repo/question/question_repo.go | 61 +- internal/repo/repo_test/comment_repo_test.go | 16 + internal/repo/repo_test/repo_main_test.go | 3 +- internal/repo/report/report_repo.go | 37 +- internal/repo/review/review_repo.go | 94 + internal/repo/revision/revision_repo.go | 15 + internal/repo/search_common/search_repo.go | 59 +- internal/repo/tag/tag_repo.go | 10 + internal/repo/user/user_repo.go | 12 +- .../user_external_login_repo.go | 11 + internal/router/answer_api_router.go | 33 +- internal/schema/activity.go | 9 + internal/schema/answer_schema.go | 32 +- internal/schema/comment_schema.go | 2 +- internal/schema/dashboard_schema.go | 6 +- internal/schema/notification_schema.go | 1 + internal/schema/plugin_admin_schema.go | 24 +- internal/schema/plugin_user_schema.go | 102 + internal/schema/question_schema.go | 21 +- internal/schema/reason_schema.go | 4 +- internal/schema/report_schema.go | 88 +- internal/schema/review_schema.go | 80 + internal/schema/revision_schema.go | 56 +- internal/schema/search_schema.go | 35 +- .../userinfo.go => schema/search_schema_test.go} | 22 +- internal/schema/simple_obj_info_schema.go | 21 +- internal/schema/siteinfo_schema.go | 29 +- internal/schema/user_notification_schema.go | 97 +- internal/schema/user_schema.go | 32 + internal/service/action/captcha_strategy.go | 89 +- internal/service/activity/activity.go | 4 +- .../service/activity/review_active.go | 22 +- internal/service/activity_type/activity_type.go | 2 + internal/service/answer_common/answer.go | 17 +- .../{ => collection}/collection_group_service.go | 2 +- .../service/{ => collection}/collection_service.go | 3 +- internal/service/comment/comment_service.go | 41 +- internal/service/comment_common/comment_service.go | 1 + internal/service/{ => content}/answer_service.go | 72 +- internal/service/{ => content}/question_service.go | 122 +- internal/service/{ => content}/revision_service.go | 103 +- internal/service/{ => content}/search_service.go | 5 +- internal/service/{ => content}/user_service.go | 48 +- internal/service/{ => content}/vote_service.go | 5 +- internal/service/dashboard/dashboard_service.go | 99 +- .../service/notification/external_notification.go | 16 + .../notification/new_comment_notification.go | 1 - .../notification/new_question_notification.go | 109 +- .../service/notification/notification_service.go | 51 +- .../service/notification_common/notification.go | 93 + internal/service/object_info/object_info.go | 88 +- internal/service/permission/question_permission.go | 3 +- .../service/plugin_common/plugin_common_service.go | 155 +- internal/service/provider.go | 26 +- internal/service/question_common/question.go | 165 +- internal/service/report/report_service.go | 151 +- internal/service/report_admin/report_backyard.go | 194 -- internal/service/report_common/report_common.go | 5 +- internal/service/report_handle/report_handle.go | 132 ++ .../service/report_handle_admin/report_handle.go | 115 - internal/service/review/review_service.go | 390 ++++ internal/service/revision/revision.go | 1 + .../service/revision_common/revision_service.go | 3 +- internal/service/search_common/search.go | 9 +- internal/service/search_parser/search_parser.go | 18 +- internal/service/siteinfo/siteinfo_service.go | 53 +- .../service/siteinfo_common/siteinfo_service.go | 2 +- internal/service/tag_common/tag_common.go | 9 +- internal/service/uploader/upload.go | 2 +- internal/service/user_common/user.go | 3 +- .../user_external_login_service.go | 3 +- .../user_notification_config_service.go | 18 +- licenserc.toml | 2 +- pkg/checker/file_type.go | 89 +- .../userinfo.go => pkg/checker/url.go | 24 +- pkg/converter/array.go | 12 + pkg/display/url.go | 5 + pkg/htmltext/htmltext.go | 100 +- pkg/htmltext/htmltext_test.go | 119 + plugin/config.go | 17 +- plugin/notification.go | 92 + plugin/plugin.go | 19 + plugin/reviewer.go | 67 + plugin/search.go | 2 +- plugin/user_config.go | 52 + script/plugin_list | 3 +- ui/.env.production | 2 + ui/.eslintrc.js | 5 +- ui/.prettierrc.json | 2 +- ui/config-overrides.js | 96 + ui/package.json | 36 +- ui/pnpm-lock.yaml | 2391 +++++++++++++------- ui/public/index.html | 2 +- ui/src/assets/images/default-avatar.svg | 18 + .../index.tsx => behaviour/useLegalClick.tsx} | 48 +- ui/src/common/color.scss | 132 ++ ui/src/common/constants.ts | 22 +- ui/src/common/interface.ts | 122 +- ui/src/common/pattern.ts | 2 + .../Comment/components/ActionBar/index.tsx | 23 +- .../components/Comment/components/Form/index.tsx | 7 +- ui/src/components/Comment/index.scss | 1 + ui/src/components/Comment/index.tsx | 53 +- ui/src/components/Counts/index.tsx | 8 +- ui/src/components/CustomizeTheme/index.tsx | 37 + ui/src/components/Editor/ToolBars/image.tsx | 29 +- ui/src/components/Editor/index.scss | 16 +- ui/src/components/Editor/index.tsx | 2 +- ui/src/components/Editor/utils/index.ts | 20 +- ui/src/components/FollowingTags/index.tsx | 2 +- ui/src/components/Footer/index.tsx | 4 +- .../Header/components/NavItems/index.tsx | 4 +- ui/src/components/Header/index.scss | 19 +- ui/src/components/Header/index.tsx | 11 +- .../HighlightText}/index.scss | 5 +- .../HighlightText/index.tsx} | 43 +- ui/src/components/Modal/Modal.tsx | 4 +- ui/src/components/Operate/index.tsx | 2 +- ui/src/components/QuestionList/index.tsx | 13 +- ui/src/components/SchemaForm/README.md | 3 +- ui/src/components/SchemaForm/components/Button.tsx | 50 +- ui/src/components/SchemaForm/components/Check.tsx | 1 - ui/src/components/SchemaForm/components/Input.tsx | 2 +- .../SchemaForm/components/InputGroup.tsx | 90 + ui/src/components/SchemaForm/components/Legend.tsx | 5 +- ui/src/components/SchemaForm/components/index.ts | 2 + ui/src/components/SchemaForm/index.tsx | 43 +- ui/src/components/SchemaForm/types.ts | 21 +- ui/src/components/SideNav/index.scss | 9 +- ui/src/components/Tag/index.tsx | 2 +- ui/src/components/TagSelector/index.scss | 39 +- ui/src/components/TagSelector/index.tsx | 345 ++- ui/src/components/index.ts | 2 + ui/src/hooks/index.ts | 2 + ui/src/hooks/usePageUsers/index.tsx | 2 +- ui/src/hooks/useReportModal/index.tsx | 101 +- ui/src/hooks/useSkeletonControl/index.tsx | 61 + ui/src/hooks/useTagModal/index.tsx | 7 +- ui/src/hooks/useToast/index.tsx | 6 +- ui/src/index.scss | 24 +- .../Admin/Answers/components/Action/index.tsx | 12 + ui/src/pages/Admin/Answers/index.tsx | 60 +- .../Dashboard/components/AnswerLinks/index.tsx | 36 +- .../Dashboard/components/HealthStatus/index.tsx | 30 +- .../Dashboard/components/Statistics/index.tsx | 6 +- .../Dashboard/components/SystemInfo/index.tsx | 12 + ui/src/pages/Admin/Flags/index.tsx | 186 -- ui/src/pages/Admin/General/index.tsx | 13 + ui/src/pages/Admin/Login/index.tsx | 16 +- ui/src/pages/Admin/Privileges/index.tsx | 63 +- .../Admin/Questions/components/Action/index.tsx | 54 +- ui/src/pages/Admin/Questions/index.tsx | 26 +- ui/src/pages/Admin/SettingsUsers/index.tsx | 2 +- ui/src/pages/Admin/Themes/index.tsx | 37 +- ui/src/pages/Admin/Users/index.tsx | 4 +- ui/src/pages/Admin/Write/index.tsx | 20 +- ui/src/pages/Admin/index.tsx | 2 +- .../pages/Install/components/FourthStep/index.tsx | 1 - ui/src/pages/Layout/index.tsx | 18 + .../Ask/components/SearchQuestion/index.tsx | 16 +- ui/src/pages/Questions/Ask/index.tsx | 31 +- .../Questions/Detail/components/Alert/index.tsx | 4 +- .../Questions/Detail/components/Answer/index.tsx | 6 + .../Detail/components/AnswerHead/index.tsx | 12 +- .../components/InviteToAnswer/PeopleDropdown.scss | 20 +- .../components/InviteToAnswer/PeopleDropdown.tsx | 156 +- .../Detail/components/InviteToAnswer}/index.scss | 21 +- .../Detail/components/InviteToAnswer/index.tsx | 103 +- .../Detail/components/WriteAnswer/index.tsx | 20 +- ui/src/pages/Questions/Detail/index.scss | 2 +- ui/src/pages/Questions/Detail/index.tsx | 27 +- ui/src/pages/Questions/EditAnswer/index.scss | 7 + ui/src/pages/Questions/EditAnswer/index.tsx | 5 +- .../Review/components/ApproveDropdown/index.tsx | 226 ++ .../components/EditPostModal}/index.scss | 6 +- .../Review/components/EditPostModal/index.tsx | 395 ++++ .../pages/Review/components/FlagContent/index.tsx | 286 +++ .../Review/components/QueuedContent/index.tsx | 265 +++ .../components/ReviewType}/index.tsx | 47 +- .../Review/components/SuggestContent/index.tsx | 248 ++ .../Review}/components/index.ts | 30 +- ui/src/pages/Review/index.tsx | 274 +-- ui/src/pages/Review/utils/generateData.ts | 78 + ui/src/pages/Search/components/Head/index.tsx | 7 +- .../pages/Search/components/SearchItem/index.tsx | 28 +- ui/src/pages/Search/index.tsx | 5 +- ui/src/pages/Tags/Create/index.tsx | 62 +- ui/src/pages/Tags/Edit/index.tsx | 90 +- ui/src/pages/Tags/Info/index.tsx | 11 +- ui/src/pages/Tags/index.tsx | 8 +- ui/src/pages/Timeline/index.tsx | 5 +- ui/src/pages/Users/Login/index.tsx | 5 +- ui/src/pages/Users/Logout/index.tsx | 68 + .../components/Achievements/index.tsx | 2 +- .../Users/Notifications/components/Inbox/index.tsx | 2 +- ui/src/pages/Users/Notifications/index.scss | 2 +- .../Users/Personal/components/UserInfo/index.tsx | 2 +- .../Users/Register/components/SignUpForm/index.tsx | 30 +- .../Settings/Account/components/MyLogins/index.tsx | 2 +- ui/src/pages/Users/Settings/Interface/index.tsx | 52 +- ui/src/pages/Users/Settings/Notification/index.tsx | 55 +- ui/src/pages/Users/Settings/Plugins/index.tsx | 134 ++ .../pages/Users/Settings/components/Nav/index.tsx | 14 + ui/src/router/pathFactory.ts | 6 +- ui/src/router/routes.ts | 16 +- ui/src/services/admin/settings.ts | 15 +- ui/src/services/client/index.ts | 1 + ui/src/services/client/review.ts | 54 + ui/src/services/client/revision.ts | 6 - ui/src/services/client/settings.ts | 37 +- ui/src/services/client/tag.ts | 4 +- ui/src/services/common.ts | 8 +- ui/src/stores/index.ts | 2 + ui/src/stores/loggedUserInfo.ts | 4 + ui/src/stores/loginSetting.ts | 1 + ui/src/stores/siteInfo.ts | 1 + ui/src/stores/themeSetting.ts | 2 + ui/src/stores/{loginSetting.ts => writeSetting.ts} | 27 +- ui/src/utils/color.ts | 2 +- ui/src/utils/common.ts | 75 +- ui/src/utils/guard.ts | 21 +- ui/src/utils/localize.ts | 27 +- ui/src/utils/request.ts | 4 +- ui/src/utils/saveDraft.ts | 2 +- ui/template/header.html | 5 +- 353 files changed, 21250 insertions(+), 10247 deletions(-) diff --cc internal/repo/collection/collection_group_repo.go index 0fc9c27a,05711f5a..90c21963 --- a/internal/repo/collection/collection_group_repo.go +++ b/internal/repo/collection/collection_group_repo.go @@@ -21,8 -21,10 +21,11 @@@ package collectio import ( "context" + "xorm.io/xorm" + "github.com/apache/incubator-answer/internal/service/collection" + "xorm.io/xorm" + "github.com/apache/incubator-answer/internal/base/data" "github.com/apache/incubator-answer/internal/base/pager" "github.com/apache/incubator-answer/internal/base/reason" diff --cc internal/repo/question/question_repo.go index 2cd9a325,29ab9c5d..8dca0c65 --- a/internal/repo/question/question_repo.go +++ b/internal/repo/question/question_repo.go @@@ -26,15 -26,10 +26,11 @@@ import "strings" "time" "unicode" + "xorm.io/xorm" - "github.com/apache/incubator-answer/internal/base/handler" - "xorm.io/builder" - "github.com/apache/incubator-answer/internal/base/constant" "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/handler" "github.com/apache/incubator-answer/internal/base/pager" "github.com/apache/incubator-answer/internal/base/reason" "github.com/apache/incubator-answer/internal/entity"
