From 01094e3e2c47dbb54bf65ef61252653f82fa343a Mon Sep 17 00:00:00 2001 From: aichy Date: Wed, 28 Sep 2022 16:41:51 +0800 Subject: [PATCH] fix --- Dockerfile | 6 +- cmd/answer/data/config.yaml | 19 ---- cmd/answer/data/i18n/en_US.yaml | 160 -------------------------------- cmd/answer/data/i18n/zh_CN.yaml | 25 ----- i18n/i18n.go | 2 +- internal/cli/install.go | 6 +- 6 files changed, 6 insertions(+), 212 deletions(-) delete mode 100644 cmd/answer/data/config.yaml delete mode 100644 cmd/answer/data/i18n/en_US.yaml delete mode 100644 cmd/answer/data/i18n/zh_CN.yaml diff --git a/Dockerfile b/Dockerfile index 43393991..fd6480c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,8 +28,7 @@ CMD ls -al ${BUILD_DIR}/web/html RUN make clean build && \ cp answer /usr/bin/answer && \ mkdir -p /tmp/cache && chmod 777 /tmp/cache && \ - mkdir /data && chmod 777 /data && cp configs/config.yaml /data && \ - mkdir -p /data/upfiles && chmod 777 /data/upfiles && cp -r i18n /data + mkdir /data && chmod 777 /data FROM debian:bullseye @@ -49,5 +48,4 @@ VOLUME /data COPY --from=golang-builder /usr/bin/answer /usr/bin/answer EXPOSE 80 -CMD ["/usr/bin/answer", "init"] -ENTRYPOINT ["dumb-init", "/usr/bin/answer", "-c", "/data/config.yaml"] +ENTRYPOINT ["dumb-init", "/usr/bin/answer","init", "&&", "/usr/bin/answer", "-c", "/data/config.yaml"] diff --git a/cmd/answer/data/config.yaml b/cmd/answer/data/config.yaml deleted file mode 100644 index db7b7c09..00000000 --- a/cmd/answer/data/config.yaml +++ /dev/null @@ -1,19 +0,0 @@ -server: - http: - addr: 0.0.0.0:80 -data: - database: - connection: root:root@tcp(127.0.0.1:3306)/answer - cache: - file_path: "/tmp/cache/cache.db" -i18n: - bundle_dir: "/data/i18n" -swaggerui: - show: false - protocol: http - host: 127.0.0.1 - address: ':80' -service_config: - secret_key: "answer" - web_host: "http://127.0.0.1" - upload_path: "./upfiles" diff --git a/cmd/answer/data/i18n/en_US.yaml b/cmd/answer/data/i18n/en_US.yaml deleted file mode 100644 index 6e4a1e8d..00000000 --- a/cmd/answer/data/i18n/en_US.yaml +++ /dev/null @@ -1,160 +0,0 @@ -base: - success: - other: "success" - unknown: - other: "unknown error" - request_format_error: - other: "request format is not valid" - unauthorized_error: - other: "unauthorized" - database_error: - other: "data server error" - -email: - other: "email" -password: - other: "password" - -email_or_password_wrong_error: &email_or_password_wrong - other: "email or password wrong" - -error: - admin: - email_or_password_wrong: *email_or_password_wrong - answer: - not_found: - other: "answer not found" - comment: - edit_without_permission: - other: "comment not allowed to edit" - not_found: - other: "comment not found" - email: - duplicate: - other: "email already exists" - need_to_be_verified: - other: "email should be verified" - verify_url_expired: - other: "email verified url is expired, please resend the email" - lang: - not_found: - other: "language not found" - object: - captcha_verification_failed: - other: "captcha wrong" - disallow_follow: - other: "You are not allowed to follow" - disallow_vote: - other: "You are not allowed to vote" - disallow_vote_your_self: - other: "You can't vote for your own post!" - not_found: - other: "object not found" - question: - not_found: - other: "question not found" - rank: - fail_to_meet_the_condition: - other: "rank fail to meet the condition" - report: - handle_failed: - other: "report handle failed" - not_found: - other: "report not found" - tag: - not_found: - other: "tag not found" - theme: - not_found: - other: "theme not found" - user: - email_or_password_wrong: - other: *email_or_password_wrong - not_found: - other: "user not found" - suspended: - other: "user is suspended" - - - -report: - spam: - name: - other: "spam" - description: - other: "This post is an advertisement,or vandalism.It is not useful or relevant to the current topic." - rude: - name: - other: "rude or abusive" - description: - other: "A reasonable person would find this content inappropriate for respectful discourse." - duplicate: - name: - other: "a duplicate" - description: - other: "This question has been asked before and already has an answer." - not_answer: - name: - other: "not an answer" - description: - other: "This was posted as an answer,but it does not attempt to answer the question. It should possibly be an edit,a comment,another question,or deleted altogether." - not_need: - name: - other: "no longer needed" - description: - other: "This comment is outdated,conversational or not relevant to this post." - other: - name: - other: "something else" - description: - other: "This post requires staff attention for another reason not listed above." - -question: - close: - duplicate: - name: - other: "spam" - description: - other: "This question has been asked before and already has an answer." - guideline: - name: - other: "a community-specific reason" - description: - other: "This question doesn't meet a community guideline." - multiple: - name: - other: "needs details or clarity" - description: - other: "This question currently includes multiple questions in one. It should focus on one problem only." - other: - name: - other: "something else" - description: - other: "This post requires another reason not listed above." - -notification: - action: - update_question: - other: "update question" - answer_the_question: - other: "answer the question" - update_answer: - other: "update answer" - adopt_answer: - other: "adopt answer" - comment_question: - other: "comment question" - comment_answer: - other: "comment answer" - reply_to_you: - other: "reply to you" - mention_you: - other: "mention you" - your_question_is_closed: - other: "your question is closed" - your_question_was_deleted: - other: "your question was deleted" - your_answer_was_deleted: - other: "your answer was deleted" - your_comment_was_deleted: - other: "your comment was deleted" diff --git a/cmd/answer/data/i18n/zh_CN.yaml b/cmd/answer/data/i18n/zh_CN.yaml deleted file mode 100644 index 30117fd9..00000000 --- a/cmd/answer/data/i18n/zh_CN.yaml +++ /dev/null @@ -1,25 +0,0 @@ -base: - success: - other: "成功" - unknown: - other: "未知错误" - request_format_error: - other: "请求格式错误" - unauthorized_error: - other: "未登录" - database_error: - other: "数据服务异常" - -email: - other: "邮箱" -password: - other: "密码" - -username_or_password_wrong_error: &username_or_password_wrong - other: "用户名或密码错误" - -error: - user: - username_or_password_wrong: *username_or_password_wrong - admin: - username_or_password_wrong: *username_or_password_wrong diff --git a/i18n/i18n.go b/i18n/i18n.go index 47198467..0613302a 100644 --- a/i18n/i18n.go +++ b/i18n/i18n.go @@ -1,4 +1,4 @@ -package I18n +package i18n import "embed" diff --git a/internal/cli/install.go b/internal/cli/install.go index aec9dd6f..8031c58d 100644 --- a/internal/cli/install.go +++ b/internal/cli/install.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/segmentfault/answer/I18n" "github.com/segmentfault/answer/configs" + "github.com/segmentfault/answer/i18n" "github.com/segmentfault/answer/pkg/dir" ) @@ -45,14 +45,14 @@ func InitConfig() { fmt.Println(err.Error()) os.Exit(2) } - i18nList, err := I18n.I18n.ReadDir(".") + i18nList, err := i18n.I18n.ReadDir(".") if err != nil { fmt.Println(err.Error()) os.Exit(2) } for _, item := range i18nList { path := fmt.Sprintf("data/i18n/%s", item.Name()) - content, err := I18n.I18n.ReadFile(item.Name()) + content, err := i18n.I18n.ReadFile(item.Name()) if err != nil { continue }