This is an automated email from the ASF dual-hosted git repository.

shuai pushed a commit to branch podling
in repository https://gitbox.apache.org/repos/asf/incubator-answer.git

commit 6ce312b1d46bff8f40ce0483de0d71f87ae7d960
Merge: d54898c4 1f7e244d
Author: shuai <[email protected]>
AuthorDate: Wed Nov 1 12:25:26 2023 +0800

    fix: resolve conflict

 .goreleaser.yaml                                   |   4 +-
 .vaunt/config.yaml                                 |   4 +-
 Dockerfile                                         |   4 +-
 Makefile                                           |   2 +-
 README.md                                          |   9 +-
 cmd/answer/main.go                                 |   2 +-
 cmd/command.go                                     |  10 +-
 cmd/main.go                                        |  12 +-
 cmd/wire.go                                        |  32 ++---
 cmd/wire_gen.go                                    | 157 +++++++++++----------
 go.mod                                             |   4 +-
 internal/base/conf/conf.go                         |  14 +-
 internal/base/constant/privilege.go                |   2 +-
 internal/base/cron/cron.go                         |   4 +-
 internal/base/data/data.go                         |   4 +-
 internal/base/handler/handler.go                   |   6 +-
 internal/base/handler/lang.go                      |   2 +-
 internal/base/handler/response.go                  |   2 +-
 internal/base/handler/short_id.go                  |   2 +-
 internal/base/middleware/accept_language.go        |   4 +-
 internal/base/middleware/auth.go                   |  18 +--
 internal/base/middleware/avatar.go                 |   6 +-
 internal/base/middleware/rate_limit.go             |   8 +-
 internal/base/middleware/short_id.go               |   4 +-
 .../base/middleware/user_center_plugin_auth.go     |   6 +-
 internal/base/middleware/visit_img_auth.go         |   2 +-
 internal/base/server/http.go                       |   8 +-
 internal/base/server/http_funcmap.go               |  12 +-
 internal/base/validator/validator.go               |   4 +-
 internal/cli/build.go                              |  30 ++--
 internal/cli/dump.go                               |   2 +-
 internal/cli/install.go                            |   8 +-
 internal/cli/install_check.go                      |   6 +-
 internal/controller/activity_controller.go         |  12 +-
 internal/controller/answer_controller.go           |  24 ++--
 internal/controller/collection_controller.go       |  14 +-
 internal/controller/comment_controller.go          |  24 ++--
 internal/controller/connector_controller.go        |  14 +-
 internal/controller/dashboard_controller.go        |   4 +-
 internal/controller/follow_controller.go           |  10 +-
 internal/controller/lang_controller.go             |   6 +-
 internal/controller/notification_controller.go     |  12 +-
 internal/controller/permission_controller.go       |   8 +-
 .../controller/plugin_user_center_controller.go    |  12 +-
 internal/controller/question_controller.go         |  28 ++--
 internal/controller/rank_controller.go             |   8 +-
 internal/controller/reason_controller.go           |   6 +-
 internal/controller/report_controller.go           |  24 ++--
 internal/controller/revision_controller.go         |  22 +--
 internal/controller/search_controller.go           |  20 +--
 internal/controller/siteinfo_controller.go         |   8 +-
 internal/controller/tag_controller.go              |  16 +--
 internal/controller/template_controller.go         |  22 +--
 internal/controller/template_render/answer.go      |   2 +-
 internal/controller/template_render/comment.go     |   4 +-
 internal/controller/template_render/controller.go  |  12 +-
 internal/controller/template_render/question.go    |   4 +-
 internal/controller/template_render/tags.go        |   4 +-
 internal/controller/template_render/userinfo.go    |   2 +-
 internal/controller/upload_controller.go           |  10 +-
 internal/controller/user_controller.go             |  30 ++--
 internal/controller/vote_controller.go             |  22 +--
 internal/controller_admin/plugin_controller.go     |   8 +-
 internal/controller_admin/report_controller.go     |   8 +-
 internal/controller_admin/role_controller.go       |   6 +-
 internal/controller_admin/siteinfo_controller.go   |   8 +-
 internal/controller_admin/theme_controller.go      |   4 +-
 .../controller_admin/user_backyard_controller.go   |  12 +-
 internal/entity/comment_entity.go                  |   2 +-
 internal/entity/config_entity.go                   |   2 +-
 internal/install/install_controller.go             |  18 +--
 internal/install/install_main.go                   |   4 +-
 internal/install/install_req.go                    |   6 +-
 internal/install/install_server.go                 |   2 +-
 internal/migrations/init.go                        |   4 +-
 internal/migrations/init_data.go                   |   4 +-
 internal/migrations/migrations.go                  |   4 +-
 internal/migrations/v10.go                         |   6 +-
 internal/migrations/v11.go                         |   2 +-
 internal/migrations/v12.go                         |   2 +-
 internal/migrations/v13.go                         |   8 +-
 internal/migrations/v15.go                         |   2 +-
 internal/migrations/v16.go                         |   4 +-
 internal/migrations/v17.go                         |   4 +-
 internal/migrations/v3.go                          |   2 +-
 internal/migrations/v4.go                          |   4 +-
 internal/migrations/v5.go                          |   2 +-
 internal/migrations/v6.go                          |   2 +-
 internal/migrations/v7.go                          |   2 +-
 internal/migrations/v8.go                          |   4 +-
 internal/migrations/v9.go                          |   2 +-
 internal/repo/activity/activity_repo.go            |  12 +-
 internal/repo/activity/answer_repo.go              |  20 +--
 internal/repo/activity/follow_repo.go              |  14 +-
 internal/repo/activity/user_active_repo.go         |  14 +-
 internal/repo/activity/vote_repo.go                |  24 ++--
 internal/repo/activity_common/activity_repo.go     |  16 +--
 internal/repo/activity_common/follow.go            |  12 +-
 internal/repo/activity_common/vote.go              |  10 +-
 internal/repo/answer/answer_repo.go                |  26 ++--
 internal/repo/auth/auth.go                         |  10 +-
 internal/repo/captcha/captcha.go                   |   8 +-
 internal/repo/collection/collection_group_repo.go  |  12 +-
 internal/repo/collection/collection_repo.go        |  18 +--
 internal/repo/comment/comment_repo.go              |  14 +-
 internal/repo/config/config_repo.go                |  10 +-
 internal/repo/export/email_repo.go                 |   6 +-
 internal/repo/limit/limit.go                       |   6 +-
 internal/repo/meta/meta_repo.go                    |   8 +-
 internal/repo/notification/notification_repo.go    |  14 +-
 internal/repo/plugin_config/plugin_config_repo.go  |   8 +-
 internal/repo/provider.go                          |  56 ++++----
 internal/repo/question/question_repo.go            |  24 ++--
 internal/repo/rank/user_rank_repo.go               |  14 +-
 internal/repo/reason/reason_repo.go                |   8 +-
 internal/repo/repo_test/auth_test.go               |   4 +-
 internal/repo/repo_test/captcha_test.go            |   2 +-
 internal/repo/repo_test/comment_repo_test.go       |  10 +-
 internal/repo/repo_test/email_repo_test.go         |   2 +-
 internal/repo/repo_test/meta_repo_test.go          |   4 +-
 internal/repo/repo_test/notification_repo_test.go  |   6 +-
 internal/repo/repo_test/reason_repo_test.go        |   6 +-
 internal/repo/repo_test/repo_main_test.go          |   4 +-
 internal/repo/repo_test/revision_repo_test.go      |   8 +-
 internal/repo/repo_test/siteinfo_repo_test.go      |   4 +-
 internal/repo/repo_test/tag_rel_repo_test.go       |   6 +-
 internal/repo/repo_test/tag_repo_test.go           |  10 +-
 internal/repo/repo_test/user_backyard_repo_test.go |   6 +-
 internal/repo/repo_test/user_repo_test.go          |   4 +-
 internal/repo/report/report_repo.go                |  16 +--
 internal/repo/revision/revision_repo.go            |  18 +--
 internal/repo/role/power_repo.go                   |   8 +-
 internal/repo/role/role_power_rel_repo.go          |   6 +-
 internal/repo/role/role_repo.go                    |   8 +-
 internal/repo/role/user_role_rel_repo.go           |   8 +-
 internal/repo/search_common/search_repo.go         |  26 ++--
 internal/repo/search_sync/search_sync.go           |  12 +-
 internal/repo/site_info/siteinfo_repo.go           |  10 +-
 internal/repo/tag/tag_rel_repo.go                  |  14 +-
 internal/repo/tag/tag_repo.go                      |  12 +-
 internal/repo/tag_common/tag_common_repo.go        |  12 +-
 internal/repo/unique/uniqid_repo.go                |  10 +-
 internal/repo/user/user_backyard_repo.go           |  12 +-
 internal/repo/user/user_repo.go                    |  14 +-
 .../user_external_login_repo.go                    |  12 +-
 .../user_notification_config_repo.go               |  10 +-
 internal/router/answer_api_router.go               |   6 +-
 internal/router/plugin_api_router.go               |   2 +-
 internal/router/static_router.go                   |   2 +-
 internal/router/swagger_router.go                  |   2 +-
 internal/router/template_router.go                 |   8 +-
 internal/router/ui.go                              |   8 +-
 internal/schema/activity.go                        |   2 +-
 internal/schema/answer_schema.go                   |   4 +-
 internal/schema/backyard_user_schema.go            |  10 +-
 internal/schema/comment_schema.go                  |   6 +-
 internal/schema/email_template.go                  |   2 +-
 internal/schema/new_question_queue_schema.go       |   4 +-
 internal/schema/permission.go                      |   6 +-
 internal/schema/plugin_admin_schema.go             |   2 +-
 internal/schema/question_schema.go                 |   8 +-
 internal/schema/reason_schema.go                   |   2 +-
 internal/schema/report_schema.go                   |   2 +-
 internal/schema/revision_schema.go                 |   2 +-
 internal/schema/search_schema.go                   |   6 +-
 internal/schema/siteinfo_schema.go                 |  10 +-
 internal/schema/tag_schema.go                      |   4 +-
 internal/schema/user_notification_schema.go        |   4 +-
 internal/schema/user_schema.go                     |  10 +-
 internal/service/action/captcha_service.go         |   6 +-
 internal/service/action/captcha_strategy.go        |   2 +-
 internal/service/activity/activity.go              |  30 ++--
 .../service/activity/answer_activity_service.go    |   6 +-
 internal/service/activity_common/activity.go       |  10 +-
 internal/service/activity_queue/activity_queue.go  |   2 +-
 internal/service/answer_common/answer.go           |  10 +-
 internal/service/answer_service.go                 |  38 ++---
 internal/service/auth/auth.go                      |   6 +-
 internal/service/collection_common/collection.go   |   2 +-
 internal/service/collection_group_service.go       |   6 +-
 internal/service/collection_service.go             |   8 +-
 internal/service/comment/comment_service.go        |  32 ++---
 internal/service/comment_common/comment_service.go |   6 +-
 internal/service/config/config_service.go          |   2 +-
 internal/service/dashboard/dashboard_service.go    |  28 ++--
 internal/service/export/email_service.go           |  16 +--
 internal/service/follow/follow_service.go          |   8 +-
 internal/service/meta/meta_service.go              |   4 +-
 internal/service/mock/siteinfo_repo_mock.go        |   2 +-
 .../notice_queue/external_notification_queue.go    |   2 +-
 internal/service/notice_queue/notice_queue.go      |   2 +-
 .../service/notification/external_notification.go  |  14 +-
 .../notification/invite_answer_notification.go     |   4 +-
 .../notification/new_answer_notification.go        |   4 +-
 .../notification/new_comment_notification.go       |   4 +-
 .../notification/new_question_notification.go      |   6 +-
 .../service/notification/notification_service.go   |  26 ++--
 .../service/notification_common/notification.go    |  22 +--
 internal/service/object_info/object_info.go        |  20 +--
 internal/service/permission/answer_permission.go   |   8 +-
 internal/service/permission/comment_permission.go  |   8 +-
 internal/service/permission/question_permission.go |   8 +-
 internal/service/permission/tag_permission.go      |   8 +-
 .../service/plugin_common/plugin_common_service.go |  16 +--
 internal/service/provider.go                       |  74 +++++-----
 internal/service/question_common/question.go       |  34 ++---
 internal/service/question_service.go               |  50 +++----
 internal/service/rank/rank_service.go              |  32 ++---
 internal/service/reason/reason_service.go          |   4 +-
 internal/service/reason_common/reason.go           |   2 +-
 internal/service/report/report_service.go          |  10 +-
 internal/service/report_admin/report_backyard.go   |  28 ++--
 internal/service/report_common/report_common.go    |   4 +-
 .../service/report_handle_admin/report_handle.go   |  16 +--
 internal/service/revision/revision.go              |   2 +-
 .../service/revision_common/revision_service.go    |  12 +-
 internal/service/revision_service.go               |  32 ++---
 internal/service/role/power_service.go             |   2 +-
 internal/service/role/role_service.go              |   8 +-
 internal/service/role/user_role_rel_service.go     |   2 +-
 internal/service/search_common/search.go           |   4 +-
 internal/service/search_parser/search_parser.go    |  10 +-
 internal/service/search_service.go                 |   8 +-
 internal/service/siteinfo/siteinfo_service.go      |  24 ++--
 .../service/siteinfo_common/siteinfo_service.go    |   8 +-
 .../siteinfo_common/siteinfo_service_test.go       |   6 +-
 internal/service/tag/tag_service.go                |  26 ++--
 internal/service/tag_common/tag_common.go          |  18 +--
 internal/service/uploader/upload.go                |  14 +-
 internal/service/user_admin/user_backyard.go       |  34 ++---
 internal/service/user_common/user.go               |  20 +--
 .../user_center_login_service.go                   |  26 ++--
 .../user_external_login_service.go                 |  28 ++--
 .../user_notification_config_service.go            |   8 +-
 internal/service/user_service.go                   |  36 ++---
 internal/service/vote_service.go                   |  30 ++--
 pkg/checker/path_ignore.go                         |   2 +-
 pkg/checker/reserved_username.go                   |   6 +-
 pkg/display/url.go                                 |   6 +-
 pkg/gravatar/gravatar_test.go                      |   2 +-
 pkg/htmltext/htmltext.go                           |   2 +-
 pkg/obj/obj.go                                     |   6 +-
 plugin/plugin.go                                   |   4 +-
 243 files changed, 1349 insertions(+), 1343 deletions(-)

