From 2f50f66fb127436c58828e12b4139bb6f8a853d0 Mon Sep 17 00:00:00 2001 From: Nadia <nadia@segmentfault.com> Date: Fri, 21 Oct 2022 19:54:52 +0800 Subject: [PATCH 1/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 22fafaa3..a259f2ff 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # Answer - Build Q&A community -A minimalist open-source knowledge based community software. You can use it to quickly build your Q&A community for product technical support, user Q&A, fans communication, and more. +An open-source knowledge based community software. You can use it to quickly build your Q&A community for product technical support, customer support, user communication, and more. To learn more about the project, visit [answer.dev](https://answer.dev). From d8f3d40db6fe2b6a18ec7e09c1bb0f11220fd5a9 Mon Sep 17 00:00:00 2001 From: sy-records <52o@qq52o.cn> Date: Mon, 24 Oct 2022 09:35:20 +0800 Subject: [PATCH 2/9] doc: update install --- INSTALL.md | 9 ++++----- INSTALL_CN.md | 31 ++++++++++++++++--------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 8e45b8f1..609dedbf 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -37,15 +37,14 @@ vim /var/data/conf/config.yaml # After configuring the configuration file, you can start the mirror again to start the service $ docker start answer - ``` ## Binary for Answer ## Install Answer using binary - 1. Unzip the compressed package. - 2. Use the command cd to enter the directory you just created. - 3. Execute the command ./answer init. + 1. Unzip the compressed package + 2. Use the command cd to enter the directory you just created + 3. Execute the command ./answer init 4. Answer will generate a ./data directory in the current directory 5. Enter the data directory and modify the config.yaml file 6. Modify the database connection address to your database connection address @@ -84,8 +83,8 @@ service_config: secret_key: "answer" #encryption key web_host: "http://127.0.0.1" #Page access using domain name address upload_path: "./upfiles" #upload directory - ``` + ## Compile the image If you have modified the source files and want to repackage the image, you can use the following statement to repackage the image ``` diff --git a/INSTALL_CN.md b/INSTALL_CN.md index 19a96d3d..7642800e 100644 --- a/INSTALL_CN.md +++ b/INSTALL_CN.md @@ -1,20 +1,20 @@ # Answer 安装指引 -安装 Answer 之前,您需要先安装基本环境。 +安装 Answer 之前,您需要先安装基本环境。 - 数据库 - [MySQL](http://dev.mysql.com):版本 >= 5.7 -然后,您可以通过以下几种种方式来安装 Answer: +然后,您可以通过以下几种方式来安装 Answer: - 采用 Docker 部署 - 二进制安装 - 源码安装 ## 使用Docker 安装 Answer -可以从 Docker Hub 或者 GitHub Container registry 下载最新的tags 镜像 +可以从 Docker Hub 或者 GitHub Container registry 下载最新的 tags 镜像 ### 用法 -将配置和存储目录挂在到镜像之外 volume (/var/data -> /data),你可以修改外部挂载地址 +将配置和存储目录挂在到镜像之外 volume (/var/data -> /data),你可以修改外部挂载地址 ``` # 将镜像从 docker hub 拉到本地 @@ -27,7 +27,7 @@ $ mkdir -p /var/data $ docker run --name=answer -p 9080:80 -v /var/data:/data answer/answer # 第一次启动后会在/var/data 目录下生成配置文件 -π# /var/data/conf/config.yaml +# /var/data/conf/config.yaml # 需要修改配置文件中的Mysql 数据库地址 vim /var/data/conf/config.yaml @@ -37,20 +37,21 @@ vim /var/data/conf/config.yaml # 配置好配置文件后可以再次启动镜像即可启动服务 $ docker start answer ``` + ## 使用二进制 安装 Answer 可以使用编译完成的各个平台的二进制文件运行 Answer 项目 ### 用法 -从GitHub 最新版本的tag中下载对应平台的二进制文件压缩包 +从 GitHub 最新版本的tag中下载对应平台的二进制文件压缩包 - 1. 解压压缩包。 - 2. 使用命令 cd 进入到刚刚创建的目录。 - 3. 执行命令 ./answer init。 - 4. Answer 会在当前目录生成./data 目录 - 5. 进入data目录修改config.yaml文件 + 1. 解压压缩包 + 2. 使用命令 cd 进入到刚刚创建的目录 + 3. 执行命令 ./answer init + 4. Answer 会在当前目录生成 ./data 目录 + 5. 进入 data 目录修改 config.yaml 文件 6. 将数据库连接地址修改为你的数据库连接地址 connection: [username]:[password]@tcp([host]:[port])/[DbName] - 7. 退出data 目录 执行 ./answer run -c ./data/conf/config.yaml + 7. 退出 data 目录,执行 ./answer run -c ./data/conf/config.yaml ## 当前支持的命令 用法: answer [command] @@ -75,7 +76,7 @@ data: i18n: bundle_dir: "/data/i18n" #国际化文件存放目录 swaggerui: - show: true #是否显示swaggerapi文档,地址 /swagger/index.html + show: true #是否显示swaggerapi文档,地址 /swagger/index.html protocol: http #swagger 协议头 host: 127.0.0.1 #可被访问的ip地址或域名 address: ':80' #可被访问的端口号 @@ -83,12 +84,12 @@ service_config: secret_key: "answer" #加密key web_host: "http://127.0.0.1" #页面访问使用域名地址 upload_path: "./upfiles" #上传目录 - ``` + ## 编译镜像 如果修改了源文件并且要重新打包镜像可以使用以下语句重新打包镜像 ``` docker build -t answer:v1.0.0 . ``` ## 常见问题 - 1. 项目无法启动,answer主程序启动依赖配置文件config.yaml 、国际化翻译目录 /i18n 、上传文件存放目录/upfiles 需要确保项目启动时加载了配置文件 answer run -c config.yaml 以及在config.yaml 正确的指定i18n 和 upfiles 目录的配置项 + 1. 项目无法启动,answer 主程序启动依赖配置文件 config.yaml 、国际化翻译目录 /i18n 、上传文件存放目录 /upfiles,需要确保项目启动时加载了配置文件 answer run -c config.yaml 以及在 config.yaml 正确的指定 i18n 和 upfiles 目录的配置项 From ec447cf16721e227c5a622695abe9bc74d992a35 Mon Sep 17 00:00:00 2001 From: Yu Zhuohao <54759734+pkmq24@users.noreply.github.com> Date: Mon, 24 Oct 2022 11:25:07 +0800 Subject: [PATCH 3/9] fix the wget link The original link will download the webpage instead of the yaml file itself. Change it to the raw link. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a259f2ff..0da9992c 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ To learn more about the project, visit [answer.dev](https://answer.dev). ```bash mkdir answer && cd answer -wget https://github.com/answerdev/answer/blob/main/docker-compose.yaml +wget https://raw.githubusercontent.com/answerdev/answer/main/docker-compose.yaml docker-compose up ``` From 63152dc9ffff3fdd6e95ef1eff6975fed185b972 Mon Sep 17 00:00:00 2001 From: LinkinStar <linkinstar@foxmail.com> Date: Mon, 24 Oct 2022 13:17:41 +0800 Subject: [PATCH 4/9] doc: add docker-compose and default user to the installation document. --- INSTALL.md | 11 +++++++++++ INSTALL_CN.md | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/INSTALL.md b/INSTALL.md index 8e45b8f1..c8140004 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -10,6 +10,17 @@ You can then install Answer in several ways: - binary installation - Source installation +## Docker-compose for Answer +```bash +$ mkdir answer && cd answer +$ wget https://raw.githubusercontent.com/answerdev/answer/main/docker-compose.yaml +$ docker-compose up +``` + +browser open URL [http://127.0.0.1:9080/](http://127.0.0.1:9080/). + +You can log in with the default administrator username( **`admin@admin.com`** ) and password( **`admin`** ). + ## Docker for Answer Visit Docker Hub or GitHub Container registry to see all available images and tags. diff --git a/INSTALL_CN.md b/INSTALL_CN.md index 19a96d3d..07edce27 100644 --- a/INSTALL_CN.md +++ b/INSTALL_CN.md @@ -10,6 +10,17 @@ - 二进制安装 - 源码安装 +## 使用 Docker-compose 安装 Answer +```bash +$ mkdir answer && cd answer +$ wget https://raw.githubusercontent.com/answerdev/answer/main/docker-compose.yaml +$ docker-compose up +``` + +启动完成后使用浏览器访问 [http://127.0.0.1:9080/](http://127.0.0.1:9080/). + +你可以使用默认的用户名:( **`admin@admin.com`** ) 和密码:( **`admin`** ) 进行登录. + ## 使用Docker 安装 Answer 可以从 Docker Hub 或者 GitHub Container registry 下载最新的tags 镜像 From adc760e87401111fddcf4101da8a5a9417f616c1 Mon Sep 17 00:00:00 2001 From: LinkinStar <linkinstar@foxmail.com> Date: Mon, 24 Oct 2022 16:51:05 +0800 Subject: [PATCH 5/9] refactor: rename go mod package to answerdev --- Dockerfile | 2 +- cmd/answer/command.go | 4 +- cmd/answer/main.go | 4 +- cmd/answer/wire.go | 22 ++-- cmd/answer/wire_gen.go | 106 +++++++++--------- go.mod | 2 +- internal/base/conf/conf.go | 10 +- internal/base/handler/handler.go | 6 +- internal/base/handler/lang.go | 2 +- internal/base/handler/response.go | 2 +- internal/base/middleware/auth.go | 12 +- internal/base/server/http.go | 4 +- internal/base/validator/validator.go | 4 +- internal/cli/dump.go | 2 +- internal/cli/install.go | 6 +- internal/cli/install_check.go | 4 +- internal/controller/answer_controller.go | 14 +-- internal/controller/collection_controller.go | 12 +- internal/controller/comment_controller.go | 12 +- internal/controller/follow_controller.go | 8 +- internal/controller/lang_controller.go | 4 +- .../controller/notification_controller.go | 8 +- internal/controller/question_controller.go | 16 +-- internal/controller/rank_controller.go | 8 +- internal/controller/reason_controller.go | 6 +- internal/controller/report_controller.go | 12 +- internal/controller/revision_controller.go | 8 +- internal/controller/search_controller.go | 12 +- internal/controller/siteinfo_controller.go | 6 +- internal/controller/tag_controller.go | 12 +- internal/controller/user_controller.go | 20 ++-- internal/controller/vote_controller.go | 8 +- .../controller_backyard/report_controller.go | 8 +- .../siteinfo_controller.go | 6 +- .../controller_backyard/theme_controller.go | 4 +- .../user_backyard_controller.go | 6 +- internal/entity/comment_entity.go | 2 +- internal/migrations/init.go | 4 +- internal/migrations/migrations.go | 4 +- internal/repo/activity/answer_repo.go | 18 +-- internal/repo/activity/follow_repo.go | 14 +-- internal/repo/activity/user_active_repo.go | 14 +-- internal/repo/activity/vote_repo.go | 26 ++--- internal/repo/activity_common/follow.go | 12 +- internal/repo/activity_common/vote.go | 8 +- internal/repo/activity_repo.go | 14 +-- internal/repo/answer_repo.go | 20 ++-- internal/repo/auth/auth.go | 10 +- internal/repo/captcha/captcha.go | 6 +- .../repo/collection/collection_group_repo.go | 12 +- internal/repo/collection/collection_repo.go | 14 +-- internal/repo/comment/comment_repo.go | 14 +-- internal/repo/common/common.go | 10 +- internal/repo/config/config_repo.go | 10 +- internal/repo/export/email_repo.go | 6 +- internal/repo/meta/meta_repo.go | 10 +- .../repo/notification/notification_repo.go | 12 +- internal/repo/provider.go | 38 +++---- internal/repo/question_repo.go | 16 +-- internal/repo/rank/user_rank_repo.go | 12 +- internal/repo/reason/reason_repo.go | 6 +- internal/repo/report/report_repo.go | 16 +-- internal/repo/revision/revision_repo.go | 14 +-- internal/repo/search_repo.go | 18 +-- internal/repo/siteinfo_repo.go | 8 +- internal/repo/tag/tag_rel_repo.go | 8 +- internal/repo/tag/tag_repo.go | 12 +- internal/repo/unique/uniqid_repo.go | 10 +- internal/repo/user/user_backyard_repo.go | 12 +- internal/repo/user/user_repo.go | 10 +- internal/router/answer_api_router.go | 4 +- internal/router/static_router.go | 2 +- internal/router/swagger_router.go | 2 +- internal/router/ui.go | 2 +- internal/schema/comment_schema.go | 2 +- internal/schema/report_schema.go | 2 +- internal/schema/tag_schema.go | 4 +- internal/schema/user_schema.go | 8 +- internal/service/action/captcha_service.go | 4 +- internal/service/activity_common/activity.go | 2 +- .../service/activity_type/activity_type.go | 2 +- internal/service/answer_common/answer.go | 4 +- internal/service/answer_service.go | 26 ++--- internal/service/auth/auth.go | 4 +- .../service/collection_common/collection.go | 2 +- internal/service/collection_group_service.go | 6 +- internal/service/collection_service.go | 8 +- internal/service/comment/comment_service.go | 22 ++-- .../service/comment_common/comment_service.go | 6 +- internal/service/export/email_service.go | 4 +- internal/service/follow/follow_service.go | 8 +- internal/service/meta/meta_service.go | 4 +- internal/service/notice_queue/notice_queue.go | 2 +- .../notification/notification_service.go | 12 +- .../notification_common/notification.go | 18 +-- internal/service/object_info/object_info.go | 16 +-- .../service/permission/comment_permission.go | 2 +- internal/service/provider.go | 50 ++++----- internal/service/question_common/question.go | 20 ++-- internal/service/question_service.go | 28 ++--- internal/service/rank/rank_service.go | 16 +-- internal/service/reason/reason_service.go | 4 +- internal/service/reason_common/reason.go | 2 +- internal/service/report/report_service.go | 16 +-- .../report_backyard/report_backyard.go | 24 ++-- .../service/report_common/report_common.go | 4 +- .../report_handle_backyard/report_handle.go | 16 +-- internal/service/revision/revision.go | 2 +- .../revision_common/revision_service.go | 8 +- internal/service/revision_service.go | 14 +-- internal/service/search/accepted_answer.go | 4 +- internal/service/search/answer.go | 4 +- internal/service/search/answers.go | 6 +- internal/service/search/author.go | 6 +- internal/service/search/in_question.go | 4 +- .../service/search/not_accepted_question.go | 4 +- internal/service/search/object.go | 4 +- internal/service/search/question.go | 4 +- internal/service/search/score.go | 6 +- internal/service/search/tag.go | 10 +- internal/service/search/views.go | 4 +- internal/service/search/within.go | 4 +- internal/service/search_common/search.go | 2 +- internal/service/search_service.go | 12 +- internal/service/siteinfo_common/siteinfo.go | 2 +- internal/service/siteinfo_service.go | 10 +- internal/service/tag/tag_service.go | 18 +-- internal/service/tag_common/tag_common.go | 6 +- internal/service/uploader/upload.go | 8 +- .../service/user_backyard/user_backyard.go | 8 +- internal/service/user_common/user.go | 4 +- internal/service/user_service.go | 18 +-- internal/service/vote_service.go | 24 ++-- pkg/obj/obj.go | 6 +- 134 files changed, 681 insertions(+), 681 deletions(-) diff --git a/Dockerfile b/Dockerfile index 40c5005c..4c46698b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ LABEL maintainer="aichy" ENV GOPATH /go ENV GOROOT /usr/local/go -ENV PACKAGE github.com/segmentfault/answer +ENV PACKAGE github.com/answerdev/answer ENV GOPROXY https://goproxy.cn,direct ENV BUILD_DIR ${GOPATH}/src/${PACKAGE} # Build diff --git a/cmd/answer/command.go b/cmd/answer/command.go index d0f76408..408f9fc4 100644 --- a/cmd/answer/command.go +++ b/cmd/answer/command.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/segmentfault/answer/internal/cli" - "github.com/segmentfault/answer/internal/migrations" + "github.com/answerdev/answer/internal/cli" + "github.com/answerdev/answer/internal/migrations" "github.com/spf13/cobra" ) diff --git a/cmd/answer/main.go b/cmd/answer/main.go index aadb6b65..08214244 100644 --- a/cmd/answer/main.go +++ b/cmd/answer/main.go @@ -4,9 +4,9 @@ import ( "os" "path/filepath" + "github.com/answerdev/answer/internal/base/conf" + "github.com/answerdev/answer/internal/cli" "github.com/gin-gonic/gin" - "github.com/segmentfault/answer/internal/base/conf" - "github.com/segmentfault/answer/internal/cli" "github.com/segmentfault/pacman" "github.com/segmentfault/pacman/contrib/conf/viper" "github.com/segmentfault/pacman/contrib/log/zap" diff --git a/cmd/answer/wire.go b/cmd/answer/wire.go index d3a6a7d1..067314f7 100644 --- a/cmd/answer/wire.go +++ b/cmd/answer/wire.go @@ -6,18 +6,18 @@ package main import ( + "github.com/answerdev/answer/internal/base/conf" + "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_backyard" + "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/google/wire" - "github.com/segmentfault/answer/internal/base/conf" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/middleware" - "github.com/segmentfault/answer/internal/base/server" - "github.com/segmentfault/answer/internal/base/translator" - "github.com/segmentfault/answer/internal/controller" - "github.com/segmentfault/answer/internal/controller_backyard" - "github.com/segmentfault/answer/internal/repo" - "github.com/segmentfault/answer/internal/router" - "github.com/segmentfault/answer/internal/service" - "github.com/segmentfault/answer/internal/service/service_config" "github.com/segmentfault/pacman" "github.com/segmentfault/pacman/log" ) diff --git a/cmd/answer/wire_gen.go b/cmd/answer/wire_gen.go index 661fb031..b034797f 100644 --- a/cmd/answer/wire_gen.go +++ b/cmd/answer/wire_gen.go @@ -7,59 +7,59 @@ package main import ( - "github.com/segmentfault/answer/internal/base/conf" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/middleware" - "github.com/segmentfault/answer/internal/base/server" - "github.com/segmentfault/answer/internal/base/translator" - "github.com/segmentfault/answer/internal/controller" - "github.com/segmentfault/answer/internal/controller_backyard" - "github.com/segmentfault/answer/internal/repo" - "github.com/segmentfault/answer/internal/repo/activity" - "github.com/segmentfault/answer/internal/repo/activity_common" - "github.com/segmentfault/answer/internal/repo/auth" - "github.com/segmentfault/answer/internal/repo/captcha" - "github.com/segmentfault/answer/internal/repo/collection" - "github.com/segmentfault/answer/internal/repo/comment" - "github.com/segmentfault/answer/internal/repo/common" - "github.com/segmentfault/answer/internal/repo/config" - "github.com/segmentfault/answer/internal/repo/export" - "github.com/segmentfault/answer/internal/repo/meta" - "github.com/segmentfault/answer/internal/repo/notification" - "github.com/segmentfault/answer/internal/repo/rank" - "github.com/segmentfault/answer/internal/repo/reason" - "github.com/segmentfault/answer/internal/repo/report" - "github.com/segmentfault/answer/internal/repo/revision" - "github.com/segmentfault/answer/internal/repo/tag" - "github.com/segmentfault/answer/internal/repo/unique" - "github.com/segmentfault/answer/internal/repo/user" - "github.com/segmentfault/answer/internal/router" - "github.com/segmentfault/answer/internal/service" - "github.com/segmentfault/answer/internal/service/action" - activity2 "github.com/segmentfault/answer/internal/service/activity" - "github.com/segmentfault/answer/internal/service/answer_common" - auth2 "github.com/segmentfault/answer/internal/service/auth" - "github.com/segmentfault/answer/internal/service/collection_common" - comment2 "github.com/segmentfault/answer/internal/service/comment" - export2 "github.com/segmentfault/answer/internal/service/export" - "github.com/segmentfault/answer/internal/service/follow" - meta2 "github.com/segmentfault/answer/internal/service/meta" - notification2 "github.com/segmentfault/answer/internal/service/notification" - "github.com/segmentfault/answer/internal/service/notification_common" - "github.com/segmentfault/answer/internal/service/object_info" - "github.com/segmentfault/answer/internal/service/question_common" - rank2 "github.com/segmentfault/answer/internal/service/rank" - reason2 "github.com/segmentfault/answer/internal/service/reason" - report2 "github.com/segmentfault/answer/internal/service/report" - "github.com/segmentfault/answer/internal/service/report_backyard" - "github.com/segmentfault/answer/internal/service/report_handle_backyard" - "github.com/segmentfault/answer/internal/service/revision_common" - "github.com/segmentfault/answer/internal/service/service_config" - tag2 "github.com/segmentfault/answer/internal/service/tag" - "github.com/segmentfault/answer/internal/service/tag_common" - "github.com/segmentfault/answer/internal/service/uploader" - "github.com/segmentfault/answer/internal/service/user_backyard" - "github.com/segmentfault/answer/internal/service/user_common" + "github.com/answerdev/answer/internal/base/conf" + "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_backyard" + "github.com/answerdev/answer/internal/repo" + "github.com/answerdev/answer/internal/repo/activity" + "github.com/answerdev/answer/internal/repo/activity_common" + "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/common" + "github.com/answerdev/answer/internal/repo/config" + "github.com/answerdev/answer/internal/repo/export" + "github.com/answerdev/answer/internal/repo/meta" + "github.com/answerdev/answer/internal/repo/notification" + "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/tag" + "github.com/answerdev/answer/internal/repo/unique" + "github.com/answerdev/answer/internal/repo/user" + "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" + "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" + export2 "github.com/answerdev/answer/internal/service/export" + "github.com/answerdev/answer/internal/service/follow" + meta2 "github.com/answerdev/answer/internal/service/meta" + notification2 "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/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_backyard" + "github.com/answerdev/answer/internal/service/report_handle_backyard" + "github.com/answerdev/answer/internal/service/revision_common" + "github.com/answerdev/answer/internal/service/service_config" + tag2 "github.com/answerdev/answer/internal/service/tag" + "github.com/answerdev/answer/internal/service/tag_common" + "github.com/answerdev/answer/internal/service/uploader" + "github.com/answerdev/answer/internal/service/user_backyard" + "github.com/answerdev/answer/internal/service/user_common" "github.com/segmentfault/pacman" "github.com/segmentfault/pacman/log" ) diff --git a/go.mod b/go.mod index 89a851fb..7fe0bfd9 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/segmentfault/answer +module github.com/answerdev/answer go 1.18 diff --git a/internal/base/conf/conf.go b/internal/base/conf/conf.go index 27f289f8..97859ac0 100644 --- a/internal/base/conf/conf.go +++ b/internal/base/conf/conf.go @@ -1,11 +1,11 @@ package conf import ( - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/server" - "github.com/segmentfault/answer/internal/base/translator" - "github.com/segmentfault/answer/internal/router" - "github.com/segmentfault/answer/internal/service/service_config" + "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/router" + "github.com/answerdev/answer/internal/service/service_config" ) // AllConfig all config diff --git a/internal/base/handler/handler.go b/internal/base/handler/handler.go index 07f283c6..2fde62de 100644 --- a/internal/base/handler/handler.go +++ b/internal/base/handler/handler.go @@ -4,10 +4,10 @@ import ( "errors" "net/http" + "github.com/answerdev/answer/internal/base/constant" + "github.com/answerdev/answer/internal/base/reason" + "github.com/answerdev/answer/internal/base/validator" "github.com/gin-gonic/gin" - "github.com/segmentfault/answer/internal/base/constant" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/base/validator" 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 c55c1e5d..a6b2122c 100644 --- a/internal/base/handler/lang.go +++ b/internal/base/handler/lang.go @@ -1,8 +1,8 @@ package handler import ( + "github.com/answerdev/answer/internal/base/constant" "github.com/gin-gonic/gin" - "github.com/segmentfault/answer/internal/base/constant" "github.com/segmentfault/pacman/i18n" ) diff --git a/internal/base/handler/response.go b/internal/base/handler/response.go index e79fbce7..876ba765 100644 --- a/internal/base/handler/response.go +++ b/internal/base/handler/response.go @@ -1,7 +1,7 @@ package handler import ( - "github.com/segmentfault/answer/internal/base/translator" + "github.com/answerdev/answer/internal/base/translator" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/i18n" ) diff --git a/internal/base/middleware/auth.go b/internal/base/middleware/auth.go index ccf40dda..cf9c8730 100644 --- a/internal/base/middleware/auth.go +++ b/internal/base/middleware/auth.go @@ -3,14 +3,14 @@ package middleware import ( "strings" - "github.com/segmentfault/answer/internal/schema" + "github.com/answerdev/answer/internal/schema" + "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/gin-gonic/gin" - "github.com/segmentfault/answer/internal/base/handler" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/service/auth" - "github.com/segmentfault/answer/pkg/converter" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/base/server/http.go b/internal/base/server/http.go index a43f6ebc..c1eb86a6 100644 --- a/internal/base/server/http.go +++ b/internal/base/server/http.go @@ -2,9 +2,9 @@ package server import ( brotli "github.com/anargu/gin-brotli" + "github.com/answerdev/answer/internal/base/middleware" + "github.com/answerdev/answer/internal/router" "github.com/gin-gonic/gin" - "github.com/segmentfault/answer/internal/base/middleware" - "github.com/segmentfault/answer/internal/router" ) // NewHTTPServer new http server. diff --git a/internal/base/validator/validator.go b/internal/base/validator/validator.go index 857795af..9695af17 100644 --- a/internal/base/validator/validator.go +++ b/internal/base/validator/validator.go @@ -4,6 +4,8 @@ import ( "errors" "reflect" + "github.com/answerdev/answer/internal/base/reason" + "github.com/answerdev/answer/internal/base/translator" "github.com/go-playground/locales" english "github.com/go-playground/locales/en" zhongwen "github.com/go-playground/locales/zh" @@ -11,8 +13,6 @@ import ( "github.com/go-playground/validator/v10" "github.com/go-playground/validator/v10/translations/en" "github.com/go-playground/validator/v10/translations/zh" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/base/translator" myErrors "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/i18n" "github.com/segmentfault/pacman/log" diff --git a/internal/cli/dump.go b/internal/cli/dump.go index 4b55cd7e..7b84d862 100644 --- a/internal/cli/dump.go +++ b/internal/cli/dump.go @@ -5,7 +5,7 @@ import ( "path/filepath" "time" - "github.com/segmentfault/answer/internal/base/data" + "github.com/answerdev/answer/internal/base/data" "xorm.io/xorm/schemas" ) diff --git a/internal/cli/install.go b/internal/cli/install.go index c1e0b3b5..ae6dd50e 100644 --- a/internal/cli/install.go +++ b/internal/cli/install.go @@ -6,9 +6,9 @@ import ( "os" "path/filepath" - "github.com/segmentfault/answer/configs" - "github.com/segmentfault/answer/i18n" - "github.com/segmentfault/answer/pkg/dir" + "github.com/answerdev/answer/configs" + "github.com/answerdev/answer/i18n" + "github.com/answerdev/answer/pkg/dir" ) const ( diff --git a/internal/cli/install_check.go b/internal/cli/install_check.go index 953d58a8..d344ad2f 100644 --- a/internal/cli/install_check.go +++ b/internal/cli/install_check.go @@ -1,8 +1,8 @@ package cli import ( - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/pkg/dir" + "github.com/answerdev/answer/internal/base/data" + "github.com/answerdev/answer/pkg/dir" ) func CheckConfigFile(configPath string) bool { diff --git a/internal/controller/answer_controller.go b/internal/controller/answer_controller.go index 1b9204d6..1223b037 100644 --- a/internal/controller/answer_controller.go +++ b/internal/controller/answer_controller.go @@ -3,14 +3,14 @@ package controller import ( "fmt" + "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/rank" "github.com/gin-gonic/gin" - "github.com/segmentfault/answer/internal/base/handler" - "github.com/segmentfault/answer/internal/base/middleware" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service" - "github.com/segmentfault/answer/internal/service/rank" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/controller/collection_controller.go b/internal/controller/collection_controller.go index a85e9324..c405acaa 100644 --- a/internal/controller/collection_controller.go +++ b/internal/controller/collection_controller.go @@ -1,14 +1,14 @@ 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/gin-gonic/gin" "github.com/jinzhu/copier" - "github.com/segmentfault/answer/internal/base/handler" - "github.com/segmentfault/answer/internal/base/middleware" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service" - "github.com/segmentfault/answer/pkg/converter" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/controller/comment_controller.go b/internal/controller/comment_controller.go index 53df3f2f..aad50ed2 100644 --- a/internal/controller/comment_controller.go +++ b/internal/controller/comment_controller.go @@ -1,13 +1,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/comment" + "github.com/answerdev/answer/internal/service/rank" "github.com/gin-gonic/gin" - "github.com/segmentfault/answer/internal/base/handler" - "github.com/segmentfault/answer/internal/base/middleware" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/comment" - "github.com/segmentfault/answer/internal/service/rank" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/controller/follow_controller.go b/internal/controller/follow_controller.go index f9a9bf2e..1ccc1220 100644 --- a/internal/controller/follow_controller.go +++ b/internal/controller/follow_controller.go @@ -1,12 +1,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/follow" "github.com/gin-gonic/gin" "github.com/jinzhu/copier" - "github.com/segmentfault/answer/internal/base/handler" - "github.com/segmentfault/answer/internal/base/middleware" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/follow" ) // FollowController activity controller diff --git a/internal/controller/lang_controller.go b/internal/controller/lang_controller.go index 36bc37d7..a689fffc 100644 --- a/internal/controller/lang_controller.go +++ b/internal/controller/lang_controller.go @@ -3,9 +3,9 @@ package controller import ( "encoding/json" + "github.com/answerdev/answer/internal/base/handler" + "github.com/answerdev/answer/internal/schema" "github.com/gin-gonic/gin" - "github.com/segmentfault/answer/internal/base/handler" - "github.com/segmentfault/answer/internal/schema" "github.com/segmentfault/pacman/i18n" ) diff --git a/internal/controller/notification_controller.go b/internal/controller/notification_controller.go index fc05efda..aa173be3 100644 --- a/internal/controller/notification_controller.go +++ b/internal/controller/notification_controller.go @@ -1,11 +1,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/notification" "github.com/gin-gonic/gin" - "github.com/segmentfault/answer/internal/base/handler" - "github.com/segmentfault/answer/internal/base/middleware" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/notification" ) // NotificationController notification controller diff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.go index 6b9643d0..620f1e41 100644 --- a/internal/controller/question_controller.go +++ b/internal/controller/question_controller.go @@ -3,15 +3,15 @@ package controller import ( "context" + "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/rank" + "github.com/answerdev/answer/pkg/converter" "github.com/gin-gonic/gin" - "github.com/segmentfault/answer/internal/base/handler" - "github.com/segmentfault/answer/internal/base/middleware" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service" - "github.com/segmentfault/answer/internal/service/rank" - "github.com/segmentfault/answer/pkg/converter" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/controller/rank_controller.go b/internal/controller/rank_controller.go index d50528c7..b3340f61 100644 --- a/internal/controller/rank_controller.go +++ b/internal/controller/rank_controller.go @@ -1,11 +1,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/rank" "github.com/gin-gonic/gin" - "github.com/segmentfault/answer/internal/base/handler" - "github.com/segmentfault/answer/internal/base/middleware" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/rank" ) // RankController rank controller diff --git a/internal/controller/reason_controller.go b/internal/controller/reason_controller.go index 5cf42d7a..7dd80632 100644 --- a/internal/controller/reason_controller.go +++ b/internal/controller/reason_controller.go @@ -1,10 +1,10 @@ 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/gin-gonic/gin" - "github.com/segmentfault/answer/internal/base/handler" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/reason" ) // ReasonController answer controller diff --git a/internal/controller/report_controller.go b/internal/controller/report_controller.go index 37cda067..1067ee52 100644 --- a/internal/controller/report_controller.go +++ b/internal/controller/report_controller.go @@ -1,13 +1,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/rank" + "github.com/answerdev/answer/internal/service/report" "github.com/gin-gonic/gin" - "github.com/segmentfault/answer/internal/base/handler" - "github.com/segmentfault/answer/internal/base/middleware" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/rank" - "github.com/segmentfault/answer/internal/service/report" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/controller/revision_controller.go b/internal/controller/revision_controller.go index 21aa1b7c..5f30b70e 100644 --- a/internal/controller/revision_controller.go +++ b/internal/controller/revision_controller.go @@ -1,11 +1,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" "github.com/gin-gonic/gin" - "github.com/segmentfault/answer/internal/base/handler" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/controller/search_controller.go b/internal/controller/search_controller.go index 90ea0579..5e2e4ae6 100644 --- a/internal/controller/search_controller.go +++ b/internal/controller/search_controller.go @@ -1,13 +1,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/gin-gonic/gin" - "github.com/segmentfault/answer/internal/base/handler" - "github.com/segmentfault/answer/internal/base/middleware" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service" - "github.com/segmentfault/answer/pkg/converter" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/controller/siteinfo_controller.go b/internal/controller/siteinfo_controller.go index 3fb0a8f0..abcbc178 100644 --- a/internal/controller/siteinfo_controller.go +++ b/internal/controller/siteinfo_controller.go @@ -1,10 +1,10 @@ package controller import ( + "github.com/answerdev/answer/internal/base/handler" + "github.com/answerdev/answer/internal/schema" + "github.com/answerdev/answer/internal/service" "github.com/gin-gonic/gin" - "github.com/segmentfault/answer/internal/base/handler" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service" ) type SiteinfoController struct { diff --git a/internal/controller/tag_controller.go b/internal/controller/tag_controller.go index 01146a79..601c2c6d 100644 --- a/internal/controller/tag_controller.go +++ b/internal/controller/tag_controller.go @@ -1,13 +1,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/rank" + "github.com/answerdev/answer/internal/service/tag" "github.com/gin-gonic/gin" - "github.com/segmentfault/answer/internal/base/handler" - "github.com/segmentfault/answer/internal/base/middleware" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/rank" - "github.com/segmentfault/answer/internal/service/tag" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/controller/user_controller.go b/internal/controller/user_controller.go index 82d6bebf..390b72ce 100644 --- a/internal/controller/user_controller.go +++ b/internal/controller/user_controller.go @@ -5,17 +5,17 @@ import ( "path" "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/base/translator" + "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/uploader" "github.com/gin-gonic/gin" - "github.com/segmentfault/answer/internal/base/handler" - "github.com/segmentfault/answer/internal/base/middleware" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/base/translator" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service" - "github.com/segmentfault/answer/internal/service/action" - "github.com/segmentfault/answer/internal/service/auth" - "github.com/segmentfault/answer/internal/service/export" - "github.com/segmentfault/answer/internal/service/uploader" "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 794e8d98..7fcdf232 100644 --- a/internal/controller/vote_controller.go +++ b/internal/controller/vote_controller.go @@ -1,12 +1,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" "github.com/gin-gonic/gin" "github.com/jinzhu/copier" - "github.com/segmentfault/answer/internal/base/handler" - "github.com/segmentfault/answer/internal/base/middleware" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service" ) // VoteController activity controller diff --git a/internal/controller_backyard/report_controller.go b/internal/controller_backyard/report_controller.go index 6f567b80..3c20394b 100644 --- a/internal/controller_backyard/report_controller.go +++ b/internal/controller_backyard/report_controller.go @@ -1,11 +1,11 @@ package controller_backyard import ( + "github.com/answerdev/answer/internal/base/handler" + "github.com/answerdev/answer/internal/schema" + "github.com/answerdev/answer/internal/service/report_backyard" + "github.com/answerdev/answer/pkg/converter" "github.com/gin-gonic/gin" - "github.com/segmentfault/answer/internal/base/handler" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/report_backyard" - "github.com/segmentfault/answer/pkg/converter" ) // ReportController report controller diff --git a/internal/controller_backyard/siteinfo_controller.go b/internal/controller_backyard/siteinfo_controller.go index ef42c5b4..30bfd1bf 100644 --- a/internal/controller_backyard/siteinfo_controller.go +++ b/internal/controller_backyard/siteinfo_controller.go @@ -1,10 +1,10 @@ package controller_backyard import ( + "github.com/answerdev/answer/internal/base/handler" + "github.com/answerdev/answer/internal/schema" + "github.com/answerdev/answer/internal/service" "github.com/gin-gonic/gin" - "github.com/segmentfault/answer/internal/base/handler" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service" ) type SiteInfoController struct { diff --git a/internal/controller_backyard/theme_controller.go b/internal/controller_backyard/theme_controller.go index 6bc512b9..69ce1d0a 100644 --- a/internal/controller_backyard/theme_controller.go +++ b/internal/controller_backyard/theme_controller.go @@ -1,9 +1,9 @@ package controller_backyard import ( + "github.com/answerdev/answer/internal/base/handler" + "github.com/answerdev/answer/internal/schema" "github.com/gin-gonic/gin" - "github.com/segmentfault/answer/internal/base/handler" - "github.com/segmentfault/answer/internal/schema" ) type ThemeController struct{} diff --git a/internal/controller_backyard/user_backyard_controller.go b/internal/controller_backyard/user_backyard_controller.go index 039d9ce3..0c3177fb 100644 --- a/internal/controller_backyard/user_backyard_controller.go +++ b/internal/controller_backyard/user_backyard_controller.go @@ -1,10 +1,10 @@ package controller_backyard import ( + "github.com/answerdev/answer/internal/base/handler" + "github.com/answerdev/answer/internal/schema" + "github.com/answerdev/answer/internal/service/user_backyard" "github.com/gin-gonic/gin" - "github.com/segmentfault/answer/internal/base/handler" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/user_backyard" ) // UserBackyardController user controller diff --git a/internal/entity/comment_entity.go b/internal/entity/comment_entity.go index e657826d..bf8ad46d 100644 --- a/internal/entity/comment_entity.go +++ b/internal/entity/comment_entity.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/segmentfault/answer/pkg/converter" + "github.com/answerdev/answer/pkg/converter" ) const ( diff --git a/internal/migrations/init.go b/internal/migrations/init.go index a2561a0d..0601ffdd 100644 --- a/internal/migrations/init.go +++ b/internal/migrations/init.go @@ -3,8 +3,8 @@ package migrations import ( "fmt" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/entity" + "github.com/answerdev/answer/internal/base/data" + "github.com/answerdev/answer/internal/entity" "xorm.io/xorm" ) diff --git a/internal/migrations/migrations.go b/internal/migrations/migrations.go index 17176666..f4f4efd8 100644 --- a/internal/migrations/migrations.go +++ b/internal/migrations/migrations.go @@ -3,8 +3,8 @@ package migrations import ( "fmt" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/entity" + "github.com/answerdev/answer/internal/base/data" + "github.com/answerdev/answer/internal/entity" "github.com/segmentfault/pacman/log" "xorm.io/xorm" ) diff --git a/internal/repo/activity/answer_repo.go b/internal/repo/activity/answer_repo.go index 74a06770..03aa1409 100644 --- a/internal/repo/activity/answer_repo.go +++ b/internal/repo/activity/answer_repo.go @@ -3,15 +3,15 @@ package activity import ( "context" - "github.com/segmentfault/answer/internal/base/constant" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/activity" - "github.com/segmentfault/answer/internal/service/activity_common" - "github.com/segmentfault/answer/internal/service/notice_queue" - "github.com/segmentfault/answer/internal/service/rank" + "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/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" "xorm.io/xorm" diff --git a/internal/repo/activity/follow_repo.go b/internal/repo/activity/follow_repo.go index 380a480f..916459a2 100644 --- a/internal/repo/activity/follow_repo.go +++ b/internal/repo/activity/follow_repo.go @@ -3,16 +3,16 @@ package activity import ( "context" - "github.com/segmentfault/answer/internal/service/activity_common" - "github.com/segmentfault/answer/internal/service/follow" - "github.com/segmentfault/answer/pkg/obj" + "github.com/answerdev/answer/internal/service/activity_common" + "github.com/answerdev/answer/internal/service/follow" + "github.com/answerdev/answer/pkg/obj" "github.com/segmentfault/pacman/log" "xorm.io/builder" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/service/unique" + "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/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 3810b5a1..27f6c5a6 100644 --- a/internal/repo/activity/user_active_repo.go +++ b/internal/repo/activity/user_active_repo.go @@ -3,13 +3,13 @@ package activity import ( "context" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/service/activity" - "github.com/segmentfault/answer/internal/service/activity_common" - "github.com/segmentfault/answer/internal/service/config" - "github.com/segmentfault/answer/internal/service/rank" + "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/segmentfault/pacman/errors" "xorm.io/xorm" ) diff --git a/internal/repo/activity/vote_repo.go b/internal/repo/activity/vote_repo.go index e96730e8..bcc95f93 100644 --- a/internal/repo/activity/vote_repo.go +++ b/internal/repo/activity/vote_repo.go @@ -2,25 +2,25 @@ package activity import ( "context" - "github.com/segmentfault/answer/pkg/converter" + "github.com/answerdev/answer/pkg/converter" "strings" - "github.com/segmentfault/answer/internal/base/pager" - "github.com/segmentfault/answer/internal/service/config" - "github.com/segmentfault/answer/internal/service/notice_queue" - "github.com/segmentfault/answer/internal/service/rank" - "github.com/segmentfault/answer/pkg/obj" + "github.com/answerdev/answer/internal/base/pager" + "github.com/answerdev/answer/internal/service/config" + "github.com/answerdev/answer/internal/service/notice_queue" + "github.com/answerdev/answer/internal/service/rank" + "github.com/answerdev/answer/pkg/obj" "xorm.io/builder" - "github.com/segmentfault/answer/internal/service/activity_common" - "github.com/segmentfault/answer/internal/service/unique" + "github.com/answerdev/answer/internal/service/activity_common" + "github.com/answerdev/answer/internal/service/unique" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service" + "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/segmentfault/pacman/errors" "xorm.io/xorm" ) diff --git a/internal/repo/activity_common/follow.go b/internal/repo/activity_common/follow.go index dda87e06..a793fdec 100644 --- a/internal/repo/activity_common/follow.go +++ b/internal/repo/activity_common/follow.go @@ -3,12 +3,12 @@ package activity_common import ( "context" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/service/activity_common" - "github.com/segmentfault/answer/internal/service/unique" - "github.com/segmentfault/answer/pkg/obj" + "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/segmentfault/pacman/errors" ) diff --git a/internal/repo/activity_common/vote.go b/internal/repo/activity_common/vote.go index 31b3b7f7..c2525145 100644 --- a/internal/repo/activity_common/vote.go +++ b/internal/repo/activity_common/vote.go @@ -3,10 +3,10 @@ package activity_common import ( "context" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/service/activity_common" - "github.com/segmentfault/answer/internal/service/unique" + "github.com/answerdev/answer/internal/base/data" + "github.com/answerdev/answer/internal/entity" + "github.com/answerdev/answer/internal/service/activity_common" + "github.com/answerdev/answer/internal/service/unique" ) // VoteRepo activity repository diff --git a/internal/repo/activity_repo.go b/internal/repo/activity_repo.go index 868041df..df14ae01 100644 --- a/internal/repo/activity_repo.go +++ b/internal/repo/activity_repo.go @@ -4,16 +4,16 @@ import ( "context" "fmt" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/service/activity_common" - "github.com/segmentfault/answer/pkg/obj" + "github.com/answerdev/answer/internal/entity" + "github.com/answerdev/answer/internal/service/activity_common" + "github.com/answerdev/answer/pkg/obj" "xorm.io/builder" "xorm.io/xorm" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/service/config" - "github.com/segmentfault/answer/internal/service/unique" + "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/segmentfault/pacman/errors" ) diff --git a/internal/repo/answer_repo.go b/internal/repo/answer_repo.go index 6092f9d9..dd4753e8 100644 --- a/internal/repo/answer_repo.go +++ b/internal/repo/answer_repo.go @@ -4,16 +4,16 @@ import ( "context" "time" - "github.com/segmentfault/answer/internal/base/constant" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/pager" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/activity_common" - answercommon "github.com/segmentfault/answer/internal/service/answer_common" - "github.com/segmentfault/answer/internal/service/rank" - "github.com/segmentfault/answer/internal/service/unique" + "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" + "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/segmentfault/pacman/errors" ) diff --git a/internal/repo/auth/auth.go b/internal/repo/auth/auth.go index 784b1e30..46202980 100644 --- a/internal/repo/auth/auth.go +++ b/internal/repo/auth/auth.go @@ -4,11 +4,11 @@ import ( "context" "encoding/json" - "github.com/segmentfault/answer/internal/base/constant" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/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/answerdev/answer/internal/service/auth" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/repo/captcha/captcha.go b/internal/repo/captcha/captcha.go index b30e180a..73ca1450 100644 --- a/internal/repo/captcha/captcha.go +++ b/internal/repo/captcha/captcha.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/service/action" + "github.com/answerdev/answer/internal/base/data" + "github.com/answerdev/answer/internal/base/reason" + "github.com/answerdev/answer/internal/service/action" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/repo/collection/collection_group_repo.go b/internal/repo/collection/collection_group_repo.go index 734d4307..cac96cfc 100644 --- a/internal/repo/collection/collection_group_repo.go +++ b/internal/repo/collection/collection_group_repo.go @@ -3,12 +3,12 @@ package collection import ( "context" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/pager" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service" + "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/segmentfault/pacman/errors" ) diff --git a/internal/repo/collection/collection_repo.go b/internal/repo/collection/collection_repo.go index 691a35f5..2fb4d92c 100644 --- a/internal/repo/collection/collection_repo.go +++ b/internal/repo/collection/collection_repo.go @@ -3,13 +3,13 @@ package collection import ( "context" - "github.com/segmentfault/answer/internal/base/constant" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/pager" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - collectioncommon "github.com/segmentfault/answer/internal/service/collection_common" - "github.com/segmentfault/answer/internal/service/unique" + "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" + collectioncommon "github.com/answerdev/answer/internal/service/collection_common" + "github.com/answerdev/answer/internal/service/unique" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/repo/comment/comment_repo.go b/internal/repo/comment/comment_repo.go index c8ea40a9..f2da8db5 100644 --- a/internal/repo/comment/comment_repo.go +++ b/internal/repo/comment/comment_repo.go @@ -3,13 +3,13 @@ package comment import ( "context" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/pager" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/service/comment" - "github.com/segmentfault/answer/internal/service/comment_common" - "github.com/segmentfault/answer/internal/service/unique" + "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/segmentfault/pacman/errors" ) diff --git a/internal/repo/common/common.go b/internal/repo/common/common.go index 15773a6a..89b15453 100644 --- a/internal/repo/common/common.go +++ b/internal/repo/common/common.go @@ -1,11 +1,11 @@ package common import ( - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/service/unique" - "github.com/segmentfault/answer/pkg/obj" + "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/answerdev/answer/pkg/obj" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" ) diff --git a/internal/repo/config/config_repo.go b/internal/repo/config/config_repo.go index e4e0a10a..4f97ad68 100644 --- a/internal/repo/config/config_repo.go +++ b/internal/repo/config/config_repo.go @@ -5,12 +5,12 @@ import ( "fmt" "sync" - "github.com/segmentfault/answer/internal/service/config" - "github.com/segmentfault/answer/pkg/converter" + "github.com/answerdev/answer/internal/service/config" + "github.com/answerdev/answer/pkg/converter" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" + "github.com/answerdev/answer/internal/base/data" + "github.com/answerdev/answer/internal/base/reason" + "github.com/answerdev/answer/internal/entity" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/repo/export/email_repo.go b/internal/repo/export/email_repo.go index 0a70a28a..85f0b249 100644 --- a/internal/repo/export/email_repo.go +++ b/internal/repo/export/email_repo.go @@ -4,9 +4,9 @@ import ( "context" "time" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/service/export" + "github.com/answerdev/answer/internal/base/data" + "github.com/answerdev/answer/internal/base/reason" + "github.com/answerdev/answer/internal/service/export" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/repo/meta/meta_repo.go b/internal/repo/meta/meta_repo.go index f23b455b..e98c8020 100644 --- a/internal/repo/meta/meta_repo.go +++ b/internal/repo/meta/meta_repo.go @@ -3,11 +3,11 @@ package meta import ( "context" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/pager" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/service/meta" + "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/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 b001fb6f..deaf431a 100644 --- a/internal/repo/notification/notification_repo.go +++ b/internal/repo/notification/notification_repo.go @@ -4,12 +4,12 @@ import ( "context" "time" - "github.com/segmentfault/answer/internal/base/constant" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" - notficationcommon "github.com/segmentfault/answer/internal/service/notification_common" + "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" + notficationcommon "github.com/answerdev/answer/internal/service/notification_common" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/repo/provider.go b/internal/repo/provider.go index 5afd7455..16c751ec 100644 --- a/internal/repo/provider.go +++ b/internal/repo/provider.go @@ -1,26 +1,26 @@ 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/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/common" + "github.com/answerdev/answer/internal/repo/config" + "github.com/answerdev/answer/internal/repo/export" + "github.com/answerdev/answer/internal/repo/meta" + "github.com/answerdev/answer/internal/repo/notification" + "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/tag" + "github.com/answerdev/answer/internal/repo/unique" + "github.com/answerdev/answer/internal/repo/user" "github.com/google/wire" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/repo/activity" - "github.com/segmentfault/answer/internal/repo/activity_common" - "github.com/segmentfault/answer/internal/repo/auth" - "github.com/segmentfault/answer/internal/repo/captcha" - "github.com/segmentfault/answer/internal/repo/collection" - "github.com/segmentfault/answer/internal/repo/comment" - "github.com/segmentfault/answer/internal/repo/common" - "github.com/segmentfault/answer/internal/repo/config" - "github.com/segmentfault/answer/internal/repo/export" - "github.com/segmentfault/answer/internal/repo/meta" - "github.com/segmentfault/answer/internal/repo/notification" - "github.com/segmentfault/answer/internal/repo/rank" - "github.com/segmentfault/answer/internal/repo/reason" - "github.com/segmentfault/answer/internal/repo/report" - "github.com/segmentfault/answer/internal/repo/revision" - "github.com/segmentfault/answer/internal/repo/tag" - "github.com/segmentfault/answer/internal/repo/unique" - "github.com/segmentfault/answer/internal/repo/user" ) // ProviderSetRepo is data providers. diff --git a/internal/repo/question_repo.go b/internal/repo/question_repo.go index 13e48be9..8554fea1 100644 --- a/internal/repo/question_repo.go +++ b/internal/repo/question_repo.go @@ -4,14 +4,14 @@ import ( "context" "time" - "github.com/segmentfault/answer/internal/base/constant" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/pager" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" - questioncommon "github.com/segmentfault/answer/internal/service/question_common" - "github.com/segmentfault/answer/internal/service/unique" + "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/segmentfault/pacman/errors" ) diff --git a/internal/repo/rank/user_rank_repo.go b/internal/repo/rank/user_rank_repo.go index ea6d9ef0..8f473e53 100644 --- a/internal/repo/rank/user_rank_repo.go +++ b/internal/repo/rank/user_rank_repo.go @@ -3,13 +3,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/jinzhu/now" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/pager" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/service/config" - "github.com/segmentfault/answer/internal/service/rank" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" "xorm.io/builder" diff --git a/internal/repo/reason/reason_repo.go b/internal/repo/reason/reason_repo.go index ced2e41c..1576df6e 100644 --- a/internal/repo/reason/reason_repo.go +++ b/internal/repo/reason/reason_repo.go @@ -5,9 +5,9 @@ import ( "encoding/json" "fmt" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/config" - "github.com/segmentfault/answer/internal/service/reason_common" + "github.com/answerdev/answer/internal/schema" + "github.com/answerdev/answer/internal/service/config" + "github.com/answerdev/answer/internal/service/reason_common" "github.com/segmentfault/pacman/log" ) diff --git a/internal/repo/report/report_repo.go b/internal/repo/report/report_repo.go index da648661..bb8246a9 100644 --- a/internal/repo/report/report_repo.go +++ b/internal/repo/report/report_repo.go @@ -3,15 +3,15 @@ package report import ( "context" - "github.com/segmentfault/answer/internal/base/constant" - "github.com/segmentfault/answer/internal/base/pager" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/report_common" + "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/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/service/unique" + "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/segmentfault/pacman/errors" ) diff --git a/internal/repo/revision/revision_repo.go b/internal/repo/revision/revision_repo.go index 34509eb4..4529caed 100644 --- a/internal/repo/revision/revision_repo.go +++ b/internal/repo/revision/revision_repo.go @@ -3,13 +3,13 @@ package revision import ( "context" - "github.com/segmentfault/answer/internal/base/constant" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/service/revision" - "github.com/segmentfault/answer/internal/service/unique" - "github.com/segmentfault/answer/pkg/obj" + "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/revision" + "github.com/answerdev/answer/internal/service/unique" + "github.com/answerdev/answer/pkg/obj" "github.com/segmentfault/pacman/errors" "xorm.io/builder" "xorm.io/xorm" diff --git a/internal/repo/search_repo.go b/internal/repo/search_repo.go index 8bd9e570..abf53360 100644 --- a/internal/repo/search_repo.go +++ b/internal/repo/search_repo.go @@ -6,16 +6,16 @@ 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" + "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/jinzhu/copier" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/search_common" - "github.com/segmentfault/answer/internal/service/unique" - usercommon "github.com/segmentfault/answer/internal/service/user_common" - "github.com/segmentfault/answer/pkg/converter" - "github.com/segmentfault/answer/pkg/obj" "github.com/segmentfault/pacman/errors" "xorm.io/builder" ) diff --git a/internal/repo/siteinfo_repo.go b/internal/repo/siteinfo_repo.go index b15262bf..579d9bb1 100644 --- a/internal/repo/siteinfo_repo.go +++ b/internal/repo/siteinfo_repo.go @@ -3,10 +3,10 @@ package repo import ( "context" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/service/siteinfo_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/siteinfo_common" "github.com/segmentfault/pacman/errors" "xorm.io/builder" ) diff --git a/internal/repo/tag/tag_rel_repo.go b/internal/repo/tag/tag_rel_repo.go index 5ba7758e..c54bf8c0 100644 --- a/internal/repo/tag/tag_rel_repo.go +++ b/internal/repo/tag/tag_rel_repo.go @@ -3,10 +3,10 @@ package tag import ( "context" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - tagcommon "github.com/segmentfault/answer/internal/service/tag_common" + "github.com/answerdev/answer/internal/base/data" + "github.com/answerdev/answer/internal/base/reason" + "github.com/answerdev/answer/internal/entity" + tagcommon "github.com/answerdev/answer/internal/service/tag_common" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/repo/tag/tag_repo.go b/internal/repo/tag/tag_repo.go index 8478cf2c..5243402e 100644 --- a/internal/repo/tag/tag_repo.go +++ b/internal/repo/tag/tag_repo.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/pager" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - tagcommon "github.com/segmentfault/answer/internal/service/tag_common" - "github.com/segmentfault/answer/internal/service/unique" + "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/segmentfault/pacman/errors" "xorm.io/builder" ) diff --git a/internal/repo/unique/uniqid_repo.go b/internal/repo/unique/uniqid_repo.go index f216ca0f..44a9c0fa 100644 --- a/internal/repo/unique/uniqid_repo.go +++ b/internal/repo/unique/uniqid_repo.go @@ -5,11 +5,11 @@ import ( "fmt" "strconv" - "github.com/segmentfault/answer/internal/base/constant" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/service/unique" + "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/segmentfault/pacman/errors" ) diff --git a/internal/repo/user/user_backyard_repo.go b/internal/repo/user/user_backyard_repo.go index feccf286..06ce7d2f 100644 --- a/internal/repo/user/user_backyard_repo.go +++ b/internal/repo/user/user_backyard_repo.go @@ -5,12 +5,12 @@ import ( "encoding/json" "time" - "github.com/segmentfault/answer/internal/base/constant" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/pager" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/service/user_backyard" + "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/user_backyard" "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 85f2229d..119bab41 100644 --- a/internal/repo/user/user_repo.go +++ b/internal/repo/user/user_repo.go @@ -5,11 +5,11 @@ import ( "fmt" "time" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/service/config" - usercommon "github.com/segmentfault/answer/internal/service/user_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/config" + usercommon "github.com/answerdev/answer/internal/service/user_common" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/router/answer_api_router.go b/internal/router/answer_api_router.go index e75f7648..e227a10f 100644 --- a/internal/router/answer_api_router.go +++ b/internal/router/answer_api_router.go @@ -1,9 +1,9 @@ package router import ( + "github.com/answerdev/answer/internal/controller" + "github.com/answerdev/answer/internal/controller_backyard" "github.com/gin-gonic/gin" - "github.com/segmentfault/answer/internal/controller" - "github.com/segmentfault/answer/internal/controller_backyard" ) type AnswerAPIRouter struct { diff --git a/internal/router/static_router.go b/internal/router/static_router.go index 76e6b336..77c32c0b 100644 --- a/internal/router/static_router.go +++ b/internal/router/static_router.go @@ -1,8 +1,8 @@ package router import ( + "github.com/answerdev/answer/internal/service/service_config" "github.com/gin-gonic/gin" - "github.com/segmentfault/answer/internal/service/service_config" ) // StaticRouter static api router diff --git a/internal/router/swagger_router.go b/internal/router/swagger_router.go index c6ee462b..b0fd7952 100644 --- a/internal/router/swagger_router.go +++ b/internal/router/swagger_router.go @@ -3,8 +3,8 @@ package router import ( "fmt" + "github.com/answerdev/answer/docs" "github.com/gin-gonic/gin" - "github.com/segmentfault/answer/docs" swaggerfiles "github.com/swaggo/files" ginSwagger "github.com/swaggo/gin-swagger" ) diff --git a/internal/router/ui.go b/internal/router/ui.go index 44ca1d6a..3498265c 100644 --- a/internal/router/ui.go +++ b/internal/router/ui.go @@ -7,8 +7,8 @@ import ( "net/http" "os" + "github.com/answerdev/answer/ui" "github.com/gin-gonic/gin" - "github.com/segmentfault/answer/ui" "github.com/segmentfault/pacman/log" ) diff --git a/internal/schema/comment_schema.go b/internal/schema/comment_schema.go index 41c46f9d..53ebf445 100644 --- a/internal/schema/comment_schema.go +++ b/internal/schema/comment_schema.go @@ -1,8 +1,8 @@ package schema import ( + "github.com/answerdev/answer/internal/entity" "github.com/jinzhu/copier" - "github.com/segmentfault/answer/internal/entity" ) // AddCommentReq add comment request diff --git a/internal/schema/report_schema.go b/internal/schema/report_schema.go index 5dc19945..b4534f82 100644 --- a/internal/schema/report_schema.go +++ b/internal/schema/report_schema.go @@ -3,7 +3,7 @@ package schema import ( "time" - "github.com/segmentfault/answer/internal/base/constant" + "github.com/answerdev/answer/internal/base/constant" ) // AddReportReq add report request diff --git a/internal/schema/tag_schema.go b/internal/schema/tag_schema.go index 03d30b0d..7680c5db 100644 --- a/internal/schema/tag_schema.go +++ b/internal/schema/tag_schema.go @@ -3,8 +3,8 @@ package schema import ( "strings" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/base/validator" + "github.com/answerdev/answer/internal/base/reason" + "github.com/answerdev/answer/internal/base/validator" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/schema/user_schema.go b/internal/schema/user_schema.go index ee5d7f78..757926c7 100644 --- a/internal/schema/user_schema.go +++ b/internal/schema/user_schema.go @@ -4,11 +4,11 @@ import ( "encoding/json" "regexp" + "github.com/answerdev/answer/internal/base/reason" + "github.com/answerdev/answer/internal/base/validator" + "github.com/answerdev/answer/internal/entity" + "github.com/answerdev/answer/pkg/checker" "github.com/jinzhu/copier" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/base/validator" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/pkg/checker" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/service/action/captcha_service.go b/internal/service/action/captcha_service.go index 2cadad8d..380e2a8c 100644 --- a/internal/service/action/captcha_service.go +++ b/internal/service/action/captcha_service.go @@ -5,9 +5,9 @@ import ( "image/color" "strings" + "github.com/answerdev/answer/internal/base/reason" + "github.com/answerdev/answer/internal/schema" "github.com/mojocn/base64Captcha" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/schema" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" ) diff --git a/internal/service/activity_common/activity.go b/internal/service/activity_common/activity.go index 20e2e575..ea81f327 100644 --- a/internal/service/activity_common/activity.go +++ b/internal/service/activity_common/activity.go @@ -3,7 +3,7 @@ package activity_common import ( "context" - "github.com/segmentfault/answer/internal/entity" + "github.com/answerdev/answer/internal/entity" "xorm.io/xorm" ) diff --git a/internal/service/activity_type/activity_type.go b/internal/service/activity_type/activity_type.go index a8a1a564..dde03890 100644 --- a/internal/service/activity_type/activity_type.go +++ b/internal/service/activity_type/activity_type.go @@ -1,6 +1,6 @@ package activity_type -import "github.com/segmentfault/answer/internal/repo/config" +import "github.com/answerdev/answer/internal/repo/config" const ( QuestionVoteUp = "question.vote_up" diff --git a/internal/service/answer_common/answer.go b/internal/service/answer_common/answer.go index 286e8499..7fc65a6f 100644 --- a/internal/service/answer_common/answer.go +++ b/internal/service/answer_common/answer.go @@ -3,8 +3,8 @@ package answercommon import ( "context" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" + "github.com/answerdev/answer/internal/entity" + "github.com/answerdev/answer/internal/schema" ) type AnswerRepo interface { diff --git a/internal/service/answer_service.go b/internal/service/answer_service.go index ec1a8b4a..11e72964 100644 --- a/internal/service/answer_service.go +++ b/internal/service/answer_service.go @@ -6,20 +6,20 @@ import ( "fmt" "time" - "github.com/segmentfault/answer/internal/base/constant" - "github.com/segmentfault/answer/internal/service/activity" - "github.com/segmentfault/answer/internal/service/activity_common" - "github.com/segmentfault/answer/internal/service/notice_queue" - "github.com/segmentfault/answer/internal/service/revision_common" + "github.com/answerdev/answer/internal/base/constant" + "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/revision_common" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" - answercommon "github.com/segmentfault/answer/internal/service/answer_common" - collectioncommon "github.com/segmentfault/answer/internal/service/collection_common" - "github.com/segmentfault/answer/internal/service/permission" - questioncommon "github.com/segmentfault/answer/internal/service/question_common" - usercommon "github.com/segmentfault/answer/internal/service/user_common" + "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" + collectioncommon "github.com/answerdev/answer/internal/service/collection_common" + "github.com/answerdev/answer/internal/service/permission" + questioncommon "github.com/answerdev/answer/internal/service/question_common" + usercommon "github.com/answerdev/answer/internal/service/user_common" "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 5c930433..c7f4e712 100644 --- a/internal/service/auth/auth.go +++ b/internal/service/auth/auth.go @@ -3,8 +3,8 @@ package auth import ( "context" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/pkg/token" + "github.com/answerdev/answer/internal/entity" + "github.com/answerdev/answer/pkg/token" "github.com/segmentfault/pacman/log" ) diff --git a/internal/service/collection_common/collection.go b/internal/service/collection_common/collection.go index 0066bced..42f11341 100644 --- a/internal/service/collection_common/collection.go +++ b/internal/service/collection_common/collection.go @@ -3,7 +3,7 @@ package collectioncommon import ( "context" - "github.com/segmentfault/answer/internal/entity" + "github.com/answerdev/answer/internal/entity" ) // CollectionRepo collection repository diff --git a/internal/service/collection_group_service.go b/internal/service/collection_group_service.go index 1e2894db..3c6a3a2b 100644 --- a/internal/service/collection_group_service.go +++ b/internal/service/collection_group_service.go @@ -3,10 +3,10 @@ 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/jinzhu/copier" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/service/collection_service.go b/internal/service/collection_service.go index 5b18fdd7..d2234289 100644 --- a/internal/service/collection_service.go +++ b/internal/service/collection_service.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" - collectioncommon "github.com/segmentfault/answer/internal/service/collection_common" - questioncommon "github.com/segmentfault/answer/internal/service/question_common" + "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/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 fe5e2ad0..749f0bec 100644 --- a/internal/service/comment/comment_service.go +++ b/internal/service/comment/comment_service.go @@ -3,18 +3,18 @@ package comment import ( "context" + "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/comment_common" + "github.com/answerdev/answer/internal/service/notice_queue" + object_info "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/jinzhu/copier" - "github.com/segmentfault/answer/internal/base/constant" - "github.com/segmentfault/answer/internal/base/pager" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/activity_common" - "github.com/segmentfault/answer/internal/service/comment_common" - "github.com/segmentfault/answer/internal/service/notice_queue" - object_info "github.com/segmentfault/answer/internal/service/object_info" - "github.com/segmentfault/answer/internal/service/permission" - usercommon "github.com/segmentfault/answer/internal/service/user_common" "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 ea657605..dc1f9fc9 100644 --- a/internal/service/comment_common/comment_service.go +++ b/internal/service/comment_common/comment_service.go @@ -3,9 +3,9 @@ package comment_common import ( "context" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" + "github.com/answerdev/answer/internal/base/reason" + "github.com/answerdev/answer/internal/entity" + "github.com/answerdev/answer/internal/schema" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/service/export/email_service.go b/internal/service/export/email_service.go index 9b61a2cc..ab396c83 100644 --- a/internal/service/export/email_service.go +++ b/internal/service/export/email_service.go @@ -6,8 +6,8 @@ import ( "fmt" "html/template" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/service/config" + "github.com/answerdev/answer/internal/base/reason" + "github.com/answerdev/answer/internal/service/config" "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 0ac58c3f..e383d119 100644 --- a/internal/service/follow/follow_service.go +++ b/internal/service/follow/follow_service.go @@ -3,10 +3,10 @@ package follow import ( "context" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/activity_common" - tagcommon "github.com/segmentfault/answer/internal/service/tag_common" + "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" ) type FollowRepo interface { diff --git a/internal/service/meta/meta_service.go b/internal/service/meta/meta_service.go index 9596762a..17760e31 100644 --- a/internal/service/meta/meta_service.go +++ b/internal/service/meta/meta_service.go @@ -3,8 +3,8 @@ package meta import ( "context" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" + "github.com/answerdev/answer/internal/base/reason" + "github.com/answerdev/answer/internal/entity" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/service/notice_queue/notice_queue.go b/internal/service/notice_queue/notice_queue.go index 8811ec47..2281a7ee 100644 --- a/internal/service/notice_queue/notice_queue.go +++ b/internal/service/notice_queue/notice_queue.go @@ -1,7 +1,7 @@ package notice_queue import ( - "github.com/segmentfault/answer/internal/schema" + "github.com/answerdev/answer/internal/schema" ) var ( diff --git a/internal/service/notification/notification_service.go b/internal/service/notification/notification_service.go index 7ebfa27a..b8a09976 100644 --- a/internal/service/notification/notification_service.go +++ b/internal/service/notification/notification_service.go @@ -5,12 +5,12 @@ import ( "encoding/json" "fmt" - "github.com/segmentfault/answer/internal/base/constant" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/pager" - "github.com/segmentfault/answer/internal/base/translator" - "github.com/segmentfault/answer/internal/schema" - notficationcommon "github.com/segmentfault/answer/internal/service/notification_common" + "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/translator" + "github.com/answerdev/answer/internal/schema" + notficationcommon "github.com/answerdev/answer/internal/service/notification_common" "github.com/segmentfault/pacman/i18n" "github.com/segmentfault/pacman/log" ) diff --git a/internal/service/notification_common/notification.go b/internal/service/notification_common/notification.go index 7f386f78..3513d0c7 100644 --- a/internal/service/notification_common/notification.go +++ b/internal/service/notification_common/notification.go @@ -5,17 +5,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/goccy/go-json" "github.com/jinzhu/copier" - "github.com/segmentfault/answer/internal/base/constant" - "github.com/segmentfault/answer/internal/base/data" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/activity_common" - "github.com/segmentfault/answer/internal/service/notice_queue" - "github.com/segmentfault/answer/internal/service/object_info" - usercommon "github.com/segmentfault/answer/internal/service/user_common" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" ) diff --git a/internal/service/object_info/object_info.go b/internal/service/object_info/object_info.go index 1daa7a14..d0749612 100644 --- a/internal/service/object_info/object_info.go +++ b/internal/service/object_info/object_info.go @@ -3,14 +3,14 @@ package object_info import ( "context" - "github.com/segmentfault/answer/internal/base/constant" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/schema" - answercommon "github.com/segmentfault/answer/internal/service/answer_common" - "github.com/segmentfault/answer/internal/service/comment_common" - questioncommon "github.com/segmentfault/answer/internal/service/question_common" - tagcommon "github.com/segmentfault/answer/internal/service/tag_common" - "github.com/segmentfault/answer/pkg/obj" + "github.com/answerdev/answer/internal/base/constant" + "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/segmentfault/pacman/errors" ) diff --git a/internal/service/permission/comment_permission.go b/internal/service/permission/comment_permission.go index 784703dd..ba04e0c3 100644 --- a/internal/service/permission/comment_permission.go +++ b/internal/service/permission/comment_permission.go @@ -1,6 +1,6 @@ package permission -import "github.com/segmentfault/answer/internal/schema" +import "github.com/answerdev/answer/internal/schema" // TODO: There is currently no permission management func GetCommentPermission(userID string, commentCreatorUserID string) ( diff --git a/internal/service/provider.go b/internal/service/provider.go index 6280ffce..3901766e 100644 --- a/internal/service/provider.go +++ b/internal/service/provider.go @@ -1,32 +1,32 @@ package service import ( + "github.com/answerdev/answer/internal/service/action" + "github.com/answerdev/answer/internal/service/activity" + 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/export" + "github.com/answerdev/answer/internal/service/follow" + "github.com/answerdev/answer/internal/service/meta" + "github.com/answerdev/answer/internal/service/notification" + notficationcommon "github.com/answerdev/answer/internal/service/notification_common" + "github.com/answerdev/answer/internal/service/object_info" + 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_backyard" + "github.com/answerdev/answer/internal/service/report_handle_backyard" + "github.com/answerdev/answer/internal/service/revision_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_backyard" + usercommon "github.com/answerdev/answer/internal/service/user_common" "github.com/google/wire" - "github.com/segmentfault/answer/internal/service/action" - "github.com/segmentfault/answer/internal/service/activity" - answercommon "github.com/segmentfault/answer/internal/service/answer_common" - "github.com/segmentfault/answer/internal/service/auth" - collectioncommon "github.com/segmentfault/answer/internal/service/collection_common" - "github.com/segmentfault/answer/internal/service/comment" - "github.com/segmentfault/answer/internal/service/comment_common" - "github.com/segmentfault/answer/internal/service/export" - "github.com/segmentfault/answer/internal/service/follow" - "github.com/segmentfault/answer/internal/service/meta" - "github.com/segmentfault/answer/internal/service/notification" - notficationcommon "github.com/segmentfault/answer/internal/service/notification_common" - "github.com/segmentfault/answer/internal/service/object_info" - questioncommon "github.com/segmentfault/answer/internal/service/question_common" - "github.com/segmentfault/answer/internal/service/rank" - "github.com/segmentfault/answer/internal/service/reason" - "github.com/segmentfault/answer/internal/service/report" - "github.com/segmentfault/answer/internal/service/report_backyard" - "github.com/segmentfault/answer/internal/service/report_handle_backyard" - "github.com/segmentfault/answer/internal/service/revision_common" - "github.com/segmentfault/answer/internal/service/tag" - tagcommon "github.com/segmentfault/answer/internal/service/tag_common" - "github.com/segmentfault/answer/internal/service/uploader" - "github.com/segmentfault/answer/internal/service/user_backyard" - usercommon "github.com/segmentfault/answer/internal/service/user_common" ) // ProviderSetService is providers. diff --git a/internal/service/question_common/question.go b/internal/service/question_common/question.go index eb9d9090..c9c105c8 100644 --- a/internal/service/question_common/question.go +++ b/internal/service/question_common/question.go @@ -5,18 +5,18 @@ import ( "encoding/json" "time" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/service/activity_common" - "github.com/segmentfault/answer/internal/service/config" - "github.com/segmentfault/answer/internal/service/meta" + "github.com/answerdev/answer/internal/base/reason" + "github.com/answerdev/answer/internal/service/activity_common" + "github.com/answerdev/answer/internal/service/config" + "github.com/answerdev/answer/internal/service/meta" "github.com/segmentfault/pacman/errors" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" - answercommon "github.com/segmentfault/answer/internal/service/answer_common" - collectioncommon "github.com/segmentfault/answer/internal/service/collection_common" - tagcommon "github.com/segmentfault/answer/internal/service/tag_common" - usercommon "github.com/segmentfault/answer/internal/service/user_common" + "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/segmentfault/pacman/log" ) diff --git a/internal/service/question_service.go b/internal/service/question_service.go index 73a53e76..88178654 100644 --- a/internal/service/question_service.go +++ b/internal/service/question_service.go @@ -5,21 +5,21 @@ import ( "fmt" "time" + "github.com/answerdev/answer/internal/base/constant" + "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" + collectioncommon "github.com/answerdev/answer/internal/service/collection_common" + "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/jinzhu/copier" - "github.com/segmentfault/answer/internal/base/constant" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/base/translator" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/activity" - collectioncommon "github.com/segmentfault/answer/internal/service/collection_common" - "github.com/segmentfault/answer/internal/service/meta" - "github.com/segmentfault/answer/internal/service/notice_queue" - "github.com/segmentfault/answer/internal/service/permission" - questioncommon "github.com/segmentfault/answer/internal/service/question_common" - "github.com/segmentfault/answer/internal/service/revision_common" - tagcommon "github.com/segmentfault/answer/internal/service/tag_common" - usercommon "github.com/segmentfault/answer/internal/service/user_common" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/i18n" "github.com/segmentfault/pacman/log" diff --git a/internal/service/rank/rank_service.go b/internal/service/rank/rank_service.go index 90fa15f2..c632149d 100644 --- a/internal/service/rank/rank_service.go +++ b/internal/service/rank/rank_service.go @@ -3,14 +3,14 @@ package rank import ( "context" - "github.com/segmentfault/answer/internal/base/pager" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/activity_type" - "github.com/segmentfault/answer/internal/service/config" - "github.com/segmentfault/answer/internal/service/object_info" - usercommon "github.com/segmentfault/answer/internal/service/user_common" + "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_type" + "github.com/answerdev/answer/internal/service/config" + "github.com/answerdev/answer/internal/service/object_info" + usercommon "github.com/answerdev/answer/internal/service/user_common" "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 6956e023..c3d8b2c9 100644 --- a/internal/service/reason/reason_service.go +++ b/internal/service/reason/reason_service.go @@ -2,8 +2,8 @@ package reason import ( "context" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/reason_common" + "github.com/answerdev/answer/internal/schema" + "github.com/answerdev/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 8b5dd41b..e4918ee1 100644 --- a/internal/service/reason_common/reason.go +++ b/internal/service/reason_common/reason.go @@ -2,7 +2,7 @@ package reason_common import ( "context" - "github.com/segmentfault/answer/internal/schema" + "github.com/answerdev/answer/internal/schema" ) type ReasonRepo interface { diff --git a/internal/service/report/report_service.go b/internal/service/report/report_service.go index 5e90c08d..ab57aeaf 100644 --- a/internal/service/report/report_service.go +++ b/internal/service/report/report_service.go @@ -3,14 +3,14 @@ package report import ( "encoding/json" - "github.com/segmentfault/answer/internal/base/constant" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/base/translator" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/object_info" - "github.com/segmentfault/answer/internal/service/report_common" - "github.com/segmentfault/answer/pkg/obj" + "github.com/answerdev/answer/internal/base/constant" + "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/object_info" + "github.com/answerdev/answer/internal/service/report_common" + "github.com/answerdev/answer/pkg/obj" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/i18n" "golang.org/x/net/context" diff --git a/internal/service/report_backyard/report_backyard.go b/internal/service/report_backyard/report_backyard.go index 029c4382..20249fce 100644 --- a/internal/service/report_backyard/report_backyard.go +++ b/internal/service/report_backyard/report_backyard.go @@ -4,20 +4,20 @@ import ( "context" "strings" - "github.com/segmentfault/answer/internal/service/config" + "github.com/answerdev/answer/internal/service/config" + "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/repo/common" + "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_backyard" + usercommon "github.com/answerdev/answer/internal/service/user_common" "github.com/jinzhu/copier" - "github.com/segmentfault/answer/internal/base/pager" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/repo/common" - "github.com/segmentfault/answer/internal/schema" - answercommon "github.com/segmentfault/answer/internal/service/answer_common" - "github.com/segmentfault/answer/internal/service/comment_common" - questioncommon "github.com/segmentfault/answer/internal/service/question_common" - "github.com/segmentfault/answer/internal/service/report_common" - "github.com/segmentfault/answer/internal/service/report_handle_backyard" - usercommon "github.com/segmentfault/answer/internal/service/user_common" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/service/report_common/report_common.go b/internal/service/report_common/report_common.go index b26bfd64..5b5f3827 100644 --- a/internal/service/report_common/report_common.go +++ b/internal/service/report_common/report_common.go @@ -2,8 +2,8 @@ package report_common import ( "context" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" + "github.com/answerdev/answer/internal/entity" + "github.com/answerdev/answer/internal/schema" ) // ReportRepo report repository diff --git a/internal/service/report_handle_backyard/report_handle.go b/internal/service/report_handle_backyard/report_handle.go index 5c24ac8f..358c2a4c 100644 --- a/internal/service/report_handle_backyard/report_handle.go +++ b/internal/service/report_handle_backyard/report_handle.go @@ -3,15 +3,15 @@ package report_handle_backyard import ( "context" - "github.com/segmentfault/answer/internal/service/config" + "github.com/answerdev/answer/internal/service/config" - "github.com/segmentfault/answer/internal/base/constant" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/comment" - "github.com/segmentfault/answer/internal/service/notice_queue" - questioncommon "github.com/segmentfault/answer/internal/service/question_common" - "github.com/segmentfault/answer/pkg/obj" + "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" + "github.com/answerdev/answer/internal/service/notice_queue" + questioncommon "github.com/answerdev/answer/internal/service/question_common" + "github.com/answerdev/answer/pkg/obj" ) type ReportHandle struct { diff --git a/internal/service/revision/revision.go b/internal/service/revision/revision.go index 57891ef9..333d8379 100644 --- a/internal/service/revision/revision.go +++ b/internal/service/revision/revision.go @@ -2,7 +2,7 @@ package revision import ( "context" - "github.com/segmentfault/answer/internal/entity" + "github.com/answerdev/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 3fa366ae..cee53710 100644 --- a/internal/service/revision_common/revision_service.go +++ b/internal/service/revision_common/revision_service.go @@ -3,12 +3,12 @@ package revision_common import ( "context" - "github.com/segmentfault/answer/internal/service/revision" - usercommon "github.com/segmentfault/answer/internal/service/user_common" + "github.com/answerdev/answer/internal/service/revision" + usercommon "github.com/answerdev/answer/internal/service/user_common" + "github.com/answerdev/answer/internal/entity" + "github.com/answerdev/answer/internal/schema" "github.com/jinzhu/copier" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" ) // RevisionService user service diff --git a/internal/service/revision_service.go b/internal/service/revision_service.go index 20b71a66..1e9b21d6 100644 --- a/internal/service/revision_service.go +++ b/internal/service/revision_service.go @@ -4,14 +4,14 @@ import ( "context" "encoding/json" + "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" + questioncommon "github.com/answerdev/answer/internal/service/question_common" + "github.com/answerdev/answer/internal/service/revision" + usercommon "github.com/answerdev/answer/internal/service/user_common" "github.com/jinzhu/copier" - "github.com/segmentfault/answer/internal/base/constant" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" - questioncommon "github.com/segmentfault/answer/internal/service/question_common" - "github.com/segmentfault/answer/internal/service/revision" - usercommon "github.com/segmentfault/answer/internal/service/user_common" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/service/search/accepted_answer.go b/internal/service/search/accepted_answer.go index f9f86f66..fafe2a84 100644 --- a/internal/service/search/accepted_answer.go +++ b/internal/service/search/accepted_answer.go @@ -4,8 +4,8 @@ import ( "context" "strings" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/search_common" + "github.com/answerdev/answer/internal/schema" + "github.com/answerdev/answer/internal/service/search_common" ) type AcceptedAnswerSearch struct { diff --git a/internal/service/search/answer.go b/internal/service/search/answer.go index fbac8dbb..d3f6fb09 100644 --- a/internal/service/search/answer.go +++ b/internal/service/search/answer.go @@ -2,8 +2,8 @@ package search import ( "context" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/search_common" + "github.com/answerdev/answer/internal/schema" + "github.com/answerdev/answer/internal/service/search_common" "strings" ) diff --git a/internal/service/search/answers.go b/internal/service/search/answers.go index 36ca50c6..6147f3c1 100644 --- a/internal/service/search/answers.go +++ b/internal/service/search/answers.go @@ -5,9 +5,9 @@ import ( "regexp" "strings" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/search_common" - "github.com/segmentfault/answer/pkg/converter" + "github.com/answerdev/answer/internal/schema" + "github.com/answerdev/answer/internal/service/search_common" + "github.com/answerdev/answer/pkg/converter" ) type AnswersSearch struct { diff --git a/internal/service/search/author.go b/internal/service/search/author.go index 0deedae3..d0a293b5 100644 --- a/internal/service/search/author.go +++ b/internal/service/search/author.go @@ -5,9 +5,9 @@ import ( "regexp" "strings" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/search_common" - usercommon "github.com/segmentfault/answer/internal/service/user_common" + "github.com/answerdev/answer/internal/schema" + "github.com/answerdev/answer/internal/service/search_common" + usercommon "github.com/answerdev/answer/internal/service/user_common" ) type AuthorSearch struct { diff --git a/internal/service/search/in_question.go b/internal/service/search/in_question.go index 00e24dcf..517c3d06 100644 --- a/internal/service/search/in_question.go +++ b/internal/service/search/in_question.go @@ -2,8 +2,8 @@ package search import ( "context" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/search_common" + "github.com/answerdev/answer/internal/schema" + "github.com/answerdev/answer/internal/service/search_common" "regexp" "strings" ) diff --git a/internal/service/search/not_accepted_question.go b/internal/service/search/not_accepted_question.go index 9609dc42..e2c34636 100644 --- a/internal/service/search/not_accepted_question.go +++ b/internal/service/search/not_accepted_question.go @@ -4,8 +4,8 @@ import ( "context" "strings" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/search_common" + "github.com/answerdev/answer/internal/schema" + "github.com/answerdev/answer/internal/service/search_common" ) type NotAcceptedQuestion struct { diff --git a/internal/service/search/object.go b/internal/service/search/object.go index abb79363..c35564d4 100644 --- a/internal/service/search/object.go +++ b/internal/service/search/object.go @@ -4,8 +4,8 @@ import ( "context" "strings" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/search_common" + "github.com/answerdev/answer/internal/schema" + "github.com/answerdev/answer/internal/service/search_common" ) type ObjectSearch struct { diff --git a/internal/service/search/question.go b/internal/service/search/question.go index 30c914b7..83e7713e 100644 --- a/internal/service/search/question.go +++ b/internal/service/search/question.go @@ -2,8 +2,8 @@ package search import ( "context" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/search_common" + "github.com/answerdev/answer/internal/schema" + "github.com/answerdev/answer/internal/service/search_common" "strings" ) diff --git a/internal/service/search/score.go b/internal/service/search/score.go index 25e626ad..71287ec7 100644 --- a/internal/service/search/score.go +++ b/internal/service/search/score.go @@ -5,9 +5,9 @@ import ( "regexp" "strings" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/search_common" - "github.com/segmentfault/answer/pkg/converter" + "github.com/answerdev/answer/internal/schema" + "github.com/answerdev/answer/internal/service/search_common" + "github.com/answerdev/answer/pkg/converter" ) type ScoreSearch struct { diff --git a/internal/service/search/tag.go b/internal/service/search/tag.go index 821b74f7..73bd3a71 100644 --- a/internal/service/search/tag.go +++ b/internal/service/search/tag.go @@ -5,11 +5,11 @@ import ( "regexp" "strings" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/activity_common" - "github.com/segmentfault/answer/internal/service/search_common" - tagcommon "github.com/segmentfault/answer/internal/service/tag_common" + "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/search_common" + tagcommon "github.com/answerdev/answer/internal/service/tag_common" ) type TagSearch struct { diff --git a/internal/service/search/views.go b/internal/service/search/views.go index ba16873d..49e4db6a 100644 --- a/internal/service/search/views.go +++ b/internal/service/search/views.go @@ -2,8 +2,8 @@ package search import ( "context" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/search_common" + "github.com/answerdev/answer/internal/schema" + "github.com/answerdev/answer/internal/service/search_common" "regexp" "strings" ) diff --git a/internal/service/search/within.go b/internal/service/search/within.go index 5e194189..9461c23d 100644 --- a/internal/service/search/within.go +++ b/internal/service/search/within.go @@ -3,8 +3,8 @@ package search import ( "context" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/search_common" + "github.com/answerdev/answer/internal/schema" + "github.com/answerdev/answer/internal/service/search_common" ) type WithinSearch struct { diff --git a/internal/service/search_common/search.go b/internal/service/search_common/search.go index de63249f..7f51ceda 100644 --- a/internal/service/search_common/search.go +++ b/internal/service/search_common/search.go @@ -2,7 +2,7 @@ package search_common import ( "context" - "github.com/segmentfault/answer/internal/schema" + "github.com/answerdev/answer/internal/schema" ) type SearchRepo interface { diff --git a/internal/service/search_service.go b/internal/service/search_service.go index 0602425e..098fac58 100644 --- a/internal/service/search_service.go +++ b/internal/service/search_service.go @@ -3,12 +3,12 @@ package service import ( "context" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/activity_common" - "github.com/segmentfault/answer/internal/service/search" - "github.com/segmentfault/answer/internal/service/search_common" - tagcommon "github.com/segmentfault/answer/internal/service/tag_common" - usercommon "github.com/segmentfault/answer/internal/service/user_common" + "github.com/answerdev/answer/internal/schema" + "github.com/answerdev/answer/internal/service/activity_common" + "github.com/answerdev/answer/internal/service/search" + "github.com/answerdev/answer/internal/service/search_common" + tagcommon "github.com/answerdev/answer/internal/service/tag_common" + usercommon "github.com/answerdev/answer/internal/service/user_common" ) type Search interface { diff --git a/internal/service/siteinfo_common/siteinfo.go b/internal/service/siteinfo_common/siteinfo.go index 0d1c9a91..ff9066b0 100644 --- a/internal/service/siteinfo_common/siteinfo.go +++ b/internal/service/siteinfo_common/siteinfo.go @@ -2,7 +2,7 @@ package siteinfo_common import ( "context" - "github.com/segmentfault/answer/internal/entity" + "github.com/answerdev/answer/internal/entity" ) type SiteInfoRepo interface { diff --git a/internal/service/siteinfo_service.go b/internal/service/siteinfo_service.go index 89db720c..23b8d566 100644 --- a/internal/service/siteinfo_service.go +++ b/internal/service/siteinfo_service.go @@ -4,12 +4,12 @@ import ( "context" "encoding/json" + "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/export" + "github.com/answerdev/answer/internal/service/siteinfo_common" "github.com/jinzhu/copier" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/export" - "github.com/segmentfault/answer/internal/service/siteinfo_common" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/service/tag/tag_service.go b/internal/service/tag/tag_service.go index 945f6356..cf6fc02e 100644 --- a/internal/service/tag/tag_service.go +++ b/internal/service/tag/tag_service.go @@ -5,17 +5,17 @@ import ( "encoding/json" "strings" - "github.com/segmentfault/answer/internal/service/revision_common" + "github.com/answerdev/answer/internal/service/revision_common" + "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" + tagcommon "github.com/answerdev/answer/internal/service/tag_common" + "github.com/answerdev/answer/pkg/converter" "github.com/jinzhu/copier" - "github.com/segmentfault/answer/internal/base/pager" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/activity_common" - "github.com/segmentfault/answer/internal/service/permission" - tagcommon "github.com/segmentfault/answer/internal/service/tag_common" - "github.com/segmentfault/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 b76c3503..dd8353eb 100644 --- a/internal/service/tag_common/tag_common.go +++ b/internal/service/tag_common/tag_common.go @@ -5,10 +5,10 @@ import ( "encoding/json" "strings" - "github.com/segmentfault/answer/internal/service/revision_common" + "github.com/answerdev/answer/internal/service/revision_common" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" + "github.com/answerdev/answer/internal/entity" + "github.com/answerdev/answer/internal/schema" "github.com/segmentfault/pacman/log" ) diff --git a/internal/service/uploader/upload.go b/internal/service/uploader/upload.go index a202ba8c..bccd7c6c 100644 --- a/internal/service/uploader/upload.go +++ b/internal/service/uploader/upload.go @@ -6,11 +6,11 @@ import ( "path" "path/filepath" + "github.com/answerdev/answer/internal/base/reason" + "github.com/answerdev/answer/internal/service/service_config" + "github.com/answerdev/answer/pkg/dir" + "github.com/answerdev/answer/pkg/uid" "github.com/gin-gonic/gin" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/service/service_config" - "github.com/segmentfault/answer/pkg/dir" - "github.com/segmentfault/answer/pkg/uid" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/service/user_backyard/user_backyard.go b/internal/service/user_backyard/user_backyard.go index 7fb79b6c..c82ce1ae 100644 --- a/internal/service/user_backyard/user_backyard.go +++ b/internal/service/user_backyard/user_backyard.go @@ -5,11 +5,11 @@ import ( "fmt" "time" + "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/jinzhu/copier" - "github.com/segmentfault/answer/internal/base/pager" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" "github.com/segmentfault/pacman/errors" ) diff --git a/internal/service/user_common/user.go b/internal/service/user_common/user.go index 12ecf641..0297ae47 100644 --- a/internal/service/user_common/user.go +++ b/internal/service/user_common/user.go @@ -3,8 +3,8 @@ package usercommon import ( "context" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" + "github.com/answerdev/answer/internal/entity" + "github.com/answerdev/answer/internal/schema" ) type UserRepo interface { diff --git a/internal/service/user_service.go b/internal/service/user_service.go index 20ab8346..0b5ad76f 100644 --- a/internal/service/user_service.go +++ b/internal/service/user_service.go @@ -9,16 +9,16 @@ import ( "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/activity" + "github.com/answerdev/answer/internal/service/auth" + "github.com/answerdev/answer/internal/service/export" + "github.com/answerdev/answer/internal/service/service_config" + usercommon "github.com/answerdev/answer/internal/service/user_common" + "github.com/answerdev/answer/pkg/checker" "github.com/google/uuid" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/schema" - "github.com/segmentfault/answer/internal/service/activity" - "github.com/segmentfault/answer/internal/service/auth" - "github.com/segmentfault/answer/internal/service/export" - "github.com/segmentfault/answer/internal/service/service_config" - usercommon "github.com/segmentfault/answer/internal/service/user_common" - "github.com/segmentfault/answer/pkg/checker" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" "golang.org/x/crypto/bcrypt" diff --git a/internal/service/vote_service.go b/internal/service/vote_service.go index 50f90deb..74789529 100644 --- a/internal/service/vote_service.go +++ b/internal/service/vote_service.go @@ -3,20 +3,20 @@ package service import ( "context" - "github.com/segmentfault/answer/internal/base/pager" - "github.com/segmentfault/answer/internal/entity" - "github.com/segmentfault/answer/internal/service/activity_type" - "github.com/segmentfault/answer/internal/service/comment_common" - "github.com/segmentfault/answer/internal/service/config" - "github.com/segmentfault/answer/internal/service/object_info" - "github.com/segmentfault/answer/pkg/obj" + "github.com/answerdev/answer/internal/base/pager" + "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/obj" "github.com/segmentfault/pacman/log" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/internal/schema" - answercommon "github.com/segmentfault/answer/internal/service/answer_common" - questioncommon "github.com/segmentfault/answer/internal/service/question_common" - "github.com/segmentfault/answer/internal/service/unique" + "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/answerdev/answer/internal/service/unique" "github.com/segmentfault/pacman/errors" ) diff --git a/pkg/obj/obj.go b/pkg/obj/obj.go index 3c62ebc9..931fa9fd 100644 --- a/pkg/obj/obj.go +++ b/pkg/obj/obj.go @@ -1,9 +1,9 @@ package obj import ( - "github.com/segmentfault/answer/internal/base/constant" - "github.com/segmentfault/answer/internal/base/reason" - "github.com/segmentfault/answer/pkg/converter" + "github.com/answerdev/answer/internal/base/constant" + "github.com/answerdev/answer/internal/base/reason" + "github.com/answerdev/answer/pkg/converter" "github.com/segmentfault/pacman/errors" ) From 833ef0ea9837d71367fd3c83071fbff549c12a9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=84=E8=A1=A8=E4=BC=9F?= <zhuangbiaowei@huawei.com> Date: Mon, 24 Oct 2022 17:52:24 +0800 Subject: [PATCH 6/9] Modify default dir_name when docker-compose start fix bug #10 --- docker-compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index d0c69b55..de1f898e 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -11,7 +11,7 @@ services: links: - db volumes: - - ./answer/data:/data + - ./answer-data/data:/data db: image: mariadb:10.4.7 ports: @@ -25,4 +25,4 @@ services: timeout: 20s retries: 10 volumes: - - ./answer/mysql:/var/lib/mysql + - ./answer-data/mysql:/var/lib/mysql From 2933d34c7da472fe6f1d107fa3485c1676c0145e Mon Sep 17 00:00:00 2001 From: Pan YANG <arielyang@gmail.com> Date: Mon, 24 Oct 2022 22:15:26 +0800 Subject: [PATCH 7/9] feat: add full content of zh_CN translation --- i18n/zh_CN.yaml | 155 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 150 insertions(+), 5 deletions(-) diff --git a/i18n/zh_CN.yaml b/i18n/zh_CN.yaml index 30117fd9..15c95126 100644 --- a/i18n/zh_CN.yaml +++ b/i18n/zh_CN.yaml @@ -15,11 +15,156 @@ email: password: other: "密码" -username_or_password_wrong_error: &username_or_password_wrong - other: "用户名或密码错误" +email_or_password_wrong_error: &email_or_password_wrong + other: "邮箱或密码错误" error: - user: - username_or_password_wrong: *username_or_password_wrong admin: - username_or_password_wrong: *username_or_password_wrong + email_or_password_wrong: *email_or_password_wrong + answer: + not_found: + other: "答案未找到" + comment: + edit_without_permission: + other: "不允许编辑评论" + not_found: + other: "评论未找到" + email: + duplicate: + other: "邮箱已经存在" + need_to_be_verified: + other: "邮箱需要验证" + verify_url_expired: + other: "邮箱验证的网址已过期,请重新发送邮件" + lang: + not_found: + other: "语言未找到" + object: + captcha_verification_failed: + other: "验证码错误" + disallow_follow: + other: "你不能关注" + disallow_vote: + other: "你不能投票" + disallow_vote_your_self: + other: "你不能为自己的帖子投票!" + not_found: + other: "对象未找到" + verification_failed: + other: "验证失败" + email_or_password_incorrect: + other: "邮箱或密码不正确" + old_password_verification_failed: + other: "旧密码验证失败" + new_password_same_as_previous_setting: + other: "新密码与之前的设置相同" + question: + not_found: + other: "问题未找到" + rank: + fail_to_meet_the_condition: + other: "级别不符合条件" + report: + handle_failed: + other: "报告处理失败" + not_found: + other: "报告未找到" + tag: + not_found: + other: "标签未找到" + theme: + not_found: + other: "主题未找到" + user: + email_or_password_wrong: + other: *email_or_password_wrong + not_found: + other: "用户未找到" + suspended: + other: "用户已被暂停" + username_invalid: + other: "用户名无效" + username_duplicate: + other: "用户名已被使用" + +report: + spam: + name: + other: "垃圾信息" + description: + other: "此帖子是一个广告贴,或是破坏性行为。它对当前的主题无用,也不相关。" + rude: + name: + other: "粗鲁或辱骂的" + description: + other: "有理智的人都会发现此内容不适合进行尊重的讨论。" + duplicate: + name: + other: "重复信息" + description: + other: "此问题以前就有人问过,而且已经有了答案。" + not_answer: + name: + other: "不是答案" + description: + other: "此帖子是作为一个答案发布的,但它并没有试图回答这个问题。总之,它可能应该是个编辑,评论,另一个问题或者被删除。" + not_need: + name: + other: "不再需要" + description: + other: "此条评论是过时的,对话性的或与本帖无关。" + other: + name: + other: "其他原因" + description: + other: "此帖子需要工作人员关注,因为是上述所列以外的其他理由。" + +question: + close: + duplicate: + name: + other: "垃圾信息" + description: + other: "此问题以前就有人问过,而且已经有了答案。" + guideline: + name: + other: "社区特定原因" + description: + other: "此问题不符合社区准则。" + multiple: + name: + other: "需要细节或澄清" + description: + other: "此问题目前涵盖多个问题。它应该只集中在一个问题上。" + other: + name: + other: "其他原因" + description: + other: "此帖子需要上述所列以外的其他理由。" + +notification: + action: + update_question: + other: "更新了问题" + answer_the_question: + other: "回答了问题" + update_answer: + other: "更新了答案" + adopt_answer: + other: "接受了答案" + comment_question: + other: "评论了问题" + comment_answer: + other: "评论了答案" + reply_to_you: + other: "回复了你" + mention_you: + other: "提到了你" + your_question_is_closed: + other: "你的问题已被关闭" + your_question_was_deleted: + other: "你的问题已被删除" + your_answer_was_deleted: + other: "你的答案已被删除" + your_comment_was_deleted: + other: "你的评论已被删除" From f77e455e275c7c4f5d11e32d8d51839dcbf6168a Mon Sep 17 00:00:00 2001 From: K8sCat <k8scat@gmail.com> Date: Mon, 24 Oct 2022 20:26:00 +0800 Subject: [PATCH 8/9] update(pkg): make functions in dir more clear Signed-off-by: K8sCat <k8scat@gmail.com> --- internal/cli/install.go | 6 +++--- internal/cli/install_check.go | 4 ++-- internal/service/uploader/upload.go | 4 ++-- pkg/dir/dir.go | 32 +++++++++-------------------- 4 files changed, 17 insertions(+), 29 deletions(-) diff --git a/internal/cli/install.go b/internal/cli/install.go index c1e0b3b5..151e8570 100644 --- a/internal/cli/install.go +++ b/internal/cli/install.go @@ -44,7 +44,7 @@ func installConfigFile() { return } - if _, err := dir.CreatePathIsNotExist(ConfigFilePath); err != nil { + if err := dir.CreateDirIfNotExist(ConfigFilePath); err != nil { fmt.Printf("[config-file] create directory fail %s\n", err.Error()) return } @@ -59,7 +59,7 @@ func installConfigFile() { func installUploadDir() { fmt.Println("[upload-dir] try to install...") - if _, err := dir.CreatePathIsNotExist(UploadFilePath); err != nil { + if err := dir.CreateDirIfNotExist(UploadFilePath); err != nil { fmt.Printf("[upload-dir] install fail %s\n", err.Error()) } else { fmt.Printf("[upload-dir] install success, upload directory is %s\n", UploadFilePath) @@ -68,7 +68,7 @@ func installUploadDir() { func installI18nBundle() { fmt.Println("[i18n] try to install i18n bundle...") - if _, err := dir.CreatePathIsNotExist(I18nPath); err != nil { + if err := dir.CreateDirIfNotExist(I18nPath); err != nil { fmt.Println(err.Error()) return } diff --git a/internal/cli/install_check.go b/internal/cli/install_check.go index 953d58a8..5ed217a4 100644 --- a/internal/cli/install_check.go +++ b/internal/cli/install_check.go @@ -6,11 +6,11 @@ import ( ) func CheckConfigFile(configPath string) bool { - return dir.CheckPathExist(configPath) + return dir.CheckFileExist(configPath) } func CheckUploadDir() bool { - return dir.CheckPathExist(UploadFilePath) + return dir.CheckDirExist(UploadFilePath) } func CheckDB(dataConf *data.Database) bool { diff --git a/internal/service/uploader/upload.go b/internal/service/uploader/upload.go index a202ba8c..bc629004 100644 --- a/internal/service/uploader/upload.go +++ b/internal/service/uploader/upload.go @@ -26,11 +26,11 @@ type UploaderService struct { // NewUploaderService new upload service func NewUploaderService(serviceConfig *service_config.ServiceConfig) *UploaderService { - _, err := dir.CreatePathIsNotExist(filepath.Join(serviceConfig.UploadPath, avatarSubPath)) + err := dir.CreateDirIfNotExist(filepath.Join(serviceConfig.UploadPath, avatarSubPath)) if err != nil { panic(err) } - _, err = dir.CreatePathIsNotExist(filepath.Join(serviceConfig.UploadPath, postSubPath)) + err = dir.CreateDirIfNotExist(filepath.Join(serviceConfig.UploadPath, postSubPath)) if err != nil { panic(err) } diff --git a/pkg/dir/dir.go b/pkg/dir/dir.go index 5be4f8ec..559f0d1c 100644 --- a/pkg/dir/dir.go +++ b/pkg/dir/dir.go @@ -2,28 +2,16 @@ package dir import "os" -// CreatePathIsNotExist create path is not exists -func CreatePathIsNotExist(path string) (bool, error) { - _, err := os.Stat(path) - if err == nil { - return true, nil - } - if os.IsNotExist(err) { - // create directory - if err := os.MkdirAll(path, os.ModePerm); err != nil { - return false, err - } else { - return true, nil - } - } - return false, err +func CreateDirIfNotExist(path string) error { + return os.MkdirAll(path, os.ModePerm) } -// CheckPathExist path if exist -func CheckPathExist(path string) bool { - _, err := os.Stat(path) - if err == nil { - return true - } - return false +func CheckDirExist(path string) bool { + f, err := os.Stat(path) + return err == nil && f.IsDir() +} + +func CheckFileExist(path string) bool { + f, err := os.Stat(path) + return err == nil && !f.IsDir() } From d3d7ef6a7c1315f092377e197ca40d77c652dfd6 Mon Sep 17 00:00:00 2001 From: K8sCat <k8scat@gmail.com> Date: Mon, 24 Oct 2022 20:27:03 +0800 Subject: [PATCH 9/9] update(gitignore): ignore data volume path Signed-off-by: K8sCat <k8scat@gmail.com> --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index fc45eec8..c0aed5e7 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ Thumbs*.db tmp vendor/ .husky +answer-data/