diff --git a/.github/workflows/build_dev_img.yml b/.github/workflows/build_dev_img.yml index 06eb4fb9f..87145112b 100644 --- a/.github/workflows/build_dev_img.yml +++ b/.github/workflows/build_dev_img.yml @@ -74,6 +74,6 @@ jobs: env: SSH_PRIVATE_KEY: ${{ secrets.GITLAB_RSA_PRIVATE_KEY }} with: - source-repo: git@github.com:answerdev/answer.git + source-repo: git@github.com:apache/incubator-answer.git destination-repo: ${{ secrets.GITLAB_REPO }} diff --git a/.goreleaser.yaml b/.goreleaser.yaml index ee06baa3f..daf254d76 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -32,7 +32,7 @@ builds: - id: build main: ./cmd/answer/. binary: answer - ldflags: -s -w -X github.com/answerdev/answer/cmd.Version={{.Version}} -X github.com/answerdev/answer/cmd.Revision={{.ShortCommit}} -X github.com/answerdev/answer/cmd.Time={{.Date}} -X github.com/answerdev/answer/cmd.BuildUser=goreleaser + ldflags: -s -w -X github.com/apache/incubator-answer/cmd.Version={{.Version}} -X github.com/apache/incubator-answer/cmd.Revision={{.ShortCommit}} -X github.com/apache/incubator-answer/cmd.Time={{.Date}} -X github.com/apache/incubator-answer/cmd.BuildUser=goreleaser flags: -v goos: - linux @@ -43,7 +43,7 @@ builds: - id: build-windows main: ./cmd/answer/. binary: answer - ldflags: -s -w -X github.com/answerdev/answer/cmd.Version={{.Version}} -X github.com/answerdev/answer/cmd.Revision={{.ShortCommit}} -X github.com/answerdev/answer/cmd.Time={{.Date}} -X github.com/answerdev/answer/cmd.BuildUser=goreleaser + ldflags: -s -w -X github.com/apache/incubator-answer/cmd.Version={{.Version}} -X github.com/apache/incubator-answer/cmd.Revision={{.ShortCommit}} -X github.com/apache/incubator-answer/cmd.Time={{.Date}} -X github.com/apache/incubator-answer/cmd.BuildUser=goreleaser flags: -v goos: - windows diff --git a/.vaunt/config.yaml b/.vaunt/config.yaml index b250524bd..87dfb18db 100644 --- a/.vaunt/config.yaml +++ b/.vaunt/config.yaml @@ -19,7 +19,7 @@ version: 0.0.1 achievements: - achievement: name: Visionary Architect - icon: https://raw.githubusercontent.com/answerdev/answer/main/.vaunt/enhancement.png + icon: https://raw.githubusercontent.com/apache/incubator-answer/main/.vaunt/enhancement.png description: Awarded for bringing up enhancement, dream big! triggers: - trigger: @@ -28,7 +28,7 @@ achievements: condition: labels in ['enhancement'] & labels in ['LGTM'] - achievement: name: Bug Hunter - icon: https://raw.githubusercontent.com/answerdev/answer/main/.vaunt/bug.png + icon: https://raw.githubusercontent.com/apache/incubator-answer/main/.vaunt/bug.png description: Awarded for identifying real bugs, well spotted! triggers: - trigger: diff --git a/Dockerfile b/Dockerfile index 84482f456..3bacfd3cf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ ENV GOPROXY=https://proxy.golang.com.cn,direct ENV GOPATH /go ENV GOROOT /usr/local/go -ENV PACKAGE github.com/answerdev/answer +ENV PACKAGE github.com/apache/incubator-answer ENV BUILD_DIR ${GOPATH}/src/${PACKAGE} ENV ANSWER_MODULE ${BUILD_DIR} @@ -45,7 +45,7 @@ RUN mkdir -p /data/uploads && chmod 777 /data/uploads \ && mkdir -p /data/i18n && cp -r i18n/*.yaml /data/i18n FROM alpine -LABEL maintainer="maintainers@sf.com" +LABEL maintainer="linkinstar@apache.org" ENV TZ "Asia/Shanghai" RUN apk update \ diff --git a/Makefile b/Makefile index b444088f2..921076c82 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ DOCKER_CMD=docker GO_ENV=CGO_ENABLED=0 GO111MODULE=on Revision=$(shell git rev-parse --short HEAD) -GO_FLAGS=-ldflags="-X github.com/answerdev/answer/cmd.Version=$(VERSION) -X 'github.com/answerdev/answer/cmd.Revision=$(Revision)' -X 'github.com/answerdev/answer/cmd.Time=`date +%s`' -extldflags -static" +GO_FLAGS=-ldflags="-X github.com/apache/incubator-answer/cmd.Version=$(VERSION) -X 'github.com/apache/incubator-answer/cmd.Revision=$(Revision)' -X 'github.com/apache/incubator-answer/cmd.Time=`date +%s`' -extldflags -static" GO=$(GO_ENV) $(shell which go) build: generate diff --git a/README.md b/README.md index 3708ce5c0..fa329b3ad 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ - + logo @@ -6,12 +6,12 @@ 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 Answer. -To learn more about the project, visit [answer.dev](https://answer.dev). +To learn more about the project, visit [answer.apache.org](https://answer.apache.org). -[![LICENSE](https://img.shields.io/github/license/answerdev/answer)](https://github.com/answerdev/answer/blob/main/LICENSE) +[![LICENSE](https://img.shields.io/github/license/apache/incubator-answer)](https://github.com/apache/incubator-answer/blob/main/LICENSE) [![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 @@ -26,23 +26,22 @@ To learn more about the project, visit [answer.dev](https://answer.dev). docker run -d -p 9080:80 -v answer-data:/data --name answer answerdev/answer:latest ``` -For more information, see [Installation](https://answer.dev/docs/installation) +For more information, see [Installation](https://answer.apache.org/docs/installation) ### Plugins -Answer provides a plugin system for developers to create custom plugins and expand Answer’s features. You can find the [plugin documentation here](https://answer.dev/docs/development/extending/). +Answer provides a plugin system for developers to create custom plugins and expand Answer’s features. You can find the [plugin documentation here](https://answer.apache.org/docs/development/extending/). 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/answerdev/plugins). - +You can also check out the [plugins here](https://github.com/apache/incubator-answer-plugins). ## Contributing Contributions are always welcome! -See [CONTRIBUTING](https://answer.dev/docs/development/contributing/) for ways to get started. +See [CONTRIBUTING](https://answer.apache.org/docs/development/contributing/) for ways to get started. ## License -[Apache License 2.0](https://github.com/answerdev/answer/blob/main/LICENSE) +[Apache License 2.0](https://github.com/apache/incubator-answer/blob/main/LICENSE) diff --git a/README_CN.md b/README_CN.md index 6e9471672..9c9e9a695 100644 --- a/README_CN.md +++ b/README_CN.md @@ -1,4 +1,4 @@ - + logo @@ -6,12 +6,12 @@ 一款问答形式的知识社区开源软件，你可以使用它快速建立你的问答社区，用于产品技术支持、客户支持、用户交流等。 -了解更多关于该项目的内容，请访问 [answer.dev](https://answer.dev). +了解更多关于该项目的内容，请访问 [answer.apache.org](https://answer.apache.org). -[![LICENSE](https://img.shields.io/github/license/answerdev/answer)](https://github.com/answerdev/answer/blob/main/LICENSE) +[![LICENSE](https://img.shields.io/github/license/apache/incubator-answer)](https://github.com/apache/incubator-answer/blob/main/LICENSE) [![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) ## 截图 @@ -26,14 +26,14 @@ docker run -d -p 9080:80 -v answer-data:/data --name answer answerdev/answer:latest ``` -其他安装配置细节请参考 [Installation](https://answer.dev/docs/installation) +其他安装配置细节请参考 [Installation](https://answer.apache.org/docs/installation) ## 贡献 我们随时欢迎你的贡献! -参考 [CONTRIBUTING](https://answer.dev/docs/development/contributing/) 开始贡献。 +参考 [CONTRIBUTING](https://answer.apache.org/docs/development/contributing/) 开始贡献。 ## License -[Apache License 2.0](https://github.com/answerdev/answer/blob/main/LICENSE) +[Apache License 2.0](https://github.com/apache/incubator-answer/blob/main/LICENSE) diff --git a/charts/README.md b/charts/README.md index f47b7028b..eeb49d353 100644 --- a/charts/README.md +++ b/charts/README.md @@ -69,7 +69,7 @@ Publish the chart to Artifacthub and add proper installation instructions. E.G. > **NOTE**: This is not currently a valid installation option. ```console -$ helm repo add answerdev https://charts.answer.dev/ +$ helm repo add answerdev https://charts.answer.apache.org/ $ helm repo update $ helm install answerdev/answer -n mynamespace ``` \ No newline at end of file diff --git a/charts/values.yaml b/charts/values.yaml index f0d0af4b0..8b6fe9998 100644 --- a/charts/values.yaml +++ b/charts/values.yaml @@ -29,7 +29,7 @@ image: # Environment variables # Configure environment variables below -# https://answer.dev/docs/env +# https://answer.apache.org/docs/env env: - name: LOG_LEVEL # [DEBUG INFO WARN ERROR] diff --git a/cmd/answer/main.go b/cmd/answer/main.go index 85fde5f88..ae1147090 100644 --- a/cmd/answer/main.go +++ b/cmd/answer/main.go @@ -20,7 +20,7 @@ package main import ( - answercmd "github.com/answerdev/answer/cmd" + answercmd "github.com/apache/incubator-answer/cmd" ) // @securityDefinitions.apikey ApiKeyAuth diff --git a/cmd/command.go b/cmd/command.go index 0d3cdd9f9..e9b352940 100644 --- a/cmd/command.go +++ b/cmd/command.go @@ -24,11 +24,11 @@ import ( "os" "strings" - "github.com/answerdev/answer/internal/base/conf" - "github.com/answerdev/answer/internal/cli" - "github.com/answerdev/answer/internal/install" - "github.com/answerdev/answer/internal/migrations" - "github.com/answerdev/answer/plugin" + "github.com/apache/incubator-answer/internal/base/conf" + "github.com/apache/incubator-answer/internal/cli" + "github.com/apache/incubator-answer/internal/install" + "github.com/apache/incubator-answer/internal/migrations" + "github.com/apache/incubator-answer/plugin" "github.com/segmentfault/pacman/log" "github.com/spf13/cobra" ) diff --git a/cmd/main.go b/cmd/main.go index 75892c7d9..306d841cf 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -25,11 +25,11 @@ import ( "os" "time" - "github.com/answerdev/answer/internal/base/conf" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/cron" - "github.com/answerdev/answer/internal/cli" - "github.com/answerdev/answer/internal/schema" + "github.com/apache/incubator-answer/internal/base/conf" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/cron" + "github.com/apache/incubator-answer/internal/cli" + "github.com/apache/incubator-answer/internal/schema" "github.com/gin-gonic/gin" "github.com/segmentfault/pacman" "github.com/segmentfault/pacman/contrib/log/zap" @@ -37,7 +37,7 @@ import ( "github.com/segmentfault/pacman/log" ) -// go build -ldflags "-X github.com/answerdev/answer/cmd.Version=x.y.z" +// go build -ldflags "-X github.com/apache/incubator-answer/cmd.Version=x.y.z" var ( // Name is the name of the project Name = "answer" diff --git a/cmd/wire.go b/cmd/wire.go index ca2a7738e..0f12f7dcc 100644 --- a/cmd/wire.go +++ b/cmd/wire.go @@ -1,3 +1,6 @@ +//go:build wireinject +// +build wireinject + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -17,27 +20,24 @@ * under the License. */ -//go:build wireinject -// +build wireinject - // The build tag makes sure the stub is not built in the final build. package answercmd import ( - "github.com/answerdev/answer/internal/base/conf" - "github.com/answerdev/answer/internal/base/cron" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/middleware" - "github.com/answerdev/answer/internal/base/server" - "github.com/answerdev/answer/internal/base/translator" - "github.com/answerdev/answer/internal/controller" - "github.com/answerdev/answer/internal/controller/template_render" - "github.com/answerdev/answer/internal/controller_admin" - "github.com/answerdev/answer/internal/repo" - "github.com/answerdev/answer/internal/router" - "github.com/answerdev/answer/internal/service" - "github.com/answerdev/answer/internal/service/service_config" + "github.com/apache/incubator-answer/internal/base/conf" + "github.com/apache/incubator-answer/internal/base/cron" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/middleware" + "github.com/apache/incubator-answer/internal/base/server" + "github.com/apache/incubator-answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/controller" + "github.com/apache/incubator-answer/internal/controller/template_render" + "github.com/apache/incubator-answer/internal/controller_admin" + "github.com/apache/incubator-answer/internal/repo" + "github.com/apache/incubator-answer/internal/router" + "github.com/apache/incubator-answer/internal/service" + "github.com/apache/incubator-answer/internal/service/service_config" "github.com/google/wire" "github.com/segmentfault/pacman" "github.com/segmentfault/pacman/log" diff --git a/cmd/wire_gen.go b/cmd/wire_gen.go index f4dc3cd90..cef3f985e 100644 --- a/cmd/wire_gen.go +++ b/cmd/wire_gen.go @@ -1,3 +1,6 @@ +//go:build !wireinject +// +build !wireinject + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -20,88 +23,86 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//go:build !wireinject -// +build !wireinject package answercmd import ( - "github.com/answerdev/answer/internal/base/conf" - "github.com/answerdev/answer/internal/base/cron" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/middleware" - "github.com/answerdev/answer/internal/base/server" - "github.com/answerdev/answer/internal/base/translator" - "github.com/answerdev/answer/internal/controller" - "github.com/answerdev/answer/internal/controller/template_render" - "github.com/answerdev/answer/internal/controller_admin" - "github.com/answerdev/answer/internal/repo/activity" - "github.com/answerdev/answer/internal/repo/activity_common" - "github.com/answerdev/answer/internal/repo/answer" - "github.com/answerdev/answer/internal/repo/auth" - "github.com/answerdev/answer/internal/repo/captcha" - "github.com/answerdev/answer/internal/repo/collection" - "github.com/answerdev/answer/internal/repo/comment" - "github.com/answerdev/answer/internal/repo/config" - "github.com/answerdev/answer/internal/repo/export" - "github.com/answerdev/answer/internal/repo/limit" - "github.com/answerdev/answer/internal/repo/meta" - notification2 "github.com/answerdev/answer/internal/repo/notification" - "github.com/answerdev/answer/internal/repo/plugin_config" - "github.com/answerdev/answer/internal/repo/question" - "github.com/answerdev/answer/internal/repo/rank" - "github.com/answerdev/answer/internal/repo/reason" - "github.com/answerdev/answer/internal/repo/report" - "github.com/answerdev/answer/internal/repo/revision" - "github.com/answerdev/answer/internal/repo/role" - "github.com/answerdev/answer/internal/repo/search_common" - "github.com/answerdev/answer/internal/repo/site_info" - "github.com/answerdev/answer/internal/repo/tag" - "github.com/answerdev/answer/internal/repo/tag_common" - "github.com/answerdev/answer/internal/repo/unique" - "github.com/answerdev/answer/internal/repo/user" - "github.com/answerdev/answer/internal/repo/user_external_login" - "github.com/answerdev/answer/internal/repo/user_notification_config" - "github.com/answerdev/answer/internal/router" - "github.com/answerdev/answer/internal/service" - "github.com/answerdev/answer/internal/service/action" - activity2 "github.com/answerdev/answer/internal/service/activity" - activity_common2 "github.com/answerdev/answer/internal/service/activity_common" - "github.com/answerdev/answer/internal/service/activity_queue" - "github.com/answerdev/answer/internal/service/answer_common" - auth2 "github.com/answerdev/answer/internal/service/auth" - "github.com/answerdev/answer/internal/service/collection_common" - comment2 "github.com/answerdev/answer/internal/service/comment" - "github.com/answerdev/answer/internal/service/comment_common" - config2 "github.com/answerdev/answer/internal/service/config" - "github.com/answerdev/answer/internal/service/dashboard" - export2 "github.com/answerdev/answer/internal/service/export" - "github.com/answerdev/answer/internal/service/follow" - meta2 "github.com/answerdev/answer/internal/service/meta" - "github.com/answerdev/answer/internal/service/notice_queue" - "github.com/answerdev/answer/internal/service/notification" - "github.com/answerdev/answer/internal/service/notification_common" - "github.com/answerdev/answer/internal/service/object_info" - "github.com/answerdev/answer/internal/service/plugin_common" - "github.com/answerdev/answer/internal/service/question_common" - rank2 "github.com/answerdev/answer/internal/service/rank" - reason2 "github.com/answerdev/answer/internal/service/reason" - report2 "github.com/answerdev/answer/internal/service/report" - "github.com/answerdev/answer/internal/service/report_admin" - "github.com/answerdev/answer/internal/service/report_handle_admin" - "github.com/answerdev/answer/internal/service/revision_common" - role2 "github.com/answerdev/answer/internal/service/role" - "github.com/answerdev/answer/internal/service/search_parser" - "github.com/answerdev/answer/internal/service/service_config" - "github.com/answerdev/answer/internal/service/siteinfo" - "github.com/answerdev/answer/internal/service/siteinfo_common" - tag2 "github.com/answerdev/answer/internal/service/tag" - tag_common2 "github.com/answerdev/answer/internal/service/tag_common" - "github.com/answerdev/answer/internal/service/uploader" - "github.com/answerdev/answer/internal/service/user_admin" - "github.com/answerdev/answer/internal/service/user_common" - user_external_login2 "github.com/answerdev/answer/internal/service/user_external_login" - user_notification_config2 "github.com/answerdev/answer/internal/service/user_notification_config" + "github.com/apache/incubator-answer/internal/base/conf" + "github.com/apache/incubator-answer/internal/base/cron" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/middleware" + "github.com/apache/incubator-answer/internal/base/server" + "github.com/apache/incubator-answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/controller" + "github.com/apache/incubator-answer/internal/controller/template_render" + "github.com/apache/incubator-answer/internal/controller_admin" + "github.com/apache/incubator-answer/internal/repo/activity" + "github.com/apache/incubator-answer/internal/repo/activity_common" + "github.com/apache/incubator-answer/internal/repo/answer" + "github.com/apache/incubator-answer/internal/repo/auth" + "github.com/apache/incubator-answer/internal/repo/captcha" + "github.com/apache/incubator-answer/internal/repo/collection" + "github.com/apache/incubator-answer/internal/repo/comment" + "github.com/apache/incubator-answer/internal/repo/config" + "github.com/apache/incubator-answer/internal/repo/export" + "github.com/apache/incubator-answer/internal/repo/limit" + "github.com/apache/incubator-answer/internal/repo/meta" + notification2 "github.com/apache/incubator-answer/internal/repo/notification" + "github.com/apache/incubator-answer/internal/repo/plugin_config" + "github.com/apache/incubator-answer/internal/repo/question" + "github.com/apache/incubator-answer/internal/repo/rank" + "github.com/apache/incubator-answer/internal/repo/reason" + "github.com/apache/incubator-answer/internal/repo/report" + "github.com/apache/incubator-answer/internal/repo/revision" + "github.com/apache/incubator-answer/internal/repo/role" + "github.com/apache/incubator-answer/internal/repo/search_common" + "github.com/apache/incubator-answer/internal/repo/site_info" + "github.com/apache/incubator-answer/internal/repo/tag" + "github.com/apache/incubator-answer/internal/repo/tag_common" + "github.com/apache/incubator-answer/internal/repo/unique" + "github.com/apache/incubator-answer/internal/repo/user" + "github.com/apache/incubator-answer/internal/repo/user_external_login" + "github.com/apache/incubator-answer/internal/repo/user_notification_config" + "github.com/apache/incubator-answer/internal/router" + "github.com/apache/incubator-answer/internal/service" + "github.com/apache/incubator-answer/internal/service/action" + activity2 "github.com/apache/incubator-answer/internal/service/activity" + activity_common2 "github.com/apache/incubator-answer/internal/service/activity_common" + "github.com/apache/incubator-answer/internal/service/activity_queue" + "github.com/apache/incubator-answer/internal/service/answer_common" + auth2 "github.com/apache/incubator-answer/internal/service/auth" + "github.com/apache/incubator-answer/internal/service/collection_common" + comment2 "github.com/apache/incubator-answer/internal/service/comment" + "github.com/apache/incubator-answer/internal/service/comment_common" + config2 "github.com/apache/incubator-answer/internal/service/config" + "github.com/apache/incubator-answer/internal/service/dashboard" + export2 "github.com/apache/incubator-answer/internal/service/export" + "github.com/apache/incubator-answer/internal/service/follow" + meta2 "github.com/apache/incubator-answer/internal/service/meta" + "github.com/apache/incubator-answer/internal/service/notice_queue" + "github.com/apache/incubator-answer/internal/service/notification" + "github.com/apache/incubator-answer/internal/service/notification_common" + "github.com/apache/incubator-answer/internal/service/object_info" + "github.com/apache/incubator-answer/internal/service/plugin_common" + "github.com/apache/incubator-answer/internal/service/question_common" + rank2 "github.com/apache/incubator-answer/internal/service/rank" + reason2 "github.com/apache/incubator-answer/internal/service/reason" + report2 "github.com/apache/incubator-answer/internal/service/report" + "github.com/apache/incubator-answer/internal/service/report_admin" + "github.com/apache/incubator-answer/internal/service/report_handle_admin" + "github.com/apache/incubator-answer/internal/service/revision_common" + role2 "github.com/apache/incubator-answer/internal/service/role" + "github.com/apache/incubator-answer/internal/service/search_parser" + "github.com/apache/incubator-answer/internal/service/service_config" + "github.com/apache/incubator-answer/internal/service/siteinfo" + "github.com/apache/incubator-answer/internal/service/siteinfo_common" + tag2 "github.com/apache/incubator-answer/internal/service/tag" + tag_common2 "github.com/apache/incubator-answer/internal/service/tag_common" + "github.com/apache/incubator-answer/internal/service/uploader" + "github.com/apache/incubator-answer/internal/service/user_admin" + "github.com/apache/incubator-answer/internal/service/user_common" + user_external_login2 "github.com/apache/incubator-answer/internal/service/user_external_login" + user_notification_config2 "github.com/apache/incubator-answer/internal/service/user_notification_config" "github.com/segmentfault/pacman" "github.com/segmentfault/pacman/log" ) diff --git a/docs/img/screenshot.png b/docs/img/screenshot.png index 0907c2f59..555de5002 100644 Binary files a/docs/img/screenshot.png and b/docs/img/screenshot.png differ diff --git a/go.mod b/go.mod index 37c3e5470..1a3b49f67 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/answerdev/answer +module github.com/apache/incubator-answer go 1.18 @@ -42,6 +42,7 @@ require ( github.com/tidwall/gjson v1.14.4 github.com/yuin/goldmark v1.4.13 golang.org/x/crypto v0.13.0 + golang.org/x/image v0.1.0 golang.org/x/net v0.15.0 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df gopkg.in/yaml.v3 v3.0.1 @@ -131,7 +132,6 @@ require ( go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.23.0 // indirect golang.org/x/arch v0.3.0 // indirect - golang.org/x/image v0.1.0 // indirect golang.org/x/mod v0.12.0 // indirect golang.org/x/sys v0.12.0 // indirect golang.org/x/text v0.13.0 // indirect diff --git a/internal/base/conf/conf.go b/internal/base/conf/conf.go index b6ff32687..eaf6d8cea 100644 --- a/internal/base/conf/conf.go +++ b/internal/base/conf/conf.go @@ -23,13 +23,13 @@ import ( "bytes" "path/filepath" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/server" - "github.com/answerdev/answer/internal/base/translator" - "github.com/answerdev/answer/internal/cli" - "github.com/answerdev/answer/internal/router" - "github.com/answerdev/answer/internal/service/service_config" - "github.com/answerdev/answer/pkg/writer" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/server" + "github.com/apache/incubator-answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/cli" + "github.com/apache/incubator-answer/internal/router" + "github.com/apache/incubator-answer/internal/service/service_config" + "github.com/apache/incubator-answer/pkg/writer" "github.com/segmentfault/pacman/contrib/conf/viper" "gopkg.in/yaml.v3" ) diff --git a/internal/base/constant/privilege.go b/internal/base/constant/privilege.go index da166b795..018247744 100644 --- a/internal/base/constant/privilege.go +++ b/internal/base/constant/privilege.go @@ -19,7 +19,7 @@ package constant -import "github.com/answerdev/answer/internal/base/reason" +import "github.com/apache/incubator-answer/internal/base/reason" type Privilege struct { Key string `json:"key"` diff --git a/internal/base/cron/cron.go b/internal/base/cron/cron.go index 9ca2b0358..bb9cb7e2b 100644 --- a/internal/base/cron/cron.go +++ b/internal/base/cron/cron.go @@ -23,8 +23,8 @@ import ( "context" "fmt" - "github.com/answerdev/answer/internal/service" - "github.com/answerdev/answer/internal/service/siteinfo_common" + "github.com/apache/incubator-answer/internal/service" + "github.com/apache/incubator-answer/internal/service/siteinfo_common" "github.com/robfig/cron/v3" "github.com/segmentfault/pacman/log" ) diff --git a/internal/base/data/data.go b/internal/base/data/data.go index 677ba3253..54e1fbb8d 100644 --- a/internal/base/data/data.go +++ b/internal/base/data/data.go @@ -23,8 +23,8 @@ import ( "path/filepath" "time" - "github.com/answerdev/answer/pkg/dir" - "github.com/answerdev/answer/plugin" + "github.com/apache/incubator-answer/pkg/dir" + "github.com/apache/incubator-answer/plugin" _ "github.com/go-sql-driver/mysql" _ "github.com/lib/pq" "github.com/segmentfault/pacman/cache" diff --git a/internal/base/handler/handler.go b/internal/base/handler/handler.go index 82907ee9f..2729a8324 100644 --- a/internal/base/handler/handler.go +++ b/internal/base/handler/handler.go @@ -21,9 +21,9 @@ package handler import ( "errors" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/base/validator" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/base/validator" "github.com/gin-gonic/gin" myErrors "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" diff --git a/internal/base/handler/lang.go b/internal/base/handler/lang.go index a43c35270..69a1d1b84 100644 --- a/internal/base/handler/lang.go +++ b/internal/base/handler/lang.go @@ -22,7 +22,7 @@ package handler import ( "context" - "github.com/answerdev/answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/constant" "github.com/gin-gonic/gin" "github.com/segmentfault/pacman/i18n" ) diff --git a/internal/base/handler/response.go b/internal/base/handler/response.go index bedd85ff8..c02ba7ecf 100644 --- a/internal/base/handler/response.go +++ b/internal/base/handler/response.go @@ -20,7 +20,7 @@ package handler import ( - "github.com/answerdev/answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/base/translator" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/i18n" ) diff --git a/internal/base/handler/short_id.go b/internal/base/handler/short_id.go index 1261d7896..70a9328c9 100644 --- a/internal/base/handler/short_id.go +++ b/internal/base/handler/short_id.go @@ -22,7 +22,7 @@ package handler import ( "context" - "github.com/answerdev/answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/constant" ) // GetEnableShortID get language from header diff --git a/internal/base/middleware/accept_language.go b/internal/base/middleware/accept_language.go index 1cf1c8745..6cb7d95d4 100644 --- a/internal/base/middleware/accept_language.go +++ b/internal/base/middleware/accept_language.go @@ -20,8 +20,8 @@ package middleware import ( - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/handler" "github.com/gin-gonic/gin" "github.com/segmentfault/pacman/i18n" ) diff --git a/internal/base/middleware/auth.go b/internal/base/middleware/auth.go index 3e0edbfcc..0fdc2c42e 100644 --- a/internal/base/middleware/auth.go +++ b/internal/base/middleware/auth.go @@ -23,17 +23,17 @@ import ( "net/http" "strings" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/role" - "github.com/answerdev/answer/internal/service/siteinfo_common" - "github.com/answerdev/answer/ui" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/role" + "github.com/apache/incubator-answer/internal/service/siteinfo_common" + "github.com/apache/incubator-answer/ui" "github.com/gin-gonic/gin" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/service/auth" - "github.com/answerdev/answer/pkg/converter" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/service/auth" + "github.com/apache/incubator-answer/pkg/converter" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" ) diff --git a/internal/base/middleware/avatar.go b/internal/base/middleware/avatar.go index bcb15346d..7bf363a7c 100644 --- a/internal/base/middleware/avatar.go +++ b/internal/base/middleware/avatar.go @@ -27,9 +27,9 @@ import ( "path/filepath" "strings" - "github.com/answerdev/answer/internal/service/service_config" - "github.com/answerdev/answer/internal/service/uploader" - "github.com/answerdev/answer/pkg/converter" + "github.com/apache/incubator-answer/internal/service/service_config" + "github.com/apache/incubator-answer/internal/service/uploader" + "github.com/apache/incubator-answer/pkg/converter" "github.com/gin-gonic/gin" "github.com/segmentfault/pacman/log" ) diff --git a/internal/base/middleware/rate_limit.go b/internal/base/middleware/rate_limit.go index 47db55a9f..569dc8b07 100644 --- a/internal/base/middleware/rate_limit.go +++ b/internal/base/middleware/rate_limit.go @@ -22,10 +22,10 @@ package middleware import ( "encoding/json" "fmt" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/repo/limit" - "github.com/answerdev/answer/pkg/encryption" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/repo/limit" + "github.com/apache/incubator-answer/pkg/encryption" "github.com/gin-gonic/gin" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" diff --git a/internal/base/middleware/short_id.go b/internal/base/middleware/short_id.go index 86ec264da..891ebaba6 100644 --- a/internal/base/middleware/short_id.go +++ b/internal/base/middleware/short_id.go @@ -20,8 +20,8 @@ package middleware import ( - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/service/siteinfo_common" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/service/siteinfo_common" "github.com/gin-gonic/gin" "github.com/segmentfault/pacman/log" ) diff --git a/internal/base/middleware/user_center_plugin_auth.go b/internal/base/middleware/user_center_plugin_auth.go index f3706e062..44589e153 100644 --- a/internal/base/middleware/user_center_plugin_auth.go +++ b/internal/base/middleware/user_center_plugin_auth.go @@ -20,9 +20,9 @@ package middleware import ( - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/plugin" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/plugin" "github.com/gin-gonic/gin" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/base/middleware/visit_img_auth.go b/internal/base/middleware/visit_img_auth.go index 05491ea70..25b635fc9 100644 --- a/internal/base/middleware/visit_img_auth.go +++ b/internal/base/middleware/visit_img_auth.go @@ -20,7 +20,7 @@ package middleware import ( - "github.com/answerdev/answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/constant" "github.com/gin-gonic/gin" "net/http" "strings" diff --git a/internal/base/server/http.go b/internal/base/server/http.go index c2be3bb69..6e0b6727d 100644 --- a/internal/base/server/http.go +++ b/internal/base/server/http.go @@ -24,10 +24,10 @@ import ( "io/fs" brotli "github.com/anargu/gin-brotli" - "github.com/answerdev/answer/internal/base/middleware" - "github.com/answerdev/answer/internal/router" - "github.com/answerdev/answer/plugin" - "github.com/answerdev/answer/ui" + "github.com/apache/incubator-answer/internal/base/middleware" + "github.com/apache/incubator-answer/internal/router" + "github.com/apache/incubator-answer/plugin" + "github.com/apache/incubator-answer/ui" "github.com/gin-gonic/gin" ) diff --git a/internal/base/server/http_funcmap.go b/internal/base/server/http_funcmap.go index f0ab8b3c7..a64e49eab 100644 --- a/internal/base/server/http_funcmap.go +++ b/internal/base/server/http_funcmap.go @@ -27,12 +27,12 @@ import ( "strings" "time" - "github.com/answerdev/answer/internal/base/translator" - "github.com/answerdev/answer/internal/controller" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/pkg/converter" - "github.com/answerdev/answer/pkg/day" - "github.com/answerdev/answer/pkg/htmltext" + "github.com/apache/incubator-answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/controller" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/pkg/converter" + "github.com/apache/incubator-answer/pkg/day" + "github.com/apache/incubator-answer/pkg/htmltext" "github.com/segmentfault/pacman/i18n" ) diff --git a/internal/base/validator/validator.go b/internal/base/validator/validator.go index 0f83b011a..bd5da31df 100644 --- a/internal/base/validator/validator.go +++ b/internal/base/validator/validator.go @@ -26,8 +26,8 @@ import ( "strings" "unicode" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/base/translator" "github.com/go-playground/locales" german "github.com/go-playground/locales/de" english "github.com/go-playground/locales/en" diff --git a/internal/cli/build.go b/internal/cli/build.go index 31645f3c4..3adffafc7 100644 --- a/internal/cli/build.go +++ b/internal/cli/build.go @@ -32,9 +32,9 @@ import ( "text/template" "github.com/Masterminds/semver/v3" - "github.com/answerdev/answer/pkg/dir" - "github.com/answerdev/answer/pkg/writer" - "github.com/answerdev/answer/ui" + "github.com/apache/incubator-answer/pkg/dir" + "github.com/apache/incubator-answer/pkg/writer" + "github.com/apache/incubator-answer/ui" "github.com/segmentfault/pacman/log" "gopkg.in/yaml.v3" ) @@ -43,7 +43,7 @@ const ( mainGoTpl = `package main import ( - answercmd "github.com/answerdev/answer/cmd" + answercmd "github.com/apache/incubator-answer/cmd" // remote plugins {{- range .remote_plugins}} @@ -86,7 +86,7 @@ type OriginalAnswerInfo struct { } type pluginInfo struct { - // Name of the plugin e.g. github.com/answerdev/github-connector + // Name of the plugin e.g. github.com/apache/incubator-answer-plugins/github-connector Name string // Path to the plugin. If path exist, read plugin from local filesystem Path string @@ -133,7 +133,7 @@ func BuildNewAnswer(outputPath string, plugins []string, originalAnswerInfo Orig func formatPlugins(plugins []string) (formatted []*pluginInfo) { for _, plugin := range plugins { plugin = strings.TrimSpace(plugin) - // plugin description like this 'github.com/answerdev/github-connector@latest=/local/path' + // plugin description like this 'github.com/apache/incubator-answer-plugins/github-connector@latest=/local/path' info := &pluginInfo{} plugin, info.Path, _ = strings.Cut(plugin, "=") info.Name, info.Version, _ = strings.Cut(plugin, "@") @@ -196,7 +196,7 @@ func createMainGoFile(b *buildingMaterial) (err error) { func downloadGoModFile(b *buildingMaterial) (err error) { // If user specify a module replacement, use it. Otherwise, use the latest version. if len(b.answerModuleReplacement) > 0 { - replacement := fmt.Sprintf("%s=%s", "github.com/answerdev/answer", b.answerModuleReplacement) + replacement := fmt.Sprintf("%s=%s", "github.com/apache/incubator-answer", b.answerModuleReplacement) err = b.newExecCmd("go", "mod", "edit", "-replace", replacement).Run() if err != nil { return err @@ -217,7 +217,7 @@ func downloadGoModFile(b *buildingMaterial) (err error) { // copyUIFiles copy ui files from answer module to tmp dir func copyUIFiles(b *buildingMaterial) (err error) { - goListCmd := b.newExecCmd("go", "list", "-mod=mod", "-m", "-f", "{{.Dir}}", "github.com/answerdev/answer") + goListCmd := b.newExecCmd("go", "list", "-mod=mod", "-m", "-f", "{{.Dir}}", "github.com/apache/incubator-answer") buf := new(bytes.Buffer) goListCmd.Stdout = buf if err = goListCmd.Run(); err != nil { @@ -226,13 +226,13 @@ func copyUIFiles(b *buildingMaterial) (err error) { answerDir := strings.TrimSpace(buf.String()) goModUIDir := filepath.Join(answerDir, "ui") - localUIBuildDir := filepath.Join(b.tmpDir, "vendor/github.com/answerdev/answer/ui/") + localUIBuildDir := filepath.Join(b.tmpDir, "vendor/github.com/apache/incubator-answer/ui/") // The node_modules folder generated during development will interfere packaging, so it needs to be ignored. if err = copyDirEntries(os.DirFS(goModUIDir), ".", localUIBuildDir, "node_modules"); err != nil { return fmt.Errorf("failed to copy ui files: %w", err) } - pluginsDir := filepath.Join(b.tmpDir, "vendor/github.com/answerdev/plugins/") + pluginsDir := filepath.Join(b.tmpDir, "vendor/github.com/apache/incubator-answer-plugins/") localUIPluginDir := filepath.Join(localUIBuildDir, "src/plugins/") // copy plugins dir @@ -270,7 +270,7 @@ func copyUIFiles(b *buildingMaterial) (err error) { // overwriteIndexTs overwrites index.ts file in ui/src/plugins/ dir func overwriteIndexTs(b *buildingMaterial) (err error) { - localUIPluginDir := filepath.Join(b.tmpDir, "vendor/github.com/answerdev/answer/ui/src/plugins/") + localUIPluginDir := filepath.Join(b.tmpDir, "vendor/github.com/apache/incubator-answer/ui/src/plugins/") folders, err := getFolders(localUIPluginDir) if err != nil { @@ -314,7 +314,7 @@ func generateIndexTsContent(folders []string) string { // buildUI run pnpm install and pnpm build commands to build ui func buildUI(b *buildingMaterial) (err error) { - localUIBuildDir := filepath.Join(b.tmpDir, "vendor/github.com/answerdev/answer/ui") + localUIBuildDir := filepath.Join(b.tmpDir, "vendor/github.com/apache/incubator-answer/ui") pnpmInstallCmd := b.newExecCmd("pnpm", "pre-install") pnpmInstallCmd.Dir = localUIBuildDir @@ -332,7 +332,7 @@ func buildUI(b *buildingMaterial) (err error) { func replaceNecessaryFile(b *buildingMaterial) (err error) { fmt.Printf("try to replace ui build directory\n") - uiBuildDir := filepath.Join(b.tmpDir, "vendor/github.com/answerdev/answer/ui") + uiBuildDir := filepath.Join(b.tmpDir, "vendor/github.com/apache/incubator-answer/ui") err = copyDirEntries(ui.Build, ".", uiBuildDir) return err } @@ -388,7 +388,7 @@ func mergeI18nFiles(b *buildingMaterial) (err error) { } } - originalI18nDir := filepath.Join(b.tmpDir, "vendor/github.com/answerdev/answer/i18n") + originalI18nDir := filepath.Join(b.tmpDir, "vendor/github.com/apache/incubator-answer/i18n") entries, err := os.ReadDir(originalI18nDir) if err != nil { return err @@ -513,7 +513,7 @@ func formatUIPluginsDirName(dirPath string) { // buildBinary build binary file func buildBinary(b *buildingMaterial) (err error) { versionInfo := b.originalAnswerInfo - cmdPkg := "github.com/answerdev/answer/cmd" + cmdPkg := "github.com/apache/incubator-answer/cmd" ldflags := fmt.Sprintf("-X %s.Version=%s -X %s.Revision=%s -X %s.Time=%s", cmdPkg, versionInfo.Version, cmdPkg, versionInfo.Revision, cmdPkg, versionInfo.Time) err = b.newExecCmd("go", "build", diff --git a/internal/cli/dump.go b/internal/cli/dump.go index 6dc1cd444..b1a3e56d5 100644 --- a/internal/cli/dump.go +++ b/internal/cli/dump.go @@ -24,7 +24,7 @@ import ( "path/filepath" "time" - "github.com/answerdev/answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/data" "xorm.io/xorm/schemas" ) diff --git a/internal/cli/install.go b/internal/cli/install.go index 77b14efc7..4ac759243 100644 --- a/internal/cli/install.go +++ b/internal/cli/install.go @@ -24,10 +24,10 @@ import ( "os" "path/filepath" - "github.com/answerdev/answer/configs" - "github.com/answerdev/answer/i18n" - "github.com/answerdev/answer/pkg/dir" - "github.com/answerdev/answer/pkg/writer" + "github.com/apache/incubator-answer/configs" + "github.com/apache/incubator-answer/i18n" + "github.com/apache/incubator-answer/pkg/dir" + "github.com/apache/incubator-answer/pkg/writer" ) const ( diff --git a/internal/cli/install_check.go b/internal/cli/install_check.go index ae01a6d74..5142a0d4f 100644 --- a/internal/cli/install_check.go +++ b/internal/cli/install_check.go @@ -22,9 +22,9 @@ package cli import ( "fmt" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/pkg/dir" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/pkg/dir" ) func CheckConfigFile(configPath string) bool { diff --git a/internal/controller/activity_controller.go b/internal/controller/activity_controller.go index 73ed2ad6e..b4481aeaa 100644 --- a/internal/controller/activity_controller.go +++ b/internal/controller/activity_controller.go @@ -20,12 +20,12 @@ package controller import ( - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/middleware" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/activity" - "github.com/answerdev/answer/internal/service/role" - "github.com/answerdev/answer/pkg/uid" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/middleware" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/activity" + "github.com/apache/incubator-answer/internal/service/role" + "github.com/apache/incubator-answer/pkg/uid" "github.com/gin-gonic/gin" ) diff --git a/internal/controller/answer_controller.go b/internal/controller/answer_controller.go index 77ef3dde9..1f57bc88d 100644 --- a/internal/controller/answer_controller.go +++ b/internal/controller/answer_controller.go @@ -23,18 +23,18 @@ import ( "fmt" "net/http" - "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/base/translator" - "github.com/answerdev/answer/internal/base/validator" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service" - "github.com/answerdev/answer/internal/service/action" - "github.com/answerdev/answer/internal/service/permission" - "github.com/answerdev/answer/internal/service/rank" - "github.com/answerdev/answer/pkg/uid" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/middleware" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/base/validator" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service" + "github.com/apache/incubator-answer/internal/service/action" + "github.com/apache/incubator-answer/internal/service/permission" + "github.com/apache/incubator-answer/internal/service/rank" + "github.com/apache/incubator-answer/pkg/uid" "github.com/gin-gonic/gin" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/controller/collection_controller.go b/internal/controller/collection_controller.go index de88572ef..74005fc40 100644 --- a/internal/controller/collection_controller.go +++ b/internal/controller/collection_controller.go @@ -20,13 +20,13 @@ package controller import ( - "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" - "github.com/answerdev/answer/pkg/converter" - "github.com/answerdev/answer/pkg/uid" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/middleware" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service" + "github.com/apache/incubator-answer/pkg/converter" + "github.com/apache/incubator-answer/pkg/uid" "github.com/gin-gonic/gin" "github.com/jinzhu/copier" "github.com/segmentfault/pacman/errors" diff --git a/internal/controller/comment_controller.go b/internal/controller/comment_controller.go index 1c86d95f8..0b9226797 100644 --- a/internal/controller/comment_controller.go +++ b/internal/controller/comment_controller.go @@ -20,18 +20,18 @@ package controller import ( - "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/base/translator" - "github.com/answerdev/answer/internal/base/validator" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/action" - "github.com/answerdev/answer/internal/service/comment" - "github.com/answerdev/answer/internal/service/permission" - "github.com/answerdev/answer/internal/service/rank" - "github.com/answerdev/answer/pkg/uid" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/middleware" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/base/validator" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/action" + "github.com/apache/incubator-answer/internal/service/comment" + "github.com/apache/incubator-answer/internal/service/permission" + "github.com/apache/incubator-answer/internal/service/rank" + "github.com/apache/incubator-answer/pkg/uid" "github.com/gin-gonic/gin" "github.com/segmentfault/pacman/errors" "net/http" diff --git a/internal/controller/connector_controller.go b/internal/controller/connector_controller.go index c26adb83d..96f3ec8e4 100644 --- a/internal/controller/connector_controller.go +++ b/internal/controller/connector_controller.go @@ -23,13 +23,13 @@ import ( "fmt" "net/http" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/middleware" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/export" - "github.com/answerdev/answer/internal/service/siteinfo_common" - "github.com/answerdev/answer/internal/service/user_external_login" - "github.com/answerdev/answer/plugin" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/middleware" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/export" + "github.com/apache/incubator-answer/internal/service/siteinfo_common" + "github.com/apache/incubator-answer/internal/service/user_external_login" + "github.com/apache/incubator-answer/plugin" "github.com/gin-gonic/gin" "github.com/segmentfault/pacman/log" ) diff --git a/internal/controller/dashboard_controller.go b/internal/controller/dashboard_controller.go index ff02c1d52..b73315638 100644 --- a/internal/controller/dashboard_controller.go +++ b/internal/controller/dashboard_controller.go @@ -20,8 +20,8 @@ package controller import ( - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/service/dashboard" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/service/dashboard" "github.com/gin-gonic/gin" ) diff --git a/internal/controller/follow_controller.go b/internal/controller/follow_controller.go index 65401bd69..52534da06 100644 --- a/internal/controller/follow_controller.go +++ b/internal/controller/follow_controller.go @@ -20,11 +20,11 @@ package controller import ( - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/middleware" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/follow" - "github.com/answerdev/answer/pkg/uid" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/middleware" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/follow" + "github.com/apache/incubator-answer/pkg/uid" "github.com/gin-gonic/gin" "github.com/jinzhu/copier" ) diff --git a/internal/controller/lang_controller.go b/internal/controller/lang_controller.go index 03e19a323..1cadc78b4 100644 --- a/internal/controller/lang_controller.go +++ b/internal/controller/lang_controller.go @@ -22,9 +22,9 @@ package controller import ( "encoding/json" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/translator" - "github.com/answerdev/answer/internal/service/siteinfo_common" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/service/siteinfo_common" "github.com/gin-gonic/gin" "github.com/segmentfault/pacman/i18n" ) diff --git a/internal/controller/notification_controller.go b/internal/controller/notification_controller.go index 51bb9a293..ab923e968 100644 --- a/internal/controller/notification_controller.go +++ b/internal/controller/notification_controller.go @@ -20,12 +20,12 @@ package controller import ( - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/middleware" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/notification" - "github.com/answerdev/answer/internal/service/permission" - "github.com/answerdev/answer/internal/service/rank" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/middleware" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/notification" + "github.com/apache/incubator-answer/internal/service/permission" + "github.com/apache/incubator-answer/internal/service/rank" "github.com/gin-gonic/gin" ) diff --git a/internal/controller/permission_controller.go b/internal/controller/permission_controller.go index 130d9cbf6..659e5dc10 100644 --- a/internal/controller/permission_controller.go +++ b/internal/controller/permission_controller.go @@ -20,10 +20,10 @@ package controller import ( - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/middleware" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/rank" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/middleware" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/rank" "github.com/gin-gonic/gin" ) diff --git a/internal/controller/plugin_user_center_controller.go b/internal/controller/plugin_user_center_controller.go index a2607d418..84da13afc 100644 --- a/internal/controller/plugin_user_center_controller.go +++ b/internal/controller/plugin_user_center_controller.go @@ -23,12 +23,12 @@ import ( "fmt" "net/http" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/middleware" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/siteinfo_common" - "github.com/answerdev/answer/internal/service/user_external_login" - "github.com/answerdev/answer/plugin" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/middleware" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/siteinfo_common" + "github.com/apache/incubator-answer/internal/service/user_external_login" + "github.com/apache/incubator-answer/plugin" "github.com/gin-gonic/gin" "github.com/segmentfault/pacman/log" ) diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.go index 55c745a96..4c6cddd87 100644 --- a/internal/controller/question_controller.go +++ b/internal/controller/question_controller.go @@ -20,20 +20,20 @@ package controller import ( - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/middleware" - "github.com/answerdev/answer/internal/base/pager" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/base/translator" - "github.com/answerdev/answer/internal/base/validator" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service" - "github.com/answerdev/answer/internal/service/action" - "github.com/answerdev/answer/internal/service/permission" - "github.com/answerdev/answer/internal/service/rank" - "github.com/answerdev/answer/internal/service/siteinfo_common" - "github.com/answerdev/answer/pkg/uid" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/middleware" + "github.com/apache/incubator-answer/internal/base/pager" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/base/validator" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service" + "github.com/apache/incubator-answer/internal/service/action" + "github.com/apache/incubator-answer/internal/service/permission" + "github.com/apache/incubator-answer/internal/service/rank" + "github.com/apache/incubator-answer/internal/service/siteinfo_common" + "github.com/apache/incubator-answer/pkg/uid" "github.com/gin-gonic/gin" "github.com/jinzhu/copier" "github.com/segmentfault/pacman/errors" diff --git a/internal/controller/rank_controller.go b/internal/controller/rank_controller.go index 105cada5f..b70e5faf6 100644 --- a/internal/controller/rank_controller.go +++ b/internal/controller/rank_controller.go @@ -20,10 +20,10 @@ package controller import ( - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/middleware" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/rank" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/middleware" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/rank" "github.com/gin-gonic/gin" ) diff --git a/internal/controller/reason_controller.go b/internal/controller/reason_controller.go index 1baf0fe15..a6a54843a 100644 --- a/internal/controller/reason_controller.go +++ b/internal/controller/reason_controller.go @@ -20,9 +20,9 @@ package controller import ( - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/reason" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/reason" "github.com/gin-gonic/gin" ) diff --git a/internal/controller/report_controller.go b/internal/controller/report_controller.go index 4dab9c7dc..e0765154b 100644 --- a/internal/controller/report_controller.go +++ b/internal/controller/report_controller.go @@ -20,18 +20,18 @@ package controller import ( - "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/base/translator" - "github.com/answerdev/answer/internal/base/validator" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/action" - "github.com/answerdev/answer/internal/service/permission" - "github.com/answerdev/answer/internal/service/rank" - "github.com/answerdev/answer/internal/service/report" - "github.com/answerdev/answer/pkg/uid" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/middleware" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/base/validator" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/action" + "github.com/apache/incubator-answer/internal/service/permission" + "github.com/apache/incubator-answer/internal/service/rank" + "github.com/apache/incubator-answer/internal/service/report" + "github.com/apache/incubator-answer/pkg/uid" "github.com/gin-gonic/gin" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/controller/revision_controller.go b/internal/controller/revision_controller.go index 0ac1f7120..7bc892cd9 100644 --- a/internal/controller/revision_controller.go +++ b/internal/controller/revision_controller.go @@ -20,17 +20,17 @@ package controller import ( - "github.com/answerdev/answer/internal/base/constant" - "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/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service" - "github.com/answerdev/answer/internal/service/permission" - "github.com/answerdev/answer/internal/service/rank" - "github.com/answerdev/answer/pkg/obj" - "github.com/answerdev/answer/pkg/uid" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/middleware" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service" + "github.com/apache/incubator-answer/internal/service/permission" + "github.com/apache/incubator-answer/internal/service/rank" + "github.com/apache/incubator-answer/pkg/obj" + "github.com/apache/incubator-answer/pkg/uid" "github.com/gin-gonic/gin" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/controller/search_controller.go b/internal/controller/search_controller.go index 723387675..d08fd8f15 100644 --- a/internal/controller/search_controller.go +++ b/internal/controller/search_controller.go @@ -20,16 +20,16 @@ package controller import ( - "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/base/translator" - "github.com/answerdev/answer/internal/base/validator" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service" - "github.com/answerdev/answer/internal/service/action" - "github.com/answerdev/answer/plugin" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/middleware" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/base/validator" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service" + "github.com/apache/incubator-answer/internal/service/action" + "github.com/apache/incubator-answer/plugin" "github.com/gin-gonic/gin" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/controller/siteinfo_controller.go b/internal/controller/siteinfo_controller.go index e3db9deed..f4e1ece65 100644 --- a/internal/controller/siteinfo_controller.go +++ b/internal/controller/siteinfo_controller.go @@ -22,10 +22,10 @@ package controller import ( "net/http" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/siteinfo_common" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/siteinfo_common" "github.com/gin-gonic/gin" "github.com/segmentfault/pacman/log" ) @@ -128,7 +128,7 @@ func (sc *SiteInfoController) GetManifestJson(ctx *gin.Context) { Version: constant.Version, Revision: constant.Revision, ShortName: "Answer", - Name: "Answer.dev", + Name: "answer.apache.org", Icons: map[string]string{ "16": favicon, "32": favicon, diff --git a/internal/controller/tag_controller.go b/internal/controller/tag_controller.go index 71e3ec827..11b1fcded 100644 --- a/internal/controller/tag_controller.go +++ b/internal/controller/tag_controller.go @@ -22,14 +22,14 @@ package controller import ( "strings" - "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/permission" - "github.com/answerdev/answer/internal/service/rank" - "github.com/answerdev/answer/internal/service/tag" - "github.com/answerdev/answer/internal/service/tag_common" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/middleware" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/permission" + "github.com/apache/incubator-answer/internal/service/rank" + "github.com/apache/incubator-answer/internal/service/tag" + "github.com/apache/incubator-answer/internal/service/tag_common" "github.com/gin-gonic/gin" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/controller/template_controller.go b/internal/controller/template_controller.go index 9998c069c..40a98e3ca 100644 --- a/internal/controller/template_controller.go +++ b/internal/controller/template_controller.go @@ -28,17 +28,17 @@ import ( "strings" "time" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/handler" - templaterender "github.com/answerdev/answer/internal/controller/template_render" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/siteinfo_common" - "github.com/answerdev/answer/pkg/checker" - "github.com/answerdev/answer/pkg/converter" - "github.com/answerdev/answer/pkg/htmltext" - "github.com/answerdev/answer/pkg/obj" - "github.com/answerdev/answer/pkg/uid" - "github.com/answerdev/answer/ui" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/handler" + templaterender "github.com/apache/incubator-answer/internal/controller/template_render" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/siteinfo_common" + "github.com/apache/incubator-answer/pkg/checker" + "github.com/apache/incubator-answer/pkg/converter" + "github.com/apache/incubator-answer/pkg/htmltext" + "github.com/apache/incubator-answer/pkg/obj" + "github.com/apache/incubator-answer/pkg/uid" + "github.com/apache/incubator-answer/ui" "github.com/gin-gonic/gin" "github.com/segmentfault/pacman/log" ) diff --git a/internal/controller/template_render/answer.go b/internal/controller/template_render/answer.go index 2a6e5974b..cc94f0ddf 100644 --- a/internal/controller/template_render/answer.go +++ b/internal/controller/template_render/answer.go @@ -22,7 +22,7 @@ package templaterender import ( "context" - "github.com/answerdev/answer/internal/schema" + "github.com/apache/incubator-answer/internal/schema" ) func (t *TemplateRenderController) AnswerList(ctx context.Context, req *schema.AnswerListReq) ([]*schema.AnswerInfo, int64, error) { diff --git a/internal/controller/template_render/comment.go b/internal/controller/template_render/comment.go index 6912ab19b..b3908f135 100644 --- a/internal/controller/template_render/comment.go +++ b/internal/controller/template_render/comment.go @@ -21,8 +21,8 @@ package templaterender import ( "context" - "github.com/answerdev/answer/internal/base/pager" - "github.com/answerdev/answer/internal/schema" + "github.com/apache/incubator-answer/internal/base/pager" + "github.com/apache/incubator-answer/internal/schema" ) func (t *TemplateRenderController) CommentList( diff --git a/internal/controller/template_render/controller.go b/internal/controller/template_render/controller.go index f712433f2..4fdcaf2bc 100644 --- a/internal/controller/template_render/controller.go +++ b/internal/controller/template_render/controller.go @@ -20,16 +20,16 @@ package templaterender import ( - questioncommon "github.com/answerdev/answer/internal/service/question_common" + questioncommon "github.com/apache/incubator-answer/internal/service/question_common" "math" - "github.com/answerdev/answer/internal/service/comment" - "github.com/answerdev/answer/internal/service/siteinfo_common" + "github.com/apache/incubator-answer/internal/service/comment" + "github.com/apache/incubator-answer/internal/service/siteinfo_common" "github.com/google/wire" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service" - "github.com/answerdev/answer/internal/service/tag" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service" + "github.com/apache/incubator-answer/internal/service/tag" ) // ProviderSetTemplateRenderController is template render controller providers. diff --git a/internal/controller/template_render/question.go b/internal/controller/template_render/question.go index 21e23e86e..a2779e235 100644 --- a/internal/controller/template_render/question.go +++ b/internal/controller/template_render/question.go @@ -24,8 +24,8 @@ import ( "math" "net/http" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/schema" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/schema" "github.com/gin-gonic/gin" "github.com/segmentfault/pacman/log" ) diff --git a/internal/controller/template_render/tags.go b/internal/controller/template_render/tags.go index 509738329..bfcc522c3 100644 --- a/internal/controller/template_render/tags.go +++ b/internal/controller/template_render/tags.go @@ -20,8 +20,8 @@ package templaterender import ( - "github.com/answerdev/answer/internal/base/pager" - "github.com/answerdev/answer/internal/schema" + "github.com/apache/incubator-answer/internal/base/pager" + "github.com/apache/incubator-answer/internal/schema" "github.com/jinzhu/copier" "golang.org/x/net/context" ) diff --git a/internal/controller/template_render/userinfo.go b/internal/controller/template_render/userinfo.go index 21e45dc53..731f6e8ed 100644 --- a/internal/controller/template_render/userinfo.go +++ b/internal/controller/template_render/userinfo.go @@ -20,7 +20,7 @@ package templaterender import ( - "github.com/answerdev/answer/internal/schema" + "github.com/apache/incubator-answer/internal/schema" "golang.org/x/net/context" ) diff --git a/internal/controller/upload_controller.go b/internal/controller/upload_controller.go index f8af5d293..56eba804a 100644 --- a/internal/controller/upload_controller.go +++ b/internal/controller/upload_controller.go @@ -20,11 +20,11 @@ package controller import ( - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/uploader" - "github.com/answerdev/answer/pkg/converter" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/uploader" + "github.com/apache/incubator-answer/pkg/converter" "github.com/gin-gonic/gin" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/controller/user_controller.go b/internal/controller/user_controller.go index a980375a7..c9149ca22 100644 --- a/internal/controller/user_controller.go +++ b/internal/controller/user_controller.go @@ -20,21 +20,21 @@ package controller import ( - "github.com/answerdev/answer/internal/base/constant" - "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/base/translator" - "github.com/answerdev/answer/internal/base/validator" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service" - "github.com/answerdev/answer/internal/service/action" - "github.com/answerdev/answer/internal/service/auth" - "github.com/answerdev/answer/internal/service/export" - "github.com/answerdev/answer/internal/service/siteinfo_common" - "github.com/answerdev/answer/internal/service/user_notification_config" - "github.com/answerdev/answer/pkg/checker" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/middleware" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/base/validator" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service" + "github.com/apache/incubator-answer/internal/service/action" + "github.com/apache/incubator-answer/internal/service/auth" + "github.com/apache/incubator-answer/internal/service/export" + "github.com/apache/incubator-answer/internal/service/siteinfo_common" + "github.com/apache/incubator-answer/internal/service/user_notification_config" + "github.com/apache/incubator-answer/pkg/checker" "github.com/gin-gonic/gin" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" diff --git a/internal/controller/vote_controller.go b/internal/controller/vote_controller.go index 21be85125..6417087b7 100644 --- a/internal/controller/vote_controller.go +++ b/internal/controller/vote_controller.go @@ -20,17 +20,17 @@ package controller import ( - "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/base/translator" - "github.com/answerdev/answer/internal/base/validator" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service" - "github.com/answerdev/answer/internal/service/action" - "github.com/answerdev/answer/internal/service/rank" - "github.com/answerdev/answer/pkg/uid" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/middleware" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/base/validator" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service" + "github.com/apache/incubator-answer/internal/service/action" + "github.com/apache/incubator-answer/internal/service/rank" + "github.com/apache/incubator-answer/pkg/uid" "github.com/gin-gonic/gin" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/controller_admin/plugin_controller.go b/internal/controller_admin/plugin_controller.go index d62d37127..769fc3bde 100644 --- a/internal/controller_admin/plugin_controller.go +++ b/internal/controller_admin/plugin_controller.go @@ -22,10 +22,10 @@ package controller_admin import ( "encoding/json" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/plugin_common" - "github.com/answerdev/answer/plugin" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/plugin_common" + "github.com/apache/incubator-answer/plugin" "github.com/gin-gonic/gin" ) diff --git a/internal/controller_admin/report_controller.go b/internal/controller_admin/report_controller.go index e56e03f5e..435b5af81 100644 --- a/internal/controller_admin/report_controller.go +++ b/internal/controller_admin/report_controller.go @@ -20,10 +20,10 @@ package controller_admin import ( - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/report_admin" - "github.com/answerdev/answer/pkg/converter" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/report_admin" + "github.com/apache/incubator-answer/pkg/converter" "github.com/gin-gonic/gin" ) diff --git a/internal/controller_admin/role_controller.go b/internal/controller_admin/role_controller.go index fca7ec438..0e038825e 100644 --- a/internal/controller_admin/role_controller.go +++ b/internal/controller_admin/role_controller.go @@ -20,9 +20,9 @@ package controller_admin import ( - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/schema" - service "github.com/answerdev/answer/internal/service/role" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/schema" + service "github.com/apache/incubator-answer/internal/service/role" "github.com/gin-gonic/gin" ) diff --git a/internal/controller_admin/siteinfo_controller.go b/internal/controller_admin/siteinfo_controller.go index 23093a987..6c1966b3c 100644 --- a/internal/controller_admin/siteinfo_controller.go +++ b/internal/controller_admin/siteinfo_controller.go @@ -22,10 +22,10 @@ package controller_admin import ( "net/http" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/middleware" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/siteinfo" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/middleware" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/siteinfo" "github.com/gin-gonic/gin" ) diff --git a/internal/controller_admin/theme_controller.go b/internal/controller_admin/theme_controller.go index 7bd3432f5..0c2d56b3b 100644 --- a/internal/controller_admin/theme_controller.go +++ b/internal/controller_admin/theme_controller.go @@ -20,8 +20,8 @@ package controller_admin import ( - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/schema" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/schema" "github.com/gin-gonic/gin" ) diff --git a/internal/controller_admin/user_backyard_controller.go b/internal/controller_admin/user_backyard_controller.go index 298d19690..7a72a5005 100644 --- a/internal/controller_admin/user_backyard_controller.go +++ b/internal/controller_admin/user_backyard_controller.go @@ -20,12 +20,12 @@ package controller_admin import ( - "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/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/middleware" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/user_admin" + "github.com/apache/incubator-answer/plugin" "github.com/gin-gonic/gin" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/entity/comment_entity.go b/internal/entity/comment_entity.go index e109dab6c..37f511983 100644 --- a/internal/entity/comment_entity.go +++ b/internal/entity/comment_entity.go @@ -24,7 +24,7 @@ import ( "fmt" "time" - "github.com/answerdev/answer/pkg/converter" + "github.com/apache/incubator-answer/pkg/converter" ) const ( diff --git a/internal/entity/config_entity.go b/internal/entity/config_entity.go index 77dbe2199..68ee9e254 100644 --- a/internal/entity/config_entity.go +++ b/internal/entity/config_entity.go @@ -23,7 +23,7 @@ import ( "encoding/json" "github.com/segmentfault/pacman/log" - "github.com/answerdev/answer/pkg/converter" + "github.com/apache/incubator-answer/pkg/converter" ) // Config config diff --git a/internal/install/install_controller.go b/internal/install/install_controller.go index f0f2644e9..7f57efbf1 100644 --- a/internal/install/install_controller.go +++ b/internal/install/install_controller.go @@ -25,15 +25,15 @@ import ( "path/filepath" "time" - "github.com/answerdev/answer/configs" - "github.com/answerdev/answer/internal/base/conf" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/base/translator" - "github.com/answerdev/answer/internal/cli" - "github.com/answerdev/answer/internal/migrations" - "github.com/answerdev/answer/internal/schema" + "github.com/apache/incubator-answer/configs" + "github.com/apache/incubator-answer/internal/base/conf" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/cli" + "github.com/apache/incubator-answer/internal/migrations" + "github.com/apache/incubator-answer/internal/schema" "github.com/gin-gonic/gin" "github.com/jinzhu/copier" "github.com/segmentfault/pacman/errors" diff --git a/internal/install/install_main.go b/internal/install/install_main.go index c57355e6e..77d4e298d 100644 --- a/internal/install/install_main.go +++ b/internal/install/install_main.go @@ -23,8 +23,8 @@ import ( "fmt" "os" - "github.com/answerdev/answer/internal/base/translator" - "github.com/answerdev/answer/internal/cli" + "github.com/apache/incubator-answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/cli" ) var ( diff --git a/internal/install/install_req.go b/internal/install/install_req.go index 6006ba7ac..83a36fd13 100644 --- a/internal/install/install_req.go +++ b/internal/install/install_req.go @@ -24,9 +24,9 @@ import ( "net/url" "strings" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/base/validator" - "github.com/answerdev/answer/pkg/checker" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/base/validator" + "github.com/apache/incubator-answer/pkg/checker" "github.com/segmentfault/pacman/errors" "xorm.io/xorm/schemas" ) diff --git a/internal/install/install_server.go b/internal/install/install_server.go index e5f9fda11..b628f2fee 100644 --- a/internal/install/install_server.go +++ b/internal/install/install_server.go @@ -25,7 +25,7 @@ import ( "io/fs" "net/http" - "github.com/answerdev/answer/ui" + "github.com/apache/incubator-answer/ui" "github.com/gin-gonic/gin" "github.com/segmentfault/pacman/log" ) diff --git a/internal/migrations/init.go b/internal/migrations/init.go index 596b0f502..f8c0babb4 100644 --- a/internal/migrations/init.go +++ b/internal/migrations/init.go @@ -23,10 +23,10 @@ import ( "context" "encoding/json" "fmt" - "github.com/answerdev/answer/internal/schema" + "github.com/apache/incubator-answer/internal/schema" "github.com/segmentfault/pacman/log" - "github.com/answerdev/answer/internal/entity" + "github.com/apache/incubator-answer/internal/entity" "golang.org/x/crypto/bcrypt" "xorm.io/xorm" ) diff --git a/internal/migrations/init_data.go b/internal/migrations/init_data.go index b8f0fa914..b39ece432 100644 --- a/internal/migrations/init_data.go +++ b/internal/migrations/init_data.go @@ -20,8 +20,8 @@ package migrations import ( - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/service/permission" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/service/permission" ) const ( diff --git a/internal/migrations/migrations.go b/internal/migrations/migrations.go index cc54d3873..e99a7030d 100644 --- a/internal/migrations/migrations.go +++ b/internal/migrations/migrations.go @@ -23,8 +23,8 @@ import ( "context" "fmt" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/entity" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/entity" "xorm.io/xorm" ) diff --git a/internal/migrations/v10.go b/internal/migrations/v10.go index a36997b91..dba8a06f7 100644 --- a/internal/migrations/v10.go +++ b/internal/migrations/v10.go @@ -24,9 +24,9 @@ import ( "encoding/json" "fmt" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" "github.com/tidwall/gjson" "xorm.io/xorm" ) diff --git a/internal/migrations/v11.go b/internal/migrations/v11.go index 5e452a593..f5e08ed24 100644 --- a/internal/migrations/v11.go +++ b/internal/migrations/v11.go @@ -23,7 +23,7 @@ import ( "context" "fmt" - "github.com/answerdev/answer/internal/entity" + "github.com/apache/incubator-answer/internal/entity" "github.com/segmentfault/pacman/log" "xorm.io/xorm" ) diff --git a/internal/migrations/v12.go b/internal/migrations/v12.go index 595760f98..172c5471e 100644 --- a/internal/migrations/v12.go +++ b/internal/migrations/v12.go @@ -24,7 +24,7 @@ import ( "fmt" "time" - "github.com/answerdev/answer/internal/entity" + "github.com/apache/incubator-answer/internal/entity" "github.com/segmentfault/pacman/log" "xorm.io/xorm" ) diff --git a/internal/migrations/v13.go b/internal/migrations/v13.go index b3a49bf1c..2c2c80a68 100644 --- a/internal/migrations/v13.go +++ b/internal/migrations/v13.go @@ -25,10 +25,10 @@ import ( "fmt" "time" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/permission" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/permission" "github.com/segmentfault/pacman/log" "xorm.io/xorm" ) diff --git a/internal/migrations/v15.go b/internal/migrations/v15.go index 0feee7de4..43878f5f1 100644 --- a/internal/migrations/v15.go +++ b/internal/migrations/v15.go @@ -21,7 +21,7 @@ package migrations import ( "context" - "github.com/answerdev/answer/internal/entity" + "github.com/apache/incubator-answer/internal/entity" "xorm.io/xorm" ) diff --git a/internal/migrations/v16.go b/internal/migrations/v16.go index f36e4ce5c..efd967b4f 100644 --- a/internal/migrations/v16.go +++ b/internal/migrations/v16.go @@ -21,8 +21,8 @@ package migrations import ( "context" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/entity" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/entity" "github.com/segmentfault/pacman/log" "xorm.io/xorm" ) diff --git a/internal/migrations/v17.go b/internal/migrations/v17.go index a1c3eccf2..37e5ce362 100644 --- a/internal/migrations/v17.go +++ b/internal/migrations/v17.go @@ -22,8 +22,8 @@ package migrations import ( "context" "fmt" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/service/permission" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/service/permission" "github.com/segmentfault/pacman/log" "xorm.io/xorm" ) diff --git a/internal/migrations/v3.go b/internal/migrations/v3.go index 5333444a6..d7313114a 100644 --- a/internal/migrations/v3.go +++ b/internal/migrations/v3.go @@ -24,7 +24,7 @@ import ( "fmt" "time" - "github.com/answerdev/answer/internal/entity" + "github.com/apache/incubator-answer/internal/entity" "github.com/segmentfault/pacman/log" "xorm.io/xorm" "xorm.io/xorm/schemas" diff --git a/internal/migrations/v4.go b/internal/migrations/v4.go index d0c893272..913dc166e 100644 --- a/internal/migrations/v4.go +++ b/internal/migrations/v4.go @@ -23,8 +23,8 @@ import ( "context" "fmt" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/service/permission" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/service/permission" "github.com/segmentfault/pacman/log" "xorm.io/xorm" ) diff --git a/internal/migrations/v5.go b/internal/migrations/v5.go index 7bee9bd7e..4924fa993 100644 --- a/internal/migrations/v5.go +++ b/internal/migrations/v5.go @@ -24,7 +24,7 @@ import ( "encoding/json" "fmt" - "github.com/answerdev/answer/internal/entity" + "github.com/apache/incubator-answer/internal/entity" "xorm.io/xorm" ) diff --git a/internal/migrations/v6.go b/internal/migrations/v6.go index e59ba5a52..367ca446f 100644 --- a/internal/migrations/v6.go +++ b/internal/migrations/v6.go @@ -24,7 +24,7 @@ import ( "encoding/json" "fmt" - "github.com/answerdev/answer/internal/entity" + "github.com/apache/incubator-answer/internal/entity" "xorm.io/xorm" ) diff --git a/internal/migrations/v7.go b/internal/migrations/v7.go index cb539b963..376e56c49 100644 --- a/internal/migrations/v7.go +++ b/internal/migrations/v7.go @@ -23,7 +23,7 @@ import ( "context" "fmt" - "github.com/answerdev/answer/internal/entity" + "github.com/apache/incubator-answer/internal/entity" "github.com/segmentfault/pacman/log" "xorm.io/xorm" ) diff --git a/internal/migrations/v8.go b/internal/migrations/v8.go index a8553acd7..829beddb1 100644 --- a/internal/migrations/v8.go +++ b/internal/migrations/v8.go @@ -24,8 +24,8 @@ import ( "fmt" "time" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/service/permission" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/service/permission" "github.com/segmentfault/pacman/log" "xorm.io/xorm" ) diff --git a/internal/migrations/v9.go b/internal/migrations/v9.go index 844985465..8c80bd01b 100644 --- a/internal/migrations/v9.go +++ b/internal/migrations/v9.go @@ -23,7 +23,7 @@ import ( "context" "fmt" - "github.com/answerdev/answer/internal/entity" + "github.com/apache/incubator-answer/internal/entity" "github.com/segmentfault/pacman/log" "xorm.io/xorm" ) diff --git a/internal/repo/activity/activity_repo.go b/internal/repo/activity/activity_repo.go index 6658a7dfa..14ffa065b 100644 --- a/internal/repo/activity/activity_repo.go +++ b/internal/repo/activity/activity_repo.go @@ -22,12 +22,12 @@ package activity import ( "context" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/service/activity" - "github.com/answerdev/answer/internal/service/activity_type" - "github.com/answerdev/answer/internal/service/config" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/service/activity" + "github.com/apache/incubator-answer/internal/service/activity_type" + "github.com/apache/incubator-answer/internal/service/config" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" ) diff --git a/internal/repo/activity/answer_repo.go b/internal/repo/activity/answer_repo.go index 219a54db1..66bcc2d07 100644 --- a/internal/repo/activity/answer_repo.go +++ b/internal/repo/activity/answer_repo.go @@ -26,16 +26,16 @@ import ( "time" "xorm.io/builder" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/activity" - "github.com/answerdev/answer/internal/service/activity_common" - "github.com/answerdev/answer/internal/service/notice_queue" - "github.com/answerdev/answer/internal/service/rank" - "github.com/answerdev/answer/pkg/converter" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/activity" + "github.com/apache/incubator-answer/internal/service/activity_common" + "github.com/apache/incubator-answer/internal/service/notice_queue" + "github.com/apache/incubator-answer/internal/service/rank" + "github.com/apache/incubator-answer/pkg/converter" "github.com/segmentfault/pacman/errors" "xorm.io/xorm" ) diff --git a/internal/repo/activity/follow_repo.go b/internal/repo/activity/follow_repo.go index 7960ffb0d..e1a015936 100644 --- a/internal/repo/activity/follow_repo.go +++ b/internal/repo/activity/follow_repo.go @@ -23,16 +23,16 @@ import ( "context" "time" - "github.com/answerdev/answer/internal/service/activity_common" - "github.com/answerdev/answer/internal/service/follow" - "github.com/answerdev/answer/pkg/obj" + "github.com/apache/incubator-answer/internal/service/activity_common" + "github.com/apache/incubator-answer/internal/service/follow" + "github.com/apache/incubator-answer/pkg/obj" "github.com/segmentfault/pacman/log" "xorm.io/builder" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/service/unique" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/service/unique" "github.com/segmentfault/pacman/errors" "xorm.io/xorm" ) diff --git a/internal/repo/activity/user_active_repo.go b/internal/repo/activity/user_active_repo.go index 4421b6035..32da886b0 100644 --- a/internal/repo/activity/user_active_repo.go +++ b/internal/repo/activity/user_active_repo.go @@ -24,13 +24,13 @@ import ( "fmt" "xorm.io/builder" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/service/activity" - "github.com/answerdev/answer/internal/service/activity_common" - "github.com/answerdev/answer/internal/service/config" - "github.com/answerdev/answer/internal/service/rank" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/service/activity" + "github.com/apache/incubator-answer/internal/service/activity_common" + "github.com/apache/incubator-answer/internal/service/config" + "github.com/apache/incubator-answer/internal/service/rank" "github.com/segmentfault/pacman/errors" "xorm.io/xorm" ) diff --git a/internal/repo/activity/vote_repo.go b/internal/repo/activity/vote_repo.go index f56cf4f3a..e7d38d3eb 100644 --- a/internal/repo/activity/vote_repo.go +++ b/internal/repo/activity/vote_repo.go @@ -25,22 +25,22 @@ import ( "github.com/segmentfault/pacman/log" "time" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/service/notice_queue" - "github.com/answerdev/answer/pkg/converter" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/service/notice_queue" + "github.com/apache/incubator-answer/pkg/converter" - "github.com/answerdev/answer/internal/base/pager" - "github.com/answerdev/answer/internal/service/rank" - "github.com/answerdev/answer/pkg/obj" + "github.com/apache/incubator-answer/internal/base/pager" + "github.com/apache/incubator-answer/internal/service/rank" + "github.com/apache/incubator-answer/pkg/obj" "xorm.io/builder" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service" - "github.com/answerdev/answer/internal/service/activity_common" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service" + "github.com/apache/incubator-answer/internal/service/activity_common" "github.com/segmentfault/pacman/errors" "xorm.io/xorm" ) diff --git a/internal/repo/activity_common/activity_repo.go b/internal/repo/activity_common/activity_repo.go index b25180211..70f49962c 100644 --- a/internal/repo/activity_common/activity_repo.go +++ b/internal/repo/activity_common/activity_repo.go @@ -24,17 +24,17 @@ import ( "fmt" "time" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/service/activity_common" - "github.com/answerdev/answer/internal/service/activity_type" - "github.com/answerdev/answer/pkg/obj" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/service/activity_common" + "github.com/apache/incubator-answer/internal/service/activity_type" + "github.com/apache/incubator-answer/pkg/obj" "xorm.io/builder" "xorm.io/xorm" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/service/config" - "github.com/answerdev/answer/internal/service/unique" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/service/config" + "github.com/apache/incubator-answer/internal/service/unique" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/repo/activity_common/follow.go b/internal/repo/activity_common/follow.go index 54787b277..294214c7b 100644 --- a/internal/repo/activity_common/follow.go +++ b/internal/repo/activity_common/follow.go @@ -22,12 +22,12 @@ package activity_common import ( "context" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/service/activity_common" - "github.com/answerdev/answer/internal/service/unique" - "github.com/answerdev/answer/pkg/obj" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/service/activity_common" + "github.com/apache/incubator-answer/internal/service/unique" + "github.com/apache/incubator-answer/pkg/obj" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" ) diff --git a/internal/repo/activity_common/vote.go b/internal/repo/activity_common/vote.go index 481e8d6cc..ecdf55a64 100644 --- a/internal/repo/activity_common/vote.go +++ b/internal/repo/activity_common/vote.go @@ -21,12 +21,12 @@ package activity_common import ( "context" - "github.com/answerdev/answer/pkg/uid" + "github.com/apache/incubator-answer/pkg/uid" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/service/activity_common" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/service/activity_common" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" ) diff --git a/internal/repo/answer/answer_repo.go b/internal/repo/answer/answer_repo.go index 00ed9f3b2..4e77b087d 100644 --- a/internal/repo/answer/answer_repo.go +++ b/internal/repo/answer/answer_repo.go @@ -21,22 +21,22 @@ package answer import ( "context" - "github.com/answerdev/answer/plugin" + "github.com/apache/incubator-answer/plugin" "github.com/segmentfault/pacman/log" "time" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/pager" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/activity_common" - answercommon "github.com/answerdev/answer/internal/service/answer_common" - "github.com/answerdev/answer/internal/service/rank" - "github.com/answerdev/answer/internal/service/unique" - "github.com/answerdev/answer/pkg/uid" + "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" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/activity_common" + answercommon "github.com/apache/incubator-answer/internal/service/answer_common" + "github.com/apache/incubator-answer/internal/service/rank" + "github.com/apache/incubator-answer/internal/service/unique" + "github.com/apache/incubator-answer/pkg/uid" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/repo/auth/auth.go b/internal/repo/auth/auth.go index 56a30f05f..90a6f415a 100644 --- a/internal/repo/auth/auth.go +++ b/internal/repo/auth/auth.go @@ -22,12 +22,12 @@ package auth import ( "context" "encoding/json" - "github.com/answerdev/answer/internal/service/auth" + "github.com/apache/incubator-answer/internal/service/auth" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" ) diff --git a/internal/repo/captcha/captcha.go b/internal/repo/captcha/captcha.go index 6e3fa4b25..02a1e57dc 100644 --- a/internal/repo/captcha/captcha.go +++ b/internal/repo/captcha/captcha.go @@ -25,10 +25,10 @@ import ( "fmt" "time" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/service/action" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/service/action" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" ) diff --git a/internal/repo/collection/collection_group_repo.go b/internal/repo/collection/collection_group_repo.go index 93048c4a7..d0d6c8043 100644 --- a/internal/repo/collection/collection_group_repo.go +++ b/internal/repo/collection/collection_group_repo.go @@ -22,12 +22,12 @@ package collection import ( "context" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/pager" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/pager" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/repo/collection/collection_repo.go b/internal/repo/collection/collection_repo.go index 6a6a3a48d..ea0754979 100644 --- a/internal/repo/collection/collection_repo.go +++ b/internal/repo/collection/collection_repo.go @@ -21,15 +21,15 @@ package collection import ( "context" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/pager" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - collectioncommon "github.com/answerdev/answer/internal/service/collection_common" - "github.com/answerdev/answer/internal/service/unique" - "github.com/answerdev/answer/pkg/uid" + "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" + collectioncommon "github.com/apache/incubator-answer/internal/service/collection_common" + "github.com/apache/incubator-answer/internal/service/unique" + "github.com/apache/incubator-answer/pkg/uid" "github.com/segmentfault/pacman/errors" "xorm.io/xorm" ) diff --git a/internal/repo/comment/comment_repo.go b/internal/repo/comment/comment_repo.go index 3ce6a0852..c8a135cfa 100644 --- a/internal/repo/comment/comment_repo.go +++ b/internal/repo/comment/comment_repo.go @@ -23,13 +23,13 @@ import ( "context" "github.com/segmentfault/pacman/log" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/pager" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/service/comment" - "github.com/answerdev/answer/internal/service/comment_common" - "github.com/answerdev/answer/internal/service/unique" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/pager" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/service/comment" + "github.com/apache/incubator-answer/internal/service/comment_common" + "github.com/apache/incubator-answer/internal/service/unique" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/repo/config/config_repo.go b/internal/repo/config/config_repo.go index c11e3d403..cbaf7aec9 100644 --- a/internal/repo/config/config_repo.go +++ b/internal/repo/config/config_repo.go @@ -23,11 +23,11 @@ import ( "context" "fmt" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/service/config" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/service/config" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" ) diff --git a/internal/repo/export/email_repo.go b/internal/repo/export/email_repo.go index 444a65acd..9552c4ac6 100644 --- a/internal/repo/export/email_repo.go +++ b/internal/repo/export/email_repo.go @@ -23,9 +23,9 @@ import ( "context" "time" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/service/export" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/service/export" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/repo/limit/limit.go b/internal/repo/limit/limit.go index b532be9aa..cf3140569 100644 --- a/internal/repo/limit/limit.go +++ b/internal/repo/limit/limit.go @@ -22,9 +22,9 @@ package limit import ( "context" "fmt" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/reason" "github.com/segmentfault/pacman/errors" "time" ) diff --git a/internal/repo/meta/meta_repo.go b/internal/repo/meta/meta_repo.go index c23a9ade3..bbf3e4223 100644 --- a/internal/repo/meta/meta_repo.go +++ b/internal/repo/meta/meta_repo.go @@ -22,10 +22,10 @@ package meta import ( "context" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/service/meta" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/service/meta" "github.com/segmentfault/pacman/errors" "xorm.io/builder" ) diff --git a/internal/repo/notification/notification_repo.go b/internal/repo/notification/notification_repo.go index 66f3dbe8c..6b4f0040d 100644 --- a/internal/repo/notification/notification_repo.go +++ b/internal/repo/notification/notification_repo.go @@ -23,13 +23,13 @@ import ( "context" "time" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/pager" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - notficationcommon "github.com/answerdev/answer/internal/service/notification_common" - "github.com/answerdev/answer/pkg/uid" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/pager" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + notficationcommon "github.com/apache/incubator-answer/internal/service/notification_common" + "github.com/apache/incubator-answer/pkg/uid" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/repo/plugin_config/plugin_config_repo.go b/internal/repo/plugin_config/plugin_config_repo.go index b88fd2eac..ddcd3ed22 100644 --- a/internal/repo/plugin_config/plugin_config_repo.go +++ b/internal/repo/plugin_config/plugin_config_repo.go @@ -22,10 +22,10 @@ package plugin_config import ( "context" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/service/plugin_common" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/service/plugin_common" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/repo/provider.go b/internal/repo/provider.go index 79279503c..0814487e3 100644 --- a/internal/repo/provider.go +++ b/internal/repo/provider.go @@ -20,34 +20,34 @@ package repo import ( - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/repo/activity" - "github.com/answerdev/answer/internal/repo/activity_common" - "github.com/answerdev/answer/internal/repo/answer" - "github.com/answerdev/answer/internal/repo/auth" - "github.com/answerdev/answer/internal/repo/captcha" - "github.com/answerdev/answer/internal/repo/collection" - "github.com/answerdev/answer/internal/repo/comment" - "github.com/answerdev/answer/internal/repo/config" - "github.com/answerdev/answer/internal/repo/export" - "github.com/answerdev/answer/internal/repo/limit" - "github.com/answerdev/answer/internal/repo/meta" - "github.com/answerdev/answer/internal/repo/notification" - "github.com/answerdev/answer/internal/repo/plugin_config" - "github.com/answerdev/answer/internal/repo/question" - "github.com/answerdev/answer/internal/repo/rank" - "github.com/answerdev/answer/internal/repo/reason" - "github.com/answerdev/answer/internal/repo/report" - "github.com/answerdev/answer/internal/repo/revision" - "github.com/answerdev/answer/internal/repo/role" - "github.com/answerdev/answer/internal/repo/search_common" - "github.com/answerdev/answer/internal/repo/site_info" - "github.com/answerdev/answer/internal/repo/tag" - "github.com/answerdev/answer/internal/repo/tag_common" - "github.com/answerdev/answer/internal/repo/unique" - "github.com/answerdev/answer/internal/repo/user" - "github.com/answerdev/answer/internal/repo/user_external_login" - "github.com/answerdev/answer/internal/repo/user_notification_config" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/repo/activity" + "github.com/apache/incubator-answer/internal/repo/activity_common" + "github.com/apache/incubator-answer/internal/repo/answer" + "github.com/apache/incubator-answer/internal/repo/auth" + "github.com/apache/incubator-answer/internal/repo/captcha" + "github.com/apache/incubator-answer/internal/repo/collection" + "github.com/apache/incubator-answer/internal/repo/comment" + "github.com/apache/incubator-answer/internal/repo/config" + "github.com/apache/incubator-answer/internal/repo/export" + "github.com/apache/incubator-answer/internal/repo/limit" + "github.com/apache/incubator-answer/internal/repo/meta" + "github.com/apache/incubator-answer/internal/repo/notification" + "github.com/apache/incubator-answer/internal/repo/plugin_config" + "github.com/apache/incubator-answer/internal/repo/question" + "github.com/apache/incubator-answer/internal/repo/rank" + "github.com/apache/incubator-answer/internal/repo/reason" + "github.com/apache/incubator-answer/internal/repo/report" + "github.com/apache/incubator-answer/internal/repo/revision" + "github.com/apache/incubator-answer/internal/repo/role" + "github.com/apache/incubator-answer/internal/repo/search_common" + "github.com/apache/incubator-answer/internal/repo/site_info" + "github.com/apache/incubator-answer/internal/repo/tag" + "github.com/apache/incubator-answer/internal/repo/tag_common" + "github.com/apache/incubator-answer/internal/repo/unique" + "github.com/apache/incubator-answer/internal/repo/user" + "github.com/apache/incubator-answer/internal/repo/user_external_login" + "github.com/apache/incubator-answer/internal/repo/user_notification_config" "github.com/google/wire" ) diff --git a/internal/repo/question/question_repo.go b/internal/repo/question/question_repo.go index 2661984a8..9288fce86 100644 --- a/internal/repo/question/question_repo.go +++ b/internal/repo/question/question_repo.go @@ -23,25 +23,25 @@ import ( "context" "encoding/json" "fmt" - "github.com/answerdev/answer/plugin" + "github.com/apache/incubator-answer/plugin" "github.com/segmentfault/pacman/log" "strings" "time" "unicode" - "github.com/answerdev/answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/handler" "xorm.io/builder" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/pager" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - questioncommon "github.com/answerdev/answer/internal/service/question_common" - "github.com/answerdev/answer/internal/service/unique" - "github.com/answerdev/answer/pkg/htmltext" - "github.com/answerdev/answer/pkg/uid" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/pager" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + questioncommon "github.com/apache/incubator-answer/internal/service/question_common" + "github.com/apache/incubator-answer/internal/service/unique" + "github.com/apache/incubator-answer/pkg/htmltext" + "github.com/apache/incubator-answer/pkg/uid" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/repo/rank/user_rank_repo.go b/internal/repo/rank/user_rank_repo.go index 7c3dd4b7e..f99b71f95 100644 --- a/internal/repo/rank/user_rank_repo.go +++ b/internal/repo/rank/user_rank_repo.go @@ -22,13 +22,13 @@ package rank import ( "context" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/pager" - "github.com/answerdev/answer/internal/base/reason" - "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/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/pager" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/service/config" + "github.com/apache/incubator-answer/internal/service/rank" + "github.com/apache/incubator-answer/plugin" "github.com/jinzhu/now" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" diff --git a/internal/repo/reason/reason_repo.go b/internal/repo/reason/reason_repo.go index 048d991c7..94df2214e 100644 --- a/internal/repo/reason/reason_repo.go +++ b/internal/repo/reason/reason_repo.go @@ -24,10 +24,10 @@ import ( "encoding/json" "fmt" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/config" - "github.com/answerdev/answer/internal/service/reason_common" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/config" + "github.com/apache/incubator-answer/internal/service/reason_common" "github.com/segmentfault/pacman/log" ) diff --git a/internal/repo/repo_test/auth_test.go b/internal/repo/repo_test/auth_test.go index 917cba177..effe1f8cc 100644 --- a/internal/repo/repo_test/auth_test.go +++ b/internal/repo/repo_test/auth_test.go @@ -23,8 +23,8 @@ import ( "context" "testing" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/repo/auth" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/repo/auth" "github.com/stretchr/testify/assert" ) diff --git a/internal/repo/repo_test/captcha_test.go b/internal/repo/repo_test/captcha_test.go index 619ca396c..0209f9af1 100644 --- a/internal/repo/repo_test/captcha_test.go +++ b/internal/repo/repo_test/captcha_test.go @@ -23,7 +23,7 @@ import ( "context" "testing" - "github.com/answerdev/answer/internal/repo/captcha" + "github.com/apache/incubator-answer/internal/repo/captcha" "github.com/stretchr/testify/assert" ) diff --git a/internal/repo/repo_test/comment_repo_test.go b/internal/repo/repo_test/comment_repo_test.go index cf856dff6..669a8e236 100644 --- a/internal/repo/repo_test/comment_repo_test.go +++ b/internal/repo/repo_test/comment_repo_test.go @@ -23,11 +23,11 @@ import ( "context" "testing" - "github.com/answerdev/answer/internal/base/pager" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/repo/comment" - "github.com/answerdev/answer/internal/repo/unique" - commentService "github.com/answerdev/answer/internal/service/comment" + "github.com/apache/incubator-answer/internal/base/pager" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/repo/comment" + "github.com/apache/incubator-answer/internal/repo/unique" + commentService "github.com/apache/incubator-answer/internal/service/comment" "github.com/stretchr/testify/assert" ) diff --git a/internal/repo/repo_test/email_repo_test.go b/internal/repo/repo_test/email_repo_test.go index a20937da3..f9f433723 100644 --- a/internal/repo/repo_test/email_repo_test.go +++ b/internal/repo/repo_test/email_repo_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/answerdev/answer/internal/repo/export" + "github.com/apache/incubator-answer/internal/repo/export" "github.com/stretchr/testify/assert" ) diff --git a/internal/repo/repo_test/meta_repo_test.go b/internal/repo/repo_test/meta_repo_test.go index d51b7f364..fefd88031 100644 --- a/internal/repo/repo_test/meta_repo_test.go +++ b/internal/repo/repo_test/meta_repo_test.go @@ -23,8 +23,8 @@ import ( "context" "testing" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/repo/meta" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/repo/meta" "github.com/stretchr/testify/assert" ) diff --git a/internal/repo/repo_test/notification_repo_test.go b/internal/repo/repo_test/notification_repo_test.go index 85d58c393..f93daf319 100644 --- a/internal/repo/repo_test/notification_repo_test.go +++ b/internal/repo/repo_test/notification_repo_test.go @@ -23,9 +23,9 @@ import ( "context" "testing" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/repo/notification" - "github.com/answerdev/answer/internal/schema" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/repo/notification" + "github.com/apache/incubator-answer/internal/schema" "github.com/stretchr/testify/assert" ) diff --git a/internal/repo/repo_test/reason_repo_test.go b/internal/repo/repo_test/reason_repo_test.go index 96b20325b..7848b2e48 100644 --- a/internal/repo/repo_test/reason_repo_test.go +++ b/internal/repo/repo_test/reason_repo_test.go @@ -23,10 +23,10 @@ import ( "context" "testing" - "github.com/answerdev/answer/internal/repo/config" - serviceconfig "github.com/answerdev/answer/internal/service/config" + "github.com/apache/incubator-answer/internal/repo/config" + serviceconfig "github.com/apache/incubator-answer/internal/service/config" - "github.com/answerdev/answer/internal/repo/reason" + "github.com/apache/incubator-answer/internal/repo/reason" "github.com/stretchr/testify/assert" ) diff --git a/internal/repo/repo_test/repo_main_test.go b/internal/repo/repo_test/repo_main_test.go index 57f38104e..653802069 100644 --- a/internal/repo/repo_test/repo_main_test.go +++ b/internal/repo/repo_test/repo_main_test.go @@ -27,8 +27,8 @@ import ( "testing" "time" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/migrations" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/migrations" "github.com/ory/dockertest/v3" "github.com/ory/dockertest/v3/docker" "github.com/segmentfault/pacman/cache" diff --git a/internal/repo/repo_test/revision_repo_test.go b/internal/repo/repo_test/revision_repo_test.go index 5a1b32c2a..649869c6c 100644 --- a/internal/repo/repo_test/revision_repo_test.go +++ b/internal/repo/repo_test/revision_repo_test.go @@ -24,10 +24,10 @@ import ( "encoding/json" "testing" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/repo/question" - "github.com/answerdev/answer/internal/repo/revision" - "github.com/answerdev/answer/internal/repo/unique" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/repo/question" + "github.com/apache/incubator-answer/internal/repo/revision" + "github.com/apache/incubator-answer/internal/repo/unique" "github.com/stretchr/testify/assert" ) diff --git a/internal/repo/repo_test/siteinfo_repo_test.go b/internal/repo/repo_test/siteinfo_repo_test.go index 6139cf737..27b4bb9c6 100644 --- a/internal/repo/repo_test/siteinfo_repo_test.go +++ b/internal/repo/repo_test/siteinfo_repo_test.go @@ -23,8 +23,8 @@ import ( "context" "testing" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/repo/site_info" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/repo/site_info" "github.com/stretchr/testify/assert" ) diff --git a/internal/repo/repo_test/tag_rel_repo_test.go b/internal/repo/repo_test/tag_rel_repo_test.go index 665aad654..edcd45e97 100644 --- a/internal/repo/repo_test/tag_rel_repo_test.go +++ b/internal/repo/repo_test/tag_rel_repo_test.go @@ -25,10 +25,10 @@ import ( "sync" "testing" - "github.com/answerdev/answer/internal/repo/unique" + "github.com/apache/incubator-answer/internal/repo/unique" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/repo/tag" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/repo/tag" "github.com/stretchr/testify/assert" ) diff --git a/internal/repo/repo_test/tag_repo_test.go b/internal/repo/repo_test/tag_repo_test.go index dde29ea28..0c00782f8 100644 --- a/internal/repo/repo_test/tag_repo_test.go +++ b/internal/repo/repo_test/tag_repo_test.go @@ -26,11 +26,11 @@ import ( "sync" "testing" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/repo/tag" - "github.com/answerdev/answer/internal/repo/tag_common" - "github.com/answerdev/answer/internal/repo/unique" - "github.com/answerdev/answer/pkg/converter" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/repo/tag" + "github.com/apache/incubator-answer/internal/repo/tag_common" + "github.com/apache/incubator-answer/internal/repo/unique" + "github.com/apache/incubator-answer/pkg/converter" "github.com/stretchr/testify/assert" ) diff --git a/internal/repo/repo_test/user_backyard_repo_test.go b/internal/repo/repo_test/user_backyard_repo_test.go index e5b039dfc..cb2c01e4e 100644 --- a/internal/repo/repo_test/user_backyard_repo_test.go +++ b/internal/repo/repo_test/user_backyard_repo_test.go @@ -23,9 +23,9 @@ import ( "context" "testing" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/repo/auth" - "github.com/answerdev/answer/internal/repo/user" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/repo/auth" + "github.com/apache/incubator-answer/internal/repo/user" "github.com/stretchr/testify/assert" ) diff --git a/internal/repo/repo_test/user_repo_test.go b/internal/repo/repo_test/user_repo_test.go index 31aeb2520..09176b761 100644 --- a/internal/repo/repo_test/user_repo_test.go +++ b/internal/repo/repo_test/user_repo_test.go @@ -23,8 +23,8 @@ import ( "context" "testing" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/repo/user" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/repo/user" "github.com/stretchr/testify/assert" ) diff --git a/internal/repo/report/report_repo.go b/internal/repo/report/report_repo.go index 25d1c5d98..0120f31cc 100644 --- a/internal/repo/report/report_repo.go +++ b/internal/repo/report/report_repo.go @@ -22,15 +22,15 @@ package report import ( "context" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/pager" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/report_common" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/pager" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/report_common" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/service/unique" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/service/unique" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/repo/revision/revision_repo.go b/internal/repo/revision/revision_repo.go index 4a80873e4..958e6d7ed 100644 --- a/internal/repo/revision/revision_repo.go +++ b/internal/repo/revision/revision_repo.go @@ -22,15 +22,15 @@ package revision import ( "context" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/pager" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/service/revision" - "github.com/answerdev/answer/internal/service/unique" - "github.com/answerdev/answer/pkg/converter" - "github.com/answerdev/answer/pkg/obj" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/pager" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/service/revision" + "github.com/apache/incubator-answer/internal/service/unique" + "github.com/apache/incubator-answer/pkg/converter" + "github.com/apache/incubator-answer/pkg/obj" "github.com/segmentfault/pacman/errors" "xorm.io/builder" "xorm.io/xorm" diff --git a/internal/repo/role/power_repo.go b/internal/repo/role/power_repo.go index 6faab2755..89b331467 100644 --- a/internal/repo/role/power_repo.go +++ b/internal/repo/role/power_repo.go @@ -22,10 +22,10 @@ package role import ( "context" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/service/role" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/service/role" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/repo/role/role_power_rel_repo.go b/internal/repo/role/role_power_rel_repo.go index 3eacb7e0b..ccb9e7445 100644 --- a/internal/repo/role/role_power_rel_repo.go +++ b/internal/repo/role/role_power_rel_repo.go @@ -22,9 +22,9 @@ package role import ( "context" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/service/role" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/service/role" "github.com/segmentfault/pacman/errors" "xorm.io/builder" ) diff --git a/internal/repo/role/role_repo.go b/internal/repo/role/role_repo.go index 70bb465d8..1a8bddbc4 100644 --- a/internal/repo/role/role_repo.go +++ b/internal/repo/role/role_repo.go @@ -22,10 +22,10 @@ package role import ( "context" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - service "github.com/answerdev/answer/internal/service/role" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + service "github.com/apache/incubator-answer/internal/service/role" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/repo/role/user_role_rel_repo.go b/internal/repo/role/user_role_rel_repo.go index 20bd89f2e..001745fea 100644 --- a/internal/repo/role/user_role_rel_repo.go +++ b/internal/repo/role/user_role_rel_repo.go @@ -22,10 +22,10 @@ package role import ( "context" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/service/role" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/service/role" "github.com/segmentfault/pacman/errors" "xorm.io/builder" "xorm.io/xorm" diff --git a/internal/repo/search_common/search_repo.go b/internal/repo/search_common/search_repo.go index b6769e4f6..51495a466 100644 --- a/internal/repo/search_common/search_repo.go +++ b/internal/repo/search_common/search_repo.go @@ -22,23 +22,23 @@ package search_common import ( "context" "fmt" - tagcommon "github.com/answerdev/answer/internal/service/tag_common" - "github.com/answerdev/answer/plugin" + tagcommon "github.com/apache/incubator-answer/internal/service/tag_common" + "github.com/apache/incubator-answer/plugin" "strconv" "strings" "time" - "github.com/answerdev/answer/pkg/htmltext" - - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/search_common" - "github.com/answerdev/answer/internal/service/unique" - usercommon "github.com/answerdev/answer/internal/service/user_common" - "github.com/answerdev/answer/pkg/converter" - "github.com/answerdev/answer/pkg/obj" + "github.com/apache/incubator-answer/pkg/htmltext" + + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/search_common" + "github.com/apache/incubator-answer/internal/service/unique" + usercommon "github.com/apache/incubator-answer/internal/service/user_common" + "github.com/apache/incubator-answer/pkg/converter" + "github.com/apache/incubator-answer/pkg/obj" "github.com/segmentfault/pacman/errors" "xorm.io/builder" ) diff --git a/internal/repo/search_sync/search_sync.go b/internal/repo/search_sync/search_sync.go index 629d98cf4..d54c7c2f7 100644 --- a/internal/repo/search_sync/search_sync.go +++ b/internal/repo/search_sync/search_sync.go @@ -21,12 +21,12 @@ package search_sync import ( "context" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/pkg/uid" - "github.com/answerdev/answer/plugin" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/pkg/uid" + "github.com/apache/incubator-answer/plugin" "github.com/segmentfault/pacman/log" ) diff --git a/internal/repo/site_info/siteinfo_repo.go b/internal/repo/site_info/siteinfo_repo.go index 939662d3a..8d81a3ffe 100644 --- a/internal/repo/site_info/siteinfo_repo.go +++ b/internal/repo/site_info/siteinfo_repo.go @@ -23,11 +23,11 @@ import ( "context" "encoding/json" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/service/siteinfo_common" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/service/siteinfo_common" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" "xorm.io/builder" diff --git a/internal/repo/tag/tag_rel_repo.go b/internal/repo/tag/tag_rel_repo.go index 053d7d9d9..70187f544 100644 --- a/internal/repo/tag/tag_rel_repo.go +++ b/internal/repo/tag/tag_rel_repo.go @@ -21,13 +21,13 @@ package tag import ( "context" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - tagcommon "github.com/answerdev/answer/internal/service/tag_common" - "github.com/answerdev/answer/internal/service/unique" - "github.com/answerdev/answer/pkg/uid" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + tagcommon "github.com/apache/incubator-answer/internal/service/tag_common" + "github.com/apache/incubator-answer/internal/service/unique" + "github.com/apache/incubator-answer/pkg/uid" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/repo/tag/tag_repo.go b/internal/repo/tag/tag_repo.go index 7753ab10d..c56e7d58e 100644 --- a/internal/repo/tag/tag_repo.go +++ b/internal/repo/tag/tag_repo.go @@ -21,12 +21,12 @@ package tag import ( "context" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/service/tag_common" - "github.com/answerdev/answer/internal/service/unique" - "github.com/answerdev/answer/pkg/converter" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/service/tag_common" + "github.com/apache/incubator-answer/internal/service/unique" + "github.com/apache/incubator-answer/pkg/converter" "github.com/segmentfault/pacman/errors" "xorm.io/builder" ) diff --git a/internal/repo/tag_common/tag_common_repo.go b/internal/repo/tag_common/tag_common_repo.go index 647d758f5..a4771d16d 100644 --- a/internal/repo/tag_common/tag_common_repo.go +++ b/internal/repo/tag_common/tag_common_repo.go @@ -24,12 +24,12 @@ import ( "fmt" "strings" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/pager" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - tagcommon "github.com/answerdev/answer/internal/service/tag_common" - "github.com/answerdev/answer/internal/service/unique" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/pager" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + tagcommon "github.com/apache/incubator-answer/internal/service/tag_common" + "github.com/apache/incubator-answer/internal/service/unique" "github.com/segmentfault/pacman/errors" "xorm.io/builder" ) diff --git a/internal/repo/unique/uniqid_repo.go b/internal/repo/unique/uniqid_repo.go index ede8978ec..27dcea19e 100644 --- a/internal/repo/unique/uniqid_repo.go +++ b/internal/repo/unique/uniqid_repo.go @@ -23,11 +23,11 @@ import ( "context" "fmt" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/service/unique" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/service/unique" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/repo/user/user_backyard_repo.go b/internal/repo/user/user_backyard_repo.go index 76a561355..44a05cfbf 100644 --- a/internal/repo/user/user_backyard_repo.go +++ b/internal/repo/user/user_backyard_repo.go @@ -26,12 +26,12 @@ import ( "xorm.io/builder" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/pager" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/service/auth" - "github.com/answerdev/answer/internal/service/user_admin" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/pager" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/service/auth" + "github.com/apache/incubator-answer/internal/service/user_admin" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" ) diff --git a/internal/repo/user/user_repo.go b/internal/repo/user/user_repo.go index 32e05ba0c..2b21e265e 100644 --- a/internal/repo/user/user_repo.go +++ b/internal/repo/user/user_repo.go @@ -24,13 +24,13 @@ import ( "strings" "time" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - usercommon "github.com/answerdev/answer/internal/service/user_common" - "github.com/answerdev/answer/pkg/converter" - "github.com/answerdev/answer/plugin" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + usercommon "github.com/apache/incubator-answer/internal/service/user_common" + "github.com/apache/incubator-answer/pkg/converter" + "github.com/apache/incubator-answer/plugin" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" "xorm.io/xorm" diff --git a/internal/repo/user_external_login/user_external_login_repo.go b/internal/repo/user_external_login/user_external_login_repo.go index 51506697a..ba0495437 100644 --- a/internal/repo/user_external_login/user_external_login_repo.go +++ b/internal/repo/user_external_login/user_external_login_repo.go @@ -23,12 +23,12 @@ import ( "context" "encoding/json" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/user_external_login" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/user_external_login" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/repo/user_notification_config/user_notification_config_repo.go b/internal/repo/user_notification_config/user_notification_config_repo.go index f38f15cfc..6785b6794 100644 --- a/internal/repo/user_notification_config/user_notification_config_repo.go +++ b/internal/repo/user_notification_config/user_notification_config_repo.go @@ -21,11 +21,11 @@ package user_notification_config import ( "context" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/service/user_notification_config" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/service/user_notification_config" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/router/answer_api_router.go b/internal/router/answer_api_router.go index 861d1b6ea..32650e4a4 100644 --- a/internal/router/answer_api_router.go +++ b/internal/router/answer_api_router.go @@ -20,9 +20,9 @@ package router import ( - "github.com/answerdev/answer/internal/base/middleware" - "github.com/answerdev/answer/internal/controller" - "github.com/answerdev/answer/internal/controller_admin" + "github.com/apache/incubator-answer/internal/base/middleware" + "github.com/apache/incubator-answer/internal/controller" + "github.com/apache/incubator-answer/internal/controller_admin" "github.com/gin-gonic/gin" ) diff --git a/internal/router/plugin_api_router.go b/internal/router/plugin_api_router.go index 5d4762a4b..8554b4c7c 100644 --- a/internal/router/plugin_api_router.go +++ b/internal/router/plugin_api_router.go @@ -20,7 +20,7 @@ package router import ( - "github.com/answerdev/answer/internal/controller" + "github.com/apache/incubator-answer/internal/controller" "github.com/gin-gonic/gin" ) diff --git a/internal/router/static_router.go b/internal/router/static_router.go index ce13490ab..5b0874313 100644 --- a/internal/router/static_router.go +++ b/internal/router/static_router.go @@ -20,7 +20,7 @@ package router import ( - "github.com/answerdev/answer/internal/service/service_config" + "github.com/apache/incubator-answer/internal/service/service_config" "github.com/gin-gonic/gin" ) diff --git a/internal/router/swagger_router.go b/internal/router/swagger_router.go index 3917ff941..795e88025 100644 --- a/internal/router/swagger_router.go +++ b/internal/router/swagger_router.go @@ -22,7 +22,7 @@ package router import ( "fmt" - "github.com/answerdev/answer/docs" + "github.com/apache/incubator-answer/docs" "github.com/gin-gonic/gin" swaggerfiles "github.com/swaggo/files" ginSwagger "github.com/swaggo/gin-swagger" diff --git a/internal/router/template_router.go b/internal/router/template_router.go index afa4bf58c..c8bf4b226 100644 --- a/internal/router/template_router.go +++ b/internal/router/template_router.go @@ -20,10 +20,10 @@ package router import ( - "github.com/answerdev/answer/internal/base/middleware" - "github.com/answerdev/answer/internal/controller" - templaterender "github.com/answerdev/answer/internal/controller/template_render" - "github.com/answerdev/answer/internal/controller_admin" + "github.com/apache/incubator-answer/internal/base/middleware" + "github.com/apache/incubator-answer/internal/controller" + templaterender "github.com/apache/incubator-answer/internal/controller/template_render" + "github.com/apache/incubator-answer/internal/controller_admin" "github.com/gin-gonic/gin" ) diff --git a/internal/router/ui.go b/internal/router/ui.go index 2642c1f95..608945001 100644 --- a/internal/router/ui.go +++ b/internal/router/ui.go @@ -26,10 +26,10 @@ import ( "net/http" "os" - "github.com/answerdev/answer/internal/controller" - "github.com/answerdev/answer/internal/service/siteinfo_common" - "github.com/answerdev/answer/pkg/htmltext" - "github.com/answerdev/answer/ui" + "github.com/apache/incubator-answer/internal/controller" + "github.com/apache/incubator-answer/internal/service/siteinfo_common" + "github.com/apache/incubator-answer/pkg/htmltext" + "github.com/apache/incubator-answer/ui" "github.com/gin-gonic/gin" "github.com/segmentfault/pacman/log" ) diff --git a/internal/schema/activity.go b/internal/schema/activity.go index a961862c9..66a6b1881 100644 --- a/internal/schema/activity.go +++ b/internal/schema/activity.go @@ -19,7 +19,7 @@ package schema -import "github.com/answerdev/answer/internal/base/constant" +import "github.com/apache/incubator-answer/internal/base/constant" // ActivityMsg activity message type ActivityMsg struct { diff --git a/internal/schema/answer_schema.go b/internal/schema/answer_schema.go index ce79b48ab..dde1cb1d7 100644 --- a/internal/schema/answer_schema.go +++ b/internal/schema/answer_schema.go @@ -20,8 +20,8 @@ package schema import ( - "github.com/answerdev/answer/internal/base/validator" - "github.com/answerdev/answer/pkg/converter" + "github.com/apache/incubator-answer/internal/base/validator" + "github.com/apache/incubator-answer/pkg/converter" ) // RemoveAnswerReq delete answer request diff --git a/internal/schema/backyard_user_schema.go b/internal/schema/backyard_user_schema.go index 61c1b64f5..f9c1c1f6f 100644 --- a/internal/schema/backyard_user_schema.go +++ b/internal/schema/backyard_user_schema.go @@ -21,11 +21,11 @@ package schema import ( "context" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/base/translator" - "github.com/answerdev/answer/internal/base/validator" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/base/validator" "github.com/segmentfault/pacman/errors" "strings" ) diff --git a/internal/schema/comment_schema.go b/internal/schema/comment_schema.go index ebb3b8aad..0030b819b 100644 --- a/internal/schema/comment_schema.go +++ b/internal/schema/comment_schema.go @@ -20,9 +20,9 @@ package schema import ( - "github.com/answerdev/answer/internal/base/validator" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/pkg/converter" + "github.com/apache/incubator-answer/internal/base/validator" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/pkg/converter" "github.com/jinzhu/copier" ) diff --git a/internal/schema/email_template.go b/internal/schema/email_template.go index f67c5b1e6..9a6be794f 100644 --- a/internal/schema/email_template.go +++ b/internal/schema/email_template.go @@ -21,7 +21,7 @@ package schema import ( "encoding/json" - "github.com/answerdev/answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/constant" ) const ( diff --git a/internal/schema/new_question_queue_schema.go b/internal/schema/new_question_queue_schema.go index d2c64f2a6..d634d5ad1 100644 --- a/internal/schema/new_question_queue_schema.go +++ b/internal/schema/new_question_queue_schema.go @@ -20,8 +20,8 @@ package schema import ( - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/pkg/uid" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/pkg/uid" ) type ExternalNotificationMsg struct { diff --git a/internal/schema/permission.go b/internal/schema/permission.go index 821eb1f12..6ad7b91f3 100644 --- a/internal/schema/permission.go +++ b/internal/schema/permission.go @@ -22,9 +22,9 @@ package schema import ( "strings" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/base/translator" - "github.com/answerdev/answer/internal/base/validator" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/base/validator" "github.com/segmentfault/pacman/i18n" ) diff --git a/internal/schema/plugin_admin_schema.go b/internal/schema/plugin_admin_schema.go index 3b2dbc2e8..76d1e9d00 100644 --- a/internal/schema/plugin_admin_schema.go +++ b/internal/schema/plugin_admin_schema.go @@ -20,7 +20,7 @@ package schema import ( - "github.com/answerdev/answer/plugin" + "github.com/apache/incubator-answer/plugin" "github.com/gin-gonic/gin" ) diff --git a/internal/schema/question_schema.go b/internal/schema/question_schema.go index 83433834d..3d0640238 100644 --- a/internal/schema/question_schema.go +++ b/internal/schema/question_schema.go @@ -23,10 +23,10 @@ import ( "strings" "time" - "github.com/answerdev/answer/internal/base/validator" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/pkg/converter" - "github.com/answerdev/answer/pkg/uid" + "github.com/apache/incubator-answer/internal/base/validator" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/pkg/converter" + "github.com/apache/incubator-answer/pkg/uid" ) const ( diff --git a/internal/schema/reason_schema.go b/internal/schema/reason_schema.go index 47c33e6a1..82d627438 100644 --- a/internal/schema/reason_schema.go +++ b/internal/schema/reason_schema.go @@ -20,7 +20,7 @@ package schema import ( - "github.com/answerdev/answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/base/translator" "github.com/segmentfault/pacman/i18n" ) diff --git a/internal/schema/report_schema.go b/internal/schema/report_schema.go index 6d42ff648..e853259cf 100644 --- a/internal/schema/report_schema.go +++ b/internal/schema/report_schema.go @@ -22,7 +22,7 @@ package schema import ( "time" - "github.com/answerdev/answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/constant" ) // AddReportReq add report request diff --git a/internal/schema/revision_schema.go b/internal/schema/revision_schema.go index 03ff681e8..d52c1c4ad 100644 --- a/internal/schema/revision_schema.go +++ b/internal/schema/revision_schema.go @@ -22,7 +22,7 @@ package schema import ( "time" - "github.com/answerdev/answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/constant" ) // AddRevisionDTO add revision request diff --git a/internal/schema/search_schema.go b/internal/schema/search_schema.go index d5a3ec01f..398fad1e8 100644 --- a/internal/schema/search_schema.go +++ b/internal/schema/search_schema.go @@ -20,9 +20,9 @@ package schema import ( - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/validator" - "github.com/answerdev/answer/plugin" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/validator" + "github.com/apache/incubator-answer/plugin" "regexp" "strings" ) diff --git a/internal/schema/siteinfo_schema.go b/internal/schema/siteinfo_schema.go index ee65c33b1..bcbe76896 100644 --- a/internal/schema/siteinfo_schema.go +++ b/internal/schema/siteinfo_schema.go @@ -25,11 +25,11 @@ import ( "net/mail" "net/url" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/base/translator" - "github.com/answerdev/answer/internal/base/validator" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/base/validator" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/schema/tag_schema.go b/internal/schema/tag_schema.go index 290fd4a4e..d283ba733 100644 --- a/internal/schema/tag_schema.go +++ b/internal/schema/tag_schema.go @@ -22,8 +22,8 @@ package schema import ( "strings" - "github.com/answerdev/answer/internal/base/validator" - "github.com/answerdev/answer/pkg/converter" + "github.com/apache/incubator-answer/internal/base/validator" + "github.com/apache/incubator-answer/pkg/converter" ) // SearchTagLikeReq get tag list all request diff --git a/internal/schema/user_notification_schema.go b/internal/schema/user_notification_schema.go index 61530dce2..c25062866 100644 --- a/internal/schema/user_notification_schema.go +++ b/internal/schema/user_notification_schema.go @@ -21,8 +21,8 @@ package schema import ( "encoding/json" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/entity" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/entity" ) type NotificationChannelConfig struct { diff --git a/internal/schema/user_schema.go b/internal/schema/user_schema.go index a9680682f..4906faffa 100644 --- a/internal/schema/user_schema.go +++ b/internal/schema/user_schema.go @@ -22,11 +22,11 @@ package schema import ( "encoding/json" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/validator" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/pkg/checker" - "github.com/answerdev/answer/pkg/converter" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/validator" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/pkg/checker" + "github.com/apache/incubator-answer/pkg/converter" "github.com/jinzhu/copier" ) diff --git a/internal/service/action/captcha_service.go b/internal/service/action/captcha_service.go index 636fecd10..7619b9838 100644 --- a/internal/service/action/captcha_service.go +++ b/internal/service/action/captcha_service.go @@ -24,9 +24,9 @@ import ( "image/color" "strings" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" "github.com/mojocn/base64Captcha" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" diff --git a/internal/service/action/captcha_strategy.go b/internal/service/action/captcha_strategy.go index 88715af8d..b4830d1bb 100644 --- a/internal/service/action/captcha_strategy.go +++ b/internal/service/action/captcha_strategy.go @@ -24,7 +24,7 @@ import ( "github.com/segmentfault/pacman/log" "time" - "github.com/answerdev/answer/internal/entity" + "github.com/apache/incubator-answer/internal/entity" ) // ValidationStrategy diff --git a/internal/service/activity/activity.go b/internal/service/activity/activity.go index 3a24e9752..8591ff2e0 100644 --- a/internal/service/activity/activity.go +++ b/internal/service/activity/activity.go @@ -23,23 +23,23 @@ import ( "context" "encoding/json" "fmt" - "github.com/answerdev/answer/internal/service/activity_common" + "github.com/apache/incubator-answer/internal/service/activity_common" "strings" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/comment_common" - "github.com/answerdev/answer/internal/service/config" - "github.com/answerdev/answer/internal/service/meta" - "github.com/answerdev/answer/internal/service/object_info" - "github.com/answerdev/answer/internal/service/revision_common" - "github.com/answerdev/answer/internal/service/tag_common" - usercommon "github.com/answerdev/answer/internal/service/user_common" - "github.com/answerdev/answer/pkg/converter" - "github.com/answerdev/answer/pkg/obj" - "github.com/answerdev/answer/pkg/uid" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/comment_common" + "github.com/apache/incubator-answer/internal/service/config" + "github.com/apache/incubator-answer/internal/service/meta" + "github.com/apache/incubator-answer/internal/service/object_info" + "github.com/apache/incubator-answer/internal/service/revision_common" + "github.com/apache/incubator-answer/internal/service/tag_common" + usercommon "github.com/apache/incubator-answer/internal/service/user_common" + "github.com/apache/incubator-answer/pkg/converter" + "github.com/apache/incubator-answer/pkg/obj" + "github.com/apache/incubator-answer/pkg/uid" "github.com/segmentfault/pacman/log" ) diff --git a/internal/service/activity/answer_activity_service.go b/internal/service/activity/answer_activity_service.go index 7845eddc5..221a20403 100644 --- a/internal/service/activity/answer_activity_service.go +++ b/internal/service/activity/answer_activity_service.go @@ -21,9 +21,9 @@ package activity import ( "context" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/activity_type" - "github.com/answerdev/answer/internal/service/config" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/activity_type" + "github.com/apache/incubator-answer/internal/service/config" "github.com/segmentfault/pacman/log" ) diff --git a/internal/service/activity_common/activity.go b/internal/service/activity_common/activity.go index 3e00c708e..db565f1e0 100644 --- a/internal/service/activity_common/activity.go +++ b/internal/service/activity_common/activity.go @@ -23,11 +23,11 @@ import ( "context" "time" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/activity_queue" - "github.com/answerdev/answer/pkg/converter" - "github.com/answerdev/answer/pkg/uid" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/activity_queue" + "github.com/apache/incubator-answer/pkg/converter" + "github.com/apache/incubator-answer/pkg/uid" "github.com/segmentfault/pacman/log" "xorm.io/xorm" ) diff --git a/internal/service/activity_queue/activity_queue.go b/internal/service/activity_queue/activity_queue.go index 49f0e3e5c..e5019e836 100644 --- a/internal/service/activity_queue/activity_queue.go +++ b/internal/service/activity_queue/activity_queue.go @@ -22,7 +22,7 @@ package activity_queue import ( "context" - "github.com/answerdev/answer/internal/schema" + "github.com/apache/incubator-answer/internal/schema" "github.com/segmentfault/pacman/log" ) diff --git a/internal/service/answer_common/answer.go b/internal/service/answer_common/answer.go index 8491f7b7a..947970164 100644 --- a/internal/service/answer_common/answer.go +++ b/internal/service/answer_common/answer.go @@ -22,11 +22,11 @@ package answercommon import ( "context" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/pkg/htmltext" - "github.com/answerdev/answer/pkg/uid" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/pkg/htmltext" + "github.com/apache/incubator-answer/pkg/uid" ) type AnswerRepo interface { diff --git a/internal/service/answer_service.go b/internal/service/answer_service.go index 4a57d217a..ad5eab261 100644 --- a/internal/service/answer_service.go +++ b/internal/service/answer_service.go @@ -22,27 +22,27 @@ package service import ( "context" "encoding/json" - "github.com/answerdev/answer/pkg/converter" - "github.com/answerdev/answer/pkg/token" + "github.com/apache/incubator-answer/pkg/converter" + "github.com/apache/incubator-answer/pkg/token" "time" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/activity" - "github.com/answerdev/answer/internal/service/activity_common" - "github.com/answerdev/answer/internal/service/activity_queue" - answercommon "github.com/answerdev/answer/internal/service/answer_common" - collectioncommon "github.com/answerdev/answer/internal/service/collection_common" - "github.com/answerdev/answer/internal/service/export" - "github.com/answerdev/answer/internal/service/notice_queue" - "github.com/answerdev/answer/internal/service/permission" - questioncommon "github.com/answerdev/answer/internal/service/question_common" - "github.com/answerdev/answer/internal/service/revision_common" - "github.com/answerdev/answer/internal/service/role" - usercommon "github.com/answerdev/answer/internal/service/user_common" - "github.com/answerdev/answer/pkg/uid" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/activity" + "github.com/apache/incubator-answer/internal/service/activity_common" + "github.com/apache/incubator-answer/internal/service/activity_queue" + answercommon "github.com/apache/incubator-answer/internal/service/answer_common" + collectioncommon "github.com/apache/incubator-answer/internal/service/collection_common" + "github.com/apache/incubator-answer/internal/service/export" + "github.com/apache/incubator-answer/internal/service/notice_queue" + "github.com/apache/incubator-answer/internal/service/permission" + questioncommon "github.com/apache/incubator-answer/internal/service/question_common" + "github.com/apache/incubator-answer/internal/service/revision_common" + "github.com/apache/incubator-answer/internal/service/role" + usercommon "github.com/apache/incubator-answer/internal/service/user_common" + "github.com/apache/incubator-answer/pkg/uid" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" ) diff --git a/internal/service/auth/auth.go b/internal/service/auth/auth.go index f5a6fa7f2..afb63391a 100644 --- a/internal/service/auth/auth.go +++ b/internal/service/auth/auth.go @@ -22,9 +22,9 @@ package auth import ( "context" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/pkg/token" - "github.com/answerdev/answer/plugin" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/pkg/token" + "github.com/apache/incubator-answer/plugin" ) // AuthRepo auth repository diff --git a/internal/service/collection_common/collection.go b/internal/service/collection_common/collection.go index 4c975948f..daf856ec2 100644 --- a/internal/service/collection_common/collection.go +++ b/internal/service/collection_common/collection.go @@ -22,7 +22,7 @@ package collectioncommon import ( "context" - "github.com/answerdev/answer/internal/entity" + "github.com/apache/incubator-answer/internal/entity" ) // CollectionRepo collection repository diff --git a/internal/service/collection_group_service.go b/internal/service/collection_group_service.go index 08509d463..0ca0236ef 100644 --- a/internal/service/collection_group_service.go +++ b/internal/service/collection_group_service.go @@ -22,9 +22,9 @@ package service import ( "context" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" "github.com/jinzhu/copier" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/service/collection_service.go b/internal/service/collection_service.go index 4ebf54ee1..d12fb8296 100644 --- a/internal/service/collection_service.go +++ b/internal/service/collection_service.go @@ -23,10 +23,10 @@ import ( "context" "fmt" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - collectioncommon "github.com/answerdev/answer/internal/service/collection_common" - questioncommon "github.com/answerdev/answer/internal/service/question_common" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + collectioncommon "github.com/apache/incubator-answer/internal/service/collection_common" + questioncommon "github.com/apache/incubator-answer/internal/service/question_common" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" ) diff --git a/internal/service/comment/comment_service.go b/internal/service/comment/comment_service.go index d1252f9b3..df93b1a4e 100644 --- a/internal/service/comment/comment_service.go +++ b/internal/service/comment/comment_service.go @@ -21,24 +21,24 @@ package comment import ( "context" - "github.com/answerdev/answer/pkg/token" + "github.com/apache/incubator-answer/pkg/token" "time" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/pager" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/activity_common" - "github.com/answerdev/answer/internal/service/activity_queue" - "github.com/answerdev/answer/internal/service/comment_common" - "github.com/answerdev/answer/internal/service/export" - "github.com/answerdev/answer/internal/service/notice_queue" - "github.com/answerdev/answer/internal/service/object_info" - "github.com/answerdev/answer/internal/service/permission" - usercommon "github.com/answerdev/answer/internal/service/user_common" - "github.com/answerdev/answer/pkg/htmltext" - "github.com/answerdev/answer/pkg/uid" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/pager" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/activity_common" + "github.com/apache/incubator-answer/internal/service/activity_queue" + "github.com/apache/incubator-answer/internal/service/comment_common" + "github.com/apache/incubator-answer/internal/service/export" + "github.com/apache/incubator-answer/internal/service/notice_queue" + "github.com/apache/incubator-answer/internal/service/object_info" + "github.com/apache/incubator-answer/internal/service/permission" + usercommon "github.com/apache/incubator-answer/internal/service/user_common" + "github.com/apache/incubator-answer/pkg/htmltext" + "github.com/apache/incubator-answer/pkg/uid" "github.com/jinzhu/copier" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" diff --git a/internal/service/comment_common/comment_service.go b/internal/service/comment_common/comment_service.go index 6da1ada76..eea32e6c3 100644 --- a/internal/service/comment_common/comment_service.go +++ b/internal/service/comment_common/comment_service.go @@ -22,9 +22,9 @@ package comment_common import ( "context" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/service/config/config_service.go b/internal/service/config/config_service.go index 8ff5e6664..cff27f2be 100644 --- a/internal/service/config/config_service.go +++ b/internal/service/config/config_service.go @@ -24,7 +24,7 @@ import ( "encoding/json" "fmt" - "github.com/answerdev/answer/internal/entity" + "github.com/apache/incubator-answer/internal/entity" ) // ConfigRepo config repository diff --git a/internal/service/dashboard/dashboard_service.go b/internal/service/dashboard/dashboard_service.go index 90582c98c..521776a77 100644 --- a/internal/service/dashboard/dashboard_service.go +++ b/internal/service/dashboard/dashboard_service.go @@ -28,20 +28,20 @@ import ( "net/url" "time" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/activity_common" - answercommon "github.com/answerdev/answer/internal/service/answer_common" - "github.com/answerdev/answer/internal/service/comment_common" - "github.com/answerdev/answer/internal/service/config" - "github.com/answerdev/answer/internal/service/export" - questioncommon "github.com/answerdev/answer/internal/service/question_common" - "github.com/answerdev/answer/internal/service/report_common" - "github.com/answerdev/answer/internal/service/service_config" - "github.com/answerdev/answer/internal/service/siteinfo_common" - usercommon "github.com/answerdev/answer/internal/service/user_common" - "github.com/answerdev/answer/pkg/dir" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/activity_common" + answercommon "github.com/apache/incubator-answer/internal/service/answer_common" + "github.com/apache/incubator-answer/internal/service/comment_common" + "github.com/apache/incubator-answer/internal/service/config" + "github.com/apache/incubator-answer/internal/service/export" + questioncommon "github.com/apache/incubator-answer/internal/service/question_common" + "github.com/apache/incubator-answer/internal/service/report_common" + "github.com/apache/incubator-answer/internal/service/service_config" + "github.com/apache/incubator-answer/internal/service/siteinfo_common" + usercommon "github.com/apache/incubator-answer/internal/service/user_common" + "github.com/apache/incubator-answer/pkg/dir" "github.com/segmentfault/pacman/log" ) @@ -202,25 +202,25 @@ func (ds *dashboardService) voteCount(ctx context.Context) int64 { } func (ds *dashboardService) remoteVersion(ctx context.Context) string { - url := "https://answer.dev/getlatest" - req, _ := http.NewRequest("GET", url, nil) + req, _ := http.NewRequest("GET", "https://getlatest.answer.dev/", nil) req.Header.Set("User-Agent", "Answer/"+constant.Version) - resp, err := (&http.Client{}).Do(req) + httpClient := &http.Client{} + httpClient.Timeout = 15 * time.Second + resp, err := httpClient.Do(req) if err != nil { - log.Error("http.Client error", err) + log.Errorf("request remote version failed: %s", err) return "" } defer resp.Body.Close() respByte, err := io.ReadAll(resp.Body) if err != nil { - log.Error("http.Client error", err) + log.Errorf("read response body failed: %s", err) return "" } remoteVersion := &schema.RemoteVersion{} - err = json.Unmarshal(respByte, remoteVersion) - if err != nil { - log.Error("json.Unmarshal error", err) + if err := json.Unmarshal(respByte, remoteVersion); err != nil { + log.Errorf("parsing response body failed: %s", err) return "" } return remoteVersion.Release.Version diff --git a/internal/service/export/email_service.go b/internal/service/export/email_service.go index 3a51e37d5..beec645d6 100644 --- a/internal/service/export/email_service.go +++ b/internal/service/export/email_service.go @@ -23,19 +23,19 @@ import ( "crypto/tls" "encoding/json" "fmt" - "github.com/answerdev/answer/pkg/display" + "github.com/apache/incubator-answer/pkg/display" "mime" "os" "strings" "time" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/base/translator" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/config" - "github.com/answerdev/answer/internal/service/siteinfo_common" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/config" + "github.com/apache/incubator-answer/internal/service/siteinfo_common" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" "golang.org/x/net/context" diff --git a/internal/service/follow/follow_service.go b/internal/service/follow/follow_service.go index 384aa604d..eecf3555f 100644 --- a/internal/service/follow/follow_service.go +++ b/internal/service/follow/follow_service.go @@ -22,10 +22,10 @@ package follow import ( "context" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/activity_common" - tagcommon "github.com/answerdev/answer/internal/service/tag_common" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/activity_common" + tagcommon "github.com/apache/incubator-answer/internal/service/tag_common" ) type FollowRepo interface { diff --git a/internal/service/meta/meta_service.go b/internal/service/meta/meta_service.go index 7eb7f9648..3c229858b 100644 --- a/internal/service/meta/meta_service.go +++ b/internal/service/meta/meta_service.go @@ -22,8 +22,8 @@ package meta import ( "context" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/service/mock/siteinfo_repo_mock.go b/internal/service/mock/siteinfo_repo_mock.go index 09b7385ef..39e2c4241 100644 --- a/internal/service/mock/siteinfo_repo_mock.go +++ b/internal/service/mock/siteinfo_repo_mock.go @@ -27,7 +27,7 @@ import ( context "context" reflect "reflect" - entity "github.com/answerdev/answer/internal/entity" + entity "github.com/apache/incubator-answer/internal/entity" gomock "github.com/golang/mock/gomock" ) diff --git a/internal/service/notice_queue/external_notification_queue.go b/internal/service/notice_queue/external_notification_queue.go index 6670c6db5..32cabdac4 100644 --- a/internal/service/notice_queue/external_notification_queue.go +++ b/internal/service/notice_queue/external_notification_queue.go @@ -22,7 +22,7 @@ package notice_queue import ( "context" - "github.com/answerdev/answer/internal/schema" + "github.com/apache/incubator-answer/internal/schema" "github.com/segmentfault/pacman/log" ) diff --git a/internal/service/notice_queue/notice_queue.go b/internal/service/notice_queue/notice_queue.go index 310874d58..c97e56b1a 100644 --- a/internal/service/notice_queue/notice_queue.go +++ b/internal/service/notice_queue/notice_queue.go @@ -22,7 +22,7 @@ package notice_queue import ( "context" - "github.com/answerdev/answer/internal/schema" + "github.com/apache/incubator-answer/internal/schema" "github.com/segmentfault/pacman/log" ) diff --git a/internal/service/notification/external_notification.go b/internal/service/notification/external_notification.go index 2970865a3..bb025e55d 100644 --- a/internal/service/notification/external_notification.go +++ b/internal/service/notification/external_notification.go @@ -21,13 +21,13 @@ package notification import ( "context" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/activity_common" - "github.com/answerdev/answer/internal/service/export" - "github.com/answerdev/answer/internal/service/notice_queue" - usercommon "github.com/answerdev/answer/internal/service/user_common" - "github.com/answerdev/answer/internal/service/user_notification_config" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/activity_common" + "github.com/apache/incubator-answer/internal/service/export" + "github.com/apache/incubator-answer/internal/service/notice_queue" + usercommon "github.com/apache/incubator-answer/internal/service/user_common" + "github.com/apache/incubator-answer/internal/service/user_notification_config" "github.com/segmentfault/pacman/log" ) diff --git a/internal/service/notification/invite_answer_notification.go b/internal/service/notification/invite_answer_notification.go index 8b913960a..1122d052d 100644 --- a/internal/service/notification/invite_answer_notification.go +++ b/internal/service/notification/invite_answer_notification.go @@ -21,8 +21,8 @@ package notification import ( "context" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/schema" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/schema" "github.com/segmentfault/pacman/i18n" "github.com/segmentfault/pacman/log" "time" diff --git a/internal/service/notification/new_answer_notification.go b/internal/service/notification/new_answer_notification.go index 45e4ea060..4a43192f8 100644 --- a/internal/service/notification/new_answer_notification.go +++ b/internal/service/notification/new_answer_notification.go @@ -21,8 +21,8 @@ package notification import ( "context" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/schema" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/schema" "github.com/segmentfault/pacman/i18n" "github.com/segmentfault/pacman/log" "time" diff --git a/internal/service/notification/new_comment_notification.go b/internal/service/notification/new_comment_notification.go index 043401d30..de69038a0 100644 --- a/internal/service/notification/new_comment_notification.go +++ b/internal/service/notification/new_comment_notification.go @@ -21,8 +21,8 @@ package notification import ( "context" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/schema" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/schema" "github.com/segmentfault/pacman/i18n" "github.com/segmentfault/pacman/log" "time" diff --git a/internal/service/notification/new_question_notification.go b/internal/service/notification/new_question_notification.go index 0916945f5..29a5a9cea 100644 --- a/internal/service/notification/new_question_notification.go +++ b/internal/service/notification/new_question_notification.go @@ -21,9 +21,9 @@ package notification import ( "context" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/pkg/token" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/pkg/token" "github.com/segmentfault/pacman/i18n" "github.com/segmentfault/pacman/log" "time" diff --git a/internal/service/notification/notification_service.go b/internal/service/notification/notification_service.go index 4213451da..bda225d1a 100644 --- a/internal/service/notification/notification_service.go +++ b/internal/service/notification/notification_service.go @@ -23,19 +23,19 @@ import ( "context" "encoding/json" "fmt" - usercommon "github.com/answerdev/answer/internal/service/user_common" - "github.com/answerdev/answer/pkg/converter" - - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/pager" - "github.com/answerdev/answer/internal/base/translator" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - notficationcommon "github.com/answerdev/answer/internal/service/notification_common" - "github.com/answerdev/answer/internal/service/revision_common" - "github.com/answerdev/answer/pkg/uid" + usercommon "github.com/apache/incubator-answer/internal/service/user_common" + "github.com/apache/incubator-answer/pkg/converter" + + "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/translator" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + notficationcommon "github.com/apache/incubator-answer/internal/service/notification_common" + "github.com/apache/incubator-answer/internal/service/revision_common" + "github.com/apache/incubator-answer/pkg/uid" "github.com/jinzhu/copier" "github.com/segmentfault/pacman/log" ) diff --git a/internal/service/notification_common/notification.go b/internal/service/notification_common/notification.go index 2a6c9d24d..84a2084f6 100644 --- a/internal/service/notification_common/notification.go +++ b/internal/service/notification_common/notification.go @@ -24,17 +24,17 @@ import ( "fmt" "time" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/activity_common" - "github.com/answerdev/answer/internal/service/notice_queue" - "github.com/answerdev/answer/internal/service/object_info" - usercommon "github.com/answerdev/answer/internal/service/user_common" - "github.com/answerdev/answer/pkg/uid" - "github.com/answerdev/answer/plugin" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/activity_common" + "github.com/apache/incubator-answer/internal/service/notice_queue" + "github.com/apache/incubator-answer/internal/service/object_info" + usercommon "github.com/apache/incubator-answer/internal/service/user_common" + "github.com/apache/incubator-answer/pkg/uid" + "github.com/apache/incubator-answer/plugin" "github.com/goccy/go-json" "github.com/jinzhu/copier" "github.com/segmentfault/pacman/errors" diff --git a/internal/service/object_info/object_info.go b/internal/service/object_info/object_info.go index e472a07e8..9ef5a8926 100644 --- a/internal/service/object_info/object_info.go +++ b/internal/service/object_info/object_info.go @@ -22,16 +22,16 @@ package object_info import ( "context" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/schema" - answercommon "github.com/answerdev/answer/internal/service/answer_common" - "github.com/answerdev/answer/internal/service/comment_common" - questioncommon "github.com/answerdev/answer/internal/service/question_common" - tagcommon "github.com/answerdev/answer/internal/service/tag_common" - "github.com/answerdev/answer/pkg/obj" - "github.com/answerdev/answer/pkg/uid" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/schema" + answercommon "github.com/apache/incubator-answer/internal/service/answer_common" + "github.com/apache/incubator-answer/internal/service/comment_common" + questioncommon "github.com/apache/incubator-answer/internal/service/question_common" + tagcommon "github.com/apache/incubator-answer/internal/service/tag_common" + "github.com/apache/incubator-answer/pkg/obj" + "github.com/apache/incubator-answer/pkg/uid" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/service/permission/answer_permission.go b/internal/service/permission/answer_permission.go index 6cb44e1ec..14af7abc8 100644 --- a/internal/service/permission/answer_permission.go +++ b/internal/service/permission/answer_permission.go @@ -21,11 +21,11 @@ package permission import ( "context" - "github.com/answerdev/answer/internal/entity" + "github.com/apache/incubator-answer/internal/entity" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/translator" - "github.com/answerdev/answer/internal/schema" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/schema" ) // GetAnswerPermission get answer permission diff --git a/internal/service/permission/comment_permission.go b/internal/service/permission/comment_permission.go index c046a783c..aef32792d 100644 --- a/internal/service/permission/comment_permission.go +++ b/internal/service/permission/comment_permission.go @@ -23,10 +23,10 @@ import ( "context" "time" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/translator" - "github.com/answerdev/answer/internal/schema" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/schema" ) // GetCommentPermission get comment permission diff --git a/internal/service/permission/question_permission.go b/internal/service/permission/question_permission.go index a2f45b398..1df244e39 100644 --- a/internal/service/permission/question_permission.go +++ b/internal/service/permission/question_permission.go @@ -21,11 +21,11 @@ package permission import ( "context" - "github.com/answerdev/answer/internal/entity" + "github.com/apache/incubator-answer/internal/entity" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/translator" - "github.com/answerdev/answer/internal/schema" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/schema" ) // GetQuestionPermission get question permission diff --git a/internal/service/permission/tag_permission.go b/internal/service/permission/tag_permission.go index 0137e5a17..2b87275dd 100644 --- a/internal/service/permission/tag_permission.go +++ b/internal/service/permission/tag_permission.go @@ -21,11 +21,11 @@ package permission import ( "context" - "github.com/answerdev/answer/internal/entity" + "github.com/apache/incubator-answer/internal/entity" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/translator" - "github.com/answerdev/answer/internal/schema" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/schema" ) // GetTagPermission get tag permission diff --git a/internal/service/plugin_common/plugin_common_service.go b/internal/service/plugin_common/plugin_common_service.go index 70220ab46..832fb3212 100644 --- a/internal/service/plugin_common/plugin_common_service.go +++ b/internal/service/plugin_common/plugin_common_service.go @@ -22,15 +22,15 @@ package plugin_common import ( "context" "encoding/json" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/repo/search_sync" + "github.com/apache/incubator-answer/internal/base/data" + "github.com/apache/incubator-answer/internal/repo/search_sync" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/config" - "github.com/answerdev/answer/plugin" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/config" + "github.com/apache/incubator-answer/plugin" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" ) diff --git a/internal/service/provider.go b/internal/service/provider.go index 1c679af0c..38b9cd72a 100644 --- a/internal/service/provider.go +++ b/internal/service/provider.go @@ -20,43 +20,43 @@ package service import ( - "github.com/answerdev/answer/internal/service/action" - "github.com/answerdev/answer/internal/service/activity" - "github.com/answerdev/answer/internal/service/activity_common" - "github.com/answerdev/answer/internal/service/activity_queue" - answercommon "github.com/answerdev/answer/internal/service/answer_common" - "github.com/answerdev/answer/internal/service/auth" - collectioncommon "github.com/answerdev/answer/internal/service/collection_common" - "github.com/answerdev/answer/internal/service/comment" - "github.com/answerdev/answer/internal/service/comment_common" - "github.com/answerdev/answer/internal/service/config" - "github.com/answerdev/answer/internal/service/dashboard" - "github.com/answerdev/answer/internal/service/export" - "github.com/answerdev/answer/internal/service/follow" - "github.com/answerdev/answer/internal/service/meta" - "github.com/answerdev/answer/internal/service/notice_queue" - "github.com/answerdev/answer/internal/service/notification" - notficationcommon "github.com/answerdev/answer/internal/service/notification_common" - "github.com/answerdev/answer/internal/service/object_info" - "github.com/answerdev/answer/internal/service/plugin_common" - questioncommon "github.com/answerdev/answer/internal/service/question_common" - "github.com/answerdev/answer/internal/service/rank" - "github.com/answerdev/answer/internal/service/reason" - "github.com/answerdev/answer/internal/service/report" - "github.com/answerdev/answer/internal/service/report_admin" - "github.com/answerdev/answer/internal/service/report_handle_admin" - "github.com/answerdev/answer/internal/service/revision_common" - "github.com/answerdev/answer/internal/service/role" - "github.com/answerdev/answer/internal/service/search_parser" - "github.com/answerdev/answer/internal/service/siteinfo" - "github.com/answerdev/answer/internal/service/siteinfo_common" - "github.com/answerdev/answer/internal/service/tag" - tagcommon "github.com/answerdev/answer/internal/service/tag_common" - "github.com/answerdev/answer/internal/service/uploader" - "github.com/answerdev/answer/internal/service/user_admin" - usercommon "github.com/answerdev/answer/internal/service/user_common" - "github.com/answerdev/answer/internal/service/user_external_login" - "github.com/answerdev/answer/internal/service/user_notification_config" + "github.com/apache/incubator-answer/internal/service/action" + "github.com/apache/incubator-answer/internal/service/activity" + "github.com/apache/incubator-answer/internal/service/activity_common" + "github.com/apache/incubator-answer/internal/service/activity_queue" + answercommon "github.com/apache/incubator-answer/internal/service/answer_common" + "github.com/apache/incubator-answer/internal/service/auth" + collectioncommon "github.com/apache/incubator-answer/internal/service/collection_common" + "github.com/apache/incubator-answer/internal/service/comment" + "github.com/apache/incubator-answer/internal/service/comment_common" + "github.com/apache/incubator-answer/internal/service/config" + "github.com/apache/incubator-answer/internal/service/dashboard" + "github.com/apache/incubator-answer/internal/service/export" + "github.com/apache/incubator-answer/internal/service/follow" + "github.com/apache/incubator-answer/internal/service/meta" + "github.com/apache/incubator-answer/internal/service/notice_queue" + "github.com/apache/incubator-answer/internal/service/notification" + notficationcommon "github.com/apache/incubator-answer/internal/service/notification_common" + "github.com/apache/incubator-answer/internal/service/object_info" + "github.com/apache/incubator-answer/internal/service/plugin_common" + questioncommon "github.com/apache/incubator-answer/internal/service/question_common" + "github.com/apache/incubator-answer/internal/service/rank" + "github.com/apache/incubator-answer/internal/service/reason" + "github.com/apache/incubator-answer/internal/service/report" + "github.com/apache/incubator-answer/internal/service/report_admin" + "github.com/apache/incubator-answer/internal/service/report_handle_admin" + "github.com/apache/incubator-answer/internal/service/revision_common" + "github.com/apache/incubator-answer/internal/service/role" + "github.com/apache/incubator-answer/internal/service/search_parser" + "github.com/apache/incubator-answer/internal/service/siteinfo" + "github.com/apache/incubator-answer/internal/service/siteinfo_common" + "github.com/apache/incubator-answer/internal/service/tag" + tagcommon "github.com/apache/incubator-answer/internal/service/tag_common" + "github.com/apache/incubator-answer/internal/service/uploader" + "github.com/apache/incubator-answer/internal/service/user_admin" + usercommon "github.com/apache/incubator-answer/internal/service/user_common" + "github.com/apache/incubator-answer/internal/service/user_external_login" + "github.com/apache/incubator-answer/internal/service/user_notification_config" "github.com/google/wire" ) diff --git a/internal/service/question_common/question.go b/internal/service/question_common/question.go index 7f25e81cb..b12a9dec9 100644 --- a/internal/service/question_common/question.go +++ b/internal/service/question_common/question.go @@ -25,25 +25,25 @@ import ( "math" "time" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/data" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/service/activity_common" - "github.com/answerdev/answer/internal/service/activity_queue" - "github.com/answerdev/answer/internal/service/config" - "github.com/answerdev/answer/internal/service/meta" - "github.com/answerdev/answer/pkg/checker" - "github.com/answerdev/answer/pkg/htmltext" - "github.com/answerdev/answer/pkg/uid" + "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/reason" + "github.com/apache/incubator-answer/internal/service/activity_common" + "github.com/apache/incubator-answer/internal/service/activity_queue" + "github.com/apache/incubator-answer/internal/service/config" + "github.com/apache/incubator-answer/internal/service/meta" + "github.com/apache/incubator-answer/pkg/checker" + "github.com/apache/incubator-answer/pkg/htmltext" + "github.com/apache/incubator-answer/pkg/uid" "github.com/segmentfault/pacman/errors" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - answercommon "github.com/answerdev/answer/internal/service/answer_common" - collectioncommon "github.com/answerdev/answer/internal/service/collection_common" - tagcommon "github.com/answerdev/answer/internal/service/tag_common" - usercommon "github.com/answerdev/answer/internal/service/user_common" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + answercommon "github.com/apache/incubator-answer/internal/service/answer_common" + collectioncommon "github.com/apache/incubator-answer/internal/service/collection_common" + tagcommon "github.com/apache/incubator-answer/internal/service/tag_common" + usercommon "github.com/apache/incubator-answer/internal/service/user_common" "github.com/segmentfault/pacman/log" ) diff --git a/internal/service/question_service.go b/internal/service/question_service.go index 6ee8ec873..b550a1f9a 100644 --- a/internal/service/question_service.go +++ b/internal/service/question_service.go @@ -22,34 +22,34 @@ package service import ( "encoding/json" "fmt" - "github.com/answerdev/answer/internal/service/notification" - "github.com/answerdev/answer/internal/service/siteinfo_common" - "github.com/answerdev/answer/pkg/token" + "github.com/apache/incubator-answer/internal/service/notification" + "github.com/apache/incubator-answer/internal/service/siteinfo_common" + "github.com/apache/incubator-answer/pkg/token" "strings" "time" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/pager" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/base/translator" - "github.com/answerdev/answer/internal/base/validator" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/activity" - "github.com/answerdev/answer/internal/service/activity_queue" - collectioncommon "github.com/answerdev/answer/internal/service/collection_common" - "github.com/answerdev/answer/internal/service/export" - "github.com/answerdev/answer/internal/service/meta" - "github.com/answerdev/answer/internal/service/notice_queue" - "github.com/answerdev/answer/internal/service/permission" - questioncommon "github.com/answerdev/answer/internal/service/question_common" - "github.com/answerdev/answer/internal/service/revision_common" - tagcommon "github.com/answerdev/answer/internal/service/tag_common" - usercommon "github.com/answerdev/answer/internal/service/user_common" - "github.com/answerdev/answer/pkg/converter" - "github.com/answerdev/answer/pkg/htmltext" - "github.com/answerdev/answer/pkg/uid" + "github.com/apache/incubator-answer/internal/base/constant" + "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/base/translator" + "github.com/apache/incubator-answer/internal/base/validator" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/activity" + "github.com/apache/incubator-answer/internal/service/activity_queue" + collectioncommon "github.com/apache/incubator-answer/internal/service/collection_common" + "github.com/apache/incubator-answer/internal/service/export" + "github.com/apache/incubator-answer/internal/service/meta" + "github.com/apache/incubator-answer/internal/service/notice_queue" + "github.com/apache/incubator-answer/internal/service/permission" + questioncommon "github.com/apache/incubator-answer/internal/service/question_common" + "github.com/apache/incubator-answer/internal/service/revision_common" + tagcommon "github.com/apache/incubator-answer/internal/service/tag_common" + usercommon "github.com/apache/incubator-answer/internal/service/user_common" + "github.com/apache/incubator-answer/pkg/converter" + "github.com/apache/incubator-answer/pkg/htmltext" + "github.com/apache/incubator-answer/pkg/uid" "github.com/jinzhu/copier" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" diff --git a/internal/service/rank/rank_service.go b/internal/service/rank/rank_service.go index 3ea1ac612..ab164d4dc 100644 --- a/internal/service/rank/rank_service.go +++ b/internal/service/rank/rank_service.go @@ -22,22 +22,22 @@ package rank import ( "context" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/pager" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/base/translator" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/activity_type" - "github.com/answerdev/answer/internal/service/config" - "github.com/answerdev/answer/internal/service/object_info" - "github.com/answerdev/answer/internal/service/permission" - "github.com/answerdev/answer/internal/service/role" - 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/apache/incubator-answer/internal/base/constant" + "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/base/translator" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/activity_type" + "github.com/apache/incubator-answer/internal/service/config" + "github.com/apache/incubator-answer/internal/service/object_info" + "github.com/apache/incubator-answer/internal/service/permission" + "github.com/apache/incubator-answer/internal/service/role" + usercommon "github.com/apache/incubator-answer/internal/service/user_common" + "github.com/apache/incubator-answer/pkg/htmltext" + "github.com/apache/incubator-answer/pkg/uid" + "github.com/apache/incubator-answer/plugin" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" "xorm.io/xorm" diff --git a/internal/service/reason/reason_service.go b/internal/service/reason/reason_service.go index ec2deb80d..c6c31c4cb 100644 --- a/internal/service/reason/reason_service.go +++ b/internal/service/reason/reason_service.go @@ -22,8 +22,8 @@ package reason import ( "context" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/reason_common" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/reason_common" ) type ReasonService struct { diff --git a/internal/service/reason_common/reason.go b/internal/service/reason_common/reason.go index a1c976d87..ca1bf73df 100644 --- a/internal/service/reason_common/reason.go +++ b/internal/service/reason_common/reason.go @@ -22,7 +22,7 @@ package reason_common import ( "context" - "github.com/answerdev/answer/internal/schema" + "github.com/apache/incubator-answer/internal/schema" ) type ReasonRepo interface { diff --git a/internal/service/report/report_service.go b/internal/service/report/report_service.go index 498b75b78..55ac42724 100644 --- a/internal/service/report/report_service.go +++ b/internal/service/report/report_service.go @@ -20,11 +20,11 @@ package report import ( - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/object_info" - "github.com/answerdev/answer/internal/service/report_common" - "github.com/answerdev/answer/pkg/obj" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/object_info" + "github.com/apache/incubator-answer/internal/service/report_common" + "github.com/apache/incubator-answer/pkg/obj" "golang.org/x/net/context" ) diff --git a/internal/service/report_admin/report_backyard.go b/internal/service/report_admin/report_backyard.go index 072bf5e90..3b1417968 100644 --- a/internal/service/report_admin/report_backyard.go +++ b/internal/service/report_admin/report_backyard.go @@ -23,22 +23,22 @@ import ( "context" "encoding/json" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/service/config" - "github.com/answerdev/answer/internal/service/object_info" - "github.com/answerdev/answer/pkg/htmltext" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/service/config" + "github.com/apache/incubator-answer/internal/service/object_info" + "github.com/apache/incubator-answer/pkg/htmltext" "github.com/segmentfault/pacman/log" - "github.com/answerdev/answer/internal/base/pager" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - answercommon "github.com/answerdev/answer/internal/service/answer_common" - "github.com/answerdev/answer/internal/service/comment_common" - questioncommon "github.com/answerdev/answer/internal/service/question_common" - "github.com/answerdev/answer/internal/service/report_common" - "github.com/answerdev/answer/internal/service/report_handle_admin" - usercommon "github.com/answerdev/answer/internal/service/user_common" + "github.com/apache/incubator-answer/internal/base/pager" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + answercommon "github.com/apache/incubator-answer/internal/service/answer_common" + "github.com/apache/incubator-answer/internal/service/comment_common" + questioncommon "github.com/apache/incubator-answer/internal/service/question_common" + "github.com/apache/incubator-answer/internal/service/report_common" + "github.com/apache/incubator-answer/internal/service/report_handle_admin" + usercommon "github.com/apache/incubator-answer/internal/service/user_common" "github.com/jinzhu/copier" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/service/report_common/report_common.go b/internal/service/report_common/report_common.go index 10ce792cf..e27ff1626 100644 --- a/internal/service/report_common/report_common.go +++ b/internal/service/report_common/report_common.go @@ -22,8 +22,8 @@ package report_common import ( "context" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" ) // ReportRepo report repository diff --git a/internal/service/report_handle_admin/report_handle.go b/internal/service/report_handle_admin/report_handle.go index 7b823ac4f..371703969 100644 --- a/internal/service/report_handle_admin/report_handle.go +++ b/internal/service/report_handle_admin/report_handle.go @@ -22,15 +22,15 @@ package report_handle_admin import ( "context" - "github.com/answerdev/answer/internal/service/config" - "github.com/answerdev/answer/internal/service/notice_queue" + "github.com/apache/incubator-answer/internal/service/config" + "github.com/apache/incubator-answer/internal/service/notice_queue" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/comment" - questioncommon "github.com/answerdev/answer/internal/service/question_common" - "github.com/answerdev/answer/pkg/obj" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/comment" + questioncommon "github.com/apache/incubator-answer/internal/service/question_common" + "github.com/apache/incubator-answer/pkg/obj" ) type ReportHandle struct { diff --git a/internal/service/revision/revision.go b/internal/service/revision/revision.go index a179ce8eb..658c92f62 100644 --- a/internal/service/revision/revision.go +++ b/internal/service/revision/revision.go @@ -22,7 +22,7 @@ package revision import ( "context" - "github.com/answerdev/answer/internal/entity" + "github.com/apache/incubator-answer/internal/entity" "xorm.io/xorm" ) diff --git a/internal/service/revision_common/revision_service.go b/internal/service/revision_common/revision_service.go index cc6f8b878..c9d454e36 100644 --- a/internal/service/revision_common/revision_service.go +++ b/internal/service/revision_common/revision_service.go @@ -22,15 +22,15 @@ package revision_common import ( "context" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/service/revision" - usercommon "github.com/answerdev/answer/internal/service/user_common" - "github.com/answerdev/answer/pkg/uid" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/service/revision" + usercommon "github.com/apache/incubator-answer/internal/service/user_common" + "github.com/apache/incubator-answer/pkg/uid" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" "github.com/jinzhu/copier" ) diff --git a/internal/service/revision_service.go b/internal/service/revision_service.go index a16e7bc11..552bccd44 100644 --- a/internal/service/revision_service.go +++ b/internal/service/revision_service.go @@ -24,22 +24,22 @@ import ( "encoding/json" "time" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/pager" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/activity_queue" - answercommon "github.com/answerdev/answer/internal/service/answer_common" - "github.com/answerdev/answer/internal/service/notice_queue" - "github.com/answerdev/answer/internal/service/object_info" - questioncommon "github.com/answerdev/answer/internal/service/question_common" - "github.com/answerdev/answer/internal/service/revision" - "github.com/answerdev/answer/internal/service/tag_common" - tagcommon "github.com/answerdev/answer/internal/service/tag_common" - usercommon "github.com/answerdev/answer/internal/service/user_common" - "github.com/answerdev/answer/pkg/converter" - "github.com/answerdev/answer/pkg/obj" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/pager" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/activity_queue" + answercommon "github.com/apache/incubator-answer/internal/service/answer_common" + "github.com/apache/incubator-answer/internal/service/notice_queue" + "github.com/apache/incubator-answer/internal/service/object_info" + questioncommon "github.com/apache/incubator-answer/internal/service/question_common" + "github.com/apache/incubator-answer/internal/service/revision" + "github.com/apache/incubator-answer/internal/service/tag_common" + tagcommon "github.com/apache/incubator-answer/internal/service/tag_common" + usercommon "github.com/apache/incubator-answer/internal/service/user_common" + "github.com/apache/incubator-answer/pkg/converter" + "github.com/apache/incubator-answer/pkg/obj" "github.com/jinzhu/copier" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" diff --git a/internal/service/role/power_service.go b/internal/service/role/power_service.go index d3043e2ef..86f0e260c 100644 --- a/internal/service/role/power_service.go +++ b/internal/service/role/power_service.go @@ -22,7 +22,7 @@ package role import ( "context" - "github.com/answerdev/answer/internal/entity" + "github.com/apache/incubator-answer/internal/entity" ) // PowerRepo power repository diff --git a/internal/service/role/role_service.go b/internal/service/role/role_service.go index 13cf0dffc..f0271312d 100644 --- a/internal/service/role/role_service.go +++ b/internal/service/role/role_service.go @@ -22,10 +22,10 @@ package role import ( "context" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/translator" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" "github.com/jinzhu/copier" ) diff --git a/internal/service/role/user_role_rel_service.go b/internal/service/role/user_role_rel_service.go index ec7a060fd..f89f3a4fa 100644 --- a/internal/service/role/user_role_rel_service.go +++ b/internal/service/role/user_role_rel_service.go @@ -22,7 +22,7 @@ package role import ( "context" - "github.com/answerdev/answer/internal/entity" + "github.com/apache/incubator-answer/internal/entity" ) // UserRoleRelRepo userRoleRel repository diff --git a/internal/service/search_common/search.go b/internal/service/search_common/search.go index f49efdeb0..d1aea5479 100644 --- a/internal/service/search_common/search.go +++ b/internal/service/search_common/search.go @@ -21,8 +21,8 @@ package search_common import ( "context" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/plugin" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/plugin" ) type SearchRepo interface { diff --git a/internal/service/search_parser/search_parser.go b/internal/service/search_parser/search_parser.go index 4d240df7d..a5dfd6700 100644 --- a/internal/service/search_parser/search_parser.go +++ b/internal/service/search_parser/search_parser.go @@ -22,14 +22,14 @@ package search_parser import ( "context" "fmt" - "github.com/answerdev/answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/constant" "regexp" "strings" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/tag_common" - usercommon "github.com/answerdev/answer/internal/service/user_common" - "github.com/answerdev/answer/pkg/converter" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/tag_common" + usercommon "github.com/apache/incubator-answer/internal/service/user_common" + "github.com/apache/incubator-answer/pkg/converter" ) type SearchParser struct { diff --git a/internal/service/search_service.go b/internal/service/search_service.go index 0b991081b..46d71374c 100644 --- a/internal/service/search_service.go +++ b/internal/service/search_service.go @@ -21,10 +21,10 @@ package service import ( "context" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/search_common" - "github.com/answerdev/answer/internal/service/search_parser" - "github.com/answerdev/answer/plugin" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/search_common" + "github.com/apache/incubator-answer/internal/service/search_parser" + "github.com/apache/incubator-answer/plugin" ) type SearchService struct { diff --git a/internal/service/siteinfo/siteinfo_service.go b/internal/service/siteinfo/siteinfo_service.go index 1933efc8c..7f609e6c9 100644 --- a/internal/service/siteinfo/siteinfo_service.go +++ b/internal/service/siteinfo/siteinfo_service.go @@ -24,18 +24,18 @@ import ( "encoding/json" "fmt" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/base/translator" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/config" - "github.com/answerdev/answer/internal/service/export" - questioncommon "github.com/answerdev/answer/internal/service/question_common" - "github.com/answerdev/answer/internal/service/siteinfo_common" - tagcommon "github.com/answerdev/answer/internal/service/tag_common" - "github.com/answerdev/answer/plugin" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/config" + "github.com/apache/incubator-answer/internal/service/export" + questioncommon "github.com/apache/incubator-answer/internal/service/question_common" + "github.com/apache/incubator-answer/internal/service/siteinfo_common" + tagcommon "github.com/apache/incubator-answer/internal/service/tag_common" + "github.com/apache/incubator-answer/plugin" "github.com/jinzhu/copier" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" diff --git a/internal/service/siteinfo_common/siteinfo_service.go b/internal/service/siteinfo_common/siteinfo_service.go index 46b277bdc..e37fb7b17 100644 --- a/internal/service/siteinfo_common/siteinfo_service.go +++ b/internal/service/siteinfo_common/siteinfo_service.go @@ -23,10 +23,10 @@ import ( "context" "encoding/json" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/pkg/gravatar" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/pkg/gravatar" "github.com/segmentfault/pacman/log" ) diff --git a/internal/service/siteinfo_common/siteinfo_service_test.go b/internal/service/siteinfo_common/siteinfo_service_test.go index 28e483ce8..bda2f3683 100644 --- a/internal/service/siteinfo_common/siteinfo_service_test.go +++ b/internal/service/siteinfo_common/siteinfo_service_test.go @@ -23,9 +23,9 @@ import ( "context" "testing" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/service/mock" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/service/mock" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" ) diff --git a/internal/service/tag/tag_service.go b/internal/service/tag/tag_service.go index cfd41fd9d..64d171834 100644 --- a/internal/service/tag/tag_service.go +++ b/internal/service/tag/tag_service.go @@ -23,21 +23,21 @@ import ( "context" "encoding/json" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/service/activity_queue" - "github.com/answerdev/answer/internal/service/revision_common" - "github.com/answerdev/answer/internal/service/siteinfo_common" - tagcommonser "github.com/answerdev/answer/internal/service/tag_common" - "github.com/answerdev/answer/pkg/htmltext" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/service/activity_queue" + "github.com/apache/incubator-answer/internal/service/revision_common" + "github.com/apache/incubator-answer/internal/service/siteinfo_common" + tagcommonser "github.com/apache/incubator-answer/internal/service/tag_common" + "github.com/apache/incubator-answer/pkg/htmltext" "github.com/jinzhu/copier" - "github.com/answerdev/answer/internal/base/pager" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/activity_common" - "github.com/answerdev/answer/internal/service/permission" - "github.com/answerdev/answer/pkg/converter" + "github.com/apache/incubator-answer/internal/base/pager" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/activity_common" + "github.com/apache/incubator-answer/internal/service/permission" + "github.com/apache/incubator-answer/pkg/converter" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" ) diff --git a/internal/service/tag_common/tag_common.go b/internal/service/tag_common/tag_common.go index c0c1850b2..74a0f0ab9 100644 --- a/internal/service/tag_common/tag_common.go +++ b/internal/service/tag_common/tag_common.go @@ -26,15 +26,15 @@ import ( "sort" "strings" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/base/validator" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/activity_queue" - "github.com/answerdev/answer/internal/service/revision_common" - "github.com/answerdev/answer/internal/service/siteinfo_common" - "github.com/answerdev/answer/pkg/converter" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/base/validator" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/activity_queue" + "github.com/apache/incubator-answer/internal/service/revision_common" + "github.com/apache/incubator-answer/internal/service/siteinfo_common" + "github.com/apache/incubator-answer/pkg/converter" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" ) diff --git a/internal/service/uploader/upload.go b/internal/service/uploader/upload.go index b9a92d0f8..fb0b2af0c 100644 --- a/internal/service/uploader/upload.go +++ b/internal/service/uploader/upload.go @@ -30,13 +30,13 @@ import ( "path/filepath" "strings" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/service/service_config" - "github.com/answerdev/answer/internal/service/siteinfo_common" - "github.com/answerdev/answer/pkg/checker" - "github.com/answerdev/answer/pkg/dir" - "github.com/answerdev/answer/pkg/uid" - "github.com/answerdev/answer/plugin" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/service/service_config" + "github.com/apache/incubator-answer/internal/service/siteinfo_common" + "github.com/apache/incubator-answer/pkg/checker" + "github.com/apache/incubator-answer/pkg/dir" + "github.com/apache/incubator-answer/pkg/uid" + "github.com/apache/incubator-answer/plugin" "github.com/disintegration/imaging" "github.com/gin-gonic/gin" exifremove "github.com/scottleedavis/go-exif-remove" diff --git a/internal/service/user_admin/user_backyard.go b/internal/service/user_admin/user_backyard.go index f37de76bd..a262d7202 100644 --- a/internal/service/user_admin/user_backyard.go +++ b/internal/service/user_admin/user_backyard.go @@ -22,29 +22,29 @@ package user_admin import ( "context" "fmt" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/translator" - "github.com/answerdev/answer/internal/base/validator" - answercommon "github.com/answerdev/answer/internal/service/answer_common" - "github.com/answerdev/answer/internal/service/comment_common" - "github.com/answerdev/answer/internal/service/export" - questioncommon "github.com/answerdev/answer/internal/service/question_common" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/base/validator" + answercommon "github.com/apache/incubator-answer/internal/service/answer_common" + "github.com/apache/incubator-answer/internal/service/comment_common" + "github.com/apache/incubator-answer/internal/service/export" + questioncommon "github.com/apache/incubator-answer/internal/service/question_common" "github.com/google/uuid" "net/mail" "strings" "time" "unicode" - "github.com/answerdev/answer/internal/base/pager" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/activity" - "github.com/answerdev/answer/internal/service/auth" - "github.com/answerdev/answer/internal/service/role" - "github.com/answerdev/answer/internal/service/siteinfo_common" - usercommon "github.com/answerdev/answer/internal/service/user_common" + "github.com/apache/incubator-answer/internal/base/pager" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/activity" + "github.com/apache/incubator-answer/internal/service/auth" + "github.com/apache/incubator-answer/internal/service/role" + "github.com/apache/incubator-answer/internal/service/siteinfo_common" + usercommon "github.com/apache/incubator-answer/internal/service/user_common" "github.com/jinzhu/copier" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" diff --git a/internal/service/user_common/user.go b/internal/service/user_common/user.go index 7da4f3cc8..753588840 100644 --- a/internal/service/user_common/user.go +++ b/internal/service/user_common/user.go @@ -21,19 +21,19 @@ package usercommon import ( "context" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/pkg/converter" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/pkg/converter" "strings" "github.com/Chain-Zhang/pinyin" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/auth" - "github.com/answerdev/answer/internal/service/role" - "github.com/answerdev/answer/internal/service/siteinfo_common" - "github.com/answerdev/answer/pkg/checker" - "github.com/answerdev/answer/pkg/random" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/auth" + "github.com/apache/incubator-answer/internal/service/role" + "github.com/apache/incubator-answer/internal/service/siteinfo_common" + "github.com/apache/incubator-answer/pkg/checker" + "github.com/apache/incubator-answer/pkg/random" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" ) diff --git a/internal/service/user_external_login/user_center_login_service.go b/internal/service/user_external_login/user_center_login_service.go index a0944f747..6089d6268 100644 --- a/internal/service/user_external_login/user_center_login_service.go +++ b/internal/service/user_external_login/user_center_login_service.go @@ -24,19 +24,19 @@ import ( "encoding/json" "time" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/base/translator" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/activity" - "github.com/answerdev/answer/internal/service/siteinfo_common" - usercommon "github.com/answerdev/answer/internal/service/user_common" - "github.com/answerdev/answer/pkg/checker" - "github.com/answerdev/answer/pkg/converter" - "github.com/answerdev/answer/pkg/random" - "github.com/answerdev/answer/plugin" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/activity" + "github.com/apache/incubator-answer/internal/service/siteinfo_common" + usercommon "github.com/apache/incubator-answer/internal/service/user_common" + "github.com/apache/incubator-answer/pkg/checker" + "github.com/apache/incubator-answer/pkg/converter" + "github.com/apache/incubator-answer/pkg/random" + "github.com/apache/incubator-answer/plugin" "github.com/segmentfault/pacman/log" ) diff --git a/internal/service/user_external_login/user_external_login_service.go b/internal/service/user_external_login/user_external_login_service.go index e9b44d3c4..db2fb75e4 100644 --- a/internal/service/user_external_login/user_external_login_service.go +++ b/internal/service/user_external_login/user_external_login_service.go @@ -25,20 +25,20 @@ import ( "fmt" "time" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/base/translator" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/activity" - "github.com/answerdev/answer/internal/service/export" - "github.com/answerdev/answer/internal/service/siteinfo_common" - usercommon "github.com/answerdev/answer/internal/service/user_common" - "github.com/answerdev/answer/pkg/checker" - "github.com/answerdev/answer/pkg/random" - "github.com/answerdev/answer/pkg/token" - "github.com/answerdev/answer/plugin" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/activity" + "github.com/apache/incubator-answer/internal/service/export" + "github.com/apache/incubator-answer/internal/service/siteinfo_common" + usercommon "github.com/apache/incubator-answer/internal/service/user_common" + "github.com/apache/incubator-answer/pkg/checker" + "github.com/apache/incubator-answer/pkg/random" + "github.com/apache/incubator-answer/pkg/token" + "github.com/apache/incubator-answer/plugin" "github.com/google/uuid" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" diff --git a/internal/service/user_notification_config/user_notification_config_service.go b/internal/service/user_notification_config/user_notification_config_service.go index b0b308695..dee84939b 100644 --- a/internal/service/user_notification_config/user_notification_config_service.go +++ b/internal/service/user_notification_config/user_notification_config_service.go @@ -21,10 +21,10 @@ package user_notification_config import ( "context" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - usercommon "github.com/answerdev/answer/internal/service/user_common" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + usercommon "github.com/apache/incubator-answer/internal/service/user_common" ) type UserNotificationConfigRepo interface { diff --git a/internal/service/user_service.go b/internal/service/user_service.go index 3f0e0393b..df740731a 100644 --- a/internal/service/user_service.go +++ b/internal/service/user_service.go @@ -23,26 +23,26 @@ import ( "context" "encoding/json" "fmt" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/service/user_notification_config" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/service/user_notification_config" "time" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/base/translator" - "github.com/answerdev/answer/internal/base/validator" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/schema" - "github.com/answerdev/answer/internal/service/activity" - "github.com/answerdev/answer/internal/service/activity_common" - "github.com/answerdev/answer/internal/service/auth" - "github.com/answerdev/answer/internal/service/export" - "github.com/answerdev/answer/internal/service/role" - "github.com/answerdev/answer/internal/service/siteinfo_common" - usercommon "github.com/answerdev/answer/internal/service/user_common" - "github.com/answerdev/answer/internal/service/user_external_login" - "github.com/answerdev/answer/pkg/checker" - "github.com/answerdev/answer/plugin" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/base/validator" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/schema" + "github.com/apache/incubator-answer/internal/service/activity" + "github.com/apache/incubator-answer/internal/service/activity_common" + "github.com/apache/incubator-answer/internal/service/auth" + "github.com/apache/incubator-answer/internal/service/export" + "github.com/apache/incubator-answer/internal/service/role" + "github.com/apache/incubator-answer/internal/service/siteinfo_common" + usercommon "github.com/apache/incubator-answer/internal/service/user_common" + "github.com/apache/incubator-answer/internal/service/user_external_login" + "github.com/apache/incubator-answer/pkg/checker" + "github.com/apache/incubator-answer/plugin" "github.com/google/uuid" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" diff --git a/internal/service/vote_service.go b/internal/service/vote_service.go index 6051bbf46..b5ce73b82 100644 --- a/internal/service/vote_service.go +++ b/internal/service/vote_service.go @@ -21,25 +21,25 @@ package service import ( "context" - "github.com/answerdev/answer/internal/service/activity_common" + "github.com/apache/incubator-answer/internal/service/activity_common" "strings" - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/pager" - "github.com/answerdev/answer/internal/base/translator" - "github.com/answerdev/answer/internal/entity" - "github.com/answerdev/answer/internal/service/activity_type" - "github.com/answerdev/answer/internal/service/comment_common" - "github.com/answerdev/answer/internal/service/config" - "github.com/answerdev/answer/internal/service/object_info" - "github.com/answerdev/answer/pkg/htmltext" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/pager" + "github.com/apache/incubator-answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/entity" + "github.com/apache/incubator-answer/internal/service/activity_type" + "github.com/apache/incubator-answer/internal/service/comment_common" + "github.com/apache/incubator-answer/internal/service/config" + "github.com/apache/incubator-answer/internal/service/object_info" + "github.com/apache/incubator-answer/pkg/htmltext" "github.com/segmentfault/pacman/log" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/internal/schema" - answercommon "github.com/answerdev/answer/internal/service/answer_common" - questioncommon "github.com/answerdev/answer/internal/service/question_common" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/internal/schema" + answercommon "github.com/apache/incubator-answer/internal/service/answer_common" + questioncommon "github.com/apache/incubator-answer/internal/service/question_common" "github.com/segmentfault/pacman/errors" ) diff --git a/pkg/checker/path_ignore.go b/pkg/checker/path_ignore.go index 98a28805d..5a307ae43 100644 --- a/pkg/checker/path_ignore.go +++ b/pkg/checker/path_ignore.go @@ -22,7 +22,7 @@ package checker import ( "sync" - "github.com/answerdev/answer/configs" + "github.com/apache/incubator-answer/configs" "github.com/segmentfault/pacman/log" "gopkg.in/yaml.v3" ) diff --git a/pkg/checker/reserved_username.go b/pkg/checker/reserved_username.go index 678cc69ec..db0bde937 100644 --- a/pkg/checker/reserved_username.go +++ b/pkg/checker/reserved_username.go @@ -25,9 +25,9 @@ import ( "path/filepath" "sync" - "github.com/answerdev/answer/configs" - "github.com/answerdev/answer/internal/cli" - "github.com/answerdev/answer/pkg/dir" + "github.com/apache/incubator-answer/configs" + "github.com/apache/incubator-answer/internal/cli" + "github.com/apache/incubator-answer/pkg/dir" ) var ( diff --git a/pkg/display/url.go b/pkg/display/url.go index b7f634465..1a9c51961 100644 --- a/pkg/display/url.go +++ b/pkg/display/url.go @@ -20,9 +20,9 @@ package display import ( - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/pkg/htmltext" - "github.com/answerdev/answer/pkg/uid" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/pkg/htmltext" + "github.com/apache/incubator-answer/pkg/uid" ) // QuestionURL get question url diff --git a/pkg/gravatar/gravatar_test.go b/pkg/gravatar/gravatar_test.go index ecc881143..50bd79b47 100644 --- a/pkg/gravatar/gravatar_test.go +++ b/pkg/gravatar/gravatar_test.go @@ -20,7 +20,7 @@ package gravatar import ( - "github.com/answerdev/answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/constant" "testing" "github.com/stretchr/testify/assert" diff --git a/pkg/htmltext/htmltext.go b/pkg/htmltext/htmltext.go index 68c93804a..792063f46 100644 --- a/pkg/htmltext/htmltext.go +++ b/pkg/htmltext/htmltext.go @@ -21,7 +21,7 @@ package htmltext import ( "github.com/Chain-Zhang/pinyin" - "github.com/answerdev/answer/pkg/checker" + "github.com/apache/incubator-answer/pkg/checker" "io" "net/http" "net/url" diff --git a/pkg/obj/obj.go b/pkg/obj/obj.go index 14ac2d6a2..1172b52bb 100644 --- a/pkg/obj/obj.go +++ b/pkg/obj/obj.go @@ -20,9 +20,9 @@ package obj import ( - "github.com/answerdev/answer/internal/base/constant" - "github.com/answerdev/answer/internal/base/reason" - "github.com/answerdev/answer/pkg/converter" + "github.com/apache/incubator-answer/internal/base/constant" + "github.com/apache/incubator-answer/internal/base/reason" + "github.com/apache/incubator-answer/pkg/converter" "github.com/segmentfault/pacman/errors" ) diff --git a/plugin/plugin.go b/plugin/plugin.go index 72f38ddce..1fec78428 100644 --- a/plugin/plugin.go +++ b/plugin/plugin.go @@ -22,8 +22,8 @@ package plugin import ( "encoding/json" - "github.com/answerdev/answer/internal/base/handler" - "github.com/answerdev/answer/internal/base/translator" + "github.com/apache/incubator-answer/internal/base/handler" + "github.com/apache/incubator-answer/internal/base/translator" "github.com/gin-gonic/gin" ) diff --git a/script/build_binary.sh b/script/build_binary.sh deleted file mode 100644 index a9615cf30..000000000 --- a/script/build_binary.sh +++ /dev/null @@ -1,26 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -docker run \ - --rm \ - -e CGO_ENABLED=1 \ - -v /var/run/docker.sock:/var/run/docker.sock \ - -v `pwd`:/go/src/github.com/answerdev/answer \ - -v `pwd`/sysroot:/sysroot \ - -w /go/src/github.com/answerdev/answer \ - goreleaser/goreleaser-cross \ - --rm-dist --skip-validate --skip-publish \ No newline at end of file diff --git a/script/plugin_list b/script/plugin_list index 07f26293c..5e6a4182a 100644 --- a/script/plugin_list +++ b/script/plugin_list @@ -1 +1 @@ -github.com/answerdev/plugins/connector-basic@latest \ No newline at end of file +github.com/apache/incubator-answer-plugins/connector-basic@latest \ No newline at end of file diff --git a/ui/public/index.html b/ui/public/index.html index 9de059726..eeb5fb11b 100644 --- a/ui/public/index.html +++ b/ui/public/index.html @@ -24,7 +24,7 @@ - + diff --git a/ui/src/components/Footer/index.tsx b/ui/src/components/Footer/index.tsx index 850fab86f..6b832ba83 100644 --- a/ui/src/components/Footer/index.tsx +++ b/ui/src/components/Footer/index.tsx @@ -36,7 +36,7 @@ const Index = () => { Built on {/* eslint-disable-next-line react/jsx-no-target-blank */} - + Answer - the open-source software that powers Q&A communities. diff --git a/ui/src/components/PageTags/index.tsx b/ui/src/components/PageTags/index.tsx index 9e09a00bc..6bed21254 100644 --- a/ui/src/components/PageTags/index.tsx +++ b/ui/src/components/PageTags/index.tsx @@ -40,7 +40,7 @@ const Index: FC = () => { if (generatorMetaNode) { generatorMetaNode.setAttribute( 'content', - `Answer ${appVersion} - https://github.com/answerdev/answer version ${hashVersion}`, + `Answer ${appVersion} - https://github.com/apache/incubator-answer version ${hashVersion}`, ); } }; diff --git a/ui/src/pages/Admin/Dashboard/components/AnswerLinks/index.tsx b/ui/src/pages/Admin/Dashboard/components/AnswerLinks/index.tsx index 3eb17e9f4..19a70fca9 100644 --- a/ui/src/pages/Admin/Dashboard/components/AnswerLinks/index.tsx +++ b/ui/src/pages/Admin/Dashboard/components/AnswerLinks/index.tsx @@ -29,7 +29,10 @@ const AnswerLinks = () => {
{t('answer_links')}
- + {t('documents')} diff --git a/ui/src/pages/Admin/Dashboard/components/HealthStatus/index.tsx b/ui/src/pages/Admin/Dashboard/components/HealthStatus/index.tsx index 2353766ae..129248ba9 100644 --- a/ui/src/pages/Admin/Dashboard/components/HealthStatus/index.tsx +++ b/ui/src/pages/Admin/Dashboard/components/HealthStatus/index.tsx @@ -51,7 +51,7 @@ const HealthStatus: FC = ({ data }) => { {t('latest')} @@ -60,7 +60,7 @@ const HealthStatus: FC = ({ data }) => { {t('update_to')} {remote_version} @@ -69,7 +69,7 @@ const HealthStatus: FC = ({ data }) => { {t('check_failed')} diff --git a/ui/src/pages/Admin/Plugins/Installed/index.tsx b/ui/src/pages/Admin/Plugins/Installed/index.tsx index 43188a63c..6df6d716b 100644 --- a/ui/src/pages/Admin/Plugins/Installed/index.tsx +++ b/ui/src/pages/Admin/Plugins/Installed/index.tsx @@ -85,7 +85,7 @@ const Users: FC = () => { Plugins extend and expand the functionality of Answer. You may find plugins in the Answer Plugin Repository diff --git a/ui/src/plugins/builtin/ThirdPartyConnector/info.yaml b/ui/src/plugins/builtin/ThirdPartyConnector/info.yaml index f137c5a9e..9b5f11052 100644 --- a/ui/src/plugins/builtin/ThirdPartyConnector/info.yaml +++ b/ui/src/plugins/builtin/ThirdPartyConnector/info.yaml @@ -18,6 +18,6 @@ slug_name: third_party_connector type: connector version: 0.0.1 -link: https://github.com/answerdev/plugins/tree/main/connector/ +link: https://github.com/apache/incubator-answer-plugins/tree/main/connector-basic author: Answer.dev diff --git a/ui/template/footer.html b/ui/template/footer.html index 7507de659..0e0e40f19 100644 --- a/ui/template/footer.html +++ b/ui/template/footer.html @@ -25,7 +25,7 @@

{{$cc := (join " " .siteinfo.Year .siteinfo.General.Name) -}} {{- $ft := translator $.language "ui.footer.build_on" "cc" $cc -}} - {{templateHTML (replaceHTMLTag $ft " Answer ")}} + {{templateHTML (replaceHTMLTag $ft " Answer ")}}

diff --git a/ui/template/header.html b/ui/template/header.html index affa128f1..47372ab63 100644 --- a/ui/template/header.html +++ b/ui/template/header.html @@ -27,7 +27,7 @@ - + {{if .keywords }}{{end}}