diff --cc README.md
index c868a1c5,b2d3487f..5c752c8e
--- a/README.md
+++ b/README.md
@@@ -8,10 -8,10 +8,15 @@@ A Q&A platform software for teams at an
  
  To learn more about the project, visit 
[answer.apache.org](https://answer.apache.org).
  
++<<<<<<< HEAD
 
+[![LICENSE](https://img.shields.io/github/license/answerdev/answer)](https://github.com/apache/incubator-answer/blob/main/LICENSE)
++=======
++
+ 
[![LICENSE](https://img.shields.io/github/license/apache/incubator-answer)](https://github.com/apache/incubator-answer/blob/main/LICENSE)
++>>>>>>> 1f7e244db31ee80d649efa34f90cc520137be9b7
  
[![Language](https://img.shields.io/badge/language-go-blue.svg)](https://golang.org/)
  
[![Language](https://img.shields.io/badge/language-react-blue.svg)](https://reactjs.org/)
- [![Go Report 
Card](https://goreportcard.com/badge/github.com/answerdev/answer)](https://goreportcard.com/report/github.com/answerdev/answer)
+ [![Go Report 
Card](https://goreportcard.com/badge/github.com/apache/incubator-answer)](https://goreportcard.com/report/github.com/apache/incubator-answer)
  
[![Discord](https://img.shields.io/badge/discord-chat-5865f2?logo=discord&logoColor=f5f5f5)](https://discord.gg/Jm7Y4cbUej)
  
  ## Screenshots
@@@ -34,8 -34,9 +39,8 @@@ Answer provides a plugin system for dev
  
  We value your feedback and suggestions to improve our documentation. If you 
have any comments or questions, please feel free to contact us. We’re excited 
to see what you can create using our plugin system!
  
- You can also check out the [plugins 
here](https://github.com/apache/incubator-answer/plugins).
+ You can also check out the [plugins 
here](https://github.com/apache/incubator-answer-plugins).
  
 -
  ## Contributing
  
  Contributions are always welcome!

Reply via email